Version bumped, bug #355261.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

4 files changed, 24 insertions, 78 deletions

diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index a65e52bf3f6b..b7ee18c86e16 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.32 2011/01/26 16:51:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.33 2011/03/21 02:48:36 matsuu Exp $
+
+*libev-4.04 (21 Mar 2011)
+
+  21 Mar 2011; MATSUU Takuto <matsuu@gentoo.org> -libev-3.90.ebuild,
+  -libev-3.90-r1.ebuild, -libev-4.01.ebuild, +libev-4.04.ebuild:
+  Version bumped, bug #355261. Removed old versions.
 
 *libev-4.03 (26 Jan 2011)
 
diff --git a/dev-libs/libev/libev-3.90-r1.ebuild b/dev-libs/libev/libev-3.90-r1.ebuild
deleted file mode 100644
index 68473f657ac2..000000000000
--- a/dev-libs/libev/libev-3.90-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.90-r1.ebuild,v 1.2 2010/05/31 18:27:32 gmsoft Exp $
-
-inherit autotools eutils
-
-MY_P="${P/0}"
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="elibc_glibc"
-
-# Bug #283558
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-3.42-gentoo.patch"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc Changes README
-}
diff --git a/dev-libs/libev/libev-3.90.ebuild b/dev-libs/libev/libev-3.90.ebuild
deleted file mode 100644
index 9c375ef5364b..000000000000
--- a/dev-libs/libev/libev-3.90.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.90.ebuild,v 1.2 2010/01/14 21:29:36 fauli Exp $
-
-inherit autotools eutils
-
-MY_P="${P/0}"
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-# Bug #283558
-DEPEND=">=sys-libs/glibc-2.9_p20081201"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-3.42-gentoo.patch"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc Changes README
-}
diff --git a/dev-libs/libev/libev-4.01.ebuild b/dev-libs/libev/libev-4.04.ebuild
index 3a0dfbba4637..eae055a0f859 100644
--- a/dev-libs/libev/libev-4.01.ebuild
+++ b/dev-libs/libev/libev-4.04.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.01.ebuild,v 1.2 2010/12/05 17:12:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.04.ebuild,v 1.1 2011/03/21 02:48:36 matsuu Exp $
 
 EAPI="3"
 
-inherit autotools eutils
+inherit autotools eutils multilib
 
 MY_P="${P}"
 
@@ -16,7 +16,7 @@ SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="elibc_glibc"
+IUSE="elibc_glibc static-libs"
 
 # Bug #283558
 DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
@@ -25,13 +25,25 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
+	epatch "${FILESDIR}/4.01-gentoo.patch"
 
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 
 	dodoc Changes README || die
 }
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libev.so.3.0.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libev.so.3.0.0
+}