gentoo resync : 15.01.2020

3 files changed, 40 insertions, 3 deletions

diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 415f7dc6164e..024b67eee8bd 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,5 @@
+DIST plantuml-1.2019.13.tar.gz 4552633 BLAKE2B f6ea05bdd1e4e3cf748dc4d48ca9a89f06246d135bfcc410ec1b2094d1e53ab6ae415c2b39a3fc56441d17999794c1862b95718932d6a20152550deaa42a6c0e SHA512 8d2a2520821a5f75c3508bf2598186718469c6cf2c411f3b975de1abbb4792be8ae70ec84da7ae0bf4668738ca052de5463701dafc5805f362876f1d770ad494
 DIST plantuml-8046.tar.gz 2966063 BLAKE2B 8634fbccbcd0ae2038a5e611215dd4343baba5e9562c02d6ebfc2a9fe702359fd035f490a9fd06484c08431993792efd1b3afd35f2a9812fb052f92f3616e284 SHA512 2ddae800fb30c0e352b44ef06476f7d770c12d516d93fe6f82ec1f33dd3bc1cb3330ba4a0cc89e06daa6eec9a56dc772a4f901d441dea86a8ce82b8d298cdfd5
-EBUILD plantuml-8046.ebuild 703 BLAKE2B 06b199c7c9877d6fe344ff18241c9aeca7397de343679a16a7bcf71b3951e1f09b2a5a1e19e0004f60780684ea0300b5bed8b16aae4e56ebdd5ecf360ef9668b SHA512 2fdc840e0816509ba11f80d21ae23c312a2d3e4836f13baa0e604c7607890ae96efe9944bcf7330d1547cf35be4923c763e8f89711378b6e6db2e817c28058c2
+EBUILD plantuml-0.8046.ebuild 764 BLAKE2B 3583b69e02be91e24c27d0f409fca640f48c9ec9b04be7b2614c87494b4cd9705374a3fcb8ad376cad875503b20b6d74c8f90c496f6d3af518f64491ff4aefa5 SHA512 c68d2f6ce2113d2013b16a0a0d88524a1c2cf0a76f9b9edbe5bb20b139d34047d9bf15ae194a324bfc1562f4f9343ad91ea583b446c193542950a903bee0492d
+EBUILD plantuml-1.2019.13.ebuild 753 BLAKE2B 1d83b5ae4792f5defe439a8194b21ba09092f4434420de14a7a2edbab2c6c9658aacc948c5037daa9f9716a557677e0090e814f5249850fa6f71e7053499d2f6 SHA512 47aac05e900c3a57ddcedad85583aa190c33ec763aa59b7bf1423b232acccc8a74db2247b875fd4e48e20aa1e130755b2773a7958ba6c1cbb2d429a953a24070
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-8046.ebuild b/media-gfx/plantuml/plantuml-0.8046.ebuild
index 57239acc9c8a..0db55ffddc12 100644
--- a/media-gfx/plantuml/plantuml-8046.ebuild
+++ b/media-gfx/plantuml/plantuml-0.8046.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2
 
+MY_VER=$(ver_cut 2)
 DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
 HOMEPAGE="http://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_VER}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
@@ -19,6 +20,8 @@ RDEPEND=">=virtual/jre-1.7
 	dev-java/ant-core:0
 	>=media-gfx/graphviz-2.26.3"
 
+S="${WORKDIR}/${PN}-${MY_VER}"
+
 EANT_BUILD_TARGET="dist"
 EANT_GENTOO_CLASSPATH="ant-core"
 JAVA_ANT_REWRITE_CLASSPATH="true"
diff --git a/media-gfx/plantuml/plantuml-1.2019.13.ebuild b/media-gfx/plantuml/plantuml-1.2019.13.ebuild
new file mode 100644
index 000000000000..be646991f7bf
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2019.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="http://plantuml.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-java/ant-core:0
+	>=media-gfx/graphviz-2.26.3"
+
+EANT_BUILD_TARGET="dist"
+EANT_GENTOO_CLASSPATH="ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	use source && java-pkg_dosrc src/*
+
+	make_desktop_entry plantuml PlantUML
+}