3 files changed, 2 insertions, 43 deletions
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index 7d9c5e58e8c7..39a6c3c71c95 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,5 +1,4 @@
 AUX 1.3.17-build.xml.patch 402 BLAKE2B 797df1a932f241974926602d2f1d7c88fcfc7c5e413fc9327ea331d5242fa13a8a3b8f57cd9952f537c206f3363de7e623745ede5134746b379f6767bfc6119e SHA512 a044037c94a8f4a1ba1f9635b4ac8426287fdad9b9942caf89b96665abb7d38f451f8e05666526087cb93511f258491f034af46589b4d611770044c62e27c732
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
-EBUILD jcifs-1.3.17-r1.ebuild 958 BLAKE2B 462e0c2f18f77b3905d459c52c8879dba9ef1a6dd2b1c70742a914275b61773e86c42394785887aa18b56f52a9c5d50d1496dae78d1677f367bf1d4c5498dc70 SHA512 6884e56cd264f7ae003deea5e6a5a078f2636eb83e61bf5862c4477cf8279542c538f7c8cefc3d02d9c2450692b6f2b3ea084bc587b447182bb274f63d662c8e
-EBUILD jcifs-1.3.17-r2.ebuild 795 BLAKE2B ade43bb113ad9d977da513d4687c3179e72cb4351ab3a28dc677f22ab7aef22a8bc1a64c669079aea8a12d98b729b784181881c65cc253752cbb85f4691787d7 SHA512 778a8bca5afb84ca542e115307d063d847f2303677cc394692208365e63bf9752a3db7e0e309cf3a68731b9ebdc595e1f8f0d1abba8bcab20735b045cb8bd352
+EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
deleted file mode 100644
index f5a1b1ecc8df..000000000000
--- a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="https://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86"
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.4"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-IUSE=""
-
-S=${WORKDIR}/${P/-/_}
-
-java_prepare() {
-	rm -v *.jar || die
-	epatch "${FILESDIR}/${PV}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-DhasServlet=true"
-EANT_GENTOO_CLASSPATH="servlet-api-2.4"
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc README.txt || die
-	# other stuff besides javadocs
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
index 2a16955fe8b9..5a4129393d4c 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
 
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"