Use prune_libtool_files. Remove old.

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

4 files changed, 15 insertions, 71 deletions

diff --git a/dev-libs/libevent/ChangeLog b/dev-libs/libevent/ChangeLog
index f090687b1a6b..22626d671ff4 100644
--- a/dev-libs/libevent/ChangeLog
+++ b/dev-libs/libevent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libevent
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.259 2013/03/08 17:46:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.260 2013/04/24 15:01:32 jer Exp $
+
+  24 Apr 2013; Jeroen Roovers <jer@gentoo.org> -libevent-2.1.1.ebuild,
+  libevent-2.0.21.ebuild, libevent-2.1.2.ebuild:
+  Use prune_libtool_files. Remove old.
 
   08 Mar 2013; Jeroen Roovers <jer@gentoo.org> -libevent-2.0.19.ebuild,
   -libevent-2.0.20.ebuild:
diff --git a/dev-libs/libevent/libevent-2.0.21.ebuild b/dev-libs/libevent/libevent-2.0.21.ebuild
index 15f0847244fe..0a63de5fa15c 100644
--- a/dev-libs/libevent/libevent-2.0.21.ebuild
+++ b/dev-libs/libevent/libevent-2.0.21.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.21.ebuild,v 1.15 2013/02/24 18:05:50 ago Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.21.ebuild,v 1.16 2013/04/24 15:01:32 jer Exp $
 
+EAPI=5
 inherit eutils libtool
 
 MY_P="${P}-stable"
@@ -25,6 +24,8 @@ RDEPEND="
 
 S=${WORKDIR}/${MY_P}
 
+DOCS=( README ChangeLog )
+
 src_prepare() {
 	elibtoolize
 
@@ -48,9 +49,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog
-	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/libevent*.la
-	fi
+	default
+	prune_libtool_files
 }
diff --git a/dev-libs/libevent/libevent-2.1.1.ebuild b/dev-libs/libevent/libevent-2.1.1.ebuild
deleted file mode 100644
index 3fcc460c99ae..000000000000
--- a/dev-libs/libevent/libevent-2.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.1.1.ebuild,v 1.5 2012/10/15 11:47:19 jer Exp $
-
-EAPI=4
-inherit eutils libtool
-
-MY_P="${P}-alpha"
-
-DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://monkey.org/~provos/libevent/"
-SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+ssl static-libs test"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/9libs-1.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	elibtoolize
-
-	# don't waste time building tests/samples
-	sed -i \
-		-e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
-		Makefile.in || die "sed Makefile.in failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable ssl openssl)
-}
-
-src_test() {
-	# The test suite doesn't quite work (see bug #406801 for the latest
-	# installment in a riveting series of reports).
-	:
-	# emake -C test check | tee "${T}"/tests
-}
-
-DOCS="README ChangeLog*"
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/libevent*.la
-	fi
-}
diff --git a/dev-libs/libevent/libevent-2.1.2.ebuild b/dev-libs/libevent/libevent-2.1.2.ebuild
index bca7a7d3f8da..8d56ff420c64 100644
--- a/dev-libs/libevent/libevent-2.1.2.ebuild
+++ b/dev-libs/libevent/libevent-2.1.2.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/dev-libs/libevent/libevent-2.1.2.ebuild,v 1.2 2012/11/19 21:12:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.1.2.ebuild,v 1.3 2013/04/24 15:01:32 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils libtool
 
 MY_P="${P}-alpha"
@@ -50,7 +50,5 @@ DOCS="README ChangeLog*"
 
 src_install() {
 	default
-	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/libevent*.la
-	fi
+	prune_libtool_files
 }