summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-11-02 10:31:33 +0000
committerSven Vermeulen <swift@gentoo.org>2014-11-02 10:31:33 +0000
commitb1a025608d37e263944641e6d842350aaa096f39 (patch)
treec8bd14e7eb39779f75596332bb0e5832dd2b9e20 /www-servers
parentRemove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #... (diff)
downloadhistorical-b1a025608d37e263944641e6d842350aaa096f39.tar.gz
historical-b1a025608d37e263944641e6d842350aaa096f39.tar.bz2
historical-b1a025608d37e263944641e6d842350aaa096f39.zip
Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698)
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2EDD52403B68AF47
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/lighttpd/ChangeLog7
-rw-r--r--www-servers/lighttpd/Manifest26
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild11
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.35.ebuild11
4 files changed, 37 insertions, 18 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index e2e1487f2119..b765c92af21b 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/lighttpd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.334 2014/06/06 12:26:20 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.335 2014/11/02 10:31:29 swift Exp $
+
+ 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> lighttpd-1.4.35-r1.ebuild,
+ lighttpd-1.4.35.ebuild:
+ Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+ #527698)
06 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> -lighttpd-1.4.32-r3.ebuild,
-lighttpd-1.4.34.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a839ea17b160..fc1987149cd4 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -16,16 +16,24 @@ AUX lighttpd.logrotate-r1 519 SHA256 4d95b9a3464d866f372ace5b4e4676e81fa6289b53f
AUX lighttpd.service 222 SHA256 0a25ef6bfa69dcf900510e45ec0cc348ad694a0598b1003faf3c72cc09b1e550 SHA512 09914f5f14d0c836bad20770d963b9577b16cd0facbb50b56566ed1b8ff52b3bc1afe5dc39be26356198224a1c7a8dd6675cdff3a614a7e008b4e316e4b27ae7 WHIRLPOOL 31446af4830301b8dbf2b704368c2c2f3fab5c5262acb69224ce087d958efb40b72829fba2b0c0f07a6c242f5d6d1a2007013814ace01f0cde892c21f41137d4
AUX lighttpd.tmpfiles.conf 44 SHA256 a31237336ad02b22579b5e2168485d43d350f78ed010d39a2dbc554dd574bbcb SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936 WHIRLPOOL 5774c609ead3af3758766cd69111af5e080dc230cb7632ae54ade74313a20f5680d83117a2a369230e2d7c5328e1703ecc315fa1555f79a688e8728a7a209b4a
DIST lighttpd-1.4.35.tar.bz2 665955 SHA256 4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7 SHA512 13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a7947ff1a4d7cc5fd7efd309fc66b7de6d954b59424f814ea2eb98fd876b9 WHIRLPOOL edbeb94ae29475be398e9281135fc43f915be68c5836ae3da302f7c94c3af19eeca601cedc9bfe59d552f45c6248a945b2de725613de395087e4e195efe9a62e
-EBUILD lighttpd-1.4.35-r1.ebuild 6694 SHA256 6ed6ac9ad16255d0d87ea60d6610ccc465b3fd8f00d2dbba6f8b5e1594fe5a78 SHA512 a0d4f21d2b302f794dcc6958add92275d306b6880d0fdb162b5ce0e175064f5993dc5427e898c84b622d0b24dab20b6e1baccc95e4378182281cde5c92b619d8 WHIRLPOOL 24d036f878714bcd3f414c9e405374728d8f72c9189c414b1fc48e4aa846ed80acbd9bd9e774084f98c45b7712d2878c80d966d5eb089affed7d5d8369d2d2f0
-EBUILD lighttpd-1.4.35.ebuild 6678 SHA256 275dca3f8985d637279fb05de86f68e4cc89a9c6bbdabe7b075e9a009229c2de SHA512 e5ac3afeae4f389833f82af04edee67857f62a38b9d2b70bfe5abe35977548773a579cd4b5c83887ae7052863f58013160aa769e5f7845fed853b09db05a77ce WHIRLPOOL c37d3a0696df81c5517fc26e44df50e5d9cbb575c64390b4e43d103708d6c453ad0131ad12fb386bd84a638beb2a662610a68f0dd7ae4d00b436feb1100994fc
-MISC ChangeLog 66649 SHA256 0bd4fcb14cd9a1251ee345665769ed5cd459b92309660382cde9a8f1fe4e3c5f SHA512 c0227e7f92661ca91ae0b08bcb6f8daa7f45fd557b93f10e6adeeece5bd788dd21ac7f836aa9135a7c6145698ff5dafbd701168add6a2d545d334ded214a5c9c WHIRLPOOL 81d5f1e2645722c059fbb9865fc437be43721810933db33667a238f68fa95a82368568a547fa728713923fe48af19c46e12b93ac3dc61d9eade060e7f010d592
+EBUILD lighttpd-1.4.35-r1.ebuild 6717 SHA256 8c576ff21ec93701c7acc36c0ad45ce75bc15ac8d94775b55da24bd740eb072e SHA512 13ea571b7b1e7fe49d479ff3f3cf2185b5915d52f47e7559be2b66c42f1a68af6db058806c0f4ecd35356079721943540f44d18a10aeb061126cb0b2e67b8a1d WHIRLPOOL 161ab3bd7ea7053fbd57ee598487c2a6f811da06d868266c1c4f7b09105e01fff4ce8cb0e1c8085f646d6d2d02a9d8db57340b7c4ec0705444a95a195b26f713
+EBUILD lighttpd-1.4.35.ebuild 6703 SHA256 393997b5acd0630af59abd3cae8ed1a30cdbd528a57ae558e40e3f1efc865df1 SHA512 daeafcc7e4c849dc4920f9fe2adba9fdbf0f77f27ec0f48b9f4ffb82e7fe2e7c528f0ece7475a316c753cbd053b7fa05628877fcd7b1801f98c613c4a5e6bfa8 WHIRLPOOL 9575338595dece1c0b650ca3145a78b4344e794d4ee687c759bd836e08cdfa71215538d310ca881ff56e5659aae2966a052afea5969aaea55285106d268d90dd
+MISC ChangeLog 66839 SHA256 a0c0ebfa16188ec20ae9667457b92f39203511b4c41798356d48d4466e2af146 SHA512 89afa3e683c0c8ae1483e88bb0d3c9746ba6e555478ef2dca03d7f0bb3d8baefc05f95ecb92ef2ca0231e6ba6a0547ed382a5a32746e82be0d5304788f57eac4 WHIRLPOOL 43c4f8a8585bdbdd12f860e8756e808035199ff3d3b4e5a15662101a08b275061bb92af1a9a85a7a34817b70bd3afbed299c654a6208476a8c4aa80e75f037c8
MISC metadata.xml 1315 SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce SHA512 4ff65b32d294a5ff288eafb81561e4160db69bbea3fab90dc7e80135901ce7c6aded4743b88d3e52e936c73d71b2ddef7d65523e6f737fd76994776bb9a6ea77 WHIRLPOOL 83a654aa9c34b778cded6acad83aaa891d57b3effc220a4a006123beef73d69e075eeb580d9b5c3021535da8a8ec64a933d0d62bd1e8ab639ccff4f3592b92f1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
-iJwEAQEIAAYFAlORtLUACgkQG9wOWsQutdZ2sAP/b5wDifZCMuCn8+DUo9dXL8FU
-O6v9K+Wng2gp8C9yW8RwR0xnL/+0jo696WkoywFU4NMTAl5PfXzQx9mUZflUJmIO
-x9dmjmYQ1KRxU10iuzRtu7x+e6I58LvfQ3oR0/4ux8U0WCsHI1X33iW9lhswSJbT
-ROYY9bjfwbOl8eIqhDA=
-=lI3i
+iQIcBAEBCAAGBQJUVggCAAoJEC7dUkA7aK9HPgUP/RUNhtUbUjEGLePiQdHShrHk
+LfCh0t3hMBY3alfWDuq1Swb141fCVfdEEzp6OJs6ehILsp84gGZZ1xvl3zmr/EFZ
+nxXZrsOni1JXAe+uFm9vEPOBbm7+QC4zIbn/vzRvj4pEm1NgN2uq/jsQcz8Cpx0m
+nSU0lK7DKjMx7p4Jc8QXcUZwyEGgRqdMrP/fVmAtPEJbuBvE2p+fZaT3nbdIVUwt
+YFW4lCRybUZ52ojjDgwPoqU+iiSgzs7cFSpXIWBjr3x+6LvCFB9b2fER7I4CpRot
+NZu1gAExJyZlNLBrGlvmCq8wK7r9IdXxxsipFGqKroYFz4vcJFjYeQ7hyIoLCyl+
+mAOi/bS3jrx+vL75LMgxJWDeVY0Xtl7Pd2Xn7K+F6n2dEK1Hmn5dRDVKRHjOE+0b
+GpRCPBMW+tt1nGtspR8hsoluQO+yrJFV196oFJAYt4Nc2qKd/QtvsVLbrUxsLSg3
+Dc1zc7G+lBpON/XucFwhqqyvJzqp/YGy8pizzH8C6dU8FfMxkvM5tfc33J+si0dD
+uwH2vkwvzXr3AKQ0WWD2quKGjgKXmkwZtfOKuf7IGMMci9lRPdW4d68K/jvCyygP
+vy1asLoeSqIG2E0lbEVvz/G/SEV7qhNY/wUhsACCv88dNrGYJbN22BLPSSzSkOay
+GMuf8ZSVPk5IcZsYYA85
+=VFqM
-----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild
index b710109fb40d..6e4c7b846593 100644
--- a/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.35-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/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild,v 1.1 2014/05/02 10:57:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild,v 1.2 2014/11/02 10:31:29 swift Exp $
EAPI="5"
inherit base autotools eutils depend.php readme.gentoo user systemd
@@ -16,7 +16,7 @@ IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysq
REQUIRED_USE="kerberos? ( ssl )"
-RDEPEND="
+CDEPEND="
bzip2? ( app-arch/bzip2 )
fam? ( virtual/fam )
gdbm? ( sys-libs/gdbm )
@@ -28,7 +28,6 @@ RDEPEND="
pcre? ( >=dev-libs/libpcre-3.1 )
php? ( dev-lang/php[cgi] )
rrdtool? ( net-analyzer/rrdtool )
- selinux? ( sec-policy/selinux-apache )
ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] )
webdav? (
dev-libs/libxml2
@@ -38,7 +37,7 @@ RDEPEND="
xattr? ( kernel_linux? ( sys-apps/attr ) )
zlib? ( >=sys-libs/zlib-1.1 )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( dev-python/docutils )
test? (
@@ -46,6 +45,10 @@ DEPEND="${RDEPEND}
dev-libs/fcgi
)"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-apache )
+"
+
# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="${D}/etc/lighttpd/lighttpd.conf"
diff --git a/www-servers/lighttpd/lighttpd-1.4.35.ebuild b/www-servers/lighttpd/lighttpd-1.4.35.ebuild
index 15aa8184c17f..9f41d55c19a5 100644
--- a/www-servers/lighttpd/lighttpd-1.4.35.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.35.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/www-servers/lighttpd/lighttpd-1.4.35.ebuild,v 1.10 2014/05/14 16:10:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.35.ebuild,v 1.11 2014/11/02 10:31:29 swift Exp $
EAPI="4"
inherit base autotools eutils depend.php readme.gentoo user systemd
@@ -16,7 +16,7 @@ IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysq
REQUIRED_USE="kerberos? ( ssl )"
-RDEPEND="
+CDEPEND="
bzip2? ( app-arch/bzip2 )
fam? ( virtual/fam )
gdbm? ( sys-libs/gdbm )
@@ -28,7 +28,6 @@ RDEPEND="
pcre? ( >=dev-libs/libpcre-3.1 )
php? ( dev-lang/php[cgi] )
rrdtool? ( net-analyzer/rrdtool )
- selinux? ( sec-policy/selinux-apache )
ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] )
webdav? (
dev-libs/libxml2
@@ -38,7 +37,7 @@ RDEPEND="
xattr? ( kernel_linux? ( sys-apps/attr ) )
zlib? ( >=sys-libs/zlib-1.1 )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( dev-python/docutils )
test? (
@@ -46,6 +45,10 @@ DEPEND="${RDEPEND}
dev-libs/fcgi
)"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-apache )
+"
+
# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="${D}/etc/lighttpd/lighttpd.conf"