dev-java/guice: Version bump. Fixes bug 556934.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

2 files changed, 77 insertions, 0 deletions

diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4599a87be264..b826a07e3a6e 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1,3 @@
+DIST 4.0.zip 23619064 SHA256 162f10637cd76d34b1bdcccff7f721424928ecdf1e15dc04270f0fa6a5f8953c SHA512 db4021518a7868fa3387686a701fa5e464b92f69f6a2e4a6a8d85c13b665da22c1cacfdb36caa0de484ad03321280fde9ad5ec9725c66c6bb455575b03915344 WHIRLPOOL 36d426f4a604b8dd0c51b42df4e6e5acd8e05391c1acf4cb90731331a8e1126d09e14c0264b6854fac14632ed11bcc45bad0f0fafc076023488f0684b7a6c55f
 DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
 DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
new file mode 100644
index 000000000000..56820e09da16
--- /dev/null
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="https://github.com/google/guice/"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/aopalliance:1
+	dev-java/asm:4
+	dev-java/guava:18
+	>=dev-java/cglib-3.1:3
+	>=dev-java/jarjar-1.4:1
+	dev-java/javax-inject:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+RESTRICT="test"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+	asm-4
+	cglib-3
+	guava-18
+	javax-inject
+	aopalliance-1
+"
+
+java_prepare() {
+	# Where could we get this FREAKIN jar?
+	cp ./lib/build/bnd-0.0.384.jar "${T}" || die
+
+	find . -name '*.jar' -exec rm -v {} + || die
+	find . -name '*.class' -exec rm -v {} + || die
+
+	cp "${T}"/*.jar ./lib/build/ || die
+
+	java-pkg_jar-from --into lib cglib-3 cglib.jar cglib-3.1.jar
+	java-pkg_jar-from --into lib/build cglib-3 cglib.jar cglib-3.1.jar
+
+	java-pkg_jar-from --into lib asm-4
+	java-pkg_jar-from --into lib/build asm-4
+	java-pkg_jar-from --into lib/build asm-4 asm.jar asm-5.0.3.jar
+
+	java-pkg_jar-from --into lib guava-18
+	java-pkg_jar-from --into lib javax-inject
+	java-pkg_jar-from --into lib aopalliance-1
+}
+
+src_compile() {
+	ANT_TASKS="jarjar-1" \
+		java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar build/dist/"${PN}"-snapshot.jar "${PN}".jar
+	use source && java-pkg_dosrc core/src/com
+}