gentoo resync : 14.07.2018

6 files changed, 221 insertions, 0 deletions

diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
new file mode 100644
index 000000000000..00285e885c33
--- /dev/null
+++ b/dev-java/jdom/Manifest
@@ -0,0 +1,8 @@
+AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
+DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
+DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
+DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
+EBUILD jdom-1.0-r4.ebuild 1365 BLAKE2B 362d41c64040b187d6245444f30e73e06b7a0f959fe5d9aaa6cf2a44bf443a3ea1a32a29b0d73e332dfdf924a551232d3bd587968d4c0166ba3f15fca5e407c9 SHA512 abcf550b34518e4c4873b4ef5a90682a7ecece474ffe5cdd02c14176169e27a913b43171eb606c9f25ceaf107e165d0987341664beca4da5443e40516ab68bc5
+EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
+EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
+MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
new file mode 100644
index 000000000000..2e3cb94ef1d2
--- /dev/null
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2015-02-15 02:58:04.000000000 +0000
++++ build.xml	2015-08-27 23:11:09.807800249 +0100
+@@ -267,7 +267,7 @@
+ 		</javac>

+ 	</target>

+ 	

+-	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"

++	<target name="compile" depends="compile.core, compile.contrib, compile.samples"

+ 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />

+ 

+ 	<!-- =================================================================== -->

+@@ -296,7 +296,7 @@
+ 	<!-- =================================================================== -->

+ 	<!-- Creates the jars                                           -->

+ 	<!-- =================================================================== -->

+-	<target name="jars" depends="compile, javadoc"

++	<target name="jars" depends="compile"

+ 	    description="Builds the Jars">

+ 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>

+ 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>

+@@ -320,6 +320,7 @@
+ 			<fileset dir="${contrib.build}" includes="**/*" />

+ 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

+ 		</jar>

++<!--

+ 		<jar jarfile="${package}/${jarbase}-junit.jar" >

+ 			<fileset dir="${junit.build}" includes="**/*" />

+ 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />

+@@ -332,6 +333,7 @@
+ 			<fileset dir="${contrib.src}" includes="**/*" />

+ 		</jar>

+ 	    	    

++-->

+ 	</target>

+ 	

+ 	<target name="androidtests" depends="jars">

diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
new file mode 100644
index 000000000000..124849d18db7
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+PDEPEND="~dev-java/jdom-jaxen-${PV}"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	cd "${S}"/lib
+	java-pkg_jar-from saxpath,xerces-2
+}
+
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
new file mode 100644
index 000000000000..50b12a26e0cf
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	java-pkg_clean
+
+	rm -r build/apidocs || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	sed -i -e 's|${name}-${version.impl}|${name}|g' \
+		-e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
+		-e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
+		"${S}"/build.xml || die
+
+	if ! use doc; then
+		sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
+			"${S}"/build.xml || die
+	fi
+}
+
+EANT_BUILD_TARGET="package"
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
new file mode 100644
index 000000000000..d93a466620b3
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="JDOM-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/xalan:0
+	dev-java/jaxen:1.1
+	dev-java/iso-relax:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="junit"
+EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/build-xml-2.patch"
+)
+
+java_prepare() {
+	java-pkg_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Remove Android stuff to avoid junit RDEPEND.
+	rm -vr contrib/src/java/org/jdom2/contrib/android || die
+}
+
+src_install() {
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
+	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
+
+	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc {contrib,core}/src/java/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
new file mode 100644
index 000000000000..ea64c2542284
--- /dev/null
+++ b/dev-java/jdom/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hunterhacker/jdom</remote-id>
+	</upstream>
+</pkgmetadata>