diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-01-03 18:42:40 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-01-03 18:42:40 +0000 |
| commit | 63cc292c0febe948744b11e0e60b99093b8d862e (patch) | |
| tree | e77a21fcd88b4791598a3440de0cc8776f540f58 /www-servers/publicfile | |
| parent | Version bump (diff) | |
| download | gentoo-2-63cc292c0febe948744b11e0e60b99093b8d862e.tar.gz gentoo-2-63cc292c0febe948744b11e0e60b99093b8d862e.tar.bz2 gentoo-2-63cc292c0febe948744b11e0e60b99093b8d862e.zip | |
block on net-ftp/netkit-ftpd due to file collision (bug #248485)
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo i686)
Diffstat (limited to 'www-servers/publicfile')
| -rw-r--r-- | www-servers/publicfile/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/publicfile/publicfile-0.52-r1.ebuild | 7 | ||||
| -rw-r--r-- | www-servers/publicfile/publicfile-0.52.ebuild | 7 |
3 files changed, 14 insertions, 8 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/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 |