loki_val    09/03/04 13:41:44

  Modified:             ccp4-6.0.2.ebuild ChangeLog ccp4-6.0.2-r1.ebuild
                        ccp4-6.0.1-r1.ebuild
  Log:
  Fix trivial manpage collision, bug 260455. Thanks to Johan Hattne <johan.hattne@...>.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sci-chemistry/ccp4/ccp4-6.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild?r1=1.6&r2=1.7

Index: ccp4-6.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccp4-6.0.2.ebuild	3 Jun 2008 02:11:18 -0000	1.6
+++ ccp4-6.0.2.ebuild	4 Mar 2009 13:41:43 -0000	1.7
@@ -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 @@
 	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() {



1.19                 sci-chemistry/ccp4/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	3 Jun 2008 02:11:18 -0000	1.18
+++ ChangeLog	4 Mar 2009 13:41:43 -0000	1.19
@@ -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@g.o> 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@...>.
 
   03 Jun 2008; Michael Sterrett <mr_bones_@g.o> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild, ccp4-6.0.2-r1.ebuild:



1.7                  sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild?r1=1.6&r2=1.7

Index: ccp4-6.0.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccp4-6.0.2-r1.ebuild	3 Jun 2008 02:11:18 -0000	1.6
+++ ccp4-6.0.2-r1.ebuild	4 Mar 2009 13:41:43 -0000	1.7
@@ -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 @@
 	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() {



1.9                  sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild?r1=1.8&r2=1.9

Index: ccp4-6.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ccp4-6.0.1-r1.ebuild	3 Jun 2008 02:11:18 -0000	1.8
+++ ccp4-6.0.1-r1.ebuild	4 Mar 2009 13:41:43 -0000	1.9
@@ -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 @@
 	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() {