Migrate to qt4-r2.eclass, ACK'ed by aballier in bug #409705.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

3 files changed, 35 insertions, 26 deletions

diff --git a/media-sound/qjackctl/ChangeLog b/media-sound/qjackctl/ChangeLog
index f7fa064725e3..2768e6b32914 100644
--- a/media-sound/qjackctl/ChangeLog
+++ b/media-sound/qjackctl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qjackctl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.71 2011/08/12 18:51:07 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.72 2012/03/27 12:13:03 pesa Exp $
+
+  27 Mar 2012; Davide Pesavento <pesa@gentoo.org> qjackctl-0.3.8.ebuild:
+  Migrate to qt4-r2.eclass, ACK'ed by aballier in bug #409705.
 
   12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> qjackctl-0.3.2.ebuild,
   qjackctl-0.3.7.ebuild, qjackctl-0.3.8.ebuild:
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index fca561a682e9..1725eb4869c0 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST qjackctl-0.3.2.tar.gz 264605 RMD160 0dc0638205371b49ad35883e235802da770169cf SHA1 690e77f10d934e648fbc975db81b1bccb20d7487 SHA256 6bf52fb16b0f4ec964a870444a0fee1e30345d1110955c4f3ff5dc0cd20526ae
 DIST qjackctl-0.3.7.tar.gz 418826 RMD160 64a4d6025aebd8a11212605139c0a654b7fbfb19 SHA1 187ed47a797d7083608aacf2f08353896646ed74 SHA256 48b0f1d57d8bb1ab1ae344bdcbf20266a00d1e3e01518fd168a4a11644f5d6bf
 DIST qjackctl-0.3.8.tar.gz 444244 RMD160 22038acba5cc7c2d070b9e2ec437afd1f1fbbf61 SHA1 41456a54010d6d4760414da581af58a06c8fe4e3 SHA256 870869836535476b7a2d77fa70c39f7d8facc4767c8fa1aac3c81d6ce7ba71e5
 EBUILD qjackctl-0.3.2.ebuild 1250 RMD160 2b7bfb0c82237ac40f1035210343c617b3959348 SHA1 06832995a4af0290e90de721b3fcd390a2f7557d SHA256 94db85dbc7b460df576228fddea6b7103bb9909c6ed36ea531a234c95e1ab7bd
 EBUILD qjackctl-0.3.7.ebuild 1253 RMD160 786cc4c7ebaf6c54108fbc11f627964571b12cfd SHA1 b372c88c3207f891d3c85573df26d390fc78ab93 SHA256 a7bf4a1799f43de1e41fddf546877b280656aa29a99991228832560aa58603fb
-EBUILD qjackctl-0.3.8.ebuild 1254 RMD160 242da32a699a4be7cb2294218329a079347c352a SHA1 c7838be54c458a98654f0cffe349997bd4217b7d SHA256 1d285efdd2b7b7a808e9089f63e3a8bd9a8f353c7a6cebbc931cd14d15a17ef5
-MISC ChangeLog 9616 RMD160 89664d84506990c5f4f8010565ce3b2ecac510b2 SHA1 082966ae9e0c0b8818dd5700895066dc3f85771a SHA256 7f0f7929d42a4486d4ac4e6b0b261b3252c61803eebae0a736500e29649bbc78
+EBUILD qjackctl-0.3.8.ebuild 1132 RMD160 dc85b4003e2f3da2a1716bedf201543e38a5a2bb SHA1 0cb9388558d2065d480bbc1e07feb31ec5df0881 SHA256 b5dd501e70852b14aa51283958f9064d398961946f316fbf6f3bd2acaded40f1
+MISC ChangeLog 9747 RMD160 b0b2e2bf0b10e13da1e3bf77ad0c606d15bea236 SHA1 1165f47adb2eb839605c54121f88823ad43bdabd SHA256 84ba9a9a17ea91793909985f8a7a9ef6734cd2728ad30a139c8d0b614dd3a4f1
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5FdiYACgkQIiMqcbOVdxSrdQQAmB+hzoxemIwBgQDJT54V8qcI
-+Rb8bmXr3/SzBvMB+JxE35iuHKphHMM3eUvX6ug9pvTvO2F6NE5wFjTuTgOFhEZo
-g7zfgCPSVjHwGydxM71R6e0aRzS27I0eQ/VsAazj0ZsvGoeAd1uLX3aU05tkTBDv
-sHyxx46fiMJ98/wK1GA=
-=1lAU
+iQIcBAEBCgAGBQJPca7dAAoJENXLsxwXqFxy4NUQAKq6PT5JHhZOYUb16kd7Goqv
+8uG4uJuh3zb5mKbo8NSxKl2X7QiLeOf2MnbLVHGjG3L/YoDjAn39QxaYtDLtCrgy
+oNuFqhU1o4t2tjXlnXld43qFjOjwxn4LtHyYP+ZpJa/E2ySrUPtVTdzkuZ7DK6o4
+/MbPSPTu1CDo31scez2NvfxJ0nFULkZIwO8Y50uSSA0GLXv4VNuGD0WtL2RWMLSF
+EF3pq6qHOi3y3HjwRpQgQo5lcRg153BhBBCx4KIZsLpTp52f4Fkw9j/ajCKTp8D7
+5ndNHnMOM5cY2cYAdPiChQ/iFwRoXA2BHmaISeXDZqru+ppa/u+EuhQ55d8cr3xM
+xyt8o8xe5XMtq5gLeN4gt9zBqdYlpWq+mD/ifAouUkv4+pb5hBia8ihzW1jk2afx
+yZxTqJumpLLEKGFMOL76k+fMTYBvtfp6sIJ3NRHT3IFfjtS9Hh96GdIRlJfXPDuj
+climKCEIpbupiFTtz5gQHTozSVYnCObQByOfzJJhnhHULvgiWYM++VF/PTNuVDug
+bmkNgKNZ7yKiaLPoUJ1GL9c0NdYb/0/wlz4J0AEBaEZVtAmD1Pl2cGfEbfefz4aU
+bsiwScAvzyNRjXJ4LO7kR8doS0uBX5kzZkqyBx8TojovEc2iFCtRXDS45XjPEEqz
+nqSXtu3kYQDQ2wJ8h+yB
+=SrEB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qjackctl/qjackctl-0.3.8.ebuild b/media-sound/qjackctl/qjackctl-0.3.8.ebuild
index d197f6231d65..b8856f901666 100644
--- a/media-sound/qjackctl/qjackctl-0.3.8.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.3.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.8.ebuild,v 1.2 2011/08/12 18:51:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.8.ebuild,v 1.3 2012/03/27 12:13:03 pesa Exp $
 
-EAPI=2
+EAPI=4
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
 HOMEPAGE="http://qjackctl.sourceforge.net/"
@@ -16,14 +16,17 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="alsa dbus debug portaudio"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
-	dbus? ( x11-libs/qt-dbus )
-	portaudio? ( media-libs/portaudio )
-	>=media-sound/jack-audio-connection-kit-0.109.2"
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( x11-libs/qt-dbus:4 )
+	portaudio? ( media-libs/portaudio )"
 DEPEND="${RDEPEND}"
 
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
 src_configure() {
 	econf \
 		$(use_enable alsa alsa-seq) \
@@ -33,15 +36,10 @@ src_configure() {
 
 	# Emulate what the Makefile does, so that we can get the correct
 	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
+	eqmake4 ${PN}.pro -o ${PN}.mak
 }
 
 src_compile() {
-	emake -f ${PN}.mak || die "emake failed"
+	emake -f ${PN}.mak
 	lupdate ${PN}.pro || die "lupdate failed"
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO AUTHORS TRANSLATORS
-}