| 1 |
commit: fd1461d6853a076e95ed977843cf3e525fa56a72 |
| 2 |
Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com> |
| 3 |
AuthorDate: Fri Sep 18 00:11:45 2015 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 29 21:19:50 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1461d6 |
| 7 |
|
| 8 |
media-video/google2srt: Updated dev-java/jdom slot from 1.0 -> 0 for v1 |
| 9 |
|
| 10 |
Also removed old version. |
| 11 |
|
| 12 |
media-video/google2srt/Manifest | 1 - |
| 13 |
media-video/google2srt/google2srt-0.5.3.ebuild | 64 ---------------------- |
| 14 |
...srt-0.5.6.ebuild => google2srt-0.5.6-r1.ebuild} | 4 +- |
| 15 |
3 files changed, 2 insertions(+), 67 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest |
| 18 |
index dbbdcf5..feca2fc 100644 |
| 19 |
--- a/media-video/google2srt/Manifest |
| 20 |
+++ b/media-video/google2srt/Manifest |
| 21 |
@@ -1,3 +1,2 @@ |
| 22 |
-DIST Google2SRT-0.5.3.zip 334238 SHA256 bcc43a2b50f82373122382adf0e17b0bd3bb0170fd58d74c4582b52faa73a7de SHA512 948aa0085750db96d16da8a693c16e14c2546aebf305544c13984c043671c81e7e94e03e4659227a9be9edf3dc25d78968c0e6d7e6dbb81d925aa3aa0fedb331 WHIRLPOOL 5cd701ea8c3d93791c1199cfad990c697023ddb9ad8308ddd8ec0e14d50661aa108fec7cd82b9654adbc1a777ca36e8f42c20bb133f704676a55d16bd3055fff |
| 23 |
DIST Google2SRT-0.5.6.zip 355167 SHA256 9f021954ff2ed3b386211a839784ae213403981f53068c51a9d2733865b249bb SHA512 edb7b1ee4440f4962220557c794090edb9b3647a64deb70c19170bb4af3edbb5abc93ddd6061badf458c6cd92c17024b91bbdfa95bb1b366d1092b659db08094 WHIRLPOOL 63b120cf28019c0c39132c99e3877ec264b5396a15003c1a235fd296aab4b178048a45a406c5697adef4ac45ab0ea5ac845a4c4665de2f0fce8b4a360ccea2c7 |
| 24 |
DIST google2srt-icon.png 1848 SHA256 d832d20322e79ad74950e0bd2168f402d18f4de2ffeff0ba7d573092b0d6e588 SHA512 051d8ffe8488e2521cdfbfd045d6b5159a18619e12dc1216b1687514cf3f1cebdf2167af372c2ec46d3886412350f5872e8a8c245fee341a30fec51615b5140f WHIRLPOOL 5a9a0c9388a0e2d8e76d87a4ff0446b83399cb5c8ca5d8718982356431a2abc9461517363590cad8dca534e75c172aecc841956392bc01b94ec965bbcb15f98b |
| 25 |
|
| 26 |
diff --git a/media-video/google2srt/google2srt-0.5.3.ebuild b/media-video/google2srt/google2srt-0.5.3.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 6bbf61c..0000000 |
| 29 |
--- a/media-video/google2srt/google2srt-0.5.3.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,64 +0,0 @@ |
| 32 |
-# Copyright 1999-2011 Gentoo Foundation |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
-# $Id$ |
| 35 |
- |
| 36 |
-EAPI="2" |
| 37 |
- |
| 38 |
-JAVA_PKG_IUSE="doc source" |
| 39 |
- |
| 40 |
-inherit eutils java-pkg-2 java-ant-2 |
| 41 |
- |
| 42 |
-MY_PN="Google2SRT" |
| 43 |
-MY_P="${MY_PN}-${PV}" |
| 44 |
-MAINCLASS="GUI" |
| 45 |
- |
| 46 |
-DESCRIPTION="Convert subtitles from Google Video and YouTube to SubRip (.srt) format" |
| 47 |
-HOMEPAGE="http://google2srt.sourceforge.net/en/" |
| 48 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip |
| 49 |
- http://sbriesen.de/gentoo/distfiles/google2srt-icon.png" |
| 50 |
- |
| 51 |
-LICENSE="GPL-3" |
| 52 |
-SLOT="0" |
| 53 |
-KEYWORDS="~amd64 ~x86" |
| 54 |
-IUSE="html" |
| 55 |
- |
| 56 |
-COMMON_DEP="dev-java/jdom:1.0" |
| 57 |
- |
| 58 |
-RDEPEND=">=virtual/jre-1.6 |
| 59 |
- ${COMMON_DEP}" |
| 60 |
- |
| 61 |
-DEPEND=">=virtual/jdk-1.6 |
| 62 |
- ${COMMON_DEP}" |
| 63 |
- |
| 64 |
-S="${WORKDIR}/${MY_P}" |
| 65 |
- |
| 66 |
-java_prepare() { |
| 67 |
- # copy build.xml |
| 68 |
- cp -f "${FILESDIR}/build.xml" build.xml || die |
| 69 |
- |
| 70 |
- # move resources |
| 71 |
- mkdir -p "resources" |
| 72 |
- mv -f src/*.{jpg,properties} "resources/" |
| 73 |
- |
| 74 |
- # update library packages |
| 75 |
- cd lib |
| 76 |
- rm -f jdom.jar ../${MY_PN}.jar || die |
| 77 |
- java-pkg_jar-from jdom-1.0 |
| 78 |
- java-pkg_ensure-no-bundled-jars |
| 79 |
-} |
| 80 |
- |
| 81 |
-src_compile() { |
| 82 |
- eant build $(use_doc) |
| 83 |
-} |
| 84 |
- |
| 85 |
-src_install() { |
| 86 |
- java-pkg_dojar dist/${MY_PN}.jar |
| 87 |
- java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m |
| 88 |
- newicon "${DISTDIR}/${PN}-icon.png" "${MY_PN}.png" |
| 89 |
- make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN} |
| 90 |
- use doc && java-pkg_dojavadoc apidocs |
| 91 |
- use source && java-pkg_dosrc src |
| 92 |
- use html && dohtml -r doc |
| 93 |
- newdoc Changelog.txt ChangeLog |
| 94 |
- newdoc README.TXT README |
| 95 |
-} |
| 96 |
|
| 97 |
diff --git a/media-video/google2srt/google2srt-0.5.6.ebuild b/media-video/google2srt/google2srt-0.5.6-r1.ebuild |
| 98 |
similarity index 95% |
| 99 |
rename from media-video/google2srt/google2srt-0.5.6.ebuild |
| 100 |
rename to media-video/google2srt/google2srt-0.5.6-r1.ebuild |
| 101 |
index ce5e840..29ba034 100644 |
| 102 |
--- a/media-video/google2srt/google2srt-0.5.6.ebuild |
| 103 |
+++ b/media-video/google2srt/google2srt-0.5.6-r1.ebuild |
| 104 |
@@ -22,7 +22,7 @@ SLOT="0" |
| 105 |
KEYWORDS="~amd64 ~x86" |
| 106 |
IUSE="html" |
| 107 |
|
| 108 |
-COMMON_DEP="dev-java/jdom:1.0" |
| 109 |
+COMMON_DEP="dev-java/jdom:0" |
| 110 |
|
| 111 |
RDEPEND=">=virtual/jre-1.6 |
| 112 |
${COMMON_DEP}" |
| 113 |
@@ -43,7 +43,7 @@ java_prepare() { |
| 114 |
# update library packages |
| 115 |
cd lib |
| 116 |
rm -f jdom.jar ../${MY_PN}.jar || die |
| 117 |
- java-pkg_jar-from jdom-1.0 |
| 118 |
+ java-pkg_jar-from jdom |
| 119 |
java-pkg_ensure-no-bundled-jars |
| 120 |
} |
Archives
