gentoo resync : 08.08.2018

4 files changed, 24 insertions, 59 deletions

diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 511fa636cf62..88bc3189f396 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,7 +1,5 @@
-DIST jopt-simple-4.6.tar.gz 107066 BLAKE2B 469ff2c3d6359b14ec95dd6b25639f01d681d72b492d28061e0ecaac729d6a1520202691da619be274e8412af88905afe93c44b3026dccaa126bd91c4d3fd67b SHA512 33c7e111312c46376d46195cdc659f011af688d4078316a2b8dcc0dfdee480a658a331902b53bb53d1b952978623e012ed595fee269e24680cffeb6c04b40f8b
-DIST jopt-simple-4.8.tar.gz 110173 BLAKE2B 75fa9659ba772ffa4d4acbbba6524c0719a0a5af8afbbd9dec0a5f9225ec75971907be3edbbbf73f320b67da8c7b3075be45380ef821913518b8e4b1917eb37b SHA512 cc5360cf97446117849f93397c41734a9a001ea623e9ea4223b8d760f36897c62103ab9d2dabfcf0fa032db8e33f7bc51759d626d7bd76dda3adc61fa6622984
-DIST jopt-simple-4.9.tar.gz 114636 BLAKE2B c694ab5fe373de6baad8789346aa763bea946da766c8123c6576616f0a081768e364c4b012772c8da0e8961f10bcefff60807ffc45f94d04921df4e5065fd58d SHA512 28b95ac9a508251b80b0283fc57422fef3f36676ad9160974386faf7f02eb7a0cda00ca1970046ed66863d49e784efba955695fcfd8b5b2535cfaefcb1035360
-EBUILD jopt-simple-4.6.ebuild 698 BLAKE2B 165bca7b16963c631e4f15e1c779f6b845584ca8cf54c657f117ce74168b73d3f32e0b10d6f7ce9655b506ef865ca5f74f0f1c789eb08c70e617fa043d064e8f SHA512 9041520b0490eb2566f860964ccbac55b6be12c3bfd111963a3fc9d7a945268db36acae67a39d8044288307bd5db339e385cde73cba0aea8fce39b3014f68617
-EBUILD jopt-simple-4.8.ebuild 689 BLAKE2B 6ca2f093cf41f99e543522fdd4a267a68e0b1111569c0a3fb512a0c6b20297db4e8b1217ec007d69946a4689825f2f049a86f5008dcdb8fdf965dfb3b59e182c SHA512 32b16f5431e8210f1187a6690e65be0f95866d5c1aa996032cdba5c8608bc8b43c363c9f7bcbbcbb22974b9411907d897538ff2333b8ce9811c55b3bfe71b6d0
-EBUILD jopt-simple-4.9.ebuild 656 BLAKE2B b8940f7ece3aea999f490984ce00f5bd0cb213b2bcb28586daf296dfe468dec2e8cbff1e0f3a8018fadd413286cee1a3403ba89b1e90f3b80e5535d6f2259036 SHA512 e1af8baac937f616554f77a501ebb1ba26f6c274bd531d4b9cd2de2389938001da5e55dc4f8144f52e00840a5a6d1493a60698b5477303e82862a1c81f1adf90
+DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
+DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
+EBUILD jopt-simple-4.6.ebuild 648 BLAKE2B 9c669a9e6b2fa635d1a6c377d5aced31b77faa2d77d890446b3f200ab06e3e526030ecc9c1620cf1cbefef2dd383a3ae2e1ce1041d548bb60373e31f0619c3b5 SHA512 da9587440b79faedaf962e68f16d1c4d95040e594709f3a7f2bd67b02e04c922200e178cda019d9a0bc7a3f32301edab1686c5317611654b0dd9cff786eec6af
+EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 320 BLAKE2B 618d24786328b35f3b25fb733c2add95fdb6fc602ddd451ec972662f5c80787f4f2283285e7a753d6dc66a4c2a7efca3aaa196cf329311f1b4799737e974b714 SHA512 e64ac86acc3088038b5ebcca26f7481730c5bdcda5d7fe05fcadbf66a4ba7d472b9787c288c1b8b4ed077d2a960cd9be3fa1645deba813de3b55e7ead642b61a
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index d0cb07818b33..496fbd46f1c0 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -10,24 +11,22 @@ DESCRIPTION="A Java library for parsing command line options"
 HOMEPAGE="https://pholser.github.com/jopt-simple/"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
-SLOT="0"
+SLOT="4.6"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-IUSE=""
-
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
 
-S="${WORKDIR}/pholser-jopt-simple-8808a39"
-
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
-	# Easier to use java-pkg-simple.
+S="${WORKDIR}/${PN}-${PN}-8808a39"
+
+src_prepare() {
+	default
 	rm -v pom.xml || die
 }
 
 src_install() {
+	default
 	java-pkg-simple_src_install
-	dodoc README.md
 }
diff --git a/dev-java/jopt-simple/jopt-simple-4.9.ebuild b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
deleted file mode 100644
index e8d3065f34ce..000000000000
--- a/dev-java/jopt-simple/jopt-simple-4.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/pholser-${PN}-94ad77a"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-}
diff --git a/dev-java/jopt-simple/jopt-simple-4.8.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
index 688255a6465c..763a855732f2 100644
--- a/dev-java/jopt-simple/jopt-simple-4.8.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple/"
+HOMEPAGE="https://pholser.github.com/jopt-simple"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
 
-IUSE=""
+KEYWORDS="amd64 ppc64 x86"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
 
-S="${WORKDIR}/pholser-${PN}-587d4ee"
+S="${WORKDIR}/${PN}-${PN}-01719a6"
 
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
-	# Easier to use java-pkg-simple.
+src_prepare() {
+	default
 	rm -v pom.xml || die
 }
 
 src_install() {
+	einstalldocs
 	java-pkg-simple_src_install
-	dodoc README.md
 }