EAPI 5 bump wrt bug 543906.

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

6 files changed, 163 insertions, 12 deletions

diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index ebee6e38aedb..43d36fc2d696 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/henplus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.26 2014/08/10 19:59:28 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.27 2015/04/05 21:03:34 monsieurp Exp $
+
+*henplus-0.9.8-r1 (05 Apr 2015)
+
+  05 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +henplus-0.9.8-r1.ebuild:
+  EAPI 5 bump wrt bug 543906.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> henplus-0.9.8.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index 0b33a24518ba..24fa8e3521ff 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -6,13 +6,18 @@ AUX henplus-0.9.7-build.xml.patch 938 SHA256 88e2d5d25ed206245b6139ce70e5c5dba12
 AUX henplus.patch 1331 SHA256 22a377b0a3e8fd38e88d1e3cd7d67c72fa754fc527d37f8f570ddc51f1ab0131 SHA512 1ebe6119d511a8f97cb9b07991ea3326b9a8dfab737bb9976d08dc2d6e20e80268e84dbec02cb8e907f2ca77af0f9283785436a69da1017c4859c0c434601eba WHIRLPOOL 3c31ad4786fe77c385171d0b7351fb36ee702cbefe7b7cb12c13e1294139df8d77d96bff674cc3491482bd9c1b303e06924e9addcbcabb5ed4df68e091a5c5fa
 AUX henplus.pre 1418 SHA256 cfd948b2b124202cc6c30d95ca29ce47c6ec43eae8fc6724e2fcd978a4442784 SHA512 331138630336c9f7a2f7cbf343b6ea77277d4ad77d706497545a6ff33cf44572cbe126acb4f0d212a40f652a24190b629f7776dbca08630de66d6f8ac3fae26a WHIRLPOOL 4a557f4bb8aa9d6f950da6a55612b04a509052134a59161810e30ebf20f1a1c430fd0c87517f24f42cc1c9a11fb24516c20e31e71dd7e921060489e9c6729cfc
 DIST henplus-0.9.8.tar.gz 233035 SHA256 ea7ca363d0503317235e97f66aa0efefe44463d8445e88b304ec0ac1748fe1ff SHA512 a22fc847f4441f627c1fa12f4f365c38d0c8ddfc205758d044e797e83f8d37032995666c2ee3dbb68d0a5f563fa5d574886e85757b1faa0acfc055e92b2fad0b WHIRLPOOL 82236dcde4865049b97d89dc02bbe062e74fbb002bdebd301400fbb84d28a4a196c7bf206fe279c881e47661216c18e5356fe6ff7170f46c6ee1c01cdb61f42e
+EBUILD henplus-0.9.8-r1.ebuild 1149 SHA256 d8f59d235b7cc63c36aeb4dd41b1d25659a6cf08b502af2d66a3362694d9481b SHA512 8a76270bf0da40c8d9d2f8b3e3eeb994b21d99f2b715c943da93a8bc61bed969f5cb1d3c3d8583c4883ee682119375a6ec8611ffd7d38394ff35cd202c2a5be4 WHIRLPOOL 753802bfc0b9d11a66380ef276d9fad5634230704b6b6cc6ab08883cdf296fcaeb7015800ae2e7b8d4f08294c1fc41b0d183777d1dbae6c34fd386c7930dadb6
 EBUILD henplus-0.9.8.ebuild 1141 SHA256 f8ca472fc932c33864934b0d01a0ee92b98e77121406aef0426d606f71638ea1 SHA512 ca04813995bf36e02fa22853d827a65cc5d2de63316dd2a79bd104b0f0dd890d926aa95fc6705605b1204833045691f4bb6a7ea212038a7ec80a295e88d96a0b WHIRLPOOL cf94ea77c43fb4f0f983c8c1612c909a14ca4cb18996ef28512285c2f6faf10e1281721d8c81630c06212cb8359fedfccb868ab5b62b9a4c6a62b290ed289b6f
-MISC ChangeLog 3386 SHA256 8b736c2c19c6d4450cf933827eec6dcc79197ed297dc5631990abb9bd80be87a SHA512 da87176ed4049a8d2a0178ffe17466cf593e178b50fab69897baa27c48b43ec6f5f2022289a1248082a67474291539d37884eff5b2334b561981ef561affffdc WHIRLPOOL e786adb6547246f76c1dc387d2301bb29089d28a993e3b8cc1b21fa02fb24e6a403533290a84bec752df915f9478f997db3ca164913da75eaeb75f8d1644614d
+MISC ChangeLog 3533 SHA256 c97210c778a14b00bd6d21e153b6fd41a8929b9b8b0b19436b99176242580ea2 SHA512 2ab66a6dd919880a30b2e535e360ac73584c767a16e96ff3f54c263aa766c2250979249c9f312f281a7a8e8541c140470e80762d32718fa9d14b78e23e7584ed WHIRLPOOL 443235e42326df041fd88c27535f1e21576f4b7a9dd337c98117953ac6a486c34daadcb49f7897f20e8e1c41fed574b4f79f9059b937e0d0d6e8c5828a64817e
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnzyEACgkQcaHudmEf86pWzACghVi/85V1bl7paMueWqwJxKr6
-4hkAnRJ92JmYOiHFElFItt9W7G9elv8d
-=Vbnz
+iQEcBAEBCAAGBQJVIaMpAAoJEJGRpfGTSRu4ltwIALLWZGRzy8Lp/ro6/gSgCReZ
+dprjlpnmKScF7H9bCiPV/coDkf3O1KtoHlhvPk8y0rZA0w0FlBlRHS9ogWMHkKBs
+HHl60q32mser2aaw7Jj7jDKfAOP+neKlu1oDx1PQtKqNR/bNcSeVJGErbmRkGcVB
+YmR2bGr4dPq5XSpGgo7/vq8Sr2z+UChZl3Dex/GM5UEQb1YmcBV7xbXikKrMFNJN
+3ALdVGcZLUaseovbYZ4wCFA9lYxpLtweSPUQ6QEN99Z/Bzigydd3FbxEjWseB8wy
+mck9rVRyrf0djhOW9C2Uz2WBIdirc20ZZQ98YaK1P6C92/316t8uSaNenf7AJeg=
+=2Ozw
 -----END PGP SIGNATURE-----
diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..58a8131215a5
--- /dev/null
+++ b/dev-db/henplus/henplus-0.9.8-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.8-r1.ebuild,v 1.1 2015/04/05 21:03:34 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support"
+HOMEPAGE="http://henplus.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/commons-cli:1
+	dev-java/libreadline-java:0"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+java_prepare() {
+	epatch "${FILESDIR}/0.9.8-build.xml.patch"
+	rm -v lib/*.jar lib/*/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-cli-1,libreadline-java"
+
+src_install () {
+	java-pkg_dojar "build/${PN}.jar"
+
+	java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
+		--main henplus.HenPlus
+
+	dodoc README || die
+	dohtml doc/HenPlus.html || die
+	
+	use doc && java-pkg_dojavadoc javadoc/api
+	use source && java-pkg_dosrc "src/${PN}"
+}
diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 6037db119226..1ae903031903 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/octopus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.20 2014/08/10 20:01:37 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.21 2015/04/05 21:05:29 monsieurp Exp $
+
+*octopus-3.0.1-r4 (05 Apr 2015)
+
+  05 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +octopus-3.0.1-r4.ebuild:
+  EAPI 5 bump wrt bug 543906.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> octopus-3.0.1-r3.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 82e901189868..c55f8b32433f 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -6,12 +6,17 @@ AUX octopus-jdk-1.5.patch 5528 SHA256 86d3989a5c8641966af58c5e1dda3278816d983834
 DIST octopus-3.0-1.src.tar.gz 25968343 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac SHA512 5591fa2bd8098260c240ed7e7294c7ec1aa4212b14f949c9497496d60a3ea1e6db989ef948c134e984e92ba2cbeecb0b3530ad5e4d0ad687a5e1a5f37d618315 WHIRLPOOL 5b67c458c7f418fa330cd539096438f472c14fdfd666ef5768075d5e1fd3c4d5c55690104b414cfd8609791904af8466a93d7db2cebdfebd903e7fd54becd564
 DIST octopus-xmls-3.0.1.tar.bz2 22492 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095 SHA512 88add21ac12e6b3898ab40db724464153c30ff4bf4826f71c26fa6c2aa53602793b5decc44428d150579bcd433246a64514469cd005f6fc76506194ae4e20e66 WHIRLPOOL 42da61f432da0613816bc4f352d02b5415ede2d9b98f239d0e8591f4e67ddc6b87ed6993127ee1f138bb35ca2922f4747ce2512cca51ba582caccaf2a9fa271a
 EBUILD octopus-3.0.1-r3.ebuild 2010 SHA256 efb0124fb1a029cf9a302acb33ecd13e34a82acbcd933c3a03bc5231d7ef8d55 SHA512 09c77dc1c6b110580415477601f05716c1dcb5d90c4d3e7d605b6837f5c525f2f68784bea3432fc13a81a03243b84e5c554864fe37bd1332cca6f42014e10efd WHIRLPOOL 755308132a55533e34e96dfb49fe46962ae1a478606c2da83d92475eb4e7c0a7c09bc71abc773a97eef6458ef2be92920a91c8aafba920d27681152deaab9e19
-MISC ChangeLog 2947 SHA256 f3b03e62e1f28aa2bf823a4f585a2e26ad7206b800b036d19c392b3859ca8f86 SHA512 d1d25a60feb6994b22b9ef20f5ce3b9243e4c340ec3e069d78dc251b1527cd1e4d2d85f4ac3cd6d3b98a6ce532b0dba5da717b0038e982319bca7058d9bf8ec2 WHIRLPOOL d3db5fc29703b44cab6c611c43c7da8ef10c00d7474d1b8fdc14e3ee5e47b2f92ffd0a08df14a6aa554d36157a56f3225a2f86e622f13d24bef2b0d913ce6075
+EBUILD octopus-3.0.1-r4.ebuild 2055 SHA256 b2b8ecfc16ea00233a10036f39b94abcb25ec622d6f9667b43b0475c6ef3b139 SHA512 1f0accce846c3ad09ed48f13af28211104f99f3290213e259b9474e3d125947b29a871bd5dbdaef6b0939a0bb6d63f0972deb8b19d913d08cddabd54ef0cdc85 WHIRLPOOL b96f6c4df16b2f66802d344178f67bb431848a8d14e3b273aaf9271d254748b0cc86228d679dd7a178b442ddde80d96b3a6e3fc5791fe61604cb050f7e57b0b0
+MISC ChangeLog 3094 SHA256 e0ad09517b711464502cd3c84a21e990344ccff739966a8a648b88ed5c049bd9 SHA512 4743940e3be38df548d92449b098acf266a263afb70f26178553598e1c831ede3fd574e8db8e757eb48963663254c214bceb0ffceba53f1c5bd03f3a162adbfd WHIRLPOOL da01f0c453cd59712fcf37e5330c8d5aacef97570510e77a6827a537be89e058f1c0900f384bdd76bb2f65248293b7c4d58b287926803a117ffadf8a20acb2f7
 MISC metadata.xml 360 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52 SHA512 bf8cd1f8cfd9d6a14364ddf010938eef76bf9c53f4d7f241c86f389896771bda5d889b0ae6c2a75bbb2331dddd078c87ea7c24d97c7bce6b80a8f2ef83ed4734 WHIRLPOOL a6fe2a18109d85e2c25adb98135e5e2835f3d8215e7d5b4d466c1a9eb8acf2d1fe2c4173f0f4df69b3cbc26c6275665624e418c10fefcec8f3bba1594bafee42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnz6IACgkQcaHudmEf86oHzACfaQHalgLd2/2t9sAYGT+EfY/e
-Q4wAn2g8yUjpvbquj0yCfGI0YBr8I5Z1
-=C+YE
+iQEcBAEBCAAGBQJVIaOdAAoJEJGRpfGTSRu426EH/jNoWz8qHTsLIKC1Tmm39oP9
+b7or7mmopCFZc6ZteyftTgOhp+hIkvcIxJepG5vr+AYex35zV2Z52PzXuf/D5PIc
+WYh4xokDSY4CJatwgKdeTn/x+7UriBsWT6Rr1CZ4yNmGZr9dIqcVR/Tezuspiqn/
+7UuWGq1+F0Yuqt9wrN8fhYC9ppsOByrb4lh80BWEylNkxh4MZU07y+bB6GiRP69k
+ha5cscuA7g2iIemGp1DJayWzwTQX8nYx0vESr2nwPuR27cmCuYf8yQ/EM/wa0SBa
+4G/GkIdK2LxCjpvGCYWLKFiNldpxPFzy3yMB5j9CfCYmEkaT5Fen0EVkr3nK8M8=
+=72rA
 -----END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1-r4.ebuild b/dev-db/octopus/octopus-3.0.1-r4.ebuild
new file mode 100644
index 000000000000..d083452edf5e
--- /dev/null
+++ b/dev-db/octopus/octopus-3.0.1-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r4.ebuild,v 1.1 2015/04/05 21:05:29 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV//./-}
+MY_PV=${MY_PV/-/.}
+DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
+	mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
+HOMEPAGE="http://octopus.objectweb.org"
+LICENSE="LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+COMMON_DEP="
+	>=dev-java/xerces-2.7
+	>=dev-java/log4j-1.2.8
+	=dev-java/rhino-1.6*
+	=dev-java/junit-3.8*
+	>=dev-java/ant-core-1.4"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+TOPDIR="${PN}-$(get_version_component_range 1-2)"
+S=${WORKDIR}/${TOPDIR}/Octopus-src
+
+java_prepare() {
+	rm -fr ${TOPDIR}/maven || die
+	mv "${WORKDIR}/xmls" "${S}/modules/Octopus" || die
+	cd "${S}"/modules || die
+
+	cp "${FILESDIR}/${P}-gentoo-build.xml" build.xml || die
+	java-ant_rewrite-classpath build.xml
+	java-pkg_filter-compiler jikes
+	java-ant_rewrite-bootclasspath 1.5
+
+	epatch "${FILESDIR}/${PN}-jdk-1.5.patch"
+}
+
+EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
+
+src_compile() {
+	cd "${S}/modules" || die
+
+	use source && antflags="${antflags} sourcezip-all"
+
+	eant jar-all $(use_doc docs-all) ${antflags}
+}
+
+RESTRICT="test"
+
+# Would need maven to work properly as the build.xml just launches maven
+#src_test() {
+#	eant test
+#}
+
+src_install() {
+	dodoc ChangeLog.txt ReleaseNotes.txt
+
+	cd "${S}/modules" || die
+	java-pkg_dojar dist/*.jar
+
+	if use source; then
+		dodir /usr/share/doc/${PF}/source
+		cp dist/*-src.zip "${D}usr/share/doc/${PF}/source"
+	fi
+
+	if use doc; then
+		docinto html/api
+		# Has multiple javadoc subdirs here
+		java-pkg_dohtml -r docs/*
+	fi
+}