[gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/google2srt/, media-video/google2srt/files/

[gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/google2srt/, media-video/google2srt/files/

[Jakov Smolić]

commit:     66f9c8305284793dc5fc52b392738a388f961683
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 17:21:39 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 17:21:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f9c830

media-video/google2srt: treeclean

Closes: https://bugs.gentoo.org/504986
Closes: https://bugs.gentoo.org/819420
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-video/google2srt/Manifest                   |  2 -
 media-video/google2srt/files/build.xml            | 85 -----------------------
 media-video/google2srt/google2srt-0.5.6-r1.ebuild | 64 -----------------
 media-video/google2srt/metadata.xml               | 20 ------
 profiles/package.mask                             |  6 --
 5 files changed, 177 deletions(-)

diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
deleted file mode 100644
index 8362ae332fcb..000000000000
--- a/media-video/google2srt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Google2SRT-0.5.6.zip 355167 BLAKE2B bb365ae01db8ca3eba67cfe01840a1e6da6034c86dac45a47c0164a72f9fbd958307ce545423a0c715f7ebefdae31d38686e9103d873d8cf98ecf99da579d143 SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094
-DIST google2srt-icon.png 1848 BLAKE2B 323ff2128b17ba6584f23869432575eeca87a0195867123193b9734cfb453d8483a79e14ba156e2b8168eb5d03c66795f6ae06d8cdb7c1e1aedcc28fbb593c79 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f

diff --git a/media-video/google2srt/files/build.xml b/media-video/google2srt/files/build.xml
deleted file mode 100644
index b1c7e3c775bb..000000000000
--- a/media-video/google2srt/files/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Google2SRT" default="jar">
-	<!-- some properties -->
-	<property name="src.dir"       value="src" />
-	<property name="lib.dir"       value="lib" />
-	<property name="resources.dir" value="resources" />
-	<property name="docs.dir"      value="apidocs" />
-	<property name="build.dir"     value="build" />
-	<property name="dist.dir"      value="dist" />
-	<property name="project.jar"   value="${dist.dir}/${ant.project.name}.jar" />
-	<property name="mainclass.jar" value="GUI" />
-	<property name="source.enc"    value="UTF-8" />
-	<property name="target.jdk"    value="1.6" />
-
-	<!-- classpath -->
-	<path id="refcp">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${docs.dir}" />
-		<mkdir dir="${build.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<javac srcdir="${src.dir}"
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"
-			classpathref="refcp"
-			encoding="${source.enc}"/>
-		<copy todir="${build.dir}">
-			<fileset dir="${resources.dir}" />
-		</copy>
-	</target>
-
-	<!-- build the jar files -->
-	<target name="build" depends="compile">
-		<jar jarfile="${project.jar}" basedir="${build.dir}">
-			<manifest>
-				<attribute name="Main-Class" value="${mainclass.jar}" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="javadoc" depends="init">
-		<javadoc sourcepath="${src.dir}"
-           		destdir="${docs.dir}"
-			packagenames="*"
-           		author="true"
-           		version="true"
-			use="true"
-			charset="UTF-8"
-			encoding="${source.enc}"
-			defaultexcludes="yes"
-			classpathref="refcp"
-           		windowtitle="${ant.project.name} API">
-			<fileset dir="${src.dir}" defaultexcludes="yes">
-				<include name="**/*.java"/>
-		        </fileset>
-		</javadoc>
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-        <!-- zip the sources -->
-        <target name="sourcezip">
-		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
-                        <zipfileset dir="${src.dir}" />
-                </zip>
-        </target>
-
-</project>

diff --git a/media-video/google2srt/google2srt-0.5.6-r1.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
deleted file mode 100644
index 4e228dc166a4..000000000000
--- a/media-video/google2srt/google2srt-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="Google2SRT"
-MY_P="${MY_PN}-${PV}"
-MAINCLASS="GUI"
-
-DESCRIPTION="Convert subtitles from Google Video and YouTube to SubRip (.srt) format"
-HOMEPAGE="http://google2srt.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	http://sbriesen.de/gentoo/distfiles/google2srt-icon.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-COMMON_DEP="dev-java/jdom:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	# copy build.xml
-	cp -f "${FILESDIR}/build.xml" build.xml || die
-
-	# move resources
-	mkdir -p "resources"
-	mv -f src/*.{jpg,properties} "resources/"
-
-	# update library packages
-	cd lib
-	rm -f jdom.jar ../${MY_PN}.jar || die
-	java-pkg_jar-from jdom
-	java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
-	eant build $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${MY_PN}.jar
-	java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m
-	newicon "${DISTDIR}/${PN}-icon.png" "${MY_PN}.png"
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-	use html && dohtml -r doc
-	newdoc Changelog.txt ChangeLog
-	newdoc README.TXT README
-}

diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
deleted file mode 100644
index 4af0071e5e99..000000000000
--- a/media-video/google2srt/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Google2SRT allows you to convert subtitles from Google Video and YouTube
-		to SubRip (.srt) format, which is recognized by most video players. You
-		can download XML subtitles or simply type video's URL, Google2SRT will
-		do the rest.
-	</longdescription>
-	<use>
-		<flag name="html">Install HTML documentation</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">google2srt</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 65613c8f534e..1277d8b1eefe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -365,12 +365,6 @@ dev-java/piccolo2d
 ~sys-kernel/vanilla-kernel-5.14.19
 ~virtual/dist-kernel-5.14.19
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-16)
-# Outdated java package, uses EAPI 5, no revdeps,
-# no other distro is packaging this.
-# Removal on 2021-12-16. Bug #819420.
-media-video/google2srt
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-15)
 # bug #771693 (multiple CVEs).
 # Library still needed for bumping dev-java/log4j