Version bumped. Added libev.pc, bug #411847.

(Portage version: 2.1.10.54/cvs/Linux x86_64)

5 files changed, 67 insertions, 78 deletions

diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index f393ea5330c2..afc5d0cb874c 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2011/08/29 06:37:46 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.39 2012/04/16 23:37:01 matsuu Exp $
+
+*libev-4.11 (16 Apr 2012)
+
+  16 Apr 2012; MATSUU Takuto <matsuu@gentoo.org> -libev-3.80-r1.ebuild,
+  -libev-3.90-r2.ebuild, -libev-4.03.ebuild, +libev-4.11.ebuild,
+  +files/libev-pc.patch:
+  Version bumped. Added libev.pc, bug #411847. Removed old versions.
 
   29 Aug 2011; Jeroen Roovers <jer@gentoo.org> libev-4.04.ebuild:
   Stable for HPPA (bug #373957).
diff --git a/dev-libs/libev/files/libev-pc.patch b/dev-libs/libev/files/libev-pc.patch
new file mode 100644
index 000000000000..a2a4c62a1ac8
--- /dev/null
+++ b/dev-libs/libev/files/libev-pc.patch
@@ -0,0 +1,42 @@
+--- /dev/null
++++ b/libev.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libev
++Description: A high-performance event loop/event model with lots of features
++Version: @VERSION@
++Libs: -L${libdir} -lev
++Libs.private:
++Cflags: -I${includedir}
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
+ libev_la_SOURCES = ev.c event.c
+ libev_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libev.pc
++
+ ev.3: ev.pod
+ 	pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,6 +2,7 @@ orig_CFLAGS="$CFLAGS"
+ 
+ AC_INIT
+ AC_CONFIG_SRCDIR([ev_epoll.c])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
+ AC_CONFIG_HEADERS([config.h])
+@@ -21,5 +22,5 @@ AC_PROG_LIBTOOL
+ 
+ m4_include([libev.m4])
+ 
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile libev.pc])
+ AC_OUTPUT
diff --git a/dev-libs/libev/libev-3.80-r1.ebuild b/dev-libs/libev/libev-3.80-r1.ebuild
deleted file mode 100644
index d1752ec7e1bd..000000000000
--- a/dev-libs/libev/libev-3.80-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.80-r1.ebuild,v 1.4 2009/12/14 18:44:37 ranger 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"
-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-3.90-r2.ebuild b/dev-libs/libev/libev-3.90-r2.ebuild
deleted file mode 100644
index 47ab8dad3863..000000000000
--- a/dev-libs/libev/libev-3.90-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-3.90-r2.ebuild,v 1.4 2011/01/26 01:06:50 jer Exp $
-
-EAPI="3"
-
-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 arm 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_prepare() {
-	epatch "${FILESDIR}/${PN}-3.42-gentoo.patch" \
-		"${FILESDIR}/${P}-ev++.patch"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc Changes README || die
-}
diff --git a/dev-libs/libev/libev-4.03.ebuild b/dev-libs/libev/libev-4.11.ebuild
index 52f150ae39e0..7a16e24b1eb8 100644
--- a/dev-libs/libev/libev-4.03.ebuild
+++ b/dev-libs/libev/libev-4.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.03.ebuild,v 1.1 2011/01/26 16:51:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.11.ebuild,v 1.1 2012/04/16 23:37:01 matsuu Exp $
 
 EAPI="3"
 
-inherit autotools eutils
+inherit autotools eutils multilib
 
 MY_P="${P}"
 
@@ -26,6 +26,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/4.01-gentoo.patch"
+	# bug #411847
+	epatch "${FILESDIR}/${PN}-pc.patch"
 
 	eautoreconf
 }
@@ -37,5 +39,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 	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
+}