Link to -ldl and use ams_LDADD instead of AM_LDFLAGS wrt #379251 by Diego Elio Pettenò

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

4 files changed, 56 insertions, 13 deletions

diff --git a/media-sound/ams/ChangeLog b/media-sound/ams/ChangeLog
index 11efc57577af..7f1c2912fd31 100644
--- a/media-sound/ams/ChangeLog
+++ b/media-sound/ams/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ams
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.27 2010/01/06 22:32:46 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.28 2012/01/20 23:03:41 ssuominen Exp $
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> ams-2.0.1.ebuild,
+  +files/ams-2.0.1-dl.patch:
+  Link to -ldl and use ams_LDADD instead of AM_LDFLAGS wrt #379251 by Diego
+  Elio Pettenò
 
   06 Jan 2010; Markus Meier <maekke@gentoo.org> ams-2.0.1.ebuild:
   x86 stable, bug #299010
diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
index 9e621eead09e..9116aa7ff8ed 100644
--- a/media-sound/ams/Manifest
+++ b/media-sound/ams/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ams-2.0.1-dl.patch 595 RMD160 1ec92381e82c4b2ae54136ea625e7158ff9841ec SHA1 dc6b06746670df323c641512f8c36ae0a244cf36 SHA256 f33dee9f326a870168da3197f7357f1b2829835203eb2201ff2c6f6f6f334a26
 DIST ams-2.0.1.tar.bz2 286609 RMD160 c9fc844e2e4c5b06bb19a6647e93429e550db156 SHA1 e370cecd843aceafbb85af0e40d7e0d4f03aea3e SHA256 1fb95261a302ff464b20a6b7363faed82dcbc0fa50b6580964e384ef0832ed64
-EBUILD ams-2.0.1.ebuild 849 RMD160 895a10a34fefba233772690f35c0f258dd51bede SHA1 bef1c39ea8f84217dad1a69602ff80e4d261ca09 SHA256 37583ee5a02a85349f1d48e9b353c3cd32c782e1705c69d6836395b6ee4d7434
-MISC ChangeLog 3308 RMD160 2ba87624d5a694cc55b6cd9e4932f1396345413b SHA1 f8f4bd45e4571972eb1493d4b2f2718c7232024f SHA256 191203321268210ca387682b891ae0d2712ba067ecc4b2740e7e268f8074347b
+EBUILD ams-2.0.1.ebuild 882 RMD160 fa0bb91c23aa58aab5dbc3f5a66844e49cd3a567 SHA1 1be28692513a486c99f426e1ac3b2902f5af0404 SHA256 ec50c2173e87e3fc5db744382829026257a48dad88c660ad2dabf0f346c2356b
+MISC ChangeLog 3505 RMD160 e6a0a49222493e0f941d9d7a08fe9c4eda5ff603 SHA1 579ed0c3644340fba24ba44cfdfd8ad5b535c052 SHA256 2b493688aa9f37fdd9bcc2da35e79b9f66158f8a4bc617578c410df197a4ba37
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPGfJPAAoJEEdUh39IaPFN5oIH/iJqBGg8WI19l2v+aMyF9W3h
+zZJ/Nz+avrfFKeNSu2KHlhDmShoSVs+hcP2v1GG48xCzc3T1M4OEQgCobWd3kYoX
+OkIbmkNVwe3PU2xuc3Ds/y4jbYslcC6Zk5zZ9GOquthXUeBAmTJrKxmUq6ddgBf0
+Y3dOPgDDhp5/CNhQt/Z4braEZwQYCI0VHz8bodrde8wNYymybNhwr9Q179qB7HGF
+85zC6HavBG3w7JBBGUKBjod1ObMMLeUhkRQHgYzKntzZIbTXQ8VqKwGamivwbAEG
+TkFH2JPnRo3TDDHm389ZhOjblcZtn8pRDVJ+29qXemqgbsi4Wd0tPiR0FapWYPI=
+=e6Uz
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ams/ams-2.0.1.ebuild b/media-sound/ams/ams-2.0.1.ebuild
index 9e7b42552539..43317a9dc94d 100644
--- a/media-sound/ams/ams-2.0.1.ebuild
+++ b/media-sound/ams/ams-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 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/ams/ams-2.0.1.ebuild,v 1.3 2010/01/06 22:32:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-2.0.1.ebuild,v 1.4 2012/01/20 23:03:41 ssuominen Exp $
 
-EAPI=2
-inherit flag-o-matic multilib
+EAPI=4
+inherit autotools eutils flag-o-matic multilib
 
 DESCRIPTION="Alsa Modular Software Synthesizer"
 HOMEPAGE="http://alsamodular.sourceforge.net"
@@ -24,12 +24,14 @@ RDEPEND="media-libs/alsa-lib
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dl.patch
+	eautoreconf
+}
+
 src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/qt4
 	econf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
diff --git a/media-sound/ams/files/ams-2.0.1-dl.patch b/media-sound/ams/files/ams-2.0.1-dl.patch
new file mode 100644
index 000000000000..ce2327d210f4
--- /dev/null
+++ b/media-sound/ams/files/ams-2.0.1-dl.patch
@@ -0,0 +1,21 @@
+Missing -ldl for dlsym, dlerror, and dlopen, see http://bugs.gentoo.org/379251
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -232,6 +232,8 @@
+ 	textedit.h \
+ 	notelist.h
+ 
++ams_LDADD = -ldl @QT_LIBS@
++
+ translationsdir = $(pkgdatadir)/translations
+ translations = \
+ 	translations/ams_de.ts \
+@@ -247,7 +249,6 @@
+ # all generated files to be removed by "make clean"
+ CLEANFILES = $(nodist_ams_SOURCES) $(translations_DATA)
+ 
+-AM_LDFLAGS = @QT_LIBS@
+ AM_CXXFLAGS = @QT_CXXFLAGS@ @AMS_CXXFLAGS@
+ DEFS = -D_REENTRANT -DLADSPA_PATH=\"$(LADSPA_PATH)\" -DTRANSLATIONSDIR=\"$(translationsdir)\" @DEFS@
+