Fix file collisions #127002

Package-Manager: portage-2.1_pre9-r4

4 files changed, 28 insertions, 25 deletions

diff --git a/app-i18n/man-pages-it/ChangeLog b/app-i18n/man-pages-it/ChangeLog
index f733a2efc9cb..bcb76e924b36 100644
--- a/app-i18n/man-pages-it/ChangeLog
+++ b/app-i18n/man-pages-it/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/man-pages-it
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/ChangeLog,v 1.1 2005/09/02 04:28:38 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/ChangeLog,v 1.2 2006/04/25 14:47:29 truedfx Exp $
+
+  25 Apr 2006; Harald van Dijk <truedfx@gentoo.org>
+  man-pages-it-0.3.4.ebuild:
+  Fix file collisions with man and vim (#127002)
 
   15 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> :
   fix broken package.
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index 801bdb06bdd0..e1a014d329c1 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4857d416547dad69030888b9d301d6af ChangeLog 494
-RMD160 40ea3e0510a62d6da8fdbf690d6e38f778bc09dd ChangeLog 494
-SHA256 e17db77eb44029a48a7345d302f16fdd9d77a26d6d93e5452e2d2227a147a9ce ChangeLog 494
-MD5 419149fc99f0fb30a1b7634c643032db files/digest-man-pages-it-0.3.4 70
-RMD160 56d689b3be2af78c1579dfa60abd375e81825116 files/digest-man-pages-it-0.3.4 70
-SHA256 ecc7ec9a5a86c991e4e6ebe50d24a78edf901565a355def3cf9927407daabfb8 files/digest-man-pages-it-0.3.4 70
-MD5 ecabc03e28429a822e0c12ced5d2cc2e man-pages-it-0.3.4.ebuild 1171
-RMD160 77514d133d89eee976ad1392c1e731c013c60dae man-pages-it-0.3.4.ebuild 1171
-SHA256 30e2a1d614602769c650724d36a9ebb7188a9115f6041799eac0e3fadbcfc605 man-pages-it-0.3.4.ebuild 1171
+DIST man-pages-it-0.3.4.tar.gz 650365 RMD160 80aa8778f36f211951b9d65caa50fa8b17c68885 SHA256 90540ab68ae86e135322fe706d4b549011104b6cd70db545f6847e46e9f2514e size 650365
+EBUILD man-pages-it-0.3.4.ebuild 1247 RMD160 d8adf113b2d631218b4e8bec16f9200864623970 SHA1 c13edb59555379b6505830149ca1f501c0bf88b5 SHA256 962406def28546c3143b4b7047a79e5358b07127c77ba190b65505a7ab994d85 size 1247
+MD5 9284765f14d85199b5d5e2b64f584e55 man-pages-it-0.3.4.ebuild 1247
+RMD160 d8adf113b2d631218b4e8bec16f9200864623970 man-pages-it-0.3.4.ebuild 1247
+SHA256 962406def28546c3143b4b7047a79e5358b07127c77ba190b65505a7ab994d85 man-pages-it-0.3.4.ebuild 1247
+MISC ChangeLog 626 RMD160 9d0e7638bfa19195fbde361fa524664af65b8edb SHA1 27219bf4b822a2fda4a7bfed46b1d25ca8c0597e SHA256 6e4f039aa83facccc5feb2d237e09b2c32aa4a0412727cba48278ceca286e75a size 626
+MD5 3c24f03367e50eb33a6053f0bbaa5442 ChangeLog 626
+RMD160 9d0e7638bfa19195fbde361fa524664af65b8edb ChangeLog 626
+SHA256 6e4f039aa83facccc5feb2d237e09b2c32aa4a0412727cba48278ceca286e75a ChangeLog 626
+MISC metadata.xml 310 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 SHA1 bdd3f2bc135db7a1475e69cf818c6644a6146d3f SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc size 310
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
 SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD7B7K2+ySkm8kpY0RAri3AKCrq1dC8yLPyN4VEVdNlvM/hR91sgCgr+LX
-Yv2MXFsUVcc0djHLfEake+4=
-=Hqiw
------END PGP SIGNATURE-----
+MD5 97fe47cfacdbaa7d320b9c1837f31897 files/digest-man-pages-it-0.3.4 256
+RMD160 a6b4513d13372ea73cf86f83bb6d5b4213f15488 files/digest-man-pages-it-0.3.4 256
+SHA256 a273503c55d8862c5106785d477b766f6e8db2b59bee4e819fc699aefe3579d8 files/digest-man-pages-it-0.3.4 256
diff --git a/app-i18n/man-pages-it/files/digest-man-pages-it-0.3.4 b/app-i18n/man-pages-it/files/digest-man-pages-it-0.3.4
index 0a402ac17fdc..eeb9def27ea9 100644
--- a/app-i18n/man-pages-it/files/digest-man-pages-it-0.3.4
+++ b/app-i18n/man-pages-it/files/digest-man-pages-it-0.3.4
@@ -1 +1,3 @@
 MD5 4e072cafbd196654c925ff0a0dca2c8f man-pages-it-0.3.4.tar.gz 650365
+RMD160 80aa8778f36f211951b9d65caa50fa8b17c68885 man-pages-it-0.3.4.tar.gz 650365
+SHA256 90540ab68ae86e135322fe706d4b549011104b6cd70db545f6847e46e9f2514e man-pages-it-0.3.4.tar.gz 650365
diff --git a/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild b/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild
index 46f8265e2e44..1b974794f67a 100644
--- a/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild,v 1.3 2006/02/10 05:03:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/man-pages-it-0.3.4.ebuild,v 1.4 2006/04/25 14:47:29 truedfx Exp $
 
 DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
 HOMEPAGE="http://it.tldp.org/man/"
@@ -24,13 +24,16 @@ src_unpack() {
 		-e '/mandir=/s:/man:/share/man:' \
 		Makefile
 	# remove manpages that other packages provide
-	#  - shadow #117738
+	#  - shadow #117738, man & vim #127002
 	cd "${S}"/man1
-	rm newgrp.1 chage.1 groups.1 login.1 chsh.1 gpasswd.1 passwd.1 su.1 chfn.1
+	rm newgrp.1 chage.1 groups.1 login.1 chsh.1 gpasswd.1 passwd.1 su.1 chfn.1 \
+		apropos.1 man.1 whatis.1 vim.1
 	cd "${S}"/man5
 	rm shadow.5
 	cd "${S}"/man8
-	rm groupadd.8 grpconv.8 usermod.8 groupdel.8 pwconv.8 vipw.8 lastlog.8 groupmod.8 pwck.8 newusers.8 useradd.8 pwunconv.8 grpck.8 userdel.8 vigr.8 grpunconv.8
+	rm groupadd.8 grpconv.8 usermod.8 groupdel.8 pwconv.8 vipw.8 lastlog.8 \
+		groupmod.8 pwck.8 newusers.8 useradd.8 pwunconv.8 grpck.8 userdel.8 \
+		vigr.8 grpunconv.8 makewhatis.8
 }
 
 src_compile() { :; }