Fixup autotools.

Package-Manager: portage-2.1.2_rc1-r4

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 498c63614b8b2d6a537064b91b87142eb3bf3d0a..90cf016e4860b1a5dfa7c6dd295a04452ecee8e2 100644 (file)
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.50 2006/11/01 18:15:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.51 2006/11/07 08:11:47 vapier Exp $
+
+  07 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/sdl-mixer-1.2.7-build.patch, sdl-mixer-1.2.7.ebuild:
+  Fixup autotools.
 
   01 Nov 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/1.2.5-gcc3.patch, -files/sdl-mixer-1.2.5-amd64-mikmod.patch,

diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 74b57308918ef39fa2315a41a460516c09f7eff0..3c212a96bb38ba4420e9ce37897ec343b8ef9050 100644 (file)
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -5,6 +5,10 @@ AUX sdl-mixer-1.2.6-mikmod-music-init.patch 260 RMD160 7d53b04ec50bd48c4b85b4381
 MD5 85c429a982fe437337599502a8fa6c1d files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 RMD160 7d53b04ec50bd48c4b85b4381640b741aba25c36 files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 SHA256 743e1c76daf96eb1f2497ba4159677103ebb8a786902b91a01800b7bb9d91a5f files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
+AUX sdl-mixer-1.2.7-build.patch 266 RMD160 fa4e1fa16f6d74e091b51101e0b7192e2988e56c SHA1 66bbca89d5e0fa455035e014d24eaf92a760ede2 SHA256 872513df92cd464c2a09783d440388da49a4ebcfe791bf2396c69d6e7147a327
+MD5 457b6faeb20acc07c1051ba769397fbf files/sdl-mixer-1.2.7-build.patch 266
+RMD160 fa4e1fa16f6d74e091b51101e0b7192e2988e56c files/sdl-mixer-1.2.7-build.patch 266
+SHA256 872513df92cd464c2a09783d440388da49a4ebcfe791bf2396c69d6e7147a327 files/sdl-mixer-1.2.7-build.patch 266
 AUX sdl-mixer-1.2.7-libmikmod.patch 932 RMD160 0979baa8f90c84e265fac39c007eb128af521b6b SHA1 b2852043c0cbc8286570650cefe9e547cdcce8be SHA256 75b27d778d4e0e6af70f97e86fdb5c0f729097619ef2ef7a5496134ff8be146d
 MD5 391fd7a206858c1f1be34c7d6f24c6b2 files/sdl-mixer-1.2.7-libmikmod.patch 932
 RMD160 0979baa8f90c84e265fac39c007eb128af521b6b files/sdl-mixer-1.2.7-libmikmod.patch 932
@@ -15,14 +19,14 @@ EBUILD sdl-mixer-1.2.6-r1.ebuild 1509 RMD160 fc908d7befe87ffa88b5c028d624c235bf5
 MD5 9e05942638a53123cefe4ef10a007531 sdl-mixer-1.2.6-r1.ebuild 1509
 RMD160 fc908d7befe87ffa88b5c028d624c235bf5c4a53 sdl-mixer-1.2.6-r1.ebuild 1509
 SHA256 433616e9ae021ecbd694a5eb1c5cfbd27cae8af2544ad32a17deb6c1751df4a2 sdl-mixer-1.2.6-r1.ebuild 1509
-EBUILD sdl-mixer-1.2.7.ebuild 1524 RMD160 8e3a16ce6d0b6657fa9c3e862f183b97110e59aa SHA1 f774075e64b898481f740bf5de37a4109ff8ab0e SHA256 ccb210416046c042f0a4fb40507f733d8129ca4dae673115d63d50963841980c
-MD5 ba73daf2c785a228e5a95128745dbec6 sdl-mixer-1.2.7.ebuild 1524
-RMD160 8e3a16ce6d0b6657fa9c3e862f183b97110e59aa sdl-mixer-1.2.7.ebuild 1524
-SHA256 ccb210416046c042f0a4fb40507f733d8129ca4dae673115d63d50963841980c sdl-mixer-1.2.7.ebuild 1524
-MISC ChangeLog 7006 RMD160 7e5839ca5b05e51ce7ad321dd2fcd911b9dd947d SHA1 f75d48f0b19d015b105a9a71999ecfa1ec083b98 SHA256 7bae96df81deb952de3c94d8649098e9986288665f6094cca0e2f18538866916
-MD5 4fe3ede228785ba9ce428895d9262f47 ChangeLog 7006
-RMD160 7e5839ca5b05e51ce7ad321dd2fcd911b9dd947d ChangeLog 7006
-SHA256 7bae96df81deb952de3c94d8649098e9986288665f6094cca0e2f18538866916 ChangeLog 7006
+EBUILD sdl-mixer-1.2.7.ebuild 1574 RMD160 ac112dacaee2e6d132b67b5ba3ef27c3fd6ac4ea SHA1 a357c21c39e13aeb4d43ad23b67373a240c280d8 SHA256 70aaf7b9b61e808f9920e24d81a919f0e7d9130277d71eb0f8c855bbf5c7427a
+MD5 8b0f487e06416528705d2fd965a86405 sdl-mixer-1.2.7.ebuild 1574
+RMD160 ac112dacaee2e6d132b67b5ba3ef27c3fd6ac4ea sdl-mixer-1.2.7.ebuild 1574
+SHA256 70aaf7b9b61e808f9920e24d81a919f0e7d9130277d71eb0f8c855bbf5c7427a sdl-mixer-1.2.7.ebuild 1574
+MISC ChangeLog 7135 RMD160 6d31d36aad8d720ca7a735bcc828cca965c3b7a2 SHA1 288109931de36199e8bb64e607bdbee34ac8bdc2 SHA256 80886990d8127571350a2790609a3f0e07058a8488a1a4c35d3d0396ac0ab62b
+MD5 50e8c90a91775756bde1b892bbafa646 ChangeLog 7135
+RMD160 6d31d36aad8d720ca7a735bcc828cca965c3b7a2 ChangeLog 7135
+SHA256 80886990d8127571350a2790609a3f0e07058a8488a1a4c35d3d0396ac0ab62b ChangeLog 7135
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -36,7 +40,7 @@ SHA256 bd1aa4af8da233bf091beea02b8019d953d2db2ced855a28dbd80dbf165b4e75 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUD3MamhnQswr0vIRAvFJAJ47DeMdswnznJDElpZbw+vxOsqTfQCfUj2o
-+CQjH8bI9Mv7uJb3tK2At1A=
-=cGBG
+iD8DBQFFUD/samhnQswr0vIRAtvGAKC9NcJv5JemEsfq0hxEM5s29P7oNQCgiTTG
+h74gvwW7lpM8oQa6Ow38m1w=
+=CDWF
 -----END PGP SIGNATURE-----

diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch
new file mode 100644 (file)
index 0000000..4fd5170
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch
@@ -0,0 +1,11 @@
+--- configure.in
++++ configure.in
+@@ -37,7 +37,7 @@
+ AC_SUBST(LT_AGE)
+ 
+ dnl Detect the canonical build and host environments
+-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
++AC_CONFIG_AUX_DIR(build-scripts)
+ AC_CANONICAL_HOST
+ 
+ dnl Set up the compiler and linker flags

diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
index 626ba9af91be219257001bdbbb353d8f13312d93..c08ed473e1ad0b702341031e308292ab93bca599 100644 (file)
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.13 2006/11/07 08:02:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.14 2006/11/07 08:11:47 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
-inherit eutils
+inherit eutils autotools
 
 MY_P=${P/sdl-/SDL_}
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -27,7 +27,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}/${P}-libmikmod.patch"
+       epatch "${FILESDIR}"/${P}-libmikmod.patch
+       epatch "${FILESDIR}"/${P}-build.patch
        sed -i \
                -e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
                timidity/config.h \
@@ -49,6 +50,6 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
        dodoc CHANGES README
 }