Link to -lasound and put objs before libs for -Wl,--as-needed wrt #295005 by Sebastian M.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 31 insertions, 38 deletions

diff --git a/media-plugins/alsaequal/ChangeLog b/media-plugins/alsaequal/ChangeLog
index 4616d8007836..d0b71f798924 100644
--- a/media-plugins/alsaequal/ChangeLog
+++ b/media-plugins/alsaequal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/alsaequal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsaequal/ChangeLog,v 1.3 2010/05/15 17:55:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsaequal/ChangeLog,v 1.4 2010/05/15 18:00:58 ssuominen Exp $
+
+  15 May 2010; Samuli Suominen <ssuominen@gentoo.org> alsaequal-0.6.ebuild,
+  +files/alsaequal-0.6-asneeded.patch:
+  Link to -lasound and put objs before libs for -Wl,--as-needed wrt #295005
+  by Sebastian M.
 
 *alsaequal-0.6 (15 May 2010)
 
diff --git a/media-plugins/alsaequal/Manifest b/media-plugins/alsaequal/Manifest
index a1e25dcd6f8f..cb7e9d61712c 100644
--- a/media-plugins/alsaequal/Manifest
+++ b/media-plugins/alsaequal/Manifest
@@ -1,6 +1,5 @@
-DIST alsaequal-0.4.tar.bz2 23358 RMD160 30bb6d64af8a363e2fe184d0c7e897636b5bcf6c SHA1 f9c77a7e563631f981be3f2adeedde90d74f7956 SHA256 468b3b372f98b6730afafa98c808137cce1e9145eca1e2fbab2867db6cb22859
+AUX alsaequal-0.6-asneeded.patch 481 RMD160 14b9cf24516941cf823ae0dac12748223f39d5f1 SHA1 3d5e6638e4437c4c28e3c25fce1642bd066edc47 SHA256 24718bedfa184b9a59127020f09105cc831b5f188be4b05f21b530bf13155a52
 DIST alsaequal-0.6.tar.bz2 23562 RMD160 f31e56716fb2928781dc7cc05814e141cb8bc6be SHA1 aeb04e06821be82bea2e439758ca775903d62a37 SHA256 916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0
-EBUILD alsaequal-0.4.ebuild 881 RMD160 904ca82ff156e059426ea842031912d03a11aebf SHA1 b0f29e21e81ffa43acd91955608576c87a61ca0c SHA256 4a49c937db3938abf59baaedd37ed15f1fa321ca25bbf5ea833a408bee31455e
-EBUILD alsaequal-0.6.ebuild 894 RMD160 1a7bc2ba23136af0b7e6d137e6983c9af03c641c SHA1 372cd36d897089845caef76f2c2d21ddcbb06002 SHA256 af264fc92547c0d5fa5ee5e61c6e02d3a3c0743743442069a0936c9ef53be6be
-MISC ChangeLog 657 RMD160 ebfb8337abefcf4e54e851d601290d3a8fc725a6 SHA1 354aea17a4fe7c47ffeff4e2544321fd27734eb7 SHA256 f4203d4dc45d2318f51177e2ec394fbeb6ac2ad642bb9f53d863295958982098
+EBUILD alsaequal-0.6.ebuild 962 RMD160 c0f02962e60136f0cff039296bee3da69be37790 SHA1 32bed1a4021c1167ba93d77a95a0f4f5b0e6ef74 SHA256 8b0a2ef7e2cde5adbb540ee20d74bd94ebae52fd51e77e1a0a2abf5b63986956
+MISC ChangeLog 867 RMD160 d91403da61910648ea2a8c5103a347589d8f6797 SHA1 6ee45f7ed669f82690449d4dfd8b2697a35a9928 SHA256 403986e1c6e2b32433912b4fd38065d249bd5823984ef59d143dc3ceb27cb1ba
 MISC metadata.xml 163 RMD160 c2b208c0913f8c5bd1148627b5c3c9e37b53060a SHA1 4195ac5ca8352b0f52be6ed92640e4365be5bf0d SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb
diff --git a/media-plugins/alsaequal/alsaequal-0.4.ebuild b/media-plugins/alsaequal/alsaequal-0.4.ebuild
deleted file mode 100644
index bde320ab3790..000000000000
--- a/media-plugins/alsaequal/alsaequal-0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsaequal/alsaequal-0.4.ebuild,v 1.2 2009/09/30 08:40:41 fauli Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="a real-time adjustable equalizer plugin for ALSA"
-HOMEPAGE="http://www.thedigitalmachine.net/alsaequal.html"
-SRC_URI="http://www.thedigitalmachine.net/tools/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	media-plugins/caps-plugins"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall -fPIC -DPIC" \
-		LD="$(tc-getCC)" LDFLAGS="${LDFLAGS} -shared" || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/alsa-lib
-	doexe *.so || die "doexe failed"
-	dodoc README || die "dodoc failed"
-}
diff --git a/media-plugins/alsaequal/alsaequal-0.6.ebuild b/media-plugins/alsaequal/alsaequal-0.6.ebuild
index b0656e820396..f12b69b9b633 100644
--- a/media-plugins/alsaequal/alsaequal-0.6.ebuild
+++ b/media-plugins/alsaequal/alsaequal-0.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsaequal/alsaequal-0.6.ebuild,v 1.1 2010/05/15 17:55:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsaequal/alsaequal-0.6.ebuild,v 1.2 2010/05/15 18:00:58 ssuominen Exp $
 
 EAPI=2
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="a real-time adjustable equalizer plugin for ALSA"
 HOMEPAGE="http://www.thedigitalmachine.net/alsaequal.html"
@@ -19,6 +19,10 @@ DEPEND="media-libs/alsa-lib
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
diff --git a/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch b/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch
new file mode 100644
index 000000000000..50a95e6a5c95
--- /dev/null
+++ b/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch
@@ -0,0 +1,16 @@
+--- Makefile
++++ Makefile
+@@ -29,11 +29,11 @@
+ 
+ $(SND_PCM_BIN): $(SND_PCM_OBJECTS)
+ 	@echo LD $@
+-	$(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN)
++	$(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) $(SND_PCM_LIBS)
+ 
+ $(SND_CTL_BIN): $(SND_CTL_OBJECTS)
+ 	@echo LD $@
+-	$(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN)
++	$(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) $(SND_CTL_LIBS)
+ 
+ %.o: %.c
+ 	@echo GCC $<