Update LICENSE to include the OSGi Specification 2.0 license and introduce fetch restriction as the license needs to be explicitly accepted (except for osgi-foundation) to obtain the downloads.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

13 files changed, 116 insertions, 61 deletions

diff --git a/dev-java/osgi-compendium/ChangeLog b/dev-java/osgi-compendium/ChangeLog
index 4e02ad225110..be8f3723635a 100644
--- a/dev-java/osgi-compendium/ChangeLog
+++ b/dev-java/osgi-compendium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/osgi-compendium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-compendium/ChangeLog,v 1.1 2013/07/05 13:05:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-compendium/ChangeLog,v 1.2 2013/07/16 12:06:03 tomwij Exp $
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> osgi-compendium-4.3.1.ebuild:
+  Update LICENSE to include the OSGi Specification 2.0 license and introduce
+  fetch restriction as the license needs to be explicitly accepted (except for
+  osgi-foundation) to obtain the downloads.
 
 *osgi-compendium-4.3.1 (05 Jul 2013)
 
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index 4a2f66479572..4baa77f12b44 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST osgi.cmpn-4.3.1.jar 741615 SHA256 d73af7676eb25236057598907ae40c7542b6a8dcdd5b9a0001552fb4b2134bbe SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9 WHIRLPOOL d24c488ed334bd634b1b5349e433274af5534a442c7a934b1f891279f4e9269459d84aed2bcdc96f268ae4ea8d25b49dcaf70e12d6c344899dbe0279c6148ab9
-EBUILD osgi-compendium-4.3.1.ebuild 965 SHA256 233467e087086b8c4f36886610dfddc504cb304caed34edf65fd186bafa52cc3 SHA512 d6cbc4ebef3af39ee99ec6a761514ee7335c8d13c1e382e56c20eb01d0ac190842c75de3a6bbea619747b0c24c712031360258f80a2ccfbcff661b75afe94bdd WHIRLPOOL 4ebefb75a4aeec86f6e9b6a42e99521f987ec414e863e9a741c6ae2c6fbaac84d5024ff78fa2ad418a248988589cc24ea5761946ff167db07652db82c57374f2
-MISC ChangeLog 483 SHA256 f58fddd207c6898ed94f5847ddecf6775ed11c54f51be7ba4f5dd260267b824a SHA512 66a5614cfb92171f4cd11d073211b14d53aa0c6461a2d11a1062a9febffe270b153b935cfc8bc970a74adfd09d182643c6bcf128b2902deb0bfa32371d8ae8c5 WHIRLPOOL f0c2bbc2c23f1a3b32664f718523edbfaefd790decdb31dc35ab8a76ad44ba96e1633fdce09d9bf17feeaa589e30f39152d21c758678d0ca2bc3757026659ff4
+EBUILD osgi-compendium-4.3.1.ebuild 1292 SHA256 ffb72025bb3c6dc42b9e49f72c6133ec03d6b357d6e3860c3576945b1569a96d SHA512 58fe91c6d29cc457036501d194beb38d3a1fcaed6cc6092b6528a5d25fe9467d72d9a6695699d85fbbdd9335a2fd9440a7efba36e45f9be2ca5de764db278137 WHIRLPOOL 3b211ba3307dd83ecc0f299964e6f6c28165172195a4bb2675ee02f84acb32f289c982dfd034186f544c18919cafed7c323505d68cd5e1890500a6617879fa84
+MISC ChangeLog 761 SHA256 ecaa91ab1623e64bb0d427ef15933df60399a2945a95e03c950264b702a7e6f0 SHA512 6dfc4089e697f4bba8401f0601da41f91a316fc0504ac8a8cfdc1bd4e9aa6e3ac21b4646471405050d9e56a5ec65860259f1a761928f7f6f2f46f58a0003a7dc WHIRLPOOL bca2152b68cef9012aef9537208c623af91cd7ecc7a2a12359bd13beed2a15fa9c6c77eaf1dc788090abeb38892e7ff618276ee1495d9daf766662bf96577059
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1sQCAAoJEJWyH81tNOV9mj4H/j/NjQ5zyUsSCZgdPRaFGi6y
-ub9K7OvA7h767O5ByE2E1hkjmYn0sV9lmxpyZ2eLJof703wsPbb0kscUBwOYkow2
-kIYoe6sgs7pD085DsUK8abPYpXVytOB9YwrRmjnzPsqhPd2EDWgITa1yhGIeipEL
-4OFZUCkP0evE3e5JefoRnXX9z1Cd6fGrLXwOSxM9k3zQups8Ma1f5O9vtM6Dy5tG
-qSceQKIUPqg2gpESVFjxIDyDPlUarmO/OXK1rtTqBRjov/IH7/luJOG8cARp1e2v
-HzhMJLNUXI3VGU4qK2kzhce+LSR+tewCZtupHwRCPYtsTTjhwrfvPiIS9nRQsUg=
-=G7m8
+iQEcBAEBCAAGBQJR5TZoAAoJEJWyH81tNOV9pNQH/0NP8aaOlTcz/bqp6fl4W8x1
+F7wUZifbfQ5sJuSzjgBchpq9dmxInJ3+b83HQI35rcO9Xws9omZlydgYiIDt3+tI
+5R3NTGikq8W7VcmKVv7ecWrOHxh3iZX0lUqTYe+HIw+6cYJKEkIR//BPebvmom8c
+sbQ4x+K4llS4mJ4W4yy8RASgPQCKom8JUzx0nknR8bujVkeULu8MY07tO/Sz8Oxu
+pakSSBsI9n2UAZVwXRlcCPQRAYGdgN+qDh3vaOHgBeahfwGG85Ksnntsk9ZruTgi
+g8h0cSZr0MGIfVC9cDPqi1QHCavvE+S2klDZYCO8b8HlrCtkxSGOPQr4nWgNdWE=
+=om7R
 -----END PGP SIGNATURE-----
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
index da533de8efab..bbb7974c1a29 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild,v 1.1 2013/07/05 13:05:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild,v 1.2 2013/07/16 12:06:03 tomwij Exp $
 
 EAPI="5"
 
@@ -12,10 +12,12 @@ DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
 HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
 SRC_URI="http://www.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RESTRICT="bindist fetch"
+
 COMMON_DEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	dev-java/osgi-foundation:0
@@ -32,6 +34,14 @@ JAVA_SRC_DIR="OSGI-OPT/src"
 
 JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,osgi-foundation,tomcat-servlet-api-3.0"
 
+pkg_nofetch() {
+	einfo "Please download osgi.cmpn-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release4V43"
+	einfo "which you can find listed as"
+	einfo "  OSGi Service Platform Release 4 Version 4.3 Compendium Companion Code"
+	einfo "after accepting the license."
+}
+
 java_prepare() {
 	rm -r org || die
 }
diff --git a/dev-java/osgi-core-api/ChangeLog b/dev-java/osgi-core-api/ChangeLog
index 48b134e394c3..ec311af8d2a6 100644
--- a/dev-java/osgi-core-api/ChangeLog
+++ b/dev-java/osgi-core-api/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/osgi-core-api
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/ChangeLog,v 1.6 2013/03/25 20:47:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/ChangeLog,v 1.7 2013/07/16 12:06:16 tomwij Exp $
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> osgi-core-api-4.3.ebuild,
+  osgi-core-api-5.0.0.ebuild:
+  Update LICENSE to include the OSGi Specification 2.0 license and introduce
+  fetch restriction as the license needs to be explicitly accepted (except for
+  osgi-foundation) to obtain the downloads.
 
   25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> osgi-core-api-5.0.0.ebuild:
   Stable for x86, wrt bug #456528
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index a807a8599766..b94a82f39a99 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST osgi-core-api-4.3-all.zip 337463 SHA256 e03188926e6dfbc87ef7a097226c6cd01e399747d75e03a233961de661b13fbc SHA512 4620e96e0a24661a0d3f3a570598d51ba9068b7204f3dd34179bdca76ad9f2edf2e20c1656f0dc355be647a2b5befc064ff50b8f75167639580fb5ef661292c1 WHIRLPOOL 97634762b8c2042301d78312baff5bc575314d5ded28d673d69f354c1e5b23d3845bd4d90421f6d2fe20574386ae5d88e126da90d1fde8aabe71530cc2b8f65f
 DIST osgi.core-5.0.0.jar 418232 SHA256 22fe6c64753a0479fb450bcb740ea5e51747cca2e1aabb8a582d50c02c3eec94 SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 WHIRLPOOL 9164e08ccd6f079898d0dedd33df1ea1f76f3ed4e65fe9205d17e72e6d8f6e5820fbab7a0bbe9633efa85f9ff4a9045813ea9d193dc110f5b6bd7d67a98b621c
-EBUILD osgi-core-api-4.3.ebuild 708 SHA256 8d8c1d3a75f19ea948c32c96f4cf177f158f99008164d2523cb56b997a970509 SHA512 6670044aeef685e9cb62263c72ac60ec1a9ff6b5ec9a12c5af6b8e44495f2d9c24e3889836a227d798cb583794822220ce65bd50324b8ce4ab10f35b60c553d8 WHIRLPOOL 749c964b58f8a98ed8564339e68f9e6b8b9de125a82479850198a64185ef999d05af1a4d9588fbe14e097378e3a42d4a2012bea70bc6d8f7bdd86024dd628388
-EBUILD osgi-core-api-5.0.0.ebuild 683 SHA256 c2a9d9d4dda72cc2e742b743b04f31e87115a02efd59e692b6ab1c671bfadcd0 SHA512 5b8711201360e3217bc751b7b1945c6915460fbc09d2a62428d1f07b09688003eed8636e8822fd3c0b0548cb5406b52f64f969d4016f6fd109d54a754cdd9623 WHIRLPOOL 87839b79f06727c9789f479022cc9c25d5f31f8a3164bc999b1521b82eb2534892535d13d492af83fc3e7941b7dfe8d37144423878e6f816cf23564f543ee764
-MISC ChangeLog 943 SHA256 539364033c6fd6608b1aa3542e6e1cd7e34212b71c9f012b3da071fb8c623f9d SHA512 f2b338da21402abb042948e9b50c33af97a6693eec906f6eb574a27bcd30617ec05ed0b80490a09f84112267fe974449f41fa2b0622a579a35138bb9c9b0caca WHIRLPOOL 24dba0f52994d4f9ec32c907fefbb6b56fb858afe0001e44ce7d584e8fb998793c223d03fdf8d67b5dd4ce92187aa53653e99bf1196e23ca40a070d9b412435e
+EBUILD osgi-core-api-4.3.ebuild 1039 SHA256 2febf90d3307bf5425328e90fac6c82c11267fee968129f8dc34dd16a1aa6ef0 SHA512 54f530912e6872781ad65db55e28839c9be8cd1be615649999e76773a935d7dbe2dea43d873e7af17aca2b4616b88201516596773e7a75950a6cb548e4ceb27d WHIRLPOOL 2a920db57595267c42cb70f79f0f60fd97214bd316d2222c3d9b4b220a7b165a1d35c529292fc85b1db3aa6ea0b7e39b7e1176b02e07bfd6bd736680a61525f1
+EBUILD osgi-core-api-5.0.0.ebuild 975 SHA256 b2b2f6d5be7ad970ea342034bf45739e499cf88f7e1d71c5b23e01f9abe42dc0 SHA512 75ead145c1a0ed884effbe5c599ea6021e5a23f5312c2bd7bc7afe557294ba3753b478b05c061348bac08387f19d7a6fa43c6af6be2beb0054fc9d8f8989af88 WHIRLPOOL d5456fff8891d936b2a65100392eac063d86490b3f4cd92ad99ee8dede9bf55d6dc157719aad057aa433014d3aea7e31d70498475a8b3fab1aae5585025e7ea6
+MISC ChangeLog 1250 SHA256 67e1cf9ed3c85a0bc7fa2e0d96704c6a235926bab8fba896ebf7480e9b258c2f SHA512 969f03b9abcbfc4bf7e260e35b6534e7d6dbf92e0e6269ae3b9aa7ab1b6a54855da20918d36be013e50aed3b266bac6f17fb45636cac5895613d9c5600f9a59c WHIRLPOOL 204bc75b3a2c3fbbb4a6db7efe5d8fb43aa0e180130cc9ba3b0e6a4568e645d09d087e1c29138e1442f6351bb8e25032923df83f99b4c25060290b63f0344ff6
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRULffAAoJELp701BxlEWfO6UP/0X3zUSTNOAB1tH6E/07KpAB
-a7lhhMCwdxIVOeoD/KGHswfSTzWOQZf+PYhL43WErtLpoDpZbqom2fVi9d8EKBF8
-vrcpuHbivja/OKADFRor64e2RzJpYxRea8ewGJA1oA/oq2zTWTc1GmCKjLqoWcrX
-WzyGweQRiSSajDpvFZBeTwKSh/oFZfm7HAiXCDHeysN7hS7yi67rC1n6mYZF7oMz
-rmQmibX7WK3Zk0hdKdHeUYTCAOV1CXgQbcwAkFnrvBW0dWlyPCL5WzHl5f10+Uvs
-HhX4zSBg7sjse1PQGglIbxISUOq8a8BPA/GYudwgDfv+HBQmnjRrr/AHVK3cJDqX
-qDkLeWCi+hwrLEJyCQl/LcMgru/prkJqlubBSGWBsw6kIWUElZN2hwVqgwoFWzaO
-V5/PyZqyIhng+DyYQmRgt/+91f+D6fg26VMZKjkhYWsX5raCIsPtRcIVbW4wbkYH
-PR5XRJO2jXDGdnDlm+M9SF0IZfV84zcu1FgCsjzYRv5/JqdqbaVodOTiXs5UAWgP
-6aLU1hxx044bMGD/TBQlihzIYCf9a4I0kzkTNbeqCEP2bWhHfZzfOhAKMUxw/oEx
-pUVS5nBqZMcJWnM6MwVdsku1Zi6pXuLBKvMb4nNAVjJbrus19bPe4Y16t3oSwvcT
-zRyIHTDeUCsIkVIv0ydh
-=MhiY
+iQEcBAEBCAAGBQJR5TZ2AAoJEJWyH81tNOV9MUwIAJL72u/6f7BDyQK0uLNgBikw
+ZDsPwC5lCtexYQmK94yXkv3Qrgfthy+Fc2HvslsbWH3a10y+h3P/WResV3SokLMm
+snNWplOridaZgqVCf7LYa5ky3uVjti+R/Hku5577K/jwRbAaGfEoKBGd8Zku2Tsy
+3RX/9LyiP7oOQQkf/JrQcx0RVhn05JA5xyoyyvuP33sQQHehZH+HD1/ng7asEJrl
+sqXVK6PX6y4lPRTsvjx32TwmO91CuMIxHMp+HAVPb2csbEhW8oomjfqg9RebFF5u
+MGMmY83DqIGx9Exm/P0asRiQtZp/rhk8Ivm1uOFe6Q2QzNcz6CfJmicH6OJ1FkM=
+=v+cZ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
index 113f7a5ec3a7..1a320ee060bc 100644
--- a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild,v 1.3 2012/05/09 17:09:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild,v 1.4 2013/07/16 12:06:16 tomwij Exp $
 
 EAPI=4
 
@@ -10,13 +10,15 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
 HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r4v${PV//./}/osgi.core.jar -> ${P}-all.zip"
+SRC_URI="http://www.osgi.org/download/r4v${PV//./}/osgi.core-${PV}.0.jar -> ${P}-all.zip"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+RESTRICT="bindist fetch"
+
 RDEPEND="
 	>=virtual/jre-1.5"
 DEPEND="
@@ -25,6 +27,14 @@ DEPEND="
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
+pkg_nofetch() {
+	einfo "Please download osgi.core-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release4V43"
+	einfo "which you can find listed as"
+	einfo "  OSGi Service Platform Release 4 Version 4.3 Core Companion Code 4.3.0"
+	einfo "after accepting the license."
+}
+
 java_prepare() {
 	rm -r org || die
 }
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
index 0ad3af3fd757..7c63b9377c7e 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild,v 1.3 2013/03/25 20:47:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild,v 1.4 2013/07/16 12:06:16 tomwij Exp $
 
 EAPI=4
 
@@ -12,11 +12,13 @@ DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
 HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
 SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+RESTRICT="bindist fetch"
+
 RDEPEND="
 	>=virtual/jre-1.5"
 DEPEND="
@@ -25,6 +27,14 @@ DEPEND="
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
+pkg_nofetch() {
+	einfo "Please download osgi.core-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release5"
+	einfo "which you can find listed as"
+	einfo "  OSGi Core Release 5 Companion Code"
+	einfo "after accepting the license."
+}
+
 java_prepare() {
 	rm -r org || die
 }
diff --git a/dev-java/osgi-enterprise-api/ChangeLog b/dev-java/osgi-enterprise-api/ChangeLog
index aba346105606..d4ea92e40555 100644
--- a/dev-java/osgi-enterprise-api/ChangeLog
+++ b/dev-java/osgi-enterprise-api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/osgi-enterprise-api
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/ChangeLog,v 1.1 2013/07/03 21:22:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/ChangeLog,v 1.2 2013/07/16 12:06:33 tomwij Exp $
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> osgi-enterprise-api-5.0.0.ebuild:
+  Update LICENSE to include the OSGi Specification 2.0 license and introduce
+  fetch restriction as the license needs to be explicitly accepted (except for
+  osgi-foundation) to obtain the downloads.
 
 *osgi-enterprise-api-5.0.0 (03 Jul 2013)
 
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index cb252f07e776..41198d42897e 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST osgi.enterprise-5.0.0.jar 479506 SHA256 2ad77a87fbd53e6e719bccfe4bb71bf9e409c104e7c2b500a9a59859faf85e4f SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144 WHIRLPOOL cfc9117632bcb7cdef03bc484beee374429ea665a049f079d7a649d16a56369e976a9d80469a7db2124d02e00ea2ffe11faecf52623abe66cf0241a9bd12028e
-EBUILD osgi-enterprise-api-5.0.0.ebuild 882 SHA256 af1df95f045ab606578b468a377b1ffd113094132a70796bf19144aabb2447e0 SHA512 39979d65bc77585cc0cc2c9660fb09c684f5d7e06b42e5959421d3918f0082a9824a0aaaa23725338a8abc76fc44ba3767257b0adf79d84e501b01d9ae950b93 WHIRLPOOL b94e7b2281913497c99c16f63d460536aeae342537a8fdce1ab3461bdbce844d89f091e15e9a1b2f8431ea0d454c901c2e3999decb29b9d55f4f0b0bf30807e4
-MISC ChangeLog 556 SHA256 8633d3b2960da2c2053596f2f4b9c349a770ad809c427422fac000fb880d7524 SHA512 502f0f218ed6e395a4811d196355f988df644a2d3c681d5d9006ecaa8a813679d18a9a56e655ab8c06b9618a686c10d8cb0f9c5da4dd8e157c0950afb521bdaa WHIRLPOOL befd16adfaaded66be2e1163922c0f931c4d8a4befa8f24364dc4e0a230102cad44e131692bacb58edd53fc953ee2a46ff391df9ad5143f7e45c210ac6e932bc
+EBUILD osgi-enterprise-api-5.0.0.ebuild 1183 SHA256 9f09bed0ad1f1487a25f641384b7240e9bf49ed5063b18d9536cc6bf6a002b67 SHA512 a3357071bca24ef9c75a1accac21628840ba5ade9be988eeb03cd218938ddbe042e10b39b5f53a8409e47eb27574bce063968d03cb44a21496f646e389313079 WHIRLPOOL b36854a9b411a2a89b3575d691dacad001205a59b4b3fd410c924e073436257451976e834e2eb38109a57b8158ede2bf7f9090f42b05562b41897ed671c738d2
+MISC ChangeLog 838 SHA256 5e48babd1e2d9c510bbeb551d93f22d3a5d155b62dc9c332f2ee960a28886f1f SHA512 d6f9d3692ef3f2a569e205e6f3e9adc01094e9f3d148e8f873bda203773330b27b8d93c203fb73aea1b19ef0d025cd2b1cfb68305422e241b592ebeaa9837278 WHIRLPOOL f5fb95c814f3163f53a1cbe348648f00caebf80faa037f76f87cdedc21c5c828639d18304a81388c84abbdddd00633741fc3afca41a87f2b66ed0073cdb3b0a9
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1JV0AAoJEJWyH81tNOV999gH/3KskVYG7X7RaCOk8jkQdeds
-X4V00X1s/6IfHPy2O9Xpd+IGjtqjf6xNwI+VJdOXVu8Vpjl3C0IsK0W9gkgG1UaI
-DqSvvwS27s4mVM0f1u36hyCeUi6lgLexhzEoyDJyBzzu+N+URF1Rgje4eog1dxak
-rgGnIHuAc4AE6/AdhoVBBfBIGUvA3vx4fOpUom0oKP8BMGwXr4hBN8jdBwtOIrzg
-V4zwrgenzQQA7MeSM9OYu6JDBaY9Oe9fZcllPJZKQ8YLNakkRoSjaofy9zzGVBRN
-O0Q9CE4+5NIrvebCkL2vv9c7NogZ9IyUQW7lfJHr9jo92L73nwIqa1x8YAal1Vo=
-=4fzK
+iQEcBAEBCAAGBQJR5TaGAAoJEJWyH81tNOV94nMIAKWU6u+AH3s1LxbVOQGjySB8
+dUqB6UVznKuutdAN5NyoLfRjOh4tE+914jO06g4gDZMOYgAKbvU8KSPSe3zyZaRt
+IevIupKjZNL6MzIEBpuhMrtTo9UE67PE6IWJE8nISLtxJZXQ9irGmt2gQQhbA/id
+LSurH05eVw1GJa4qbVlwLQWZ9Vn1ZY9oso/Ueytw+kcz4y6hSSUbHKXYTfdhsIMP
+oSou5fe0aR886v9smFddujqDRlmGeG8wBHdyHOxDXJR9T6M6ZPR1loPIyIIhwHyl
+JGylS5+dBBfyFqZwfgYvoW0PSAPR0UsUyJUw2mKLv2ttC0qsnAGWnKIPextTv9Y=
+=pzZ3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
index d2dcb68a4386..b67e3fd1c553 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild,v 1.1 2013/07/03 21:22:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild,v 1.2 2013/07/16 12:06:33 tomwij Exp $
 
 EAPI="5"
 
@@ -12,10 +12,12 @@ DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
 SRC_URI="http://www.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 HOMEPAGE="http://www.osgi.org/Main/HomePage"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RESTRICT="bindist fetch"
+
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	java-virtuals/servlet-api:2.5"
@@ -31,6 +33,14 @@ JAVA_SRC_DIR="OSGI-OPT/src"
 
 JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
 
+pkg_nofetch() {
+	einfo "Please download osgi.enterprise-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release5"
+	einfo "which you can find listed as"
+	einfo "  OSGi Enterprise Release 5 Companion Code"
+	einfo "after accepting the license."
+}
+
 java_prepare() {
 	rm -r org || die
 }
diff --git a/dev-java/osgi-foundation/ChangeLog b/dev-java/osgi-foundation/ChangeLog
index 36bf826535c9..3fe3e3075f3e 100644
--- a/dev-java/osgi-foundation/ChangeLog
+++ b/dev-java/osgi-foundation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/osgi-foundation
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-foundation/ChangeLog,v 1.1 2013/07/05 13:03:01 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-foundation/ChangeLog,v 1.2 2013/07/16 12:06:53 tomwij Exp $
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> osgi-foundation-1.2.0.ebuild:
+  Update LICENSE to include the OSGi Specification 2.0 license and introduce
+  fetch restriction as the license needs to be explicitly accepted (except for
+  osgi-foundation) to obtain the downloads.
 
 *osgi-foundation-1.2.0 (05 Jul 2013)
 
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index 1ee6f489b09d..c3173e561a2e 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX osgi-foundation-1.2.0-build.xml 9886 SHA256 935d373fa3820fad30d6df1356a861b60453a4041f03c59407264b2543f99230 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc WHIRLPOOL 617e92e6545a2192846c341cbd917f51d0d05a87c411e450ebe85a04cbd1cc8bfe3f94cadd8e0fb32148539ab241a6ed993deac2274e5c2054a85a6aba3c402c
-EBUILD osgi-foundation-1.2.0.ebuild 795 SHA256 e43dffee88f1e5eedbd5ad463d09ac0c4193b5f34e4c4079276974e769dfc608 SHA512 1e33774ad834c27232c2f98ede36e58ea22338d57b4bc6cb05944c2e09c40da3e3069b05f4cbd7fbaa7c6cabf911f85da1bd2ba0d08f66000852268666a1a5cf WHIRLPOOL 389b401d758aa2e1b7ac46f75f46af73edc5d7d911bbbd8999661282ffc97c05b5b8b3c2b2683242507aa0d23a56389ccd4b12d30eb82d43af71c67c9bebc84e
-MISC ChangeLog 535 SHA256 e273dafc5cbf5c7db46329df486cd94b82f20fdde104c476b749ed85287d64c6 SHA512 694f71f366a3729dc520dbcb93df3c13d8a755a54ccf28ec090e06047592f641af585ac84d1981e8f63bcffa596514b527ecdd3a9ad12500e7e677b240269998 WHIRLPOOL e96c2ee5037510f787ce5537248e903f6068b08beefa0c1934113968d3810bc0cc531bfba68cd36a0ca43a799bd18da7efa5ab9c0e10319f8e3f06cf83b7c3ac
+EBUILD osgi-foundation-1.2.0.ebuild 818 SHA256 a0b43b12e701085e7616358ccc7c78b1faaa3f71369644680c84e5f1a602a115 SHA512 1bf4a1439a56ccf8edbdd251633ede3bf43366106a9e1544beb801eadec177f42889608d802b364d9da6c038607d0d281abf0adc615aec73729964e30484ae53 WHIRLPOOL 0949d525d4a7bad7704215099b60760574a9d3703bac4dd5a949ff5406babb258c91ae60fb6b0c871430bf3762de1a40111c35341c5d9a6686401737557c8a2b
+MISC ChangeLog 813 SHA256 44a963aba778349313c8e8e0317074f83f52ed5a2cbbe053d661504f2651ccea SHA512 9dee5a34b1aba9cab92492099a3ea62d8199de9813bb098190120b017d082ac2975cbdd4dd9edc8fb363969091d9520bf2ab6a20f762d60ea6a601038f3724f7 WHIRLPOOL 0000683f52a8f113c4c4ba0141d145070656c32026bf42d237167eddd7a62e156707b406419360ad9e262b6982465ca206756e492a9473f0a2d4b5dc8e804ddd
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1sNRAAoJEJWyH81tNOV9GsAIALu+NCfK/KCbswoq8x4Uqw86
-S8gajzFY/IRocStcS3Lw+PyW+JGLUV+Ln9VJVwgSvemtcEHveO4rpwwErKAHwAYz
-5Cs1brHGGwXfDzHuARnLODgT8z/SDg3xkoHNt245vd+CwBcN+6HsEFR4iBndsD+K
-h9L4V6k1kgqgUqJPWtnJoEAKp161hBhL0RRsAUxLhENBdusA2mPtmRGy/jECbiO/
-lvwZIcQQ9TRwsKUf+01jcFCNhk9uGGj7y8osUmDX/0o1oxM/24+MPRQJb2Jy2XJm
-WOn/X7tir+oLydfxGIVKYmQYvX4jzIM8uwF0HWBqPnjlAmALnn2v2bQdM/MmXBc=
-=x5Te
+iQEcBAEBCAAGBQJR5TaaAAoJEJWyH81tNOV99UYH/0nTH/FMO1HRRUxGpMIjzmOR
+hHdfLeR4FJcZ30HAbatWIauOVdu0AVbJsT/l4GmL5tei2PcuLficA9ixI3X4/gP0
+I2UVS2u5V7L38Ov/y/UG9c1ft1qmlRbs4otZAMynMvdE5PzSIXS9CaAHni/8Haxz
+OjYVLddEMZ1IpX5XIXQADnMoTLoEoe7PnSJAsQR8jF6l2QrrhJeFH99UwkB2JA/N
+89lt73snte55wlqrLywii1kQxbqvnga4dHUsNgsNnJHM84BbWdx33rLtRVJoN7ci
+rIjh6t0syk2XFgRAMtCgN3tzewr54jKNVdldS1o0psbLD9sfVcj0aTUR+jf711k=
+=9ULJ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild
index 1b8f7c94504d..34745f6fdc55 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild,v 1.1 2013/07/05 13:03:01 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-foundation/osgi-foundation-1.2.0.ebuild,v 1.2 2013/07/16 12:06:53 tomwij Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ DESCRIPTION="OSGi R4 Foundation EE by Apache Felix"
 HOMEPAGE="http://felix.apache.org/"
 ESVN_REPO_URI="https://svn.apache.org/repos/asf/felix/releases/org.osgi.foundation-${PV}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"