Respect CFLAGS and LDFLAGS, fixes bug 331883.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 59 insertions, 5 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/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)