gentoo resync : 14.04.2018

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
index 3592c040f889..1f647a1a130c 100644
--- a/dev-java/jupidator/Manifest
+++ b/dev-java/jupidator/Manifest
@@ -1,5 +1,3 @@
 DIST jupidator-0.6.0.tar.bz2 253170 BLAKE2B 0a32df25c2885115ba914ecbcad8d8c426893eace2f8067a3f6c858ae15f3573e9106693694acc9179fe6841e5f3a664a0b1038cbda001dbbee08b475914d29b SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415
-DIST jupidator.0.6.0.tar.bz2 253170 BLAKE2B 0a32df25c2885115ba914ecbcad8d8c426893eace2f8067a3f6c858ae15f3573e9106693694acc9179fe6841e5f3a664a0b1038cbda001dbbee08b475914d29b SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415
-EBUILD jupidator-0.6.0-r1.ebuild 637 BLAKE2B 0d8010de4de296c68e657aa88082e0d82fc8e6b87d7799660c4b3c333a553666223d1f857ca6a3f7ea134ca607e79c6a7561ecbb30249fbe05b8809d66602f1c SHA512 7ff7ee0d3417c6a3c8414d368dd1a5bf98f43b9a9ae2e6f14af614857fd2cb9bdcd313fd439e70087e70ebea5064721c96263e974a3a123d1e915071d17de87b
-EBUILD jupidator-0.6.0.ebuild 1085 BLAKE2B aec262706447ac3f0a21c8e0cedd596266e922e7bff074fa85231ca727d4403eadeac0ecc4713b1d7e832695747c8b7e9aa6de665e21731dc4f7916926a59c8e SHA512 c9768062ea9909206fb52aa8e3ab1b2e65f8e8a54efa06a9317e4ca4bcf4c09fa603ff0dbe230226db492bbf36c37de90fdb8325a7dbd2a9b07623bea1311642
+EBUILD jupidator-0.6.0-r1.ebuild 636 BLAKE2B a4fa93db37d87e123d4b254fe59c24e79a2bf1c0ad6373438d5ddeba6eb39cb6a3ea65d9cfecd912e53797f613693765495cb0d09bb7eeaaf2e3879c021a8da8 SHA512 8da8b551d581f4261d380bd2803d7aeb5a0e7383caa83b821635f8fdc91c24ec6e592d93fb654c834d4454d0fd1ea21abb6fa254dbfd639b0f06364332084861
 MISC metadata.xml 315 BLAKE2B b2b3803bab58cdcc7fe68de765c6a2041b615b741c9252aebf54235a18293325a2da0c16a2292a04266514a10cf54930e9ba7411b6f0ebf385b6b76221eb0675 SHA512 ee74e4fc53d2a94b32fda03601185b2178e7329c1ca4a0560f94d3715b9f8cb8aab34ec1b09a8e388e87844bf4cbed70f36bad166eb2f7ee7420259ceaa95203
diff --git a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
index 523ea542a97b..eecea93a1353 100644
--- a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
+++ b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jupidator/jupidator-0.6.0.ebuild b/dev-java/jupidator/jupidator-0.6.0.ebuild
deleted file mode 100644
index 690f152de270..000000000000
--- a/dev-java/jupidator/jupidator-0.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Jupidator is a library/tool in Java for automatic updating of applications"
-HOMEPAGE="http://www.sourceforge.net/projects/jupidator"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core
-	doc? ( app-text/xmlto )
-	sys-devel/gettext"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	rm -v dist/*.jar || die
-	rm -rv src/java/org/apache/tools/bzip2 || die
-	#Bundled ant classes
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-	chmod +x i18n/make.sh || die
-}
-
-src_compile() {
-	ANT_TASKS="ant-nodeps" eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" compile jar
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dohtml -r dist/doc
-	use source && java-pkg_dosrc src/java/com
-}