Add patch to build with --as-needed; add error message if alsa-lib is built without midi USE flag enabled; add pkgconfig build-time dependency and fix dependencies for nls USE flag.

Package-Manager: portage-2.1.3_rc6

4 files changed, 70 insertions, 13 deletions

diff --git a/media-sound/jack-rack/ChangeLog b/media-sound/jack-rack/ChangeLog
index 66180939eb24..b46a7b913844 100644
--- a/media-sound/jack-rack/ChangeLog
+++ b/media-sound/jack-rack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jack-rack
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.23 2007/02/22 01:05:11 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.24 2007/06/29 14:40:27 flameeyes Exp $
+
+  29 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/jack-rack-1.4.5-asneeded.patch, jack-rack-1.4.5.ebuild:
+  Add patch to build with --as-needed; add error message if alsa-lib is built
+  without midi USE flag enabled; add pkgconfig build-time dependency and fix
+  dependencies for nls USE flag.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index 1fb460270ac9..3a64feba3c4e 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -1,21 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jack-rack-1.4.4-gtkdep.patch 1163 RMD160 3b5e70e7e804d3bc132162b78ef47101322e8108 SHA1 5314445c564c34e76387e3c3bac0806445b10933 SHA256 f72a414aef7c4a9ff0b5035d2b6f5e7fceee77032b9206232eeff6cdcc3a29ee
 MD5 61300f433a057fcf44b34fd04ee68139 files/jack-rack-1.4.4-gtkdep.patch 1163
 RMD160 3b5e70e7e804d3bc132162b78ef47101322e8108 files/jack-rack-1.4.4-gtkdep.patch 1163
 SHA256 f72a414aef7c4a9ff0b5035d2b6f5e7fceee77032b9206232eeff6cdcc3a29ee files/jack-rack-1.4.4-gtkdep.patch 1163
+AUX jack-rack-1.4.5-asneeded.patch 355 RMD160 312e4e3fde8895a87ae180762bfd588e1cf8ca99 SHA1 d21f23e1d3db23ec3ec49ba7178fa708a2376029 SHA256 ca73979ea8949ff0ed749f08c6bda8c1b953582a3bd54b1843fa8031f8694ddd
+MD5 6b8943e2fa3168112782b51cfa6ced15 files/jack-rack-1.4.5-asneeded.patch 355
+RMD160 312e4e3fde8895a87ae180762bfd588e1cf8ca99 files/jack-rack-1.4.5-asneeded.patch 355
+SHA256 ca73979ea8949ff0ed749f08c6bda8c1b953582a3bd54b1843fa8031f8694ddd files/jack-rack-1.4.5-asneeded.patch 355
 DIST jack-rack-1.4.4.tar.gz 453755 RMD160 c9e7e482e134e3337cd5fae7c598c0df08b49764 SHA1 a2be031ac0c2dfbef98907e7a48834766c6e143f SHA256 61843ec3c2a5163e47ddadb39ecdecc09697c34a70c378f31b003c5e647ccceb
 DIST jack-rack-1.4.5.tar.gz 310693 RMD160 3d75672ec658b9c082f60bab441d033313d3f06b SHA1 d24192ae6e6502cda138859f29fa30d66c9091d4 SHA256 eed89e0252ba459c9f556bd8c5a899f3bdf071571e58fc043b677b3207974fb9
 EBUILD jack-rack-1.4.4.ebuild 1126 RMD160 a091f77f22659ad7a3e092f0c684232bdc6fc1a6 SHA1 1b6b0c686039ffca0f3bc1f3be4ec7fa050e1182 SHA256 b592102550c9aed0ffc82b992fa610c0138354daa44d65bdf246a51f93f9cfd0
 MD5 bdeb3667cc3bf4b92eeaa4cc98b163f8 jack-rack-1.4.4.ebuild 1126
 RMD160 a091f77f22659ad7a3e092f0c684232bdc6fc1a6 jack-rack-1.4.4.ebuild 1126
 SHA256 b592102550c9aed0ffc82b992fa610c0138354daa44d65bdf246a51f93f9cfd0 jack-rack-1.4.4.ebuild 1126
-EBUILD jack-rack-1.4.5.ebuild 1234 RMD160 26a9874264262661d3de3dec2255a47b06b13e89 SHA1 60e5de6fc7172d21ba3dd723727013a1554f81c7 SHA256 e19d0570d9752268eb7d948a7da7a1f82edde0d14f3f1b7ed900fe19caba62bf
-MD5 65adf883c7c511a6ac5e97cb312f6fd0 jack-rack-1.4.5.ebuild 1234
-RMD160 26a9874264262661d3de3dec2255a47b06b13e89 jack-rack-1.4.5.ebuild 1234
-SHA256 e19d0570d9752268eb7d948a7da7a1f82edde0d14f3f1b7ed900fe19caba62bf jack-rack-1.4.5.ebuild 1234
-MISC ChangeLog 3085 RMD160 30361c5362ba3007200cad5f89cf6d7fb7dbd2bf SHA1 e82ea30d75dad0fc92b464b967c97880d7e31ed9 SHA256 196a847cdf8eb677b8c5c9dd5f9274068f7fd078d6348d7c1ab8157dd4dbc0a0
-MD5 00a96f4adb97b266175503a28ffd1eb5 ChangeLog 3085
-RMD160 30361c5362ba3007200cad5f89cf6d7fb7dbd2bf ChangeLog 3085
-SHA256 196a847cdf8eb677b8c5c9dd5f9274068f7fd078d6348d7c1ab8157dd4dbc0a0 ChangeLog 3085
+EBUILD jack-rack-1.4.5.ebuild 1765 RMD160 0c282b223f1b3b6e8453898f7a51d3e02a2ca2d3 SHA1 31b6232f3754b8ba705d6a552b744dfd1f7fd252 SHA256 bcfbe27b29be0257967e355ba3cc5733e9386fb3454438850c26d6ea27d1b10f
+MD5 58d0f41e25d17ceb968a9809d053c3d4 jack-rack-1.4.5.ebuild 1765
+RMD160 0c282b223f1b3b6e8453898f7a51d3e02a2ca2d3 jack-rack-1.4.5.ebuild 1765
+SHA256 bcfbe27b29be0257967e355ba3cc5733e9386fb3454438850c26d6ea27d1b10f jack-rack-1.4.5.ebuild 1765
+MISC ChangeLog 3396 RMD160 9b58db1de0134da342adfd8895f85dacaa074df3 SHA1 af49aa55f3b2aba580aab32ad2dd9c8f66fd725d SHA256 43aa831daea16bbc461cd8479b866dd86387a42778161a7d95519a476833a342
+MD5 b1b82480ef788961bf96e1260ff71dd9 ChangeLog 3396
+RMD160 9b58db1de0134da342adfd8895f85dacaa074df3 ChangeLog 3396
+SHA256 43aa831daea16bbc461cd8479b866dd86387a42778161a7d95519a476833a342 ChangeLog 3396
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -26,3 +33,10 @@ SHA256 3478e67993bd808a78f4eca5206e80aa4358627c6fd698969c04c3b99d42748e files/di
 MD5 3a0aebe01ac8ae0675eb3ef137ca965e files/digest-jack-rack-1.4.5 247
 RMD160 e6a376c9dd42615bda2388f5ce311dcba107a2a2 files/digest-jack-rack-1.4.5 247
 SHA256 2e01dbdd258abc8bedeffe53dbf5a4951791ba01e15a70283ae7a8f004b92103 files/digest-jack-rack-1.4.5 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGhRoGAiZjviIA2XgRAsP6AKCPmSiwKUe7YYG2/Wt6s25L1Ur6cgCg1+nP
+7O5utcKRzYTL2qslOClqXYk=
+=d/GW
+-----END PGP SIGNATURE-----
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
new file mode 100644
index 000000000000..4a07049f0603
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
@@ -0,0 +1,13 @@
+Index: jack-rack-1.4.5/src/Makefile.am
+===================================================================
+--- jack-rack-1.4.5.orig/src/Makefile.am
++++ jack-rack-1.4.5/src/Makefile.am
+@@ -60,7 +60,7 @@ jack_rack_CFLAGS = \
+ 	-DGNOME_DISABLE_DEPRECATED=1
+ 
+ 
+-jack_rack_LDFLAGS = \
++jack_rack_LDADD = \
+ 	$(JACK_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(GNOMEUI_LIBS) \
diff --git a/media-sound/jack-rack/jack-rack-1.4.5.ebuild b/media-sound/jack-rack/jack-rack-1.4.5.ebuild
index 96c7273590e9..c290c96fa5ea 100644
--- a/media-sound/jack-rack/jack-rack-1.4.5.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.5.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.5.ebuild,v 1.1 2007/01/14 02:20:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.5.ebuild,v 1.2 2007/06/29 14:40:27 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit autotools
 
 IUSE="alsa gnome lash nls xml"
 
@@ -12,17 +16,36 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND=">=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/ladspa-sdk-1.12
 	media-sound/jack-audio-connection-kit
 	alsa? ( media-libs/alsa-lib )
 	lash? ( >=media-sound/lash-0.5 )
 	gnome? ( >=gnome-base/libgnomeui-2 )
-	nls? ( sys-devel/gettext )
+	nls? ( virtual/libintl )
 	xml? ( dev-libs/libxml2
 		media-libs/liblrdf )"
 
-MAKEOPTS="-j1"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ${CATEGORY}/${PN} with ALSA support you"
+		eerror "need to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	eautomake
+}
 
 src_compile() {
 	local myconf
@@ -35,6 +58,7 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_enable xml) \
 		$(use_enable xml lrdf ) \
+		--disable-dependency-tracking \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }