Depend on selinux-couchdb if SELinux is used (bug #499284)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 32 insertions, 26 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 14896c15d1ac..a9ec6cb8899c 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/couchdb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.87 2013/12/24 12:53:12 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.88 2014/02/02 10:31:24 swift Exp $
+
+  02 Feb 2014; Sven Vermeulen <swift@gentoo.org> couchdb-1.4.0.ebuild,
+  couchdb-1.5.0.ebuild:
+  Fix bug #499284 - USE=selinux depend on couchdb policy
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> couchdb-1.4.0.ebuild:
   Stable for x86, wrt bug #490826
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 60a207616b12..a511dd0025c1 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -13,24 +13,24 @@ DIST apache-couchdb-1.4.0.tar.gz 3422107 SHA256 bdbb9c35c2738ae0fe63280bd818a504
 DIST apache-couchdb-1.5.0.tar.gz 11594978 SHA256 abbdb2a6433124a4a4b902856f6a8a070d53bf7a55faa7aa8b6feb7127638fef SHA512 557f712cf927b8713285e716a9dce624960316af0c481c98553c12b310fc228d30b585d25bf2c3e3debde5b25fc3d94dbbedaf79a7ae480e92a847abff73c2de WHIRLPOOL cecc476c7266623a823d4b2aa1641f9b15c43ac012859483fc97f0aae6ec7afcd716baa27aac455d0eafbe80b042ce0329327a72e3df90af1eb920e70e870d86
 EBUILD couchdb-1.3.0-r1.ebuild 1709 SHA256 87da5272e1a520731d9d52dc7f937404af8964377549cb2f12f44b3db47a382a SHA512 25c4a22711995f693f541f86a1f4e3754df5853b895c03b0d3e4bdc4e7df7e644510bc498c5d5c7971c11293bedd8c2009100bfd86b8a3722e7b0f489020939a WHIRLPOOL 4d18ef73d918ee346090745f3aec5df40d957350e22e5b96e343ec83cc5d47c162d83e7c5a597fdf5553709272d1c53bf4ae93030d0b3bbc49f5f75a7d9f93ef
 EBUILD couchdb-1.3.1.ebuild 1724 SHA256 595abe2c0109f2dc3cec5ee29668d406b32e41701ecd9b65e3288fe7f107c042 SHA512 d8e9fa31407817d860b57e0b21c965d85122b3afd5872fb493fbc3b81da0c8f198e026ea70c7615d08ff59c702a6e629f4e0db836283fc2c6194d09785e1f2d6 WHIRLPOOL 2e0da2fc02ae07b04564adac772d8712fcc20e893cee522053c44bdb939b377a026bc4ae073d01a809589f0efe71e46b8463ae893692ba0fc4bc6a3ebfe93b2f
-EBUILD couchdb-1.4.0.ebuild 1720 SHA256 ff3bf6f09982089d9e621b4c75fac81653f5feb0278c604add8e08b121239150 SHA512 937ca848990e7e31bde5a50053f9391479e61492dd0efef718f43852d3fc4f33687b62bd28fe4a20c407c0fafc82e53fe5a38e3f4a3674226a78c2ad140ea620 WHIRLPOOL e985f34eaaa526910daad143ee74227bebae30063f5a3b95c7b2e9c7cc4fcaea615694361cb41764320939de9d624504a8a6717d07aa164e679b85c92bff1580
-EBUILD couchdb-1.5.0.ebuild 1723 SHA256 388aaed956bab34544e72cb3c053890e49c0291939d2823b4d81c8f4c80f836b SHA512 be0d5cca292ab0d611bc2449541512d46ff224ab2d032d4742986d94c3035194a9880299b7b06232e2f3ff6f5f4ae32c2c185d5206a929973f831f94b2534e81 WHIRLPOOL a9c584afa870d27b22f2689574917f07c18f0a6d85c0f02dce42a3213748611e8eeec6412dd9d59befe13cbb59402eb3d350b79b74e7fd5ccbac94743dad8338
-MISC ChangeLog 11373 SHA256 275e4f39ed2585fd58b87288863b9832acd06d7bfe54a5c8cf97574348e1bf11 SHA512 9c116e965c7676a736065b164448f9f2b82a6108a5a409fccdfeff09555bd15ac50bf80963c23d60cec69ff5c47a0c460ee7a2e838cbcfc981f195f0d312c6e2 WHIRLPOOL b871076f8f40e83a4ccb20414186ad5ea8a71746f8a845aceb47c0d90a9d44ff360ae231802ca0f07e0132afdc2d2f9c1d29669845cd64d4e233ac977b4532df
+EBUILD couchdb-1.4.0.ebuild 1772 SHA256 ad1d8e32b872cd8cce019c04ba3310f0376a9c035fb5177d9b888813f927ce83 SHA512 77a977a203af130a4f5ae5021a82ee480da4d6989d1a9eadf65a99469cc5c8ca6395861890c1d0aa12bf7d9aebf84621ce5a2eeaf98deb524077fe28f19f927d WHIRLPOOL 0af45204f0cb8f5ae34c2a09f60d86e170dbdbedd71592f44471230a9dae9b8e647987ef0ba3e4af98e52028242bc4758f4b56ec758641dbfde41cf5f9064509
+EBUILD couchdb-1.5.0.ebuild 1775 SHA256 51f04d2e14192baf8187cef9cd01f838ceb20a68b057a8a626494b0e7453d47f SHA512 5c9a6cc11b7d2db8508f960c490a2e333fc0229ece2f39c90af7de9a5adc6bd5b2756755f210e46aac5412c84f9443b414fb69d729926ad1616fd65342197504 WHIRLPOOL 374bde1dc3fae0bf1368b6272bdbe4047a9e1ecd61efbf2edf970ad716f20f81672233c67952d4a34fa2bf9f0b4069b88f74eb8fc408da156a559125c7ce77c7
+MISC ChangeLog 11528 SHA256 373e22b76045094b334b659a72c8e534eaa48ec5188d5b97d90bb717315490d6 SHA512 cd7f672a7379cfed9373bb6bddce7c5b3d012e812900c848869b8fc0e25e4c1a02fa373a2359d7688fa392447dace7345f5759ccc70fd4ed61166d0376bcd620 WHIRLPOOL f40c96f9f1cc5f17c9910a6b997a0eefb494a45b0f93521cd5c821ec3cee589a84714e0ff95601dbe1b2d0a50d83276cb80381fbd8a25b59e8b95b975004c40c
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYO7AAoJELp701BxlEWfUJwQAIa2hTL4jLZFUFxLTS7xJnKS
-JxkBZz8XPgOEDX4QMzWMczntDXgL3btcgqsIW2hFbHkTxKAljGOUhdVSemH53qJs
-5Po/yEC7fxPtpmG1nzKyfJ5fPIA3I/1sMsRwKJHQcZheOTbM3EDQlek55EapDZAj
-IxdBaGieYaTChIOQsfB6WtZ5sfj7Mi4CX7wbr0gLEB4ZcuchhLX1rbCasRC7eNJN
-ZMsydNjITf0o2k7IdIIwZSnZTzJ5wYmHEfvzcwqAVfNGVl+keJ8iX9yziG6rDrz9
-lZpM9e90Xjq9lZ+FJsCn8Gzkt9qXawvTSCz3zcFyzz+YT4y7bWBO+Cz9I3BBAxbA
-TKxDhUNm8tiH8voTN9aVfOz7Z8+16KxLpBUunEba+xXWidy0+hfiSwOM9Ai13kO3
-UFxIT+TYsI4Kl/DWzOTb0ntl07/J3XA3NrJ7eg3+WoPLfIR057aPWgkAbRJqNVFs
-9fW8+Zb5ABexmjRp36zGwipLtQHuKsXwoFF7p9u6rwaPnKaiML9DqPwr6P7aSXy9
-Tg5b+OOCZ4IswIbi76SbcQKAKi2e1hSDHTOzZuMj7+CG4lvfkjVSmTI3a+Kdfyg2
-X1osrjERCEF/SL8Hwz5XWUW31mRfXW4TUQS6rvOjE/9B2Fgw9RgcDwQjvqaduhML
-Pira/fM7Qdq/Md5uzlY/
-=wWcW
+iQIcBAEBCAAGBQJS7h5KAAoJEC7dUkA7aK9H1+MP/2YZrcqnLpdEUtGtELVhK3yb
+C0NiIuzpWTa7IvanviHpwNmcP8q7eYSOnVwiwbT32CzyGgxfIM9xDA9ivO+gLFto
+kgiqAnaTw7RocwpoeKqR0L6mO0D/h7o2LQWUvMwZP3J+uHr7XIFVe1tpMOP2KVHy
+rboKAq1pr/NJEUCLeFpTcfnnMyCqcFcdeEcC+2z0fbh3gGjngxeZHLRH2ti7CmMk
+FVgQDoh6mppUx0zLdAIchg3kD8P5gH2DQPOI7tLWtrlAmro6yOqaRXNjBgsD0zqb
+Qin+xiyRAOrB6KudrKcedUOjXtmtZtzANyc3bqxJomGnDWpbr+v4P24Osh66Yk2k
+ci9a1UVHh7DjdpWLJjzrKYvwrUgWpuE0aeoiPNwEQUnLOnitGuf8YSAMmn+ikaKJ
+wj8Im10YdM3jwsADpx6c7vALmZb4cdzYyETQSnYumJYvuApwyrulJHLNvOtqR2OA
+QvnlNcfoS+AfVHvnPYRwvNHn/gNsIQHa0tsyr/WUrpvqYbi24KJ4IU6n5ZwJQD5P
+g6WS8VSJ7WiQIlNzWE49fi9jy1h89l4ERRfuOAvkSNyuSMOdSZ649Wr9AAyVsUkx
+hPq4jwGGKAUmH1TAycLKGs1mFENniiHj9LPtsKvqFekvDjKCE4StmKa042HFJxXJ
+F0u60EJjDg4RrAiJuPmc
+=NM2I
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.4.0.ebuild b/dev-db/couchdb/couchdb-1.4.0.ebuild
index 47c3818b0f37..1b0200055abf 100644
--- a/dev-db/couchdb/couchdb-1.4.0.ebuild
+++ b/dev-db/couchdb/couchdb-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.4.0.ebuild,v 1.4 2013/12/24 12:53:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.4.0.ebuild,v 1.5 2014/02/02 10:31:24 swift Exp $
 
 EAPI=5
 
@@ -13,13 +13,14 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="test"
+IUSE="selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1
 		dev-lang/erlang[ssl]
 		>=dev-libs/openssl-0.9.8j:0
 		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7"
+		<dev-lang/spidermonkey-1.8.7
+		selinux? ( sec-policy/selinux-couchdb )"
 
 DEPEND="${RDEPEND}"
 RESTRICT=test
diff --git a/dev-db/couchdb/couchdb-1.5.0.ebuild b/dev-db/couchdb/couchdb-1.5.0.ebuild
index a3ba53f3dc00..e62117c4887a 100644
--- a/dev-db/couchdb/couchdb-1.5.0.ebuild
+++ b/dev-db/couchdb/couchdb-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.5.0.ebuild,v 1.1 2013/11/09 10:29:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.5.0.ebuild,v 1.2 2014/02/02 10:31:24 swift Exp $
 
 EAPI=5
 
@@ -13,13 +13,14 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
+IUSE="selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1
 		dev-lang/erlang[ssl]
 		>=dev-libs/openssl-0.9.8j:0
 		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7"
+		<dev-lang/spidermonkey-1.8.7
+		selinux? ( sec-policy/selinux-couchdb )"
 
 DEPEND="${RDEPEND}"
 RESTRICT=test