Respect CFLAGS and LDFLAGS, fixes bug 331883.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 67 insertions, 11 deletions

diff --git a/app-emacs/emms/ChangeLog b/app-emacs/emms/ChangeLog
index 48f0d6a034b4..4117a102416e 100644
--- a/app-emacs/emms/ChangeLog
+++ b/app-emacs/emms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emms
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.13 2009/05/05 07:55:53 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.14 2010/08/09 20:19:30 ulm Exp $
+
+*emms-3.0-r1 (09 Aug 2010)
+
+  09 Aug 2010; Ulrich Mueller <ulm@gentoo.org> +emms-3.0-r1.ebuild,
+  +files/emms-3.0-Makefile.patch:
+  Respect CFLAGS and LDFLAGS, fixes bug 331883.
 
   05 May 2009; Christian Faulhammer <fauli@gentoo.org> emms-3.0.ebuild:
   set explicit RDEPEND
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index ebcc21fcd785..0145dea7107a 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX 2.0-taglib-Makefile-gentoo.patch 440 RMD160 9f27ab4f0dad8994af16da2bb6b86e3bb1d71f98 SHA1 5b3546fdee30c40a67d957245b67e5ff8e64c66c SHA256 2756285af4592f58ecc515cf1aa69b990a32a0d53a6bc095c197429765734ee5
-AUX 50emms-gentoo.el 94 RMD160 baa9941e03f39b1f46195b155408fb96311481bb SHA1 1819e4e0f8a48e05740ab2e3579c5a9dac680f6b SHA256 cb8374bf3d0cd7fbff60c73338e8d0752e738b156f8f8f0242b23bebe02a395c
+AUX 50emms-gentoo.el 59 RMD160 601c21f4d3c50557204b55a0c13ba67d93adce6c SHA1 16261648012129af4f23ce02511bf354b0f0de50 SHA256 86d464acaafdf27649e81518af8e1d5b4e6399e8a3543de91f9d13bd7460770b
+AUX emms-3.0-Makefile.patch 379 RMD160 7c663ff069b30e72a4d1edee438151df17f61ab6 SHA1 cefd879d651196b01a0e2b0ef6906faad8f40ce9 SHA256 5f51780cdc10bd118dbcc572ab7ad97153c5a37ef65678a5507590cae149f5f9
 DIST emms-3.0.tar.gz 200838 RMD160 672eab126f21e3cd1ca2d1889e39668bf0b488bc SHA1 d1317227e8d9d2e80d6bd9f2938fcf636d112e2d SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594
+EBUILD emms-3.0-r1.ebuild 1158 RMD160 444ee9b60d416ca33792d467bdc2669969fccff3 SHA1 e52848fcf424b7fe6dc5c65e58909b291f1edc18 SHA256 d6c7bbc854fad80cc47028d50766ef62fd18f1aece1010009fc44e7c8a88d3a1
 EBUILD emms-3.0.ebuild 1229 RMD160 d4cfa7e2915ff111c0ac1408ea34d5c55c0aa078 SHA1 b9fa47bfb35d01f02d4e61e2977e9fd84eca9081 SHA256 22abc49e99f647d43bd67d33a383830b2c2c270af7bca734b34a8666aa60b8d9
-MISC ChangeLog 2011 RMD160 60fddeaa08d73f526ca70bfbe48c110094ae40ab SHA1 f163616151de6b74c73f5e9ce4f198876ecb620c SHA256 7aca5a29055dae2d023a2107cb2b8d2957dd225c81fd70d67b3088afbb348d0f
+MISC ChangeLog 2188 RMD160 93f96228e7f67376f0ed3ee4f86a19f4e69ce5ba SHA1 b76804d03e473b9fc479f552bdb39722fba2801b SHA256 a46c01da7e2997a63b68b2cb9b75607f51d8659e9ab219f59b462c2b8d177d42
 MISC metadata.xml 680 RMD160 2fe42aefc7970bd6322f5a4ce5ff847d006de84a SHA1 5f745b07a9cc14ff4df5d8f7d85facc1a7f72d2d SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkn/8Q4ACgkQNQqtfCuFneM7VwCeNRk1j3baQ94m3OahiwshPpDT
-cB0AniMaUsinvBmrcQ7syKMBNn/JaTRx
-=oxkh
+iEYEARECAAYFAkxgY6AACgkQOeoy/oIi7uyyXwCfYfHKX7cBrqBMmsvGC6ydoVAx
++2MAoMSlKU84mdlhN/zu6kqhH4YaTz7M
+=2e+8
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emms/emms-3.0-r1.ebuild b/app-emacs/emms/emms-3.0-r1.ebuild
new file mode 100644
index 000000000000..6b506c76f1c1
--- /dev/null
+++ b/app-emacs/emms/emms-3.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0-r1.ebuild,v 1.1 2010/08/09 20:19:30 ulm Exp $
+
+NEED_EMACS=22
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="http://www.gnu.org/software/emms/
+	http://www.emacswiki.org/cgi-bin/wiki/EMMS"
+SRC_URI="http://www.gnu.org/software/emms/download/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+ELISP_PATCHES="${P}-Makefile.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		EMACS=emacs \
+		all emms-print-metadata || die
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc} || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	doinfo *.info* || die
+	dobin *-wrapper emms-print-metadata || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE || die
+}
diff --git a/app-emacs/emms/files/50emms-gentoo.el b/app-emacs/emms/files/50emms-gentoo.el
index ebbf55bd5063..9749f5e1e866 100644
--- a/app-emacs/emms/files/50emms-gentoo.el
+++ b/app-emacs/emms/files/50emms-gentoo.el
@@ -1,5 +1,2 @@
-
-;;; emms site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (require 'emms-auto)
diff --git a/app-emacs/emms/files/emms-3.0-Makefile.patch b/app-emacs/emms/files/emms-3.0-Makefile.patch
new file mode 100644
index 000000000000..00a82b76a977
--- /dev/null
+++ b/app-emacs/emms/files/emms-3.0-Makefile.patch
@@ -0,0 +1,10 @@
+--- emms-3.0-orig/Makefile	2007-06-29 18:16:24.000000000 +0200
++++ emms-3.0/Makefile	2010-08-09 22:14:39.000000000 +0200
+@@ -42,6 +42,7 @@
+ 
+ emms-print-metadata: emms-print-metadata.c
+ 	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< `taglib-config --libs --cflags` -ltag_c
+ 
+ install:
+ 	test -d $(SITELISP) || mkdir -p $(SITELISP)