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.

(Portage version: 2.1.3_rc6)

3 files changed, 48 insertions, 5 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/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"
 }