Revert unnecessary revision bump and autotools-utils.eclass port.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 23 insertions, 72 deletions

diff --git a/media-libs/id3lib/ChangeLog b/media-libs/id3lib/ChangeLog
index f3015355a688..3086662de5e4 100644
--- a/media-libs/id3lib/ChangeLog
+++ b/media-libs/id3lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/id3lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.81 2013/05/03 17:33:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.82 2013/05/03 18:05:14 ssuominen Exp $
+
+  03 May 2013; Samuli Suominen <ssuominen@gentoo.org> id3lib-3.8.3-r8.ebuild,
+  -id3lib-3.8.3-r9.ebuild:
+  Revert unnecessary revision bump and autotools-utils.eclass port.
 
 *id3lib-3.8.3-r9 (03 May 2013)
 
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index aea43868d122..a8b56dde5468 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX id3lib-3.8.3-autoconf259.patch 1130 SHA256 ffde572cb263cce4585292143a4396ebd12592ac34b398da19d1608f1c2374f9 SHA512 e7d15ca57889934d1956293454e6326e1fbf81116d42e42732a2f0c9fc04b067ebf43f896d28bfa2fa18978b9099fdc6a36c573da137c2ee80efcbb83cdb04ae WHIRLPOOL 1fd5c554c837186037e1146e0e83dd69a07974115c42f12837c0f555bb36f65067af0394c5486a1ba7d17f034e7d6751b74d514dfe1b358b46ef255804047c2b
 AUX id3lib-3.8.3-doxyinput.patch 977 SHA256 e7cd2eafe39229fee1195524872be3465d247590b7ead4a9cfa2178102a3d9ea SHA512 f226281ba0afb7d0f2c49d5769ba374ab36edd228a7b4251c9775c83b50489db6b853044f442268134e2885e9d90500708597d59adccdb563c2eff2dd9af9fa8 WHIRLPOOL e4ec428ccc83e1a4079a1af69f3aae307068a3a11feb627137cf1cdd513e012f057c7d21e363156b69a82ba929edcd02805d1e73ff7d8a997321cde600413c39
@@ -10,14 +10,17 @@ AUX id3lib-3.8.3-test_io.patch 281 SHA256 cc124f8805bcb977a1673f0b04fff368dac1af
 AUX id3lib-3.8.3-unicode16.patch 1542 SHA256 71c79002d9485965a3a93e87ecbd7fed8f89f64340433b7ccd263d21385ac969 SHA512 f2396475ba3b70b74fe7689318d6a80715bbef0fe6cbb9cbbc7fdd811304630fd9748f35316d569fdcd68a324588bb48cbc50ebb33a3288e5a54c1ddfc1d3c79 WHIRLPOOL 1f4dfca9842bca5dede5cee10cf99d058ac8a2193570a932eec0165b958dd02521a4b7d8981f4deafa94bf2493b9a3cd3f6ce369d2d02351fa99b34b92d5ef90
 AUX id3lib-3.8.3-zlib.patch 833 SHA256 0b5531089422bda659deddcccf0562fcaa96529e74778065e35c848d6cf2a502 SHA512 61937ec6c2751467dd13179db15f06eff04b5b186f82b4327c38388f03c03ac7de277b9173b2b0326141c77335cad7fcd98234994cc5694cd1228e0d81919e53 WHIRLPOOL 28656260c6db086659e73b739e3d22db575cd66255c5ec6ad87356dc18ef54bc08e4fc7eb9e894fe6ea331cc906761ca03e80b2251c73e4e941393702a74910f
 DIST id3lib-3.8.3.tar.gz 950726 SHA256 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf WHIRLPOOL c52c4239578bcdb1bf1c999cfa5fdf28e80064a3e0ccffc67a4dc5d4ac19978da95479b59bb8cd72638d2b5dea6448dd6f1e9a3985389ef3c5ae8900a1695b97
-EBUILD id3lib-3.8.3-r8.ebuild 1402 SHA256 80d8778676618c6de03c4a4656715076e25478befe1a8f224855b5f743d4abf7 SHA512 04b01ed603e18484c398fabd1265c79792d4cd56f2f5deb421f64a422508cf117083d8fb9d692f2bff0e7d308efa17728a830023ec7bdc2851045c761137c234 WHIRLPOOL a352170bcc8fba47ca604656da25489bda0db8685bf3170c46b737a611d32aeb9350ffdbafb6af7cae92a1063f7b09813274637f4961be134416ff9272c6a17b
-EBUILD id3lib-3.8.3-r9.ebuild 1425 SHA256 efde3fa2a9e7677b21fc0c176de2e346a96138fae2e4cb84672917ddc5583346 SHA512 6d3b3e3db44cfe76f5faef86530e7fd06d1973fc488d7db5875566bf63a40538a067d289ab4cc567be99f839def2d34366671f07dde40475bc2e483fff210ddb WHIRLPOOL f20825e14ecf960f01f06bce165f450754633ee4f64fabe1a407211fe08e6a2d13a574cfe6287c19f9262619bc76256436893106b8db93e3faa03bf8aeb66fae
-MISC ChangeLog 11047 SHA256 f1ddc32eac307b9488abf40cdfecbdc43336e326f188a5aa4eddf00f6ee4da26 SHA512 280dd7fbfa8af5962b748af695938d52255ca815e3c11aaf7d52a97d93dc712168a8ad431e93c4591205949ba5f4df77439f101ab95b4d1d144226efe73454ca WHIRLPOOL 776058610b452fddede88d136a799f5372d47e1412cccde3399b3dec9fdf6b805eb1b41906d57ea5ba12d0b14cb9233f2c8c4f0dfbde1f7d5d8c907c39739bce
+EBUILD id3lib-3.8.3-r8.ebuild 1451 SHA256 4edaef55d568f56b8d099e5a9a376744d7a5ab08928d42c056c2d831a7d960c6 SHA512 4681520f29c7c7a09b749ab5da7f8236dbfae4dad06c45cc465ffd0bb1ce10b6a0bcf0674466a3c82739faefefa83aabefd8e789d6cc8ac740173735b73ab0fb WHIRLPOOL 78185e391374087c2f0733dbe03443858734df544ed484765a9934dc3e9286e46ec13869fde008c2b3cefe06128a532a483980b4b4d4e3bfd9a92ec1bd80ccff
+MISC ChangeLog 11226 SHA256 9e487f16988273341137ee4c0eed4655ea05b77184b8290cc966f647996948ad SHA512 bae0f43dc8749e7213658b6402bad30b2ae5e89cbbd04930c91126bb526d736a6072beeb5bd1b1e7932a80534e605e47a6b9421e0a82454bee78341acc4dea57 WHIRLPOOL 43f75f6c0dbeefc0804060ea7910efc49894fec6db6934738322fbbb6165bcb130932d7fa1b714dc5a132b59c920f1e42d156fd9f486b8204491f1a37e0fd4ac
 MISC metadata.xml 160 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b SHA512 f00066790833ce0ac73de2a96f22bc5ba7b9440a8f73749e2ab52f85038a05d3f768fe6ad59b15430b39b3c36163ae60b5e32d0c323326bb9427529c365549b9 WHIRLPOOL 0e3afa7015a86fdd97bcf0aa4d3b0063e87e34fffeb907b1c7c25c3b662849fefa7e45330d5aa697c7d65b24647d0ecefdfeb6b83b27645c12f2afb2c21be423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlGD9QUACgkQgAnW8HDreRZNQQCgzFzYnz9TMLfJpeVCH6nUXjN0
-KaMAoNFD3lFE22Tg4xZMeSA25Sr6gJZI
-=Dqkg
+iQEcBAEBCAAGBQJRg/xVAAoJEEdUh39IaPFNAjwH/2/A6ZP4eo1vARwWqRaeLdgv
+lz/XNsbOvHvKpuzSZd7onTKXkTUBqEid1DlpoZPmbYdwP5TpBeTaLfddh7m/jQUN
+oRuRcKroTk/kKEPkN3Ya1OGfw8kr0wftRFo4usq+52zZZzeeiNiIjkkSLdpyro3N
+2MfNPMl+s7FhelS+GdLBTyehrNMj69yZQn412vnfqGGj351CYJUWaJLoZecsxV3X
+6VtXaSxPsMRb65sbLVQMyvhN0lHPZVOZg1l4JWZY58P0C1NPnh8INjIzJkZcbFRe
+E4LeWQj6C22HItKyE/XXP4EWGWJAEs+pOwJHPr4IN7KGtTM+bCoDElbM0GeMbEc=
+=cox1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index a5f3c452ebce..fe494706126a 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.9 2012/03/22 12:33:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.10 2013/05/03 18:05:14 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Id3 library for C/C++"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND="sys-libs/zlib"
+RDEPEND="sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
@@ -35,7 +35,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-missing_nullpointer_check.patch \
 		"${FILESDIR}"/${P}-security.patch
 
-	AT_M4DIR="${S}/m4" eautoreconf
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {.,zlib}/configure.in || die
+
+	AT_M4DIR=${S}/m4 eautoreconf
 }
 
 src_configure() {
@@ -53,6 +55,6 @@ src_compile() {
 
 src_install() {
 	default
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.la
+	prune_libtool_files
 	use doc && dohtml -r doc
 }
diff --git a/media-libs/id3lib/id3lib-3.8.3-r9.ebuild b/media-libs/id3lib/id3lib-3.8.3-r9.ebuild
deleted file mode 100644
index 324b62d1760a..000000000000
--- a/media-libs/id3lib/id3lib-3.8.3-r9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r9.ebuild,v 1.1 2013/05/03 17:33:56 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Id3 library for C/C++"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-zlib.patch
-	"${FILESDIR}"/${P}-test_io.patch
-	"${FILESDIR}"/${P}-autoconf259.patch
-	"${FILESDIR}"/${P}-doxyinput.patch
-	"${FILESDIR}"/${P}-unicode16.patch
-	"${FILESDIR}"/${P}-gcc-4.3.patch
-	"${FILESDIR}"/${P}-missing_nullpointer_check.patch
-	"${FILESDIR}"/${P}-security.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' {,zlib/}configure.in || die
-	AT_M4DIR="${S}/m4" autotools-utils_src_prepare
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		pushd doc >/dev/null
-		doxygen Doxyfile || die
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}"/doc/. )
-	autotools-utils_src_install
-}