EAPI 5 bump. Fix tests. Bump servlet-api SLOT.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 86 insertions, 11 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 762addc53b8c..c210a8f06f7d 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/avalon-logkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.99 2014/08/10 20:08:27 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.100 2015/08/01 20:05:43 monsieurp Exp $
+
+*avalon-logkit-2.1-r7 (01 Aug 2015)
+
+  01 Aug 2015; Patrice Clement <monsieurp@gentoo.org>
+  +avalon-logkit-2.1-r7.ebuild, avalon-logkit-2.1-r6.ebuild:
+  EAPI 5 bump. Fix tests. Bump servlet-api SLOT.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   avalon-logkit-1.2.2-r1.ebuild:
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index f6b9a9b982a8..0d466e9252fb 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -8,13 +8,18 @@ DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c
 DIST logkit-1.2.2-src.tar.gz 113180 SHA256 2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8 SHA512 a2a027e70a2432d07ef44d229edde57b1fe7a89ee9db2cd85c5609b180d704e28273f7ddbe55b7086260bc4be2c0ac56b1e23f405b785068678a50a8159a5333 WHIRLPOOL 2f5eebe87fd6dddce535360c44bb62e0ff90f2eead5a162dea748d7ee712faf2385b16ab0b719cd1537cada0436a9217f093e48de1a50767680d1230eff301f9
 EBUILD avalon-logkit-1.2.2-r1.ebuild 2732 SHA256 cbca5df9d9547ec73b0f7a6235e85e8b5b929a1bd6ccfb89fd8882506205e719 SHA512 bc4bcbcec7fda68fe6a847bd65d0b23e61a69686ace3df5ab895e07590b19fa2882489fa29148c70be6dbfce4c7751a33fb523cef1578df4be1891c06a804038 WHIRLPOOL 5fb2e170a005df0ebacaad104d4d5308e30fdbe10236f54cba1e852b609538fb8b84743fda6c257981838242358c88e959ed7c2ed1529f226de8cdbc5b2faf50
 EBUILD avalon-logkit-2.1-r5.ebuild 1522 SHA256 962d56e7402bf27ea270d2677b274f791264af82d88314df7e16afe97231972c SHA512 7cc614d93f46153603b96f4cd02288b99ff0e61b910e2ae552979fc39cfb826c86f0d09643499cafea6bc0b01a86a8fa8891783a54837b669a23865499cf84c5 WHIRLPOOL 8eb01ecf290e5be1dd96063d43ae046be5b27ce629f7de4fbd5b659d8f3ed2bfb44689c21d6d33923cc0677b58df88ae7207c5e63805765aea1d2a7be858d3d5
-EBUILD avalon-logkit-2.1-r6.ebuild 1385 SHA256 5f5d190046f6cc27a49af7c54d176a8e4e2cbd17bf8f3e386058f0cae45906c5 SHA512 eaee400f77a9665f81c04c48b39f447f282a36a346be9fbc943683e5cb7f867e711a8dd5fcbe982cdd7bd810ab82dc42d3212353045ed556d244e88bd38e4975 WHIRLPOOL 7d893af924de8642ff0d31c60ab85e3d4fa5aa9a37a7f642388885acfc10c621c0113719a22bde58c12a0e2b34226fd18d94ed48bec8e999fef0b1cee5838c9f
-MISC ChangeLog 13559 SHA256 43e2247c2de8e1cf939546501e83e93ffdccb39ded55ee599c411e89f14a5360 SHA512 d9dbe791eb7609b184518c045ed7224d9baf8c3809b3f7835853d2dc6f5c4e160b5b016ba2f8b57cce247488eb38d2ca82cc56b246736c6d133b939c5e653a42 WHIRLPOOL 7a9d8d1f25d57218a7a1194a1f31a993670359b3815c468658934d2f2643b9b0d02fc1627260e378b61a9b6b7269832b07381f833ddde5845a917eec5c43b247
+EBUILD avalon-logkit-2.1-r6.ebuild 1395 SHA256 4d1354f50608dd193cfbaac94a55ced5e954fc9fefdc328b82ffbdebf5f2672d SHA512 4dc5d75c99f00396b7936d135be31aa67073f4f640c4d4d9a6b2c917076e4238398e8806c0d7953e3384331cd45bf644a1481b9c3f0c3704e6af104a6ef66c04 WHIRLPOOL 04a324804b36c5effc1c07a92c39470193ee4bb7d99bb909bdfb2cee23247825bc5f2a002804b79dc126a260c9c0f2711588323bff1cb6130b6141bad0044f0e
+EBUILD avalon-logkit-2.1-r7.ebuild 1507 SHA256 45e0fdcd8fc7319befd5a0cb06c87b41d67b381ca9590fecedca53aad3784e4c SHA512 76e735635c21e73a4300adcdb743eb82064b515a776e55a48139da04c811fba3fc787a7dd276a536f1a438b79614e2f8740c15792f7c4b7288e4e661dca1299d WHIRLPOOL 38b11b89c865f8734e116fc730d5e5d3e61ac61254447961168db67764a7eab506824864bebcdd2da9a0347bb3228233250c5bd8482f5c21d8ed94eb8bcc7119
+MISC ChangeLog 13765 SHA256 0abef77211463942eddd1019a712bd5e7446b6480bdb6694870aef7e939c6c06 SHA512 3274203c626fda16e3f20ca4b256c5860fc597e88cfdb11c323b8e8a032e32d880072f81b15161a2461611e0007fcdf1de0e3b27740f048eec54e589bcaf9b95 WHIRLPOOL 4b3b02adff9c682b5cd3bc8dda195940dcb5d0c33f56e822dc47d3189529f8fdf504cec80f37961d1ff1941a30ce9cbd67b33a33aa3637a04db5cbeb8062d5f7
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0TsACgkQcaHudmEf86r1mACfVzgmt2+rsEsNxN7zg33y0RvV
-IQMAn3A65zpTZOuliRhfi5H4Ckwrwlok
-=mzdd
+iQEcBAEBCAAGBQJVvTTQAAoJEJGRpfGTSRu4KEgH/1qNHmwY6Co0lE6DndKEgXDq
+oAEDNOQ81h6znvROD0XD3R7USdxo+KE8AWl3XXMifyUL3T7iYUh5MVWVeFAXjmy4
+KYmu9jOc3fMo6QbvSn+TnQNZts2TOnJKgEgKLGwjlm9wfpxm06kXr9UofHjrv6+7
+UvlHEv6FtkvxcuEYqwzmrzzsjcdzY6/5+AGDN9QCg0xszuLU9wNdSkmbsw6ApeuD
+z+iYgI0plivpf68VwCnSQeaiquNRZFkqFNKSAB8hYGqguKVz+uYrf+4cJMlNrz97
+hI4ZVoz0yW7LqRAVhMg9xNSGztEa78cLSZZdm5hQYnAwuEIZ2lG+BZ8lgJwvii4=
+=VJ3m
 -----END PGP SIGNATURE-----
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
index 4d5e87173ef6..75cb90a70c7d 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 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/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.2 2015/08/01 20:05:43 monsieurp Exp $
 
 EAPI=4
 
@@ -21,12 +21,14 @@ COMMON_DEP="
 	dev-java/log4j:0
 	java-virtuals/jms:0
 	java-virtuals/javamail:0
-	java-virtuals/servlet-api:2.5"
+	java-virtuals/servlet-api:3.0"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
+	test? (
+		dev-java/ant-junit:0
+	)"
 
 java_prepare() {
 	# Doesn't like 1.6 / 1.7 changes to JDBC
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
new file mode 100644
index 000000000000..81ff0706d154
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild,v 1.1 2015/08/01 20:05:43 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+# NB: this project is dead and we should look into removing it from the tree.
+# Take a look at the homepage.
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+CDEPEND="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+java_prepare() {
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	epatch "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite \
+		-f build.xml \
+		-c -e available \
+		-a classpathref \
+		-v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}