gentoo resync : 22.05.2021

5 files changed, 8 insertions, 262 deletions

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 90a3aa24f546..631ada4b1358 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,8 +1,5 @@
-AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
-DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
-EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r2.ebuild 862 BLAKE2B 9ff56c92543733c389227c44b32b219cc84374e96dbd1aacabe123de5d9c940862cc93e0f9822312112e93b585c10fa0905e2a5adbd8076a818e39e295f9e89b SHA512 13e3ab9d0223f7b9448e0c125d29422652b4d6298d1d4b002b1cf66a3a11e480478e03d16fed59650b97b61438a425f2e6b87e5a4eb4601e5a23daada78ee128
-EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
+EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
+EBUILD jaxen-1.2.0-r1.ebuild 1913 BLAKE2B b25661c32fe81cfbbedc1cec06a8473c107c8b4e7b854df1d725e97b6211b34bdba4663398d155ce2d5549cba144f4ceddcc4e11d10f0afed2a4ba076f2c046a SHA512 91b9f4fbd7a2f80b6125cceaedb67097f122613143314f81e0b291717241fec783c230067aab717cd7b6ec124cd4a07dc4adf45d9ffe50ac5acbb53e5a7829f9
 MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
deleted file mode 100644
index efbdd2074bb2..000000000000
--- a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.1.4
-  on date October 14 2012, time 0755-->
-<project default="jar" name="jaxen" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties"></property>
-  <property file="${user.home}/build.properties"></property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${user.home}/.maven/repository"></property>
-  <property name="classesdir" value="${basedir}/target/classes"></property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
-  <property name="testreportdir" value="${basedir}/target/test-reports"></property>
-  <property name="distdir" value="${basedir}/dist"></property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
-  <property name="final.name" value="jaxen-1.1.4"></property>
-  <property name="proxy.host" value=""></property>
-  <property name="proxy.port" value=""></property>
-  <property name="proxy.username" value=""></property>
-  <property name="proxy.password" value=""></property>
-  <path id="build.classpath">
-    <pathelement location="${libdir}/dom4j/jars/dom4j-1.6.1.jar"></pathelement>
-    <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar"></pathelement>
-    <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar"></pathelement>
-    <pathelement location="${libdir}/xerces/jars/xercesImpl-2.6.2.jar"></pathelement>
-    <pathelement location="${libdir}/xom/jars/xom-1.0.jar"></pathelement>
-    <pathelement location="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></pathelement>
-    <pathelement location="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></pathelement>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-    <available property="Junit.present" classname="junit.framework.Test"></available>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host"></isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
-        </not>
-      </and>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
-    <mkdir dir="${classesdir}"></mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/java/main"></pathelement>
-      </src>
-      <classpath refid="build.classpath"></classpath>
-    </javac>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}"></delete>
-    <delete dir="${distdir}"></delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures."></fail>
-  </target>
-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
-    <mkdir dir="${testreportdir}"></mkdir>
-    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value="."></sysproperty>
-      <formatter type="xml"></formatter>
-      <formatter usefile="false" type="plain"></formatter>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${testclassesdir}"></pathelement>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/java/test">
-          <include name="**/*Test.java"></include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
-    <mkdir dir="${testclassesdir}"></mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/java/test"></pathelement>
-      </src>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="2001-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  Codehaus. All Rights Reserved."></property>
-    <property name="title" value="jaxen 1.1.4 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java/main" packagenames="org.jaxen.*">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
-    <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
-    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/dom4j/jars/dom4j-1.6.1.jar"></get>
-    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//dom4j/jars/dom4j-1.6.1.jar"></get>
-  </target>
-  <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
-    <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}"></get>
-  </target>
-  <target name="get-dep-jdom.jar" description="o Download the dependency : jdom.jar" unless="jdom.jar" depends="init,setProxy,noProxy,get-custom-dep-jdom.jar">
-    <mkdir dir="${libdir}/jdom/jars/"></mkdir>
-    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/jdom/jars/jdom-1.0.jar"></get>
-    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//jdom/jars/jdom-1.0.jar"></get>
-  </target>
-  <target name="get-custom-dep-jdom.jar" if="jdom.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/jdom/jars/"></mkdir>
-    <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${jdom.jar}"></get>
-  </target>
-  <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
-    <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
-    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xml-apis/jars/xml-apis-1.3.02.jar"></get>
-    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xml-apis/jars/xml-apis-1.3.02.jar"></get>
-  </target>
-  <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
-    <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}"></get>
-  </target>
-  <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar">
-    <mkdir dir="${libdir}/xerces/jars/"></mkdir>
-    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xerces/jars/xercesImpl-2.6.2.jar"></get>
-    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xerces/jars/xercesImpl-2.6.2.jar"></get>
-  </target>
-  <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/xerces/jars/"></mkdir>
-    <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}"></get>
-  </target>
-  <target name="get-dep-xom.jar" description="o Download the dependency : xom.jar" unless="xom.jar" depends="init,setProxy,noProxy,get-custom-dep-xom.jar">
-    <mkdir dir="${libdir}/xom/jars/"></mkdir>
-    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xom/jars/xom-1.0.jar"></get>
-    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xom/jars/xom-1.0.jar"></get>
-  </target>
-  <target name="get-custom-dep-xom.jar" if="xom.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/xom/jars/"></mkdir>
-    <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${xom.jar}"></get>
-  </target>
-  <target name="get-dep-maven-cobertura-plugin.jar" description="o Download the dependency : maven-cobertura-plugin.jar" unless="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-cobertura-plugin.jar">
-    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
-    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
-    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
-  </target>
-  <target name="get-custom-dep-maven-cobertura-plugin.jar" if="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
-    <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="${maven-cobertura-plugin.jar}"></get>
-  </target>
-  <target name="get-dep-maven-findbugs-plugin.jar" description="o Download the dependency : maven-findbugs-plugin.jar" unless="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-findbugs-plugin.jar">
-    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
-    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
-    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
-  </target>
-  <target name="get-custom-dep-maven-findbugs-plugin.jar" if="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
-    <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="${maven-findbugs-plugin.jar}"></get>
-  </target>
-  <target name="get-deps" unless="noget"></target>
-  <target name="setProxy" if="useProxy" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
-    <echo>Proxy used :</echo>
-    <echo>Proxy host [${proxy.host}]</echo>
-    <echo>Proxy port [${proxy.port}]</echo>
-    <echo>Proxy user [${proxy.username}]</echo>
-    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
-  </target>
-  <target name="noProxy" unless="useProxy" depends="init">
-    <echo>Proxy not used.</echo>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
-  </target>
-</project>
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
deleted file mode 100644
index 8968d7a7d6f0..000000000000
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xom:0
-	dev-java/jdom:0
-	dev-java/dom4j:1"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.4"
-
-DEPEND="
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )
-	>=virtual/jdk-1.4"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
-EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar"
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use examples && java-pkg_doexamples src/java/samples
-	use source && java-pkg_dosrc src/java/main/*
-}
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 90a7eed0092f..be43e2578b5a 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	${CDEPEND}
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 3722e883f75b..211abc53f20a 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
@@ -47,13 +47,13 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}"
+S="${WORKDIR}/${P}"
 
-DOCS=( "${P}"/{LICENSE.txt,README.md} )
+DOCS=( "${S}"/{LICENSE.txt,README.md} )
 
-JAVA_SRC_DIR="${P}/src/java/main"
+JAVA_SRC_DIR="src/java/main"
 
-JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_SRC_DIR="src/java/test"
 JAVA_TEST_GENTOO_CLASSPATH="junit"
 
 src_prepare() {