Get rid of file collisions

Package-Manager: portage-1.589-cvs

diff --git a/app-i18n/man-pages-fr/ChangeLog b/app-i18n/man-pages-fr/ChangeLog
index 70439dc4a978c37d5e625cef1008136bae18d46f..e81c118f4196c4c6f35ff00bc226656b1b5cc9e7 100644 (file)
--- a/app-i18n/man-pages-fr/ChangeLog
+++ b/app-i18n/man-pages-fr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/man-pages-fr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/ChangeLog,v 1.1 2005/09/02 04:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/ChangeLog,v 1.2 2005/09/24 18:08:18 truedfx Exp $
+
+  24 Sep 2005; Harald van Dijk <truedfx@gentoo.org>
+  man-pages-fr-1.64.0.ebuild:
+  Don't touch shadow's files
 
 *manpages-fr-0.9.5-r1 (11 Jun 2005)
 

diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 79f42f4ecd4dc91a28c2bd458aed4ece7c6dd227..33fd73dae04db3c90c6598a3c6f420b439fa287a 100644 (file)
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -1,4 +1,14 @@
-MD5 b374b22dcc450df5f2216c7c4015aad8 man-pages-fr-1.64.0.ebuild 896
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee863916bc5c271c5f8362b4bdd7871d ChangeLog 1153
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 c720797fca10a9691f600821699a2f5c ChangeLog 1041
+MD5 1f446f1f920923c56a27bb816743a3d3 man-pages-fr-1.64.0.ebuild 963
 MD5 71681a56780c0352afa1eefe5a53aa2f files/digest-man-pages-fr-1.64.0 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNYkFwnQyISwouHwRAnD9AJ4t4fA8tuf4PZH5N2tFZQNNHBZtkQCeKRfv
+UeolIyCAw6SzDedxiqMmsiw=
+=Vwbr
+-----END PGP SIGNATURE-----

diff --git a/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild b/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
index a8dd88cb628f98cb2a1418170b8a00c76c5b9c61..d00ef1b480158fe7fd43d61bb2e35ff99e5c7291 100644 (file)
--- a/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild,v 1.1 2005/09/02 04:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild,v 1.2 2005/09/24 18:08:18 truedfx Exp $
 
 MY_P=${P/-pages/}
 DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
@@ -21,6 +21,8 @@ src_unpack() {
        cd "${S}"
        # Don't trample on lilo's files, closes bug #91314
        rm man8/lilo.8 man5/lilo.conf.5
+       # Also don't touch shadow's files
+       rm man1/{chsh,groups,passwd}.1
 }
 
 src_compile() { :; }

diff --git a/app-i18n/man-pages-ja/ChangeLog b/app-i18n/man-pages-ja/ChangeLog
index 8fd4ecbe0faf5d6cc7ec11b3a815ffada3616415..0b3b58470ba2f16490e221b3726556b1f16c1719 100644 (file)
--- a/app-i18n/man-pages-ja/ChangeLog
+++ b/app-i18n/man-pages-ja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/man-pages-ja
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.1 2005/09/02 04:30:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/ChangeLog,v 1.2 2005/09/24 18:08:50 truedfx Exp $
+
+  24 Sep 2005; Harald van Dijk <truedfx@gentoo.org>
+  man-pages-ja-20050415.ebuild:
+  Get rid of file collisions with man and shadow
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   manpages-ja-20041115.ebuild:

diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index 12e70df7ee3971a2ba203645e5de72b62f01ef2c..e4b92449621efde1c9dd3fa2838b3db5ab2dad30 100644 (file)
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 00743f5dcd07dfb8e075bce586192b07 ChangeLog 6152
 MD5 475629439c6cc71bc10ec394f4da68cf metadata.xml 566
-MD5 6b27c87b549e5cc40834e50d22d1f23a man-pages-ja-20050415.ebuild 2010
 MD5 b7d69529d12a696d9b702860ffffeb74 man-pages-ja-20040915.ebuild 1942
 MD5 5a4a95eedd55524ea58085cdadae0a10 man-pages-ja-20041115.ebuild 2102
-MD5 5df9493d1c0f9b61688ad153e778278a ChangeLog 6018
-MD5 9ba4ab9843ce463a09144a4265e05e69 files/digest-man-pages-ja-20041115 153
+MD5 4d2c0c0356c261bd9ccd4d1074b91557 man-pages-ja-20050415.ebuild 2211
 MD5 0df2cea45b1b8531bcece297c9303154 files/digest-man-pages-ja-20040915 153
+MD5 9ba4ab9843ce463a09144a4265e05e69 files/digest-man-pages-ja-20041115 153
 MD5 0ee23ca65e525e327a81af5f32699f7d files/digest-man-pages-ja-20050415 153
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDF9WGgIKl8Uu19MoRAg0iAJ9lTxkKIYfsgqQETIAqbgdFBsc+rACeJ8Gf
-I7HUdhaUKcIs5eodBO3hHR4=
-=606S
+iD8DBQFDNZUpwnQyISwouHwRAiblAJ0cjAMOnBX+2/fOkHEpqeIANOVBUgCfckeC
+RKXRpBZFVwI6n6XCZdSF1Kg=
+=rnyC
 -----END PGP SIGNATURE-----

diff --git a/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
index 1a1888c306e6157a685529ab6b9838770b87c1d1..ebfeaac658eb75b1622ac81fd6bfebf9edc0ab40 100644 (file)
--- a/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild,v 1.1 2005/09/02 04:30:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20050415.ebuild,v 1.2 2005/09/24 18:08:50 truedfx Exp $
 
 MY_P="man-pages-ja-${PV}"
 GENTOO_MAN_P="portage-${P/man-/man}"
@@ -31,6 +31,14 @@ pkg_setup() {
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       # Get rid of file collisions with man and shadow
+       rm -r manual/{man{,-db},shadow}
+       rm manual/*/man{1/{chfn,chsh,groups,newgrp,passwd,su}.1,8/{vigr,vipw}.8}
+}
+
 src_compile() { :; }
 
 src_install() {
@@ -45,7 +53,7 @@ src_install() {
                done
        done
 
-       cd ${WORKDIR}/${GENTOO_MAN_P}
+       cd "${WORKDIR}/${GENTOO_MAN_P}"
 
        for x in *; do
                if [ -d "$x" ]; then