Fix autotools-utils usage (bug #392155).

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

3 files changed, 28 insertions, 25 deletions

diff --git a/media-libs/libzen/ChangeLog b/media-libs/libzen/ChangeLog
index 33abfa1da3d0..edaa5281c42b 100644
--- a/media-libs/libzen/ChangeLog
+++ b/media-libs/libzen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libzen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.25 2011/11/27 04:07:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.26 2011/11/28 03:03:00 radhermit Exp $
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> libzen-0.4.23.ebuild:
+  Fix autotools-utils usage (bug #392155).
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> libzen-0.4.23.ebuild:
   Build in the source tree.
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index 8f2d7fde26cd..240e1b55fc21 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -5,17 +5,17 @@ AUX libzen-0.4.21-no-tinyxml.patch 773 RMD160 8c1b150b321e69cfa6c9a0b692819d55b2
 DIST libzen_0.4.22.tar.bz2 135170 RMD160 c860f829acb3b991aaa79996a8276973036deb98 SHA1 38df560ca9d79af8f7edea26baae0df9e7bf0006 SHA256 5abb187deaaba772433134122e800f582b49b8d5b64b440f38911b53c8b618d8
 DIST libzen_0.4.23.tar.bz2 133225 RMD160 43192ffec74e78218a98dd03dae09978e6e63e28 SHA1 ff5443b94521f3530177fbffbfece45f069bea0b SHA256 e06020bd7dabf69bcbe783fc98e282af17da0d85099aa98c74f193a4c73f171e
 EBUILD libzen-0.4.22.ebuild 1404 RMD160 aa358e5bd525927927a9af2577c16ea1710250d7 SHA1 6dd3a49f648cfce82da9a813606eca191bdd9369 SHA256 13c8aeb7bed222e0bea6a1b9c65c4b7ce82770e7a0a0df6e24174da9a20ee160
-EBUILD libzen-0.4.23.ebuild 1426 RMD160 00e3f7f0e194b36a8edebd88711368e504f5f3ad SHA1 2266b4a8a804afd089eb50ebf71a1e1f11a629b3 SHA256 89fba09bbc200114f66d9003c617f32cf7da9b545bdcd092d5b02b1054d8583b
-MISC ChangeLog 3571 RMD160 0b50ee3b4b700f4869f7c3b5924a6d45c9de6464 SHA1 328b47f8752330e4728985d81270a882baed7347 SHA256 2c191878757d9da6c69eabdb2209dd89f452e15e437ca9a245371127f29a1117
+EBUILD libzen-0.4.23.ebuild 1441 RMD160 836079bdac348b1a35f0e9540ce3fb8683f4e0f1 SHA1 75bf2d59834d8874559856c293e7cdf49e995e29 SHA256 a3cee382a3cd0abc69494db87596a72ea5adc6682c76fd740093c3768c9e673b
+MISC ChangeLog 3686 RMD160 34b9ec6b8c40b0d11d8df8b7c4df0e42019f6f6f SHA1 41fa4a91b5310925fa08c4da55d740113cfc9145 SHA256 cf182915a813d87cbac0d728aa4b23223742e896e702adcfa4e6f6c92d7208c8
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0bd+AAoJEEqz6FtPBkyjxz0IAIbJ2NFZ3gA3Hb0QRO8lPYsf
-tZde0soqGAcj0sGX/DbciS1kSCJYD7MHukKPjY3Zc+ozhnI8+bp6O25lieQx9zNz
-4idSMY5MUDTmWhp8FAZmbqt/TzBF/l2oOunCopfvZwD7rynNP5394k2YlgQxHkUH
-cIRZ5bSnE9xyQTquBk2desdBNOqn2aPRtJxek2oKH2Dke42cGHKJNsU9Gf/+ktI8
-CRL2kBp6o6A2fzWqLjkijktJdwJ0KHUi4QrpNZ2+w3l2IRYDRmmn4MYV4iOa7N3g
-ezy6tyfP+/QzMQuh/6uoXtGjpo3DoLsyd+m5o44QNcocM8IHpsUxj/IP28GhdDg=
-=/bPU
+iQEcBAEBCgAGBQJO0vnrAAoJEEqz6FtPBkyjl3wH/jvj0OhF3X4WsMpGCbDgUKcH
+wJmwjTyatvpmjVpX8MdC8dKXxYipYNG1SpAPmbfOWSt5LW5u5Y+aLcFpnBihpkm0
+aZ6Im9QyMdyhv5SeohCeFU4b7qxWbrsxWqxBJTA5G8SzVRq845sAXATCKq6NISZO
+FH9uFCPzTzmfnWNr/Dm9GqIUyQk3kQY9t/9CyD//zo99wEjSTNnErAG3N/gPptDb
+9fj/MVi4S/wLS4smxhiqtlWnFsVYeZSl2x3zHkhABBBx7zn1Tj3jzBfytaWIMgGO
+WqDkWtByxg/P5RnsQVmrJ1pYS+qnJfBlR+w8R7buvfpwJl2cz4LwyuvOMGlP/bw=
+=ckY9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libzen/libzen-0.4.23.ebuild b/media-libs/libzen/libzen-0.4.23.ebuild
index d0f10a2000eb..b0286190fbfa 100644
--- a/media-libs/libzen/libzen-0.4.23.ebuild
+++ b/media-libs/libzen/libzen-0.4.23.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.2 2011/11/27 04:07:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.3 2011/11/28 03:03:00 radhermit Exp $
 
 EAPI="4"
 
-inherit autotools-utils multilib eutils
+inherit autotools-utils multilib
 
 MY_PN="ZenLib"
 DESCRIPTION="Shared library for libmediainfo and mediainfo"
@@ -22,35 +22,37 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}/Project/GNU/Library"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
+	autotools-utils_src_prepare
 	sed -i -e "s:-O2::" configure.ac
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--enable-unicode \
-		--enable-shared \
-		$(use_enable static-libs static)
+	myeconfargs=(
+		--enable-unicode
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	default
+	autotools-utils_src_compile
 
-	if use doc; then
+	if use doc ; then
 		cd "${WORKDIR}"/${MY_PN}/Source/Doc
 		doxygen Doxyfile || die
 	fi
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${S}"/${PN}.pc
+	doins "${AUTOTOOLS_BUILD_DIR}"/${PN}.pc
 
 	for x in ./ Base64 Format/Html Format/Http HTTP_Client ; do
 		insinto /usr/include/${MY_PN}/${x}
@@ -58,9 +60,7 @@ src_install() {
 	done
 
 	dodoc "${WORKDIR}"/${MY_PN}/History.txt
-	if use doc; then
+	if use doc ; then
 		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
 	fi
-
-	remove_libtool_files all
 }