[proaudio] [1744] qsampler: cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 1744
Author:   gentoid
Date:     2010-09-02 21:55:53 +0200 (Thu, 02 Sep 2010)
Log Message:
-----------
qsampler: cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/qsampler/ChangeLog
    trunk/overlays/proaudio/media-sound/qsampler/Manifest
    trunk/overlays/proaudio/media-sound/qsampler/qsampler-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/qsampler/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/qsampler/ChangeLog	2010-09-02 19:44:26 UTC (rev 1743)
+++ trunk/overlays/proaudio/media-sound/qsampler/ChangeLog	2010-09-02 19:55:53 UTC (rev 1744)
@@ -1,7 +1,10 @@
 # ChangeLog for media-sound/qsampler
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Sep 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> qsampler-9999.ebuild:
+  cleanup
+
   06 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
   qsampler-0.2.1.ebuild, qsampler-9999.ebuild:
   fixed qt4_min_version

Modified: trunk/overlays/proaudio/media-sound/qsampler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/qsampler/Manifest	2010-09-02 19:44:26 UTC (rev 1743)
+++ trunk/overlays/proaudio/media-sound/qsampler/Manifest	2010-09-02 19:55:53 UTC (rev 1744)
@@ -1,3 +1,3 @@
-EBUILD qsampler-9999.ebuild 833 RMD160 7e98c6da83e4331aaff3788dc39513c85b2c93fd SHA1 bd5cd2e25838defdc7a6d616178b6c4d5f5dee7f SHA256 cb73ceeee5455f4143f66ea1d0c8ee25b89eea1eaddefe32ccf7d7c7cd231530
-MISC ChangeLog 338 RMD160 e50bdd68923743b1a59135756ddeb28816608d1a SHA1 e54cb7631ff9fc61474bbdcc31bc10dac501ed36 SHA256 fb5a7cc22a3bf533cf132237bd0e846a2b4d8b5ddc56cca8138a694acf80445a
+EBUILD qsampler-9999.ebuild 810 RMD160 d3b9c02f2141ace3940fdfed49866711a591f603 SHA1 440f87a940631252bdb83cc9273591a54f310e81 SHA256 7f5bd26162aa43eb33c95b313c1131fca9d5a03ba14c1cf0db503a37b07f3d44
+MISC ChangeLog 424 RMD160 ab82cc1b4ce645531c0239cc6b4186122483e41a SHA1 f13eb502af52199239b55a4b4cfbead5d1c3086f SHA256 d6d950d6e8f070247f0fae89321a21045a3e2002e36b60dff853f4a17269d4d2
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/qsampler/qsampler-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/qsampler/qsampler-9999.ebuild	2010-09-02 19:44:26 UTC (rev 1743)
+++ trunk/overlays/proaudio/media-sound/qsampler/qsampler-9999.ebuild	2010-09-02 19:55:53 UTC (rev 1744)
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="2"
 
-inherit eutils qt4 cvs
+inherit eutils qt4-r2 cvs
 
 DESCRIPTION="QSampler is a graphical frontend to the LinuxSampler engine."
 HOMEPAGE="http://qsampler.sourceforge.net";
@@ -17,8 +17,7 @@
 SLOT="0"
 KEYWORDS=""
 IUSE=""
-RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui )
-			>=x11-libs/qt-4.1:4 )
+RDEPEND="x11-libs/qt-gui:4
 	>=media-libs/liblscp-0.5.5
 	>=media-libs/libgig-0.3.3
 	>=media-sound/linuxsampler-0.4
@@ -26,9 +25,12 @@
 
 DEPEND="${RDEPEND}"
 
-src_compile() {
+src_configure() {
 	make -f Makefile.cvs
 	econf || die "configure failed"
+}
+
+src_compile() {
 	emake || die "make failed"
 }