gentoo resync : 14.04.2018

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
index d5331538922a..ddf018312acb 100644
--- a/dev-java/jung/Manifest
+++ b/dev-java/jung/Manifest
@@ -1,5 +1,4 @@
 AUX jung-1.7.6-build.xml.patch 714 BLAKE2B 593d710468ffa969e709936892a47686218ab32e9afe4ae2dd5b89253042561ccd486c758748db54d7a4b25eb564f618c4e78f40a40fce51b090baa1f6876e70 SHA512 d9e8548ed4b0271a88aa827dd94a49a95fda7e22e78dfe0e0490ef7c9e161c86d7289f5f3382d4bfcdfa95daf84582143ee6d1cfe7946114c9fb35d2fea17c4e
 DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
-EBUILD jung-1.7.6-r1.ebuild 661 BLAKE2B ce7752ba2806d026817867bd0218d6836f9ed39df84aa7c05ef8487c2b3b5f42f27855934d9c1f16206703ab7700084f58fa32d74bc402ca2045bcbb530eb8bc SHA512 001ea4d1793b91c4b5ef2343811708fb916fa07e380792c88c4e52982ea8d8d8cd41c5623baad54c176e1013bc7bf5946429be0cf40913452d129b9758ac9c70
-EBUILD jung-1.7.6.ebuild 1081 BLAKE2B 0b6c30f03b071fc215f84de8bdef3bea14b23395d93155d0c9fa45c6953e6f9f5d35d72c047769ac3c416063e807a9525261660ea44d02c4d0813a03611dd7ef SHA512 ff85c9c612b716df1913a6bbf9525fe5d0bca1202fc67e76382d7fde0cc4c597fc70eb800c63157288d848c44275fcc9af2db1e7ce36883200df5a8307d222cc
+EBUILD jung-1.7.6-r1.ebuild 660 BLAKE2B 782c19117a4c1d230c7bf2b9dd0fc884cfa4b25bc1ce452782fd3140b3aefe7a623bbbba6533db43baf9027dab450cf85b3855591c93ef7a3ee0e9b3356f175c SHA512 f5676eaa00faba26d7e9f1dd9227bb9f5798753cc55d1e322e64c0a88ffd284bdb6aafbd5dfa5321060813552056074838480b8fed1a890baae5877d4dc0eb2e
 MISC metadata.xml 532 BLAKE2B 3f7a781a447b885d31f1a33b8e6030dcb56e4be649b6a1716ef4bba3ee2047caa037dae275c9781f6a90b5d242482eb32dcf35353be8ee7098abec46f9195c41 SHA512 2662c5bedc6f2e200bbcca0af62dfa46063e01759e4abd5ffdaa908abe82f20f875c3fbd3e83134616997d67f8989e059810847ee5951cb0c2b296bb127f3c14
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
index e34b3e5d87e0..529a37e622f1 100644
--- a/dev-java/jung/jung-1.7.6-r1.ebuild
+++ b/dev-java/jung/jung-1.7.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jung/jung-1.7.6.ebuild b/dev-java/jung/jung-1.7.6.ebuild
deleted file mode 100644
index bbe81f6a7456..000000000000
--- a/dev-java/jung/jung-1.7.6.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Java Universal Network/Graph Framework"
-HOMEPAGE="http://jung.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/colt:0
-	dev-java/commons-collections"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/junit:0
-	app-arch/unzip
-	${COMMON_DEP}"
-
-PATCHES=( "${FILESDIR}/${P}-build.xml.patch" )
-
-S="${WORKDIR}/src"
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-	rm -R doc/*
-	find "${WORKDIR}" -iname '*.jar' -delete
-	find "${WORKDIR}" -iname '*.class' -delete
-	java-pkg_jar-from --into ../lib colt
-	java-pkg_jar-from --into ../lib commons-collections
-	java-pkg_jar-from --build-only --into ../lib junit
-}
-
-src_compile() {
-	eant -Djardir="../lib" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc edu
-}