Fixed compilation error in ev++.h, bug #325391.

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

4 files changed, 78 insertions, 2 deletions

diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index 0efd45ae3d69..89ef846ee07e 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libev
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.25 2010/05/31 18:27:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.26 2010/07/03 16:55:04 matsuu Exp $
+
+*libev-3.90-r2 (03 Jul 2010)
+
+  03 Jul 2010; MATSUU Takuto <matsuu@gentoo.org> +libev-3.90-r2.ebuild,
+  +files/libev-3.90-ev++.patch:
+  Fixed compilation error in ev++.h, bug #325391.
 
   31 May 2010; Guy Martin <gmsoft@gentoo.org> libev-3.90-r1.ebuild:
   Added ~hppa to KEYWORDS
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index f8baa78ce5e0..f4ef657b5160 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 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 1ed7a4037541b05798b13f76da558d1a533b5c83 SHA1 4b5b4f7352f5c7cf0d9d964a6a7f6bd8206fa42f SHA256 b812a0df3a780cab66a048f054d922471e94c1c0d94755559b271b8f62135b3f
 EBUILD libev-3.90.ebuild 918 RMD160 64f7904648b73c491323061e5c61876b3f1d1b25 SHA1 68e70e18e1c4d46d0db08d02e65fbe818dca3d68 SHA256 a9308906ac8035f19f62e51115272361cb8987b0108e355571aea7392cfc0657
-MISC ChangeLog 3280 RMD160 1131cd41f9786651b65f37c9928634c7bb910296 SHA1 3a4f58f3f02d8333147bba1b9bc3c0536da407b9 SHA256 e602cccafdc596ecd340a6e660b382d48af777a0d4af0ce2cadee17611754306
+MISC ChangeLog 3465 RMD160 01640e0e277b4dc5fdb035bdd0ba71666d1729db SHA1 6473f5dd4cfbad28733458ef184624f69333c09e SHA256 5a4a7dbbc0e5efc6aae272b32580a206ec9dad6588805af2b2372e149674c33f
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJML2uPAAoJECaGw+YFKA1pcB0P+waHNrg4NKMNbx76wn1R7C0c
+H0c7USVZ0wSHQUqjjrs8ZOybqK8hKmWi+MdzDB5CWzB0jwQB82sNm/DcgobJXzdM
+jlK/CR3NH7cynutYnanMdmM2MfrnIhQ5clG0SIhps8EM/PEAvbH1uOsRor9yjKsX
+uI5bSVzwYPG91deVWhjZkmaVuNw068ufPTUgxyjOn8iGg6Y1VnfWuE55awoUJkI2
+3sfaGrfuix5go3PahoVrNR+lEBtq7i7jAXuYb43NxkROSUP6/W7WiPR2SHqmg+PD
+907usee1Uw8UbX9ofReByLPRX+A4cb2ZpSflFr5MMboSLq/7j0JrRdnr3cR2veBO
+YNrcXoYlEkmOBbkXrKJZudR6CcaBTXBIk3J97vFzX5ZZDDpGCRXiuDVtjOMNLmjl
+ets2FgqUERF/k4YGEZ6jrZ1XCEdwtYaq6ntaH2wiWtbU3ePcj5T8HkjMWi64rnci
+v2Bt+k0674ySG3bEgdQugT7uqgWSSFb6xT74GEP7FDiVd3Kbh3xBvGlZwFBCfHDM
+jtT8bZiAoweZDPv0Jlq+1/OiL10COJwHWvnw+MQ+isPre9a93C+GL3IbbnrryuHJ
+Hg+cTNYm1uhLCQZj3Yrfk9z0iDZMdQamKQ8qSUvjD23QmHLYKa19s1+kj3TDWMyN
+baX7UU7YeN/pMISK8uOM
+=62ie
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libev/files/libev-3.90-ev++.patch b/dev-libs/libev/files/libev-3.90-ev++.patch
new file mode 100644
index 000000000000..815b63eb5f89
--- /dev/null
+++ b/dev-libs/libev/files/libev-3.90-ev++.patch
@@ -0,0 +1,11 @@
+--- /schmorpforge/libev/ev++.h	2010/03/16 00:43:22	1.49
++++ /schmorpforge/libev/ev++.h	2010/06/24 19:22:26	1.50
+@@ -480,7 +480,7 @@
+     template<class K, void (K::*method)()>
+     static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents)
+     {
+-      static_cast<K *>(w->data)->*method
++      (static_cast<K *>(w->data)->*method)
+         ();
+     }
+ 
diff --git a/dev-libs/libev/libev-3.90-r2.ebuild b/dev-libs/libev/libev-3.90-r2.ebuild
new file mode 100644
index 000000000000..b9cf3f056043
--- /dev/null
+++ b/dev-libs/libev/libev-3.90-r2.ebuild
@@ -0,0 +1,37 @@
+# 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-r2.ebuild,v 1.1 2010/07/03 16:55:04 matsuu 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 ~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
+}