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

[James Le Cuirot]

commit:     fd1461d6853a076e95ed977843cf3e525fa56a72
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Fri Sep 18 00:11:45 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1461d6

media-video/google2srt: Updated dev-java/jdom slot from 1.0 -> 0 for v1

Also removed old version.

 media-video/google2srt/Manifest                    |  1 -
 media-video/google2srt/google2srt-0.5.3.ebuild     | 64 ----------------------
 ...srt-0.5.6.ebuild => google2srt-0.5.6-r1.ebuild} |  4 +-
 3 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
index dbbdcf5..feca2fc 100644
--- a/media-video/google2srt/Manifest
+++ b/media-video/google2srt/Manifest
@@ -1,3 +1,2 @@
-DIST Google2SRT-0.5.3.zip 334238 SHA256 
bcc43a2b50f82373122382adf0e17b0bd3bb0170fd58d74c4582b52faa73a7de SHA512 
948aa0085750db96d16da8a693c16e14c2546aebf305544c13984c043671c81e7e94e03e4659227a9be9edf3dc25d78968c0e6d7e6dbb81d925aa3aa0fedb331
 WHIRLPOOL 
5cd701ea8c3d93791c1199cfad990c697023ddb9ad8308ddd8ec0e14d50661aa108fec7cd82b9654adbc1a777ca36e8f42c20bb133f704676a55d16bd3055fff
 DIST Google2SRT-0.5.6.zip 355167 SHA256 
9f021954ff2ed3b386211a839784ae213403981f53068c51a9d2733865b249bb SHA512 
edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094
 WHIRLPOOL 
63b120cf28019c0c39132c99e3877ec264b5396a15003c1a235fd296aab4b178048a45a406c5697adef4ac45ab0ea5ac845a4c4665de2f0fce8b4a360ccea2c7
 DIST google2srt-icon.png 1848 SHA256 
d832d20322e79ad74950e0bd2168f402d18f4de2ffeff0ba7d573092b0d6e588 SHA512 
051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f
 WHIRLPOOL 
5a9a0c9388a0e2d8e76d87a4ff0446b83399cb5c8ca5d8718982356431a2abc9461517363590cad8dca534e75c172aecc841956392bc01b94ec965bbcb15f98b

diff --git a/media-video/google2srt/google2srt-0.5.3.ebuild 
b/media-video/google2srt/google2srt-0.5.3.ebuild
deleted file mode 100644
index 6bbf61c..0000000
--- a/media-video/google2srt/google2srt-0.5.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-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:1.0"
-
-RDEPEND=">=virtual/jre-1.6
-       ${COMMON_DEP}"
-
-DEPEND=">=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-1.0
-       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/google2srt-0.5.6.ebuild 
b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
similarity index 95%
rename from media-video/google2srt/google2srt-0.5.6.ebuild
rename to media-video/google2srt/google2srt-0.5.6-r1.ebuild
index ce5e840..29ba034 100644
--- a/media-video/google2srt/google2srt-0.5.6.ebuild
+++ b/media-video/google2srt/google2srt-0.5.6-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="html"
 
-COMMON_DEP="dev-java/jdom:1.0"
+COMMON_DEP="dev-java/jdom:0"
 
 RDEPEND=">=virtual/jre-1.6
        ${COMMON_DEP}"
@@ -43,7 +43,7 @@ java_prepare() {
        # update library packages
        cd lib
        rm -f jdom.jar ../${MY_PN}.jar || die
-       java-pkg_jar-from jdom-1.0
+       java-pkg_jar-from jdom
        java-pkg_ensure-no-bundled-jars
 }