fix manpage collision with readline

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 24 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index e3cbef553461..e8ecfe5669b7 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.102 2011/11/07 16:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.103 2011/11/07 22:47:46 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild,
+  +files/freebsd-lib-9.0-mancol.patch:
+  fix manpage collision with readline
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild:
   fix sed calls with gnu sed when bsd sed is not available
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 5ea8f503694d..5136943b0e73 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -15,6 +15,7 @@ AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e
 AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
 AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
 AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
+AUX freebsd-lib-9.0-mancol.patch 591 RMD160 639a7cfe412bc529b333454c48b5d260f535cae9 SHA1 e80047ab6a6f993e780d12f197c66224606fc6b8 SHA256 90177d1a08185c136368faa218478371bf71c98cce7111842792b4e8dab25ddf
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
 AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
 AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
@@ -59,13 +60,13 @@ DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db66
 EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28938158 SHA1 d91c9328cfbe8e614bda3b93d782a8452dff0c8e SHA256 4cfd26e8299670f33e6fa20094b66e464ed3bd113c899b3374b55678ac4a4dd0
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
 EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
-EBUILD freebsd-lib-9.0_rc1.ebuild 16059 RMD160 914556e076a5a6833d255d0c0c4772fb13a57a1e SHA1 fb4c566a2ccab04b3f95fc1d6390ce2122eb9f0b SHA256 a1f16c4d0abc26717906a771b19e24b47da70561bc425b14745539ddcb706aff
-MISC ChangeLog 23382 RMD160 b41f37d82248f0975c24e37c6cdcb72c74b96096 SHA1 531417706594b08a323bdb1c431478f9afc97a9c SHA256 b343eb5e50440c0f09778a82bccac8bf8e3b7bf710eb2f890f764bae55f79427
+EBUILD freebsd-lib-9.0_rc1.ebuild 16097 RMD160 affa155b0bd222a25a0a399d39aeb8dd143556ea SHA1 a0aad78dbe62ad939e5d4f0ba16aff477826b8d8 SHA256 0676f289b039b3d4b2b81de715e7f45c50063ed03de009635d95ef6566ca74c2
+MISC ChangeLog 23540 RMD160 00d6259bfab0daa9e8e39bd1af22fac569fff548 SHA1 ea885ff4e84fcd7da77b6ee48d287019ba2160d2 SHA256 96fe46f5c5e7c13599a9b9c12e478fda8b84e3b26141aaceb228f8692eb207e4
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk64C2gACgkQvFcC4BYPU0r84ACeNP+tHiWa7tyClgiNM0rpw6Tv
-N0cAoJfyULHlsf3dgrjl6Uqa1HM1a1Nf
-=CQTw
+iEYEARECAAYFAk64YBcACgkQvFcC4BYPU0pHLwCeMdk9HKQ9EewbHo287x3anGp/
+8WAAn3K4IOtD69e5UB7WZL9itX0vjP15
+=YwKr
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch
new file mode 100644
index 000000000000..64bdd9b557aa
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch
@@ -0,0 +1,11 @@
+--- lib/libedit/Makefile.old	2011-11-07 16:02:33.000000000 +0000
++++ lib/libedit/Makefile	2011-11-07 16:02:53.000000000 +0000
+@@ -17,7 +17,7 @@
+ 
+ MLINKS=	editline.3 el_deletestr.3 editline.3 el_end.3 editline.3 el_init.3 \
+ 	editline.3 el_get.3 editline.3 el_getc.3 editline.3 el_gets.3 \
+-	editline.3 history.3 editline.3 history_end.3 \
++	editline.3 history_libedit.3 editline.3 history_end.3 \
+ 	editline.3 history_init.3 editline.3 el_insertstr.3 \
+ 	editline.3 el_line.3 editline.3 el_parse.3 editline.3 el_push.3 \
+ 	editline.3 el_reset.3 editline.3 el_resize.3 editline.3 el_set.3 \
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
index 0b0bb5ace436..01131937fde6 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.3 2011/11/07 16:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.4 2011/11/07 22:47:46 aballier Exp $
 
 EAPI=2
 
@@ -89,6 +89,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.2-bluetooth.patch"
 	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.0-mancol.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
 
 # Here we disable and remove source which we don't need or want