SLOT bump wrt bug 546288.

Signed-off-by: monsieurp@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 123 insertions, 9 deletions

diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog
index 8be54c696e3f..5ccd19612954 100644
--- a/dev-java/guice/ChangeLog
+++ b/dev-java/guice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/guice
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.3 2014/08/10 20:13:56 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.4 2015/04/11 22:25:47 monsieurp Exp $
+
+*guice-3.0-r1 (11 Apr 2015)
+*guice-2.0-r1 (11 Apr 2015)
+
+  11 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +guice-2.0-r1.ebuild,
+  +guice-3.0-r1.ebuild, guice-2.0.ebuild:
+  SLOT bump wrt bug 546288.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> guice-3.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 3f50b1522286..935668da8f9d 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -7,14 +7,20 @@ AUX 3.0-build.xml.patch 2486 SHA256 9d9cc3f7bb73992a83c13b05b2c774a0c7dc8b280b5c
 AUX 3.0-common.xml.patch 1562 SHA256 39b1cc3190d17232d3064bdf47c411eb861f7a5c199bb1c00acf648d9031c681 SHA512 2c2d332781d2c464f7f2a2cc2e5f0009a4ab0cd6f58d12867de68a4ec8a0d410de156156495cc30680140ec4e80d59e27c84b01ac07b1b54cb31ed47b8912719 WHIRLPOOL 35a94dd7cc0041960914c1e6fad6407054b801aa910dd70804b4a401aa60e5d09902d261a922b62126f9ee3eb07bd2a5e8f043108f8d5aff9afd3d0fe302f0cc
 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
-EBUILD guice-2.0.ebuild 1284 SHA256 ceeadcb5221e0c5f593a11f98666c54bec4ebd520949337947c7df28650f7ecd SHA512 2b12d2e60b252ee57973e12f60eba185ab0ab75e135f562376d6eb5821cff52a9319e5331c0691dae16e210f90d4f841bfe2473ee1bd569c6ac9c861b4daf063 WHIRLPOOL 6b6f59aecb139b41ed9d7b7fe3877f5d838f275aa26a730bebd72a2e727acc71357b3e2ee5e1d6dbd044c58a726058ec05435be3c8d5194374abf33166d16bbe
+EBUILD guice-2.0-r1.ebuild 1287 SHA256 c264472d734f4789c92463cdf23e0bcc8ce24087eb8b33cbd43634f07734e8d4 SHA512 03df572cae5ace2d911aa3881cd7dbd2aa743619aef921edd3111cfb5b484bf53d96354cfdfa1e27cbbd15a41368c46a4bffdb95a3c65265c32f63aee33fe20d WHIRLPOOL e1731c9261cdfee92b50570885b9964cab023dadd8ab621b9c103780e360deb5edd71ca1492917ffebe47c7f1c74b52a8609698dc04fa4aa3a08febe27c15763
+EBUILD guice-2.0.ebuild 1288 SHA256 1066331bb8c089cfd90d6581af60fc88a71d0dbe19829d54d854ddba558719fe SHA512 8f06187cb9f6040f7fe553d17d237f5d7e26c12aa63eaef7249f874497862a2517807e7a85e0d0f8253d3c96c4bd8a79ad7d0c9dc5fd77fc5032238c2a3dbfa1 WHIRLPOOL b713268a2105df0b4a4e6c89a740102e1c03e3ac5bb79e7632c43d4c59bcb47974ac1eed854acb298bede4955f428fa606f87bc425290241380208550bf7aa12
+EBUILD guice-3.0-r1.ebuild 1243 SHA256 5d3582f952cbe4d3bb26c8db7f0fc4ce800f06d18b85f8b82fd4893032837a07 SHA512 72bf32fb9e7d79d67b47334e55b737c0f3d3109626f9a44531207b00444217499f21f00bd846c1359f59c0219484d405a450c9ff8fb7f53086666fb4746afba4 WHIRLPOOL 5b8157e32203f98b139a58f67498dd984fc42aee4b176afd52a5e703215910d16ff3d76fb3d53cbcd5350e562439929ac85da592c068f1a090838f11fed648e2
 EBUILD guice-3.0.ebuild 1241 SHA256 42c00f10ff32972966380b315cc93ebb520a84dee9d7ff69b6aab3d2202d386f SHA512 cd10203dabdc243d2546ac6fe6f3ccc063fab706799c9c292cf0a01a2289f7174d33d6902ab528656222beb4fc064276313392e63379670c2177317f3b91423d WHIRLPOOL 32e5cb82c61330a19da304afd42a5fa06fdfae77660649efc8b8473bdd4d8d7c9b6534d4247321fc2e68439c0feb15da9148706220ddf5ba7fc6f93dd5a56159
-MISC ChangeLog 779 SHA256 90e3c42c5dd1ddea07480c8ef868e5a04f81bc39b1daba04a9ee6cb7e94c0086 SHA512 c9840ef687366771ad16a9cbcec5714999923c6bd052af197ef74d24ec48f33fadc9b09f7887950b594dcbb48527b99fc27e8ef52606f8cb8120da881c14fe99 WHIRLPOOL c1ac8101527b6e3d40497c470fe7af701728a0227f2b1aa53d0c422595bcba52a46ea7e5f3d2ce7e9b298c2aa32b8c328e6487684ab8a38addbeba81d405860f
+MISC ChangeLog 986 SHA256 8dfcd25f5753d71a20f89e23658a406777229458f3a4405901b01e910012f5e9 SHA512 f125a596a173653566b07db9c65e742203c46d6580b4c59048b04c8f5dd6d9becdc82d35e8384dcfa978dbdcb37d9ff6915a06cf5406fc2e8173e029720a7232 WHIRLPOOL 0e296bc3a86335898384ceb7cd65bbc8edf5b07edb8e7d2fb584d246a0c7834e036a9b19c4e5300d0a73bdcad1f4c9f1a96f54058b8408709370cda30d9ce184
 MISC metadata.xml 241 SHA256 06abd52331abac969df4f818ffe7047e0cc3fdfc1a243cec03e53b5a665cfdb1 SHA512 2aab29c42487d867d041d8753ad7fa8261f418a14aa8981c169955c6ccca991e1fd5b7c83a451fb1dc724c5a94ac28a552fff7eb9a78ea5988a1916a1803246f WHIRLPOOL c53ad30024ef34350c7759715758ec6b8296d5dcbd322724c0e0c3ee5a3a6f4fbfddd7d2d605bd08d605103c56e05e7e9038e12074a623631d2c542898581850
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0oUACgkQcaHudmEf86pzIgCcCo6eMLedBK+lLw3Fngae0rnm
-cMcAn1j7s7cgN+dR26Kdr44YkUg+/ahj
-=w4OO
+iQEcBAEBCAAGBQJVKZ9uAAoJEJGRpfGTSRu4PuwH/2y2erxy7RGS+hxebA2Snn2/
+lbwnF7ILsUCASJWiURtAoqJnFntzL/Pvm0vaD+RDAxA92xkrz+ufkOWGLOPc0rat
+DrBoFJPetKKE6dpfmqMdQ4CgNKyvMk2rLinJpQyjERbhbnrHrjEPROopDFUK8F1+
++KThKLMpLQyI9mKH2AZl3MqnDL7ITlbiZdu+qFcUP8f+RJSxvEkFgTK0Xku28RUd
+JRkz1ZyPuahhE9RxkTQs2eQgHfLwN40dhAeP5w6FdtI8xxDtmg7BLS4Tsc80Isdz
+yvb2OhtXwZ8XIvy/MLb1tF4h+3KO3ufkrINC6zAOKeX8wkEOfj+oAMt05GFOk0M=
+=Vrvw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/guice/guice-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild
new file mode 100644
index 000000000000..6ce1b8243fa2
--- /dev/null
+++ b/dev-java/guice/guice-2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0-r1.ebuild,v 1.1 2015/04/11 22:25:47 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/asm:3
+	dev-java/cglib:3"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="test"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3"
+
+java_prepare() {
+	find . -name '*.jar' -delete || die
+	find . -name '*.class' -delete || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/guice/guice-2.0.ebuild b/dev-java/guice/guice-2.0.ebuild
index b970dd36e977..26bd7df87cee 100644
--- a/dev-java/guice/guice-2.0.ebuild
+++ b/dev-java/guice/guice-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0.ebuild,v 1.1 2013/09/25 17:20:14 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0.ebuild,v 1.2 2015/04/11 22:25:46 monsieurp Exp $
 
 EAPI="5"
 
diff --git a/dev-java/guice/guice-3.0-r1.ebuild b/dev-java/guice/guice-3.0-r1.ebuild
new file mode 100644
index 000000000000..87be890f705f
--- /dev/null
+++ b/dev-java/guice/guice-3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-3.0-r1.ebuild,v 1.1 2015/04/11 22:25:47 monsieurp Exp $
+
+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="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/javax-inject:0
+	dev-java/asm:3
+	dev-java/cglib:3"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}-src/"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3,javax-inject"
+
+java_prepare() {
+	find . -name '*.jar' -exec rm -v {} + || die
+	find . -name '*.class' -exec rm -v {} + || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use source && java-pkg_dosrc core/src/com
+}