[proaudio] [2243] media-sound/ qjackctl qt3 cleanup and update for deprecated qt4 eclass

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2243
Author:   gavlee
Date:     2012-10-17 08:33:03 +0200 (Wed, 17 Oct 2012)
Log Message:
-----------
media-sound/qjackctl qt3 cleanup and update for deprecated qt4 eclass

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/qjackctl/ChangeLog
    trunk/overlays/proaudio/media-sound/qjackctl/Manifest
    trunk/overlays/proaudio/media-sound/qjackctl/metadata.xml
    trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.2.23.ebuild
    trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.3.3.ebuild

Modified: trunk/overlays/proaudio/media-sound/qjackctl/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/ChangeLog	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/ChangeLog	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,7 +1,14 @@
 # ChangeLog for media-sound/qjackctl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Oct 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  -qjackctl-0.2.23.ebuild, -qjackctl-0.3.3.ebuild, qjackctl-9999.ebuild,
+  metadata.xml:
+  remove 0.2.23 because of no Qt3, 0.3.3 because it's old and uses qt4 eclass
+  which is no longer in tree and spews error.
+  sync live ebuild from 0.3.9 in portage also fixing qt4 eclass inherit.
+
   14 Feb 2012: Dominique Michel <dominique@xxxxxxxxxxxxx>
   qjackctl-9999.ebuild:
   replaced "emake" by "make -j1" in src_install

Modified: trunk/overlays/proaudio/media-sound/qjackctl/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/Manifest	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/Manifest	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,7 +1,3 @@
-DIST qjackctl-0.2.23.tar.gz 260545 RMD160 a975e51ec6d95abaff33ea9e32430e30d8d31a46 SHA1 e44b7487ab1e436e4c1bdf909e8e96d338c059c3 SHA256 f6781aba529cd4acfa1e4278f6c65b91336684b79232364cb43aa42fcba868bc
-DIST qjackctl-0.3.3.tar.gz 268722 RMD160 fa08f02f37fb3a75ecc17471183c9aa0d4ca8e9d SHA1 27dab9f3603e1970b152dbbc8a1e02340ce8cf9c SHA256 b25fe8c64deba03140722c295131e6c19709562fbbdc11ad51331ded10103bfd
-EBUILD qjackctl-0.2.23.ebuild 1008 RMD160 ea46e58370f6c0aa4996824e355afd223c2c1be7 SHA1 abb50d34102710fc125d7e3c527ea41c1d1406e3 SHA256 532b565d41ed3a655215a64c5b03075708af689e59bf14a206df2074313da124
-EBUILD qjackctl-0.3.3.ebuild 1203 RMD160 e3e143932e20c491dd42f02dd7b9168bc28fb0fe SHA1 46d7c372d6deb59fbe2da4923f40637b25b31c18 SHA256 8e2ac1e3d276e405bdaaed339790311b4e0d56acf1df9e7fd994175c47379474
-EBUILD qjackctl-9999.ebuild 1442 RMD160 e897ac9baa05ba2565b5bc4121f3933d391550b6 SHA1 9a7d5cf973e502b663c1b61136a37a1ca57b0b47 SHA256 47b1523bd9e2c2f11020243b5d8001c3a4b48267c32332962a580d032441c18d
-MISC ChangeLog 1150 RMD160 71c6cc17c65c258ef59c7659e323e0bb4f368461 SHA1 f6a252bc8c5654d4ec79a8c3c4ae1da4e0dabad3 SHA256 5faede0587f5e126b8356c0c0e15dd05c9834803614b5af04cd2215642eb1262
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD qjackctl-9999.ebuild 1239 SHA256 698c511056042eed04a32bf15b725320ef30a0d0cd00d4c732d8ec4ceb391cb3 SHA512 035dca288e331f066f4851671a19dd812fdc7c6c45a7b16ea7490a44d966b0eaf77dfe2b8bebbdd8c498b1a15cf9eccacea24298ac00822e547f39585e5b24bb WHIRLPOOL e6678e2194c592fabcdd22b3a87f9b6fabb1f224a775d2edbe29db6c0ab702009bc9de1ca1821c5fe2133a0a61e7616dd34d602447e244ec3a21612a80d1ed3a
+MISC ChangeLog 1502 SHA256 b2bf1fde82a3495bf5e1baeb1e7db4b2ce64b9a6caa2263ce1e538c5ae91a9da SHA512 9692b36b3470a99a33e164497002d9a992fdec23a78941438ea8131073c5fb3e7bc7e9b0a1ea973106835ec0a9da6bf392599b88b4902ba8c5c323640c064a38 WHIRLPOOL 0f2aef1a3cbce11f3639c5161f4dcbdecb8c26c5a894d8af9f7fe5fe5f537184b157301d748b8ea22a6d7a066708ee7b6eb7865ecd41cce4ea0e437010fea24e
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Modified: trunk/overlays/proaudio/media-sound/qjackctl/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/metadata.xml	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/metadata.xml	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>

Deleted: trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.2.23.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.2.23.ebuild	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.2.23.ebuild	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sourceforge.net/";
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="alsa debug jackmidi"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	=x11-libs/qt-3*
-	media-sound/jack-audio-connection-kit"
-
-src_compile() {
-	econf \
-		$(use_enable jackmidi jack-midi) \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	rm "${D}/usr/share/applications/qjackctl.desktop"
-
-	# Upstream desktop file is invalid, better stick with our for now.
-	make_desktop_entry "${PN}" "QjackCtl" "/usr/share/icons/qjackctl.png"
-
-	dodoc README ChangeLog TODO AUTHORS
-}

Deleted: trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.3.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.3.3.ebuild	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-0.3.3.ebuild	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sourceforge.net/";
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-IUSE="alsa debug jackmidi"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	|| ( (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-		) >=x11-libs/qt-4.1:4 )
-	media-sound/jack-audio-connection-kit"
-
-src_compile() {
-	econf \
-		$(use_enable jackmidi jack-midi) \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable debug) \
-		|| die "econf failed"
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
-
-	emake -f ${PN}.mak || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	rm "${D}/usr/share/applications/qjackctl.desktop"
-
-	# Upstream desktop file is invalid, better stick with our for now.
-	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
-
-	dodoc README ChangeLog TODO AUTHORS
-}

Modified: trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild	2012-10-17 05:59:45 UTC (rev 2242)
+++ trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild	2012-10-17 06:33:03 UTC (rev 2243)
@@ -1,59 +1,52 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.9.ebuild,v 1.1 2012/05/21 15:24:00 aballier Exp $
 
-EAPI=1
+EAPI=4
 
-inherit eutils qt4 subversion
+inherit qt4-r2 autotools subversion
 
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
 HOMEPAGE="http://qjackctl.sourceforge.net/";
-
 ESVN_REPO_URI="https://qjackctl.svn.sourceforge.net/svnroot/${PN}/trunk";
-#ESVN_PROJECT="qjackctl-svn"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="alsa debug dbus jackmidi portaudio"
+IUSE="alsa dbus debug portaudio"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
-	|| ( (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-		) >=x11-libs/qt-4.1:4 )
-	dbus? ( x11-libs/qt-dbus )
-	portaudio? ( media-libs/portaudio )
-	media-sound/jack-audio-connection-kit"
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( x11-libs/qt-dbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
-src_compile() {
-	make -f Makefile.svn || die
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_prepare() {
+	qt4-r2_src_prepare
+	eautoreconf
+}
+
+src_configure() {
 	econf \
-		$(use_enable jackmidi jack-midi) \
 		$(use_enable alsa alsa-seq) \
-		$(use_enable debug) \
 		$(use_enable dbus) \
-		$(use_enable portaudio) \
-		|| die "econf failed"
+		$(use_enable debug) \
+		$(use_enable portaudio)
 
 	# Emulate what the Makefile does, so that we can get the correct
 	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
-
-	emake -f ${PN}.mak || die "emake failed"
+	eqmake4 ${PN}.pro -o ${PN}.mak
 }
 
-src_install() {
-	make -j1 DESTDIR="${D}" install || die "make install failed"
-
-	rm "${D}/usr/share/applications/qjackctl.desktop"
-
-	# Upstream desktop file is invalid, better stick with our for now.
-	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
-
-	dodoc README ChangeLog TODO AUTHORS
+src_compile() {
+	emake -f ${PN}.mak
+	lupdate ${PN}.pro || die "lupdate failed"
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/