summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-11-02 08:56:39 +0000
committerSven Vermeulen <swift@gentoo.org>2014-11-02 08:56:39 +0000
commitc7dd5dc85c88e454459fc6a324be061333a05082 (patch)
tree5cd2486319a80b6a20015cdbbea7b7dbeb92001e /net-ftp
parentStable for alpha, wrt bug #522016 (diff)
downloadgentoo-2-c7dd5dc85c88e454459fc6a324be061333a05082.tar.gz
gentoo-2-c7dd5dc85c88e454459fc6a324be061333a05082.tar.bz2
gentoo-2-c7dd5dc85c88e454459fc6a324be061333a05082.zip
Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/tftp-hpa/ChangeLog6
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild10
2 files changed, 11 insertions, 5 deletions
diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index b09541fe51e0..6249c730473e 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/tftp-hpa
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.77 2014/08/11 04:36:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.78 2014/11/02 08:56:39 swift Exp $
+
+ 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> tftp-hpa-5.2-r1.ebuild:
+ Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+ #527698)
11 Aug 2014; Mike Frysinger <vapier@gentoo.org> tftp-hpa-5.2-r1.ebuild:
Do not create an empty /tftproot #519338 by Michael Jones.
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index 8671eedd894a..6295e048aa63 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild,v 1.12 2014/08/11 04:36:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild,v 1.13 2014/11/02 08:56:39 swift Exp $
EAPI="4"
@@ -15,14 +15,16 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
IUSE="ipv6 readline selinux tcpd"
-RDEPEND="selinux? ( sec-policy/selinux-tftp )
+CDEPEND="
readline? ( sys-libs/readline )
tcpd? ( sys-apps/tcp-wrappers )
!net-ftp/atftp
!net-ftp/netkit-tftp"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
app-arch/xz-utils"
-
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-tftp )
+"
src_prepare() {
epatch_user