gentoo resync : 28.04.2021

3 files changed, 68 insertions, 3 deletions

diff --git a/media-tv/channeleditor/Manifest b/media-tv/channeleditor/Manifest
index 4df4b8507c50..dde460143376 100644
--- a/media-tv/channeleditor/Manifest
+++ b/media-tv/channeleditor/Manifest
@@ -2,5 +2,6 @@ AUX build-1.9.2.1.xml 1204 BLAKE2B 6a00e578c9108f0a6df66eab6e4aac582a0b699d05bc2
 AUX channeleditor-1.9.2.1-messages.properties.patch 18594 BLAKE2B 0b24118aca4bf3d43127def0f25ba11afeef13b7e5f6a10457c33390f5e5173168ca6245b6deb62aab4658fc22c762b5662baf2904fd4d9c326d9bb55fbd4068 SHA512 2a023617e7231f1a140ec92a8ddd2997182de8fa662d728ece01d8a3fede358d2c2bf180e038f094938db2ca3aa6857fae11e9a53885d95a6af520d88ff62347
 AUX channeleditor-1.9.2.1-messages_en.properties.patch 7226 BLAKE2B f5992f06de852454a004883d96dc61e56728a745dd03f7545f9854ee839ac55ca511b518aa03e20cbb2a6126bb34964c7af72f4b81536bdcec24f76988826ec0 SHA512 8a2c09010ce01f001150a759bb91fdf2bdebf4a6776ada8fc1dfbb4b9000aeb4d5ad0be5bb99ed4b5237c4a070ebbea5ca862585a74f1c64dad5349127f45a97
 DIST channeleditor_1.9.2.1_src.tar.gz 317608 BLAKE2B 26afc8d08a525f26c942fda20eb8ed63ff973bc112743edb80043ef9f2bd78f34dc4b2ef7ad60110b624dbfa6e2058a41e945b616d2ca587acffefe5b15b583e SHA512 84147868aa8b1aacf4ef31a7665822bc7ccd4f7372aaa040aacd8ee42581db1d67092b6b09cda6e447bae2c058fe4ceaab28f3e2a268a54dc5ac25452e64d7d9
-EBUILD channeleditor-1.9.2.1-r2.ebuild 1444 BLAKE2B 81c169ed7e78ada298eeb82d84fc1055ead8ada1b0b0d525958a8361e17ae0761729599d71a9a2d8077b5dae53660c1644a832afa5f846935a98c877c5dfeb55 SHA512 f7c9f5d308eda235421783bbbc42e4a0000f5e95f7a23cc71cd1e44607163f2a4f31f57c9a728c9ed943ff7f666d027bc9bd955a0fadf538242ffb8783ff0abe
+EBUILD channeleditor-1.9.2.1-r2.ebuild 1447 BLAKE2B 0e10a726fe62ba37ec91e8de234780d9b0efb60f326a03ce6631aba37560d3f134c67de13ddd1a08fea3b093221f2a2ea43e8d419efd3eef2ea4cfbd018755f3 SHA512 c5d2670b592dbb898cc47c5abb260a23d85d7cab23bc9e9deebb107668ddb8a78654f1f59d3ffe05c44b881a0262e26f550bd27a682163da4fad12e3734c7de6
+EBUILD channeleditor-1.9.2.1-r3.ebuild 1453 BLAKE2B 5a6f1d7be8a619e652b3ce219491a4174ae0670e095e658876cd7a0ceb71cf75e2fd6df61d9739948f314ec0fb98c83bd1b0fb0ac94572a87046ef8b2cef28cc SHA512 96a8f5c8e0b2ea516ca5020d7ee709169fc01bbbb464f83c33d825c908e968c60436633a4cc121f3d0b60ce1e84ae9e28b833a97af66b4c904e3b9fe485c6c4b
 MISC metadata.xml 332 BLAKE2B 94c6fc0a7d5f1fc8ba176c5ec6fbf88d05b2af0463a8bb59547db726fac957ba32a8386db915d3afb6c86088f1865bda3c4d142a8d9ee8896f5cb416f79c8267 SHA512 69d8f78543a8a036dbb365e8cd89755265e8be29085c4f68de21b833325163ef17ec16927d0a3a3f414daf54dd123e6f654d82b7d354af59ce5665c5cf65ec6e
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
index 587e3271b494..4605bec42ea3 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE=source
-inherit desktop eutils java-pkg-2 java-ant-2 xdg
+inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
 
 DESCRIPTION="Editor for VDR channels.conf"
 HOMEPAGE="https://sites.google.com/site/reniershomepage/"
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
new file mode 100644
index 000000000000..684ff24bffbb
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE=source
+inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	# include localisation changes
+	"${FILESDIR}"/${P}-messages.properties.patch
+	"${FILESDIR}"/${P}-messages_en.properties.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
+	|| die "reading Main-Class failed"
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# move files out of build and remove stuff not needed in the package
+	mv build/* "${S}" || die "cleaning build dir failed"
+	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
+		|| die "removing files failed"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
+		|| die "copying build.xml failed"
+
+	# convert CRLF to LF
+	edos2unix MANIFEST.MF
+}
+
+src_compile() {
+	eant build -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main $(mainclass)
+
+	use source && java-pkg_dosrc src
+
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}