Fix trivial manpage collision, bug 260455. Thanks to Johan Hattne <johan.hattne@utsouthwestern.edu>.

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

5 files changed, 20 insertions, 15 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index 5f36aa126b7d..7085f432a624 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ccp4
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.18 2008/06/03 02:11:18 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.19 2009/03/04 13:41:43 loki_val Exp $
+
+  04 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> ccp4-6.0.1-r1.ebuild,
+  ccp4-6.0.2.ebuild, ccp4-6.0.2-r1.ebuild:
+  Fix trivial manpage collision, bug 260455. Thanks to Johan Hattne
+  <johan.hattne@utsouthwestern.edu>.
 
   03 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild, ccp4-6.0.2-r1.ebuild:
diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index 29157c9f18be..5b0332db97a1 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -37,8 +37,8 @@ DIST scala.f-r1.101.2.3-r1.101.2.4.diff 932 RMD160 a0f03c0cdd3591001d1b87041a804
 DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
 DIST topp.f-r1.16.2.5-r1.16.2.6.diff 2083 RMD160 4f7522c52afc525bdf345feaec37958eb0557cbf SHA1 bdd1e5a81e65c6d3ed7ab89ba21bd68055cc72ca SHA256 6d28b8fae0c3640aaf7ffb9878db4d03d9e53a9398f6b7887c06094d0c680cec
 DIST util_windows.tcl-r1.27-r1.27.2.1.diff 1486 RMD160 06b5598bcff7da11e19ec62c73babd15c6adb1f3 SHA1 fec29ceec77944ecc37f77449147a26d1dc3f149 SHA256 092e2d281a9366c375711616c1e07d2e1f886c9709ed81da78ef7e9a039ff530
-EBUILD ccp4-6.0.1-r1.ebuild 13684 RMD160 1e07083158de9f1ef4facc5c40a91ea02b673be2 SHA1 01d8b89adaf9c64c38a7c8531bdbd181d1e7d7e3 SHA256 c01aebee4300c0432c6e96021ac2aff9e88791fcc3b884a658da8a2f3c4da894
-EBUILD ccp4-6.0.2-r1.ebuild 14096 RMD160 c64a9630918ecea1452165cb2f7e4944a8d8e5b8 SHA1 d022c419ef45863b01c78c17ae05e82de68e1584 SHA256 e93f8b711a61854aea2ef4f233a35ba13342cfb5fb8ba53a5937bb0f853293aa
-EBUILD ccp4-6.0.2.ebuild 13251 RMD160 50bba0cc8a51f09646b467516e10cd6feac6f95c SHA1 93774d6fa144a424e8f298d7ae51bd165826f200 SHA256 f017a9128528adcf41fb80225858eb379dfe8d2b82a48e1b14efd4d93aff3b03
-MISC ChangeLog 3822 RMD160 f2895ef49e026b7b9dbb10bf54c2d2befe790ac0 SHA1 05df732a9f2d7b2b8f383d8543bb8020f0fa4239 SHA256 079c2aa96ec9dea37539bb1f79826ea8b6d22f1a4762cf669b9558eff3d43da5
+EBUILD ccp4-6.0.1-r1.ebuild 13681 RMD160 881038127962bb7aea4f9f77b4cc5b8c170dd688 SHA1 34d43786b53b4adfeec8740036cd2a9081823452 SHA256 bfda422f6d798d29c22faf86b789e4ac5db9799508d027e3428a8f264d286fc7
+EBUILD ccp4-6.0.2-r1.ebuild 14094 RMD160 e273884aea608217207b0c8751fce978c67a53e7 SHA1 7d9569120787984943be86b9e0e838a43cbb5b29 SHA256 dbd1c61f294ce3ed091809dc9952f6d027dd01c6b7fd9cb71f3046264ebcb02a
+EBUILD ccp4-6.0.2.ebuild 13248 RMD160 747c3e19277ef49aeda2d42cd8a93597a545775f SHA1 ef54e5d59b6a29ac6d0b06f23e47e274f2c6925b SHA256 f46b1fc972615e04d4f643f33b8b3f5a1df4c19217e221afa621cce6918cb17f
+MISC ChangeLog 4045 RMD160 bd70e63cb00cf71c06e7604456e295055a123a98 SHA1 a9237f17fd803c90e61930508610213ab36b5266 SHA256 6f97c20b872b516b1f26ce119369b3e7f3cd30f7d5303b32283b5ad7b0c985bc
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
index 02e803487c6b..164e63b4f64f 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.8 2008/06/03 02:11:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.9 2009/03/04 13:41:43 loki_val Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -399,7 +399,7 @@ src_install() {
 	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
 
 	# Fix overlaps with other packages
-	rm ${D}/usr/share/man/man1/rasmol.1.gz
+	rm ${D}/usr/share/man/man1/rasmol.1*
 }
 
 pkg_postinst() {
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
index ace38f6c00e1..06effb0695ab 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v 1.6 2008/06/03 02:11:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v 1.7 2009/03/04 13:41:43 loki_val Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -411,7 +411,7 @@ src_install() {
 	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
 
 	# Fix overlaps with other packages
-	rm -f ${D}/usr/share/man/man1/rasmol.1.*
+	rm -f ${D}/usr/share/man/man1/rasmol.1*
 }
 
 pkg_postinst() {
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
index d1b689a32d82..80e887d4fd4a 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.6 2008/06/03 02:11:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.7 2009/03/04 13:41:43 loki_val Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -379,7 +379,7 @@ src_install() {
 	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
 
 	# Fix overlaps with other packages
-	rm ${D}/usr/share/man/man1/rasmol.1.gz
+	rm ${D}/usr/share/man/man1/rasmol.1*
 }
 
 pkg_postinst() {