Version bumped, bug #355261.

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

5 files changed, 40 insertions, 96 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/Manifest b/dev-libs/libev/Manifest
index e21752df4684..586a04f8753f 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -6,30 +6,28 @@ AUX libev-3.42-gentoo.patch 784 RMD160 f78d88c5a6fd487c0f0313d13aff8a88180b0fd8
 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.01.tar.gz 466183 RMD160 7bb9f9f0473e8d22d4a776ff10905deb92e97328 SHA1 c1d78fd00800fca8ecf3af2c23fb9ad39119d78b SHA256 41d468fee312bbc3f63298d563b104b0b12bf181d431976c1f97d4b8ccb50b78
 DIST libev-4.03.tar.gz 471094 RMD160 504dd1b2190fdaa1624f2ab1d1875c7ba9bffe00 SHA1 98f8c1ecac4751c04e3607e7de405c5f42174d0b SHA256 0af5149df84ddcd0041fc23f2b4de8b4fd6ce96389a63c606310efdba101f08f
+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-r1.ebuild 956 RMD160 9b959dea2394cfcf9678961d06a1d13b5a052347 SHA1 10bb580c1e03a649a8e8cb7ef5e25df5878f9d46 SHA256 96c38592ec3d28b84a027b6fb9693c66f058f2dd3f66678fada3386d930ad54f
 EBUILD libev-3.90-r2.ebuild 984 RMD160 34a014c5584e39bcb395a71d6b04d32bcab82904 SHA1 09757f2f71e5718b87a11723cc0fd52c6f666b18 SHA256 be209a45bf71185a6c06f351e80af702b480680d14d595393efbf60be58f5737
-EBUILD libev-3.90.ebuild 918 RMD160 64f7904648b73c491323061e5c61876b3f1d1b25 SHA1 68e70e18e1c4d46d0db08d02e65fbe818dca3d68 SHA256 a9308906ac8035f19f62e51115272361cb8987b0108e355571aea7392cfc0657
-EBUILD libev-4.01.ebuild 971 RMD160 23d06c3b201808f5010f9581cd4fcda8abd2a285 SHA1 e6f1416a8411be84a46ae1aac789bcd4e1b02b61 SHA256 8ec40b07aa6632ba009620c96caea9a089bdeea39cb4b9bbce369967dc2a1df7
 EBUILD libev-4.03.ebuild 1042 RMD160 d32a7573e75ddeea2a2f446120386236580bb508 SHA1 d9c9f878d8ad883537bbd641c9e18158ace63e4b SHA256 2ce140222be71e3d569b95a1e74dc0d6b616e66e3c05db1b8e4094d576d4f945
-MISC ChangeLog 4149 RMD160 931bcca5f0a3ff2192a03cca3d09ba23adc48502 SHA1 ffd5624da861091262ca3446ef985e892549154c SHA256 d8a7625ddef66497903df22794b967562daada1bf70a2b5b7897a86324ac25f5
+EBUILD libev-4.04.ebuild 1201 RMD160 a7a96a5b1011af9e2fdb43ef053c8d94e903fb17 SHA1 f5a5b3eb408862f876019f382a51b702f158440f SHA256 d4aa0e72bfca785841057c0acd01ed6d2320ff1f7725f98e71d96f6ac92e5d36
+MISC ChangeLog 4364 RMD160 d1b0dfbe0959c73068d3ce4cc4f5d19c3f599517 SHA1 bfadb6f86d70554aab552d8754806b8729afa76e SHA256 f1ec8d8a64f696d56c910cfdfd77208fbac8d3108645010cc249d5d086815152
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNQFKEAAoJECaGw+YFKA1pWp4QAJg+LqZr5z95z9eZCPIdFQST
-vXOc4e6/qJpH6ADX5wO/q+VxQU4wlVu6Ir2RZCYLLaVgOhkdM/ZWR1b9TffkQdlH
-yVovKp20MjOZrqZNIKxZBAXqTxa4d2gEeABsiGq9HK9jLjZDgLhpVEDczah4wAJR
-isohGl7OCTPnh7OJ9ThYkploche8jm+U+Tck1EmCR291nsnv23DBHi04/F8kYo1J
-fgoEfJjrhHIoQtQBbnwErpOv9vdO+aBEKYSFNpxbhuNMhg2FplIPnqgufOvGA+Z7
-L1dA6DyMHmRgmqULz3f6FY4ApBXZHDlJl1iO4TsVcQHd68Uv6HoOrtF8U2TM0Ox4
-Fv4xXGpDxzA2dxxLXz0bUdyxeAkJvEZOTmT/2fELjzrBAlhQQnXkUAWvC3A3lhv+
-BptRFj09766UO0N/HF700CjRv4uHQClcczNHC4wt9+oUqfZ2DRExUF8vdPH//GxO
-g+FI2n1a5Uo5kRjYI374nERZQaPhsVR1iBJ/ati32xRtn1uCscpsSDiGz9AuZZed
-VshT9tEe/yweZEXIitXicr/ihC0CTjGK/kiDUnqWQZ2M9wGWB27tJE1EZHT05Yh8
-xWlf1xq0Rbk1xzGSuyc1cV4PbltbVdNeDHpwpG5SGwZQ4nnmUC1J7LsMCbnXYbw4
-czRfJ3Kpij1l7OYxOhXT
-=fi0E
+iQIcBAEBAgAGBQJNhryTAAoJECaGw+YFKA1p1VkQAKHC6piGjKFSerYWBmvDa9Cu
+imlomqi8OjSDBy++Us//yx9Esfb0WrVJW+UmOKdKFkn3Bm2aTyJL9/SK2W+mCrV6
+hnC3YqNE0yjbcJeZndLmzqtAMyHK0ImIKAhwRe4MIbZFVS9FOtn3V8lek87sqyUG
+VFLq8v/Gr+r68LbFGSB+4wFXaKckuXK9mipWgRChOPo6NfMrbODDnCEa9WCl1GRQ
+uNpM0x1LDldzM3mfELqY5Z/YMCreEXZLO0Sy5TMQXYFfGHB9CCdcEwXZR9BYXYm8
+Y4EWRbQDs2rPFFnPATDw0omYResD2wzeKrVOst9hhIRZQYCO8PpLlH7E+baJgw09
+xJCkXHy04Uek0aBlQBlMYf6zy/3AyWmvqq+ZMrnEfI32tkhw9FbJ7N1I2wf4Teh4
+BHJzLiB1jQ4NtFynaQFOVP1iLfL/dU5D7sXgHnETEYQBqoWAYpk17L9PBQh1Jwr5
+7UtS5F4nw36DO4NmTT5cpIM2pXpQQ0XbL+P7aJWLjQBS/qEkymM0bWIGZGGzZLUq
+XpuKTQ8GKHCj7I8bEHf2jXpcGUDR9flFIlt/OmiMMcnrqmAUNGuFwVbIlYkYTkNT
+oyctvu0xO6EkBjGmgw/R2UOiizPMwool0yVN31LHZpMVFiD9XJG7FVfBZe2xlKki
+s0Gzd/ETu9A5UV9FjaF3
+=ihPa
 -----END PGP SIGNATURE-----
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 a00607ea59e2..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/${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 b7b12370df46..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/${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 dcb53b69087c..dd7d9789b05c 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
+}