Add patch to respect LDFLAGS and avoid polluting CFLAGS, do a revbump as it requires quite a bit of changes (to autotools) and it's better to fall back in ~arch.

(Portage version: 2.1_pre6-r3)

5 files changed, 149 insertions, 11 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 813b2ecdf416..d7147910ab4b 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libmikmod
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.30 2005/05/27 06:40:20 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.31 2006/03/18 22:35:22 flameeyes Exp $
+
+*libmikmod-3.1.11-r2 (18 Mar 2006)
+
+  18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libmikmod-3.1.11-respectflags.patch, +libmikmod-3.1.11-r2.ebuild:
+  Add patch to respect LDFLAGS and avoid polluting CFLAGS, do a revbump as it
+  requires quite a bit of changes (to autotools) and it's better to fall back
+  in ~arch.
 
   27 May 2005; Joseph Jezak <josejx@gentoo.org> libmikmod-3.1.11-r1.ebuild:
   Marked ppc stable.
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 9235629b6f72..734f1e0632b4 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,12 +1,42 @@
 MD5 7cf3a690fd04473543751425e359d643 ChangeLog 4039
-MD5 95f6b778cd53d6ab3e97218f6ae22a40 libmikmod-3.1.10.ebuild 1026
-MD5 9b8f0a34c2717f3ff295b65c2772fd04 libmikmod-3.1.11-r1.ebuild 1089
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 fbacfd72b2a725f11ca968a2f36ee967 libmikmod-3.1.11.ebuild 1085
-MD5 3fe5e8c8ad4a371c9b0f7a8b268805d7 libmikmod-3.1.10-r1.ebuild 1102
+RMD160 30b4bc5d25d9dcaaf7fe7bde77197dd4019d3683 ChangeLog 4039
+SHA256 42b5fef68cd4c746b7ca98613e0392884d4179473039696d6b8cfa2d3d1879bb ChangeLog 4039
+MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10 68
+RMD160 11057a02b301896ef94af8ba7f90f1daebb3ad79 files/digest-libmikmod-3.1.10 68
+SHA256 38a3993a5ea9fa891da0b459b5ff424243078d1fe25505c329c0163f2b94d2de files/digest-libmikmod-3.1.10 68
+MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10-r1 68
+RMD160 11057a02b301896ef94af8ba7f90f1daebb3ad79 files/digest-libmikmod-3.1.10-r1 68
+SHA256 38a3993a5ea9fa891da0b459b5ff424243078d1fe25505c329c0163f2b94d2de files/digest-libmikmod-3.1.10-r1 68
+MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11 68
+RMD160 132f1455112f8588829420d0c8d0e760292b36cf files/digest-libmikmod-3.1.11 68
+SHA256 eeed368541a83daed8d70f560efe8ef1e08ef8534ccc64b67f658b725d647c18 files/digest-libmikmod-3.1.11 68
+MD5 390683167d648b72950db89680baf753 files/digest-libmikmod-3.1.11-r1 521
+RMD160 b51127b57f4e0f3fc479c7fbf90adbae301fee82 files/digest-libmikmod-3.1.11-r1 521
+SHA256 893794fe0bcb7844b12bb1b74b5ea8af95b76aaba1b9c178b5effc75d148adc6 files/digest-libmikmod-3.1.11-r1 521
+MD5 390683167d648b72950db89680baf753 files/digest-libmikmod-3.1.11-r2 521
+RMD160 b51127b57f4e0f3fc479c7fbf90adbae301fee82 files/digest-libmikmod-3.1.11-r2 521
+SHA256 893794fe0bcb7844b12bb1b74b5ea8af95b76aaba1b9c178b5effc75d148adc6 files/digest-libmikmod-3.1.11-r2 521
 MD5 0624777bac2c07bc43ba979a97bd863d files/libmikmod-3.1.11-amd64-archdef.patch 490
+RMD160 eeba4322c3cc54391acc35c6cfb9e544d32b5daa files/libmikmod-3.1.11-amd64-archdef.patch 490
+SHA256 59101a6b5c25a4a8af7a18a7d9b206e3183380c80f490c251f9bb4140bcd7b6d files/libmikmod-3.1.11-amd64-archdef.patch 490
 MD5 5308beabab9b1ad8dd38deeedb71e9da files/libmikmod-3.1.11-m4.patch 268
-MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11 68
-MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11-r1 68
-MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10-r1 68
-MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10 68
+RMD160 b11341869880ae7880318247efa7d771f741a152 files/libmikmod-3.1.11-m4.patch 268
+SHA256 cd9b3a93005b332f298af392537651f2430df7f6400d68983a19788c33d401aa files/libmikmod-3.1.11-m4.patch 268
+MD5 d314b8d7786b9bc553e1683e5a7ee573 files/libmikmod-3.1.11-respectflags.patch 1637
+RMD160 b166b5e82e7683717afbfdbac89571c10fd01595 files/libmikmod-3.1.11-respectflags.patch 1637
+SHA256 cec50c01cdf9ee1ea4df792444a3dd1b6c9317ccc3fb1ec48a9c37d90e72a55b files/libmikmod-3.1.11-respectflags.patch 1637
+MD5 3fe5e8c8ad4a371c9b0f7a8b268805d7 libmikmod-3.1.10-r1.ebuild 1102
+RMD160 4ea7aa46199c5f57d6c846e8b9606362dce9c0a1 libmikmod-3.1.10-r1.ebuild 1102
+SHA256 e7d0eef280ee0222680654cd9ad881878028806ac546fa4bced5b0d12c9f50d3 libmikmod-3.1.10-r1.ebuild 1102
+MD5 95f6b778cd53d6ab3e97218f6ae22a40 libmikmod-3.1.10.ebuild 1026
+RMD160 3c84f9c4d0ecc6fe7662a757d9a31759525f86ad libmikmod-3.1.10.ebuild 1026
+SHA256 d4f4fc8c5209f83dafb9f9ff66b3deb3dd35ca3640c0536f6033cc0b594d4e2f libmikmod-3.1.10.ebuild 1026
+MD5 6b1f2348fb5754b3261610070ea1ba58 libmikmod-3.1.11-r2.ebuild 1211
+RMD160 dbe414f62149906e525ba640081b81521673d692 libmikmod-3.1.11-r2.ebuild 1211
+SHA256 a40eff03f0c0dac7a14112f488438c2f32574e8f21d8b2f320f1bf538e57407a libmikmod-3.1.11-r2.ebuild 1211
+MD5 fbacfd72b2a725f11ca968a2f36ee967 libmikmod-3.1.11.ebuild 1085
+RMD160 9c06c92bf06144144144c87361ca58f2a204944a libmikmod-3.1.11.ebuild 1085
+SHA256 c22aabdc17509c4f2338a11728f4371287123010647f333e4f121b788e2e4973 libmikmod-3.1.11.ebuild 1085
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
diff --git a/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r2 b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r2
new file mode 100644
index 000000000000..6f922159993f
--- /dev/null
+++ b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r2
@@ -0,0 +1,6 @@
+MD5 5d7a4705bbc7260332e752f32e48613b libmikmod-3.1.11-esdm4.patch.bz2 2944
+RMD160 8abf8e31a5e3cb9ebee45a04b52ef04024894e25 libmikmod-3.1.11-esdm4.patch.bz2 2944
+SHA256 3dc3d413a9c617b919523866768559bee487a240670040f987825305609987da libmikmod-3.1.11-esdm4.patch.bz2 2944
+MD5 705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz 611590
+RMD160 79b144cce51340b4c9abe09d1110dba2333d7bfb libmikmod-3.1.11.tar.gz 611590
+SHA256 2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 libmikmod-3.1.11.tar.gz 611590
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
new file mode 100644
index 000000000000..f8238b757fbb
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
@@ -0,0 +1,47 @@
+Index: libmikmod-3.1.11/configure.in
+===================================================================
+--- libmikmod-3.1.11.orig/configure.in
++++ libmikmod-3.1.11/configure.in
+@@ -616,14 +616,11 @@ int main()
+ 	libmikmod_cv_gcc_inline_safe=yes,
+ 	libmikmod_cv_gcc_inline_safe=no,
+ 	libmikmod_cv_gcc_inline_safe=no))
+-	if test $libmikmod_cv_gcc_inline_safe = yes
++	if test x$libmikmod_cv_gcc_inline_safe != xyes
+ 	then
+-		CFLAGS="$CFLAGS -finline-functions"
+-	else
+ 		CFLAGS="$CFLAGS -fno-strength-reduce"
+ 	fi
+-	CFLAGS="$CFLAGS -funroll-loops -ffast-math"
+-	if test $libmikmod_debug = yes
++	if test x$libmikmod_debug = xyes
+ 	then
+ 		CFLAGS="$CFLAGS -Wall -Werror"
+ 	else
+Index: libmikmod-3.1.11/libmikmod-config.in
+===================================================================
+--- libmikmod-3.1.11.orig/libmikmod-config.in
++++ libmikmod-3.1.11/libmikmod-config.in
+@@ -50,7 +50,7 @@ while test $# -gt 0 ; do
+ 	;;
+ 	--libs)
+ 		libdir=-L${exec_prefix}/lib
+-		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod
+ 	;;
+ 	*)
+ 		echo "${usage}" 1>&2
+Index: libmikmod-3.1.11/libmikmod/Makefile.in
+===================================================================
+--- libmikmod-3.1.11.orig/libmikmod/Makefile.in
++++ libmikmod-3.1.11/libmikmod/Makefile.in
+@@ -72,7 +72,7 @@ distclean:	clean
+ 	rm -f Makefile
+ 
+ $(LIB): $(OBJ)
+-	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
+ 
+ dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
+ 			$(top_srcdir)/dlapi/dlfcn.h
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild
new file mode 100644
index 000000000000..ce95cf04689e
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild,v 1.1 2006/03/18 22:35:22 flameeyes Exp $
+
+inherit flag-o-matic eutils libtool autotools
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.raphnet.net/"
+SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz
+	mirror://gentoo/${P}-esdm4.patch.bz2"
+
+LICENSE="|| ( LGPL-2.1 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="oss esd alsa"
+
+DEPEND=">=media-libs/audiofile-0.2.3
+	alsa? ( >=media-libs/alsa-lib-0.5.9 )
+	esd? ( >=media-sound/esound-0.2.19 )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${DISTDIR}/${P}-esdm4.patch.bz2"
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-amd64-archdef.patch
+	epatch "${FILESDIR}/${P}-respectflags.patch"
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-af \
+		$(use_enable esd) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+}