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

Package-Manager: portage-2.1.10.54/cvs/Linux x86_64

6 files changed, 86 insertions, 92 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/Manifest b/dev-libs/libev/Manifest
index a7e600dfa91f..7452f7d40cf6 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,25 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 4.01-gentoo.patch 592 RMD160 96e05d63c92ad2b906f354efa0af889f94fd99eb SHA1 525926f1504dc9b52e3ff14808c25205e6b1684a SHA256 9d497cea52e9b15d298d0e0e83bc03bfee89a59818f66257665900aa59cabbc7
 AUX libev-3.42-gentoo.patch 784 RMD160 f78d88c5a6fd487c0f0313d13aff8a88180b0fd8 SHA1 15b1d5602f1092940421e0c735ed574519cc4d7d SHA256 3229c2f69f892e4e3c467f73d3b4b97beaefced2b7beb5ed00480965c856c84c
 AUX libev-3.90-ev++.patch 363 RMD160 b592c7af86e728f48c5e31ae4f2c351dd5132d92 SHA1 b085d708ee0deafc024ea70e8626bd9476a347ef SHA256 606d4126c959c23610a0f0a36b423ec721d5aba6eb9865ca63d6a3978c0310e2
-DIST libev-3.8.tar.gz 470250 RMD160 63398782022f3047f6e8587b802e072cfe4094c8 SHA1 cc57a3e6e171738aaa9d6af35ea66624a0a62b51 SHA256 25e353af5707bc4261276e02901ad469e1a46c589eaf5f66c5d3275c98b12294
-DIST libev-3.9.tar.gz 473062 RMD160 b3a2c9a5a03be1120512d81c534b3ed4f2b39295 SHA1 a006a91346efd070359f4ad5c5077a0bac6fcee5 SHA256 0b81cb55a8eb0a2e3d2364a397e244812dd6dd496e860ed7bf143e39e4c21c2e
-DIST libev-4.03.tar.gz 471094 RMD160 504dd1b2190fdaa1624f2ab1d1875c7ba9bffe00 SHA1 98f8c1ecac4751c04e3607e7de405c5f42174d0b SHA256 0af5149df84ddcd0041fc23f2b4de8b4fd6ce96389a63c606310efdba101f08f
+AUX libev-pc.patch 1031 RMD160 d620d168acf4cfe16dcca567ace92aae1a9fefc3 SHA1 ff3a0d1e503bcaace78992db31ecdfdf367b0893 SHA256 c80e756f4404e40d93d027f161413748c750838168653ae0014e97c5b76a2d0c
 DIST libev-4.04.tar.gz 471713 RMD160 cd82228834c51cf152a0214b77a57b0359aead7b SHA1 7768c2bcce30dbf76672e51642a655479dd45772 SHA256 ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012
-EBUILD libev-3.80-r1.ebuild 859 RMD160 e5c1c40708047e5771139d95d6a8d314e1b71fdf SHA1 b32ba1aebf42186a603774da4a34815ebf42d720 SHA256 f54709a87100243b6d4e75f774463a88a7770bb7ecd2f0ed864637fd28f032e5
-EBUILD libev-3.90-r2.ebuild 984 RMD160 34a014c5584e39bcb395a71d6b04d32bcab82904 SHA1 09757f2f71e5718b87a11723cc0fd52c6f666b18 SHA256 be209a45bf71185a6c06f351e80af702b480680d14d595393efbf60be58f5737
-EBUILD libev-4.03.ebuild 1042 RMD160 d32a7573e75ddeea2a2f446120386236580bb508 SHA1 d9c9f878d8ad883537bbd641c9e18158ace63e4b SHA256 2ce140222be71e3d569b95a1e74dc0d6b616e66e3c05db1b8e4094d576d4f945
+DIST libev-4.11.tar.gz 484766 RMD160 524b86e24b45ff01bf79775f9ce9374f792b3c4c SHA1 e7752a518742c0f8086a8005aa7efcc4dcf02ed9 SHA256 9f55f16ff6e4d60a1b1fa7f4962af69768468f0d7c362aab6387f52020938cdf
 EBUILD libev-4.04.ebuild 1188 RMD160 2141132f825a5633138eaf2116065e763b83e6ab SHA1 2cb63705cfebd2f03b5cffa47a65f5caec2faddf SHA256 cd3e07d3af354f770cf5cddc124436de6bcac64bf7862216d0133b5a28a32018
-MISC ChangeLog 4875 RMD160 500851bd94cfadc458a205ed7a84ea409cbc7e71 SHA1 0ec18cc748df60ed5d0096aa7b5ccb35c0b4fd12 SHA256 3412e9d656440fcb98c499f8da83b38f02dfbab51e42bacb378b767f75d8b6fd
+EBUILD libev-4.11.ebuild 1329 RMD160 288f8831e445eb9cfaad851b56f953210046409b SHA1 28a73d62de14cb45784088b66d5056759b1dcf03 SHA256 1ea96967d718fd32b3a8cdc1f4ad2235fb617bfda9d708c7ebdb793d0e6dbb30
+MISC ChangeLog 5137 RMD160 ca579bf81fb45f0fa07d9fc8ee235d308104551b SHA1 9a50d7b56773abfaa330baaadc3d663d0315e23c SHA256 9a5d83864c608476202c53438c54934ece3c0dc81ac3ce577efe316412cc4b95
 MISC metadata.xml 200 RMD160 397a9fbaf0e2d458f8d95d2415a47a671d5dda58 SHA1 714cb7b31fb311633bb0cc8ca2f24155891e342d SHA256 bb8d57cfa8edd3743459c30d264cc37cc5e20d71dca61651939a965274f23b20
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C7QACgkQfXuS5UK5QB38MQP/b4AJGZdA+llmIdF4nvEoraie
-MAqQP7ygRllLCFEj1EKEnRUe/O+/o8ev9v0YkL5jroG8Y2DQ4Sfd3Kx7oOcVZIIC
-523yU4jO7qfGt7RbLtXrHMqxDLKGWOZPryM9b6Ue2zS5ZOrAcU+O1vDNquhkBbNX
-PWVMeQ0vhEoGYDAKENg=
-=Owps
+iQIcBAEBAgAGBQJPjK0nAAoJECaGw+YFKA1p/VwP/0RYN/iXvjCd2bI4ggFMT7Ft
++nf4QT/8yC7OQ7AFKwz8viUg4X+Utceqgn+oGm55ekgJRc/SnEAIyp4dxPnFLiNt
+D2yqsbhhMOOxl4odiQ0hBhQAWjSI9zjJbnyYUjnhEHOYEgSQEWESsAqtOa8fWNVT
+PoTpnuE1jsRX5DD0RuLPFqLifU5VPN/LUPeeQsgQdhJgo5QQFVrzduBePFIAjc0B
+XUuYMc/AC+3BK1Qv66+uSmAyymaMj2UBItA77YmNiv/QXKu2f6Gbb+8FxUD/tvqn
+y1LsncYuQkIkX9vj5dHJfvNUpKEbRSUR6oksIx6idi+6YI9X//2VAF8hnteHZXSC
+w9xEpzIeihI5JYoJb9q3LGZ/fFR5v0iMTqajyP9/ydKWpCrDWYpmppnxJzfcL8mS
+aE2BlKCtns8Nx37xSGt9Da25YNDUgBEm/JtLZzyDLREbjkLxrGAtmpVs5tukFVoF
+lJXDdj1F/ceNkY7cTyrEx3Nlpgp4BnIQGv5SH3CFqVgBEIZrwXm5tHdQ9gKMuJBO
+90Rg/pI8PNhZLhR1oHQeVoBOeKf73ZboYYd/0zzMAUsJO0YBwk46kT7k2slrUmxJ
+bCuhR9F4FchNQENeyCZneQwwp3ERMIVXwjaBugstNGrpBxNpwcyFpLyBnjaS3qu1
+EUVA4dt+H2rvnfoy4orb
+=p/uu
 -----END PGP SIGNATURE-----
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 f3edff5efc7f..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/${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 425069598298..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/${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 0a6d76de55ed..61ef58ebe3e2 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
+}