Removed event.h.

Package-Manager: portage-2.1.5_rc6

4 files changed, 23 insertions, 8 deletions

diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index 7786e3069961..a7c10b00da5d 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.1 2008/06/17 23:44:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.2 2008/06/22 00:49:26 matsuu Exp $
+
+*libev-3.42-r1 (22 Jun 2008)
+
+  22 Jun 2008; MATSUU Takuto <matsuu@gentoo.org>
+  files/libev-3.42-gentoo.patch, -libev-3.42.ebuild, +libev-3.42-r1.ebuild:
+  Removed event.h.
 
 *libev-3.42 (17 Jun 2008)
 
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 29a01bc1b554..348c3aba398e 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,5 +1,5 @@
-AUX libev-3.42-gentoo.patch 452 RMD160 9b3792fc0050ccc8816eb0b5d00180deb2e57609 SHA1 ee7752689e122b8f982cb9bcd80eaeb699a10871 SHA256 9d6f46b01ba9a48c4a48b121e583cf6323b56f911fb952b4d2fc537fe0b37c0b
+AUX libev-3.42-gentoo.patch 784 RMD160 f78d88c5a6fd487c0f0313d13aff8a88180b0fd8 SHA1 15b1d5602f1092940421e0c735ed574519cc4d7d SHA256 3229c2f69f892e4e3c467f73d3b4b97beaefced2b7beb5ed00480965c856c84c
 DIST libev-3.42.tar.gz 424277 RMD160 f262bc322c3a273aee613635a560fd198a6c4078 SHA1 d8a85e48783b580c302c4474a749fd54ba31148d SHA256 69e6c3310cf9547d66b12af8a11be8cfcfbc39d26973c091fed8671238111832
-EBUILD libev-3.42.ebuild 707 RMD160 249080ac2280f324289a098f1693fc3947a62503 SHA1 0b70359a147c957a58dff4298e6009090136bd71 SHA256 08362fc0b8671e4673671f09ae526798bc8ae96d4aed5b5719e31977388035d5
-MISC ChangeLog 378 RMD160 5d6533e5bbe2c50be7bd7628d334f97dbd174ac8 SHA1 9550554faea5e633ca17316a5f9217c97b5d9ff8 SHA256 c0b6d44f4415ddbd3d9401cd817515733b924b2e1b375805bd9c5082f0831320
+EBUILD libev-3.42-r1.ebuild 663 RMD160 3d45e1a27e09f18e180f8d7c615d187d4c2aade8 SHA1 9b23f44fbe72686615a2b2de5281623db959951a SHA256 b91515c0f6ffed935db7182230b5c21bd7c359503d904172c61b15f73faa13ea
+MISC ChangeLog 553 RMD160 219345690f9fdfd87cd5c78b7a5f1274c5ebc076 SHA1 8b3e291b7fc9d8b9bc1194fffd970dcea43589c8 SHA256 c0d5180bfc64d5bcb8d4290ed3c5b3bfd410f16949a68e2e02a2d11ddc0e5322
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
diff --git a/dev-libs/libev/files/libev-3.42-gentoo.patch b/dev-libs/libev/files/libev-3.42-gentoo.patch
index 1c8ac029f9c1..2f11941da5d5 100644
--- a/dev-libs/libev/files/libev-3.42-gentoo.patch
+++ b/dev-libs/libev/files/libev-3.42-gentoo.patch
@@ -1,3 +1,15 @@
+diff -Naur libev-3.42.orig/Makefile.am libev-3.42/Makefile.am
+--- libev-3.42.orig/Makefile.am	2008-05-11 09:12:36.000000000 +0900
++++ libev-3.42/Makefile.am	2008-06-22 09:23:05.000000000 +0900
+@@ -9,7 +9,7 @@
+ 
+ man_MANS = ev.3
+ 
+-include_HEADERS = ev.h ev++.h event.h
++include_HEADERS = ev.h ev++.h
+ 
+ lib_LTLIBRARIES = libev.la
+ 
 diff -Naur libev-3.42.orig/configure.ac libev-3.42/configure.ac
 --- libev-3.42.orig/configure.ac	2008-06-17 19:12:02.000000000 +0900
 +++ libev-3.42/configure.ac	2008-06-18 01:23:21.000000000 +0900
diff --git a/dev-libs/libev/libev-3.42.ebuild b/dev-libs/libev/libev-3.42-r1.ebuild
index d807f9dd01fd..9f4320edbf02 100644
--- a/dev-libs/libev/libev-3.42.ebuild
+++ b/dev-libs/libev/libev-3.42-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.42.ebuild,v 1.1 2008/06/17 23:44:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.42-r1.ebuild,v 1.1 2008/06/22 00:49:26 matsuu Exp $
 
 inherit autotools eutils
 
@@ -13,9 +13,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# file collision
-RDEPEND="!dev-libs/libevent"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"