Remove conflicting manpages with sys-apps/shadow. This closes bug #126345.

Package-Manager: portage-2.1

diff --git a/app-i18n/man-pages-cs/ChangeLog b/app-i18n/man-pages-cs/ChangeLog
index d7e34bb0b14b5ff1b029e5de1a5adeb02f71a03a..9370b21a000c8c3dfc18d530ba05ae653a988b28 100644 (file)
--- a/app-i18n/man-pages-cs/ChangeLog
+++ b/app-i18n/man-pages-cs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/man-pages-cs
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-cs/ChangeLog,v 1.1 2005/09/02 04:28:24 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-cs/ChangeLog,v 1.2 2006/06/17 15:21:45 usata Exp $
+
+*man-pages-cs-0.16-r1 (17 Jun 2006)
+
+  17 Jun 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +man-pages-cs-0.16-r1.ebuild:
+  Remove conflicting manpages with sys-apps/shadow. This closes bug #126345.
 
 *man-pages-cs-0.16 (16 May 2004)
 

diff --git a/app-i18n/man-pages-cs/Manifest b/app-i18n/man-pages-cs/Manifest
index 1a80b5d5d7ef390d7b726b28d2efaf79076428a3..e80191a18e90dea2296bb4397c6d416f2b1afbec 100644 (file)
--- a/app-i18n/man-pages-cs/Manifest
+++ b/app-i18n/man-pages-cs/Manifest
@@ -1,4 +1,23 @@
-MD5 87fa6336880f4e870e9725a77f59d01a metadata.xml 338
+DIST man-pages-cs-0.16.tar.gz 247358 RMD160 db8eb4933120ecb98b0507a6cc11e2b0f783e0e6 SHA1 c872735dbd7681cff4f9ffca5473eb6f85ec33bd SHA256 6c255ed5c8061f8424e47800ab2e6d2c9214415634b60b82fca247067a05dd6e
+EBUILD man-pages-cs-0.16-r1.ebuild 968 RMD160 8aefa8422109da8320d4374163f129239852df20 SHA1 fd43649e15be75a29dcbb1b426f87f4af2a20e95 SHA256 f87e35146553631f94333b444f8e7f831305c8c09849c317ef0155f419f3ed01
+MD5 94c542e25e09d36c03e4acbc32f1cdc9 man-pages-cs-0.16-r1.ebuild 968
+RMD160 8aefa8422109da8320d4374163f129239852df20 man-pages-cs-0.16-r1.ebuild 968
+SHA256 f87e35146553631f94333b444f8e7f831305c8c09849c317ef0155f419f3ed01 man-pages-cs-0.16-r1.ebuild 968
+EBUILD man-pages-cs-0.16.ebuild 698 RMD160 d1394f654be96578c00e57051a61f154a06ff5a8 SHA1 5ec916bb764bb3abdcf40e482ac8ff206d8e977b SHA256 f8898a0d4755d9e071c223d49a35bad2ad1af917486923a9e02f65bff524b1fd
 MD5 ed28fc5d34d504c033e9e7579a710f96 man-pages-cs-0.16.ebuild 698
-MD5 dc415f02ed250ff1d84baedc1c99797c ChangeLog 419
-MD5 9df87f11b3a737bdf1a4dca17513e890 files/digest-man-pages-cs-0.16 69
+RMD160 d1394f654be96578c00e57051a61f154a06ff5a8 man-pages-cs-0.16.ebuild 698
+SHA256 f8898a0d4755d9e071c223d49a35bad2ad1af917486923a9e02f65bff524b1fd man-pages-cs-0.16.ebuild 698
+MISC ChangeLog 614 RMD160 be036313980d73b1d501c2bdd66530f146e0e563 SHA1 f122635ad6f440b06c590b5f62bb4f863332b835 SHA256 0bfc5492513fb066f3736a1aeaddd89caa89ba1fcc2a43aa58e8952f88e9310f
+MD5 ba9d453ec088c35d5b1608925426570b ChangeLog 614
+RMD160 be036313980d73b1d501c2bdd66530f146e0e563 ChangeLog 614
+SHA256 0bfc5492513fb066f3736a1aeaddd89caa89ba1fcc2a43aa58e8952f88e9310f ChangeLog 614
+MISC metadata.xml 338 RMD160 cc8f9590b17fe404cfa89f1d3d19524939446f77 SHA1 029e03dd51767d4d394d034f544f0049e0fb2ea0 SHA256 8e6d103b8cceb1497398be093af877f67358ff05943538bf6ea79031cd8d766a
+MD5 87fa6336880f4e870e9725a77f59d01a metadata.xml 338
+RMD160 cc8f9590b17fe404cfa89f1d3d19524939446f77 metadata.xml 338
+SHA256 8e6d103b8cceb1497398be093af877f67358ff05943538bf6ea79031cd8d766a metadata.xml 338
+MD5 3a4891338214e43c92560a20a1399914 files/digest-man-pages-cs-0.16 253
+RMD160 d440cdf6cf4d2483c8545dc779cee774b1136471 files/digest-man-pages-cs-0.16 253
+SHA256 e59830facda33ba58375dd8ba1ebd494d82f5e087868c60305123f54681b1b97 files/digest-man-pages-cs-0.16 253
+MD5 3a4891338214e43c92560a20a1399914 files/digest-man-pages-cs-0.16-r1 253
+RMD160 d440cdf6cf4d2483c8545dc779cee774b1136471 files/digest-man-pages-cs-0.16-r1 253
+SHA256 e59830facda33ba58375dd8ba1ebd494d82f5e087868c60305123f54681b1b97 files/digest-man-pages-cs-0.16-r1 253

diff --git a/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16 b/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16
index e72c18b8cca12c4ed4a3372fa8d27e258724c837..ccabae4dd1f0d8a0cd54998762e370e0782f06d2 100644 (file)
--- a/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16
+++ b/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16
@@ -1 +1,3 @@
 MD5 e8036794c1762804f2e242cc5b52001e man-pages-cs-0.16.tar.gz 247358
+RMD160 db8eb4933120ecb98b0507a6cc11e2b0f783e0e6 man-pages-cs-0.16.tar.gz 247358
+SHA256 6c255ed5c8061f8424e47800ab2e6d2c9214415634b60b82fca247067a05dd6e man-pages-cs-0.16.tar.gz 247358

diff --git a/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16-r1 b/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16-r1
new file mode 100644 (file)
index 0000000..ccabae4
--- /dev/null
+++ b/app-i18n/man-pages-cs/files/digest-man-pages-cs-0.16-r1
@@ -0,0 +1,3 @@
+MD5 e8036794c1762804f2e242cc5b52001e man-pages-cs-0.16.tar.gz 247358
+RMD160 db8eb4933120ecb98b0507a6cc11e2b0f783e0e6 man-pages-cs-0.16.tar.gz 247358
+SHA256 6c255ed5c8061f8424e47800ab2e6d2c9214415634b60b82fca247067a05dd6e man-pages-cs-0.16.tar.gz 247358

diff --git a/app-i18n/man-pages-cs/man-pages-cs-0.16-r1.ebuild b/app-i18n/man-pages-cs/man-pages-cs-0.16-r1.ebuild
new file mode 100644 (file)
index 0000000..b153433
--- /dev/null
+++ b/app-i18n/man-pages-cs/man-pages-cs-0.16-r1.ebuild
@@ -0,0 +1,27 @@
+# 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-cs/man-pages-cs-0.16-r1.ebuild,v 1.1 2006/06/17 15:21:45 usata Exp $
+
+DESCRIPTION="A somewhat comprehensive collection of Linux czech man page translations"
+HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
+SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/manpages/translations/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/man"
+
+src_compile() { :; }
+
+src_install() {
+       make MANDIR="${D}"/usr/share/man/cs install || die
+       dodoc CONTRIB README*
+
+       # remove man pages that are provided by other packages.
+       # - sys-apps/shadow +nls
+       rm -f ${D}/usr/share/man/cs/man1/{chfn,chsh,newgrp,su,passwd,groups}.1
+       rm -f ${D}/usr/share/man/cs/man5/shadow.5
+       rm -f ${D}/usr/share/man/cs/man8/{lastlog,vigr,vipw}.8
+}