Remove man-pages provided by other packages, fix for bug #154140. Spotted by Jesus de Santos Garcia <icg_ent@bigfoot.com>

Package-Manager: portage-2.1.1-r1

4 files changed, 31 insertions, 19 deletions

diff --git a/app-i18n/man-pages-es/ChangeLog b/app-i18n/man-pages-es/ChangeLog
index 98a975a40dbe..dd4fc4e7cf7e 100644
--- a/app-i18n/man-pages-es/ChangeLog
+++ b/app-i18n/man-pages-es/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/man-pages-es
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/ChangeLog,v 1.6 2006/04/30 12:57:54 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/ChangeLog,v 1.7 2006/11/05 20:17:03 ferdy Exp $
+
+  05 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  man-pages-es-1.55-r1.ebuild:
+  Remove man-pages provided by other packages, fix for bug #154140. Spotted by
+  Jesus de Santos Garcia <icg_ent@bigfoot.com>
 
   30 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org>
   -man-pages-es-1.55.ebuild, man-pages-es-1.55-r1.ebuild:
diff --git a/app-i18n/man-pages-es/Manifest b/app-i18n/man-pages-es/Manifest
index 513be54e2331..d96c50790fb0 100644
--- a/app-i18n/man-pages-es/Manifest
+++ b/app-i18n/man-pages-es/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST man-pages-es-1.55.tar.bz2 677347
-DIST man-pages-es-extra-0.8a.tar.gz 594357
-EBUILD man-pages-es-1.55-r1.ebuild 1433 RMD160 f85f85d2446a42af806aa2609a64b7b81e6e88a9 SHA1 f9cc60132ef1d0169804d5fb4506b9a3ffed2d64 SHA256 ce671fe52be2f7eb9afe3c8062d2f29080baef4dfbf7c797ee8a1caf06176105
-MD5 45516302a6ee475758de5b6bab8e02ba man-pages-es-1.55-r1.ebuild 1433
-RMD160 f85f85d2446a42af806aa2609a64b7b81e6e88a9 man-pages-es-1.55-r1.ebuild 1433
-SHA256 ce671fe52be2f7eb9afe3c8062d2f29080baef4dfbf7c797ee8a1caf06176105 man-pages-es-1.55-r1.ebuild 1433
-MISC ChangeLog 1997 RMD160 597f5039132819f227093c78909a142e820d5fd3 SHA1 3ea15e0c22d2b37b5417007c9b0482283e063bd5 SHA256 c2f4b3d0977d20b57dd36124534aafdb6a28d53a79668362a39bab7ffea1d3ef
-MD5 f7c37ddf50744d2768b49a6b54a1a478 ChangeLog 1997
-RMD160 597f5039132819f227093c78909a142e820d5fd3 ChangeLog 1997
-SHA256 c2f4b3d0977d20b57dd36124534aafdb6a28d53a79668362a39bab7ffea1d3ef ChangeLog 1997
+DIST man-pages-es-1.55.tar.bz2 677347 RMD160 4da4fa5ffd326e04ef9ab617bab0912acf8f6818 SHA1 1d72e80d0c41f9e5c24ba6a4eea161fc151ec5b5 SHA256 cc9c19b44146ebb55243a86ab66bdd654a696a0eedd378db9cc4bad2cb621fea
+DIST man-pages-es-extra-0.8a.tar.gz 594357 RMD160 a341c5144176ed87539a6d46b9ce6f18d843627f SHA1 47ef621ac6ae6b3519b35eb792ee0f2b1e038947 SHA256 9096662d0ad45cdd0f2de30a3cf7c04bd450eb1c9f2b43c7f22deb40265f7361
+EBUILD man-pages-es-1.55-r1.ebuild 1548 RMD160 471f8ada8e6946bbb3280ea7ebb4dc961d2eb637 SHA1 3e1b0d2f9bb68e48014e90fb556b25159920d96d SHA256 e2e69f26e2a1767b18b1d5c78376bd78c7efa0149b237c8d11a0ae4411b43a90
+MD5 1632c43e79ff094df8d27073cbf19885 man-pages-es-1.55-r1.ebuild 1548
+RMD160 471f8ada8e6946bbb3280ea7ebb4dc961d2eb637 man-pages-es-1.55-r1.ebuild 1548
+SHA256 e2e69f26e2a1767b18b1d5c78376bd78c7efa0149b237c8d11a0ae4411b43a90 man-pages-es-1.55-r1.ebuild 1548
+MISC ChangeLog 2208 RMD160 65ea3efdd0c255187bfb1c3f8c9b2de57a68df23 SHA1 29d75d8dae6d1c0cd6aec467ee950788ce57f7b9 SHA256 714bf141ecd8d64c86f0358d67a4cfd9169bd1e319f390aaebc58dd7247f9e7b
+MD5 b6861d9cfabe328654328188c6fb0efd ChangeLog 2208
+RMD160 65ea3efdd0c255187bfb1c3f8c9b2de57a68df23 ChangeLog 2208
+SHA256 714bf141ecd8d64c86f0358d67a4cfd9169bd1e319f390aaebc58dd7247f9e7b ChangeLog 2208
 MISC metadata.xml 236 RMD160 8609b11161defd2e30d4477c7bdafbe6eb044faf SHA1 85ac1bb3d93b54015fe961527827e298683860db SHA256 4ec4649f3ac5e537ec5286668b66318b42b4d0083a5c15249b49c8ff421d3a9e
 MD5 ca3932d46d157fa90faffe0eae0a00bf metadata.xml 236
 RMD160 8609b11161defd2e30d4477c7bdafbe6eb044faf metadata.xml 236
 SHA256 4ec4649f3ac5e537ec5286668b66318b42b4d0083a5c15249b49c8ff421d3a9e metadata.xml 236
-MD5 28e6cb03830c4ed47c590fd9d2bb8eb4 files/digest-man-pages-es-1.55-r1 145
-RMD160 f46ab375f0fbf9e906c90f53a33bcfee18f25a59 files/digest-man-pages-es-1.55-r1 145
-SHA256 c161f958171bd7f9b82d250f2a422ebd361f038c6240c4ef236ae0a88f0829c7 files/digest-man-pages-es-1.55-r1 145
+MD5 c4858d29f78868f7ec56208181242eb2 files/digest-man-pages-es-1.55-r1 527
+RMD160 cd446e7ff30648b104eb1f4e8463458dcf3ba103 files/digest-man-pages-es-1.55-r1 527
+SHA256 117c5a512ca2c82973ba4b0c24f8b97e8808d76a1baa0c6feab4e7096a1e3330 files/digest-man-pages-es-1.55-r1 527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEmYIsamhnQswr0vIRAt9NAJwNUF+zfy7CeSHGzHC4Q9KY5d6XawCgiI2L
-d4aLUEZUjnk3YmVz3sV12mM=
-=nhU9
+iD8DBQFFTkbkViELBEf1JB0RAt0wAJ0URG87xL/e9Az1yDPH1DxlHEarbACeKb1u
+etC/Wv/RoQCSEjjGFeXguNQ=
+=Hu1m
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/man-pages-es/files/digest-man-pages-es-1.55-r1 b/app-i18n/man-pages-es/files/digest-man-pages-es-1.55-r1
index 42b5051a51bb..c17da8a6d9bb 100644
--- a/app-i18n/man-pages-es/files/digest-man-pages-es-1.55-r1
+++ b/app-i18n/man-pages-es/files/digest-man-pages-es-1.55-r1
@@ -1,2 +1,6 @@
 MD5 b71f701dcae827f2f5e4e848c66321fc man-pages-es-1.55.tar.bz2 677347
+RMD160 4da4fa5ffd326e04ef9ab617bab0912acf8f6818 man-pages-es-1.55.tar.bz2 677347
+SHA256 cc9c19b44146ebb55243a86ab66bdd654a696a0eedd378db9cc4bad2cb621fea man-pages-es-1.55.tar.bz2 677347
 MD5 5827f41f77658df17f550b7f8e831432 man-pages-es-extra-0.8a.tar.gz 594357
+RMD160 a341c5144176ed87539a6d46b9ce6f18d843627f man-pages-es-extra-0.8a.tar.gz 594357
+SHA256 9096662d0ad45cdd0f2de30a3cf7c04bd450eb1c9f2b43c7f22deb40265f7361 man-pages-es-extra-0.8a.tar.gz 594357
diff --git a/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild b/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild
index 7ce1ba0ad437..6859f7457689 100644
--- a/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild
+++ b/app-i18n/man-pages-es/man-pages-es-1.55-r1.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-es/man-pages-es-1.55-r1.ebuild,v 1.5 2006/06/21 17:25:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild,v 1.6 2006/11/05 20:17:03 ferdy Exp $
 
 manpagesextra=${PN}-extra-0.8a
 S2=${WORKDIR}/${manpagesextra}
@@ -23,6 +23,9 @@ src_compile() { :; }
 src_install() {
 	local d f toencoding
 
+	# These are provided by sys-apps/shadow, see bug #154140
+	rm -f man{1/{passwd,su,newgrp,login}.1,8/{vigr,vipw}.8}
+
 	dodoc man?/{LEAME,README}
 
 	dodir /usr/share/man/es/man{1,2,3,4,5,6,7,8}