block on net-ftp/netkit-ftpd due to file collision (bug #248485)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

4 files changed, 17 insertions, 21 deletions

diff --git a/www-servers/publicfile/ChangeLog b/www-servers/publicfile/ChangeLog
index 637a842deede..9c0fc9a20172 100644
--- a/www-servers/publicfile/ChangeLog
+++ b/www-servers/publicfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/publicfile
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.10 2008/08/23 17:55:07 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.11 2009/01/03 18:42:40 bangert Exp $
+
+  03 Jan 2009; Thilo Bangert <bangert@gentoo.org> publicfile-0.52.ebuild,
+  publicfile-0.52-r1.ebuild:
+  block on net-ftp/netkit-ftpd due to file collision (bug #248485)
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> publicfile-0.52-r1.ebuild:
   add ~amd64, bug #211550
diff --git a/www-servers/publicfile/Manifest b/www-servers/publicfile/Manifest
index 6627e1b2ef0b..420eb1b575dc 100644
--- a/www-servers/publicfile/Manifest
+++ b/www-servers/publicfile/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ftp-ls-patch 3280 RMD160 2685dbc4d91a3140eb635383b1b47ee674aaae01 SHA1 1316ca53aa14dafbcad4dcf31971348fa156c07c SHA256 801c44bb6f92dbfb6b6943337c2fb02e3ee2419b0e8514e265696e28d908d04d
 DIST publicfile-0.52-filetype-diff 1101 RMD160 e11c38d40d184bbc2046446b3d13aee2b05f8381 SHA1 4a67c20dcf1d93bf8ce62e39eb9c7676b5c5446a SHA256 451f70a2817943b5be0a09941cab9f2473991933097bc21ceb368d68ada414b6
 DIST publicfile-0.52.tar.gz 34892 RMD160 02d2bff245e9d474f26ac29a96775c8eeed0799c SHA1 067e5a0c57bf8ac04c578cac47bd80c2d88eddeb SHA256 3f9fcf737bfe48910812cc357a31bf1f2e3da2490dbd175ce535830f251c08ef
-EBUILD publicfile-0.52-r1.ebuild 1613 RMD160 797e4b24b3e43eebf31acdbeefd44824ab72c376 SHA1 4ae010fde417e4015fd04bd103d24ba3441ed7ed SHA256 a57dbc816ba8805356b39c59b850e85a86ba2b662a5988dff0c746d55ded9433
-EBUILD publicfile-0.52.ebuild 1452 RMD160 6754945cc9b9a8fac43368d1eb64a31d75a17853 SHA1 1af691fcfc132ea54f99dbfbbc7c7c2a7f39b953 SHA256 088afe8048b59963af21668114d9148e3688cf3c9055c5cd44da49c273a0dce8
-MISC ChangeLog 2818 RMD160 8c688ee73633515e96791025d3d3a9122a024ca3 SHA1 a4d2ad31dd26579a8b17c69f594f722426cdb08a SHA256 da09f40ed4d6eb04e560062ffe8c270adf3e55f75b467256723a2b5d0b01bc72
+EBUILD publicfile-0.52-r1.ebuild 1636 RMD160 90a376e680559d21a3e2ccdc2ef6f05d60952914 SHA1 0d589335cc28dfb1f7ae33319f9c541c004a5de3 SHA256 75273b7c2d6bada77eb676d33b14794db983a2575bc15b84d1f545312c4c6a2c
+EBUILD publicfile-0.52.ebuild 1472 RMD160 0b9a6fc7a6e413f842b62a1b3539aeadacb8b734 SHA1 2d312b2ae51ff8e035990a8d2cda1826c73a4516 SHA256 70a40fe08199a2aead8c6434c1fa07a8502edfe14015fac7f6611171fbd5247b
+MISC ChangeLog 2990 RMD160 7cd9c08eda9844ef49a88e24a9c427ed50f45483 SHA1 3fb7615468e25b2186d1d60743a3fbc1a6ef634f SHA256 f722c50e160c55ede36d934bf95ecef5228aadc023f96b02de1e8baa5e1aec21
 MISC metadata.xml 166 RMD160 cd7b5b3e4e4943d69bae98184debdf0a6f9bab9d SHA1 b57962de7999732b1690e79d2e462f8a6f1b121b SHA256 80accb0cd0be4f5ddbc51eaa01a2e74901a5f4a0e86a27b94e4eaee6d0b54b9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiwT00ACgkQkKaRLQcq0GJB0ACfbu1PYtdffYUc8BpNsMZTYh30
-GFoAn3sitm0Jv7ByAR6IHFr40IOke5oe
-=6cDD
------END PGP SIGNATURE-----
diff --git a/www-servers/publicfile/publicfile-0.52-r1.ebuild b/www-servers/publicfile/publicfile-0.52-r1.ebuild
index db6bd29f4f7a..de6a38c6f098 100644
--- a/www-servers/publicfile/publicfile-0.52-r1.ebuild
+++ b/www-servers/publicfile/publicfile-0.52-r1.ebuild
@@ -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/www-servers/publicfile/publicfile-0.52-r1.ebuild,v 1.7 2008/08/23 17:55:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r1.ebuild,v 1.8 2009/01/03 18:42:40 bangert Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 hppa ppc sparc x86"
 
 RDEPEND=">=sys-process/daemontools-0.70
 	>=sys-apps/ucspi-tcp-0.83
-	selinux? ( sec-policy/selinux-publicfile )"
+	selinux? ( sec-policy/selinux-publicfile )
+	!net-ftp/netkit-ftpd"
 
 src_unpack() {
 	unpack publicfile-0.52.tar.gz
diff --git a/www-servers/publicfile/publicfile-0.52.ebuild b/www-servers/publicfile/publicfile-0.52.ebuild
index bd07f38071ea..c2d39763a595 100644
--- a/www-servers/publicfile/publicfile-0.52.ebuild
+++ b/www-servers/publicfile/publicfile-0.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52.ebuild,v 1.4 2005/12/31 13:58:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52.ebuild,v 1.5 2009/01/03 18:42:40 bangert Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ LICENSE="as-is"
 
 RDEPEND=">=sys-process/daemontools-0.70
 	>=sys-apps/ucspi-tcp-0.83
-	selinux? ( sec-policy/selinux-publicfile )"
+	selinux? ( sec-policy/selinux-publicfile )
+	!net-ftp/netkit-ftpd"
 
 src_compile() {
 	echo "gcc ${CFLAGS}" > conf-cc