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

3 files changed, 27 insertions, 12 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
 }