Rename some man pages, in order to avoid collisions with dev-libs/libevent;

remove blocker against libevent; fixes bug 137932. Remove old.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 31 insertions, 45 deletions

diff --git a/dev-libs/9libs/9libs-1.0-r1.ebuild b/dev-libs/9libs/9libs-1.0-r1.ebuild
index 768bd53baede..e848f8fe3d38 100644
--- a/dev-libs/9libs/9libs-1.0-r1.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/9libs-1.0-r1.ebuild,v 1.6 2009/07/23 23:38:30 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/9libs-1.0-r1.ebuild,v 1.7 2010/09/23 19:07:29 ulm Exp $
 
 inherit toolchain-funcs
 
@@ -13,22 +13,26 @@ SLOT="0"
 KEYWORDS="sparc x86"
 IUSE=""
 
-DEPEND=" >=x11-proto/xproto-7.0.4
+DEPEND=">=x11-proto/xproto-7.0.4
 	>=x11-libs/libX11-1.0.0
 	>=x11-libs/libXt-1.0.0"
 
-RDEPEND="$DEPEND
-	!dev-libs/libevent"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
 		--includedir=/usr/include/9libs \
-		--enable-shared \
-		|| die "econf failed"
-	emake CC=$(tc-getCC) || die
+		--enable-shared
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
 	make install DESTDIR="${D}" || die
 	dodoc README
+
+	# rename some man pages to avoid collisions with dev-libs/libevent
+	local f
+	for f in add balloc bitblt cachechars event frame graphics rgbpix; do
+		mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die
+	done
 }
diff --git a/dev-libs/9libs/9libs-1.0.ebuild b/dev-libs/9libs/9libs-1.0.ebuild
deleted file mode 100644
index f53c439af550..000000000000
--- a/dev-libs/9libs/9libs-1.0.ebuild
+++ /dev/null
@@ -1,32 +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/9libs/9libs-1.0.ebuild,v 1.15 2009/07/23 23:38:30 vostorga Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A package of Plan 9 compatibility libraries"
-HOMEPAGE="http://www.netlib.org/research/9libs/9libs-1.0.README"
-SRC_URI="ftp://www.netlib.org/research/9libs/${P}.tar.bz2"
-
-LICENSE="PLAN9"
-SLOT="0"
-KEYWORDS="sparc x86"
-IUSE=""
-
-DEPEND=">=x11-proto/xproto-7.0.4
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		--includedir=/usr/include/9libs \
-		--enable-shared \
-		|| die "econf failed"
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc README
-}
diff --git a/dev-libs/9libs/ChangeLog b/dev-libs/9libs/ChangeLog
index 54d175ad2246..f7bae21db6b3 100644
--- a/dev-libs/9libs/ChangeLog
+++ b/dev-libs/9libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/9libs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/ChangeLog,v 1.16 2009/07/23 23:38:30 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/9libs/ChangeLog,v 1.17 2010/09/23 19:07:29 ulm Exp $
+
+  23 Sep 2010; Ulrich Mueller <ulm@gentoo.org> -9libs-1.0.ebuild,
+  9libs-1.0-r1.ebuild:
+  Rename some man pages, in order to avoid collisions with dev-libs/libevent;
+  remove blocker against libevent; fixes bug 137932. Remove old.
 
   23 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> 9libs-1.0.ebuild,
   9libs-1.0-r1.ebuild:
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index 2d10add986e3..68fad0b53a4d 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,5 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST 9libs-1.0.tar.bz2 163744 RMD160 6edfccc45bb6697cc93b9aeb1d1cd981f79e4c41 SHA1 3dcf02882b6628f0004fae397eba9e9ceabb1030 SHA256 1d14f945782c8c5b0f97d5026181a105041f8c3e374d7f80bd53a87315ea54f6
-EBUILD 9libs-1.0-r1.ebuild 811 RMD160 05ddae8d906583f25c81308c14a03c72130cc3bc SHA1 90a98d2894e9ce9fbd8c75707e3414c2f0e6b8bf SHA256 345aefccdef56c2b4d7ddf28f5c147a2f33202ead9d5335f5684fba9b603b746
-EBUILD 9libs-1.0.ebuild 791 RMD160 a8dc659dcb756dd1dfee6e13276193ad581b06b9 SHA1 9581d4adcb031a282f176a2da1be7193ea29d99a SHA256 7be6f812f01736a546588487a840ba3d6b73efb839619f97174a8cf6c3b965f6
-MISC ChangeLog 1986 RMD160 0ba48dc2a7bc38a4cf44ba232bbdf0aab23b54f9 SHA1 455bc11120f80c5ed524871470ac5025cf0c151f SHA256 5722179c1a6baa7002500668d166e775895bfa3fbf5dcb74310ba19bb9e43f2c
+EBUILD 9libs-1.0-r1.ebuild 968 RMD160 8a2eac9d401afd84f847ed7340fd7cd9e044362d SHA1 e3279e4dedebc55944302096a3283a315e9cb517 SHA256 5f98d03a17dd7f25c018438d7b74957c5a41b571baa75364f7577055c33d2225
+MISC ChangeLog 2214 RMD160 acc134b134a5ce2266083c47d9e0bd504909c2e9 SHA1 4a11fb6297f01baa32b348d582773211ad2d0701 SHA256 5da74d5777f3a6e1356173a9ee34f28ff7bc64a0cb1963e263a7efd623779eaa
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkybpcUACgkQOeoy/oIi7uz0cgCgmyidmZroqaDeJr7lHUyol4O4
+xOcAoMUVzaVuRMpaDJV6aHURkQqLeYzf
+=Fir1
+-----END PGP SIGNATURE-----