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

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 13 insertions, 65 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/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
-}