version bump + icon.png moved to distfiles

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 94 insertions, 9 deletions

diff --git a/media-video/google2srt/ChangeLog b/media-video/google2srt/ChangeLog
index 308d5f7eea83..c7edf758798d 100644
--- a/media-video/google2srt/ChangeLog
+++ b/media-video/google2srt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/google2srt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/google2srt/ChangeLog,v 1.1 2010/08/02 23:43:59 sbriesen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/google2srt/ChangeLog,v 1.2 2011/07/10 02:18:34 sbriesen Exp $
+
+*google2srt-0.5.3 (10 Jul 2011)
+
+  10 Jul 2011; Stefan Briesenick <sbriesen@gentoo.org> google2srt-0.5.2.ebuild,
+  +google2srt-0.5.3.ebuild, -files/icon.png:
+  version bump + icon.png moved to distfiles
 
 *google2srt-0.5.2 (02 Aug 2010)
 
diff --git a/media-video/google2srt/Manifest b/media-video/google2srt/Manifest
index f54107c63685..500ea3778f6f 100644
--- a/media-video/google2srt/Manifest
+++ b/media-video/google2srt/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 2320 RMD160 81be9ceea74c2286a8e3d68a33a3c40c50538244 SHA1 26d59d7e727163f6ab0bb8cd8678fb87d7789dfa SHA256 545bb2203a03215ae213cab6ba69411b06d49f03c473896add9ddd51122e513b
-AUX icon.png 1848 RMD160 d220ad5d68350c3a1ba8db73b0d9a03be73d473b SHA1 30eaf51ee09857e97057745d196a29d31dabad74 SHA256 d832d20322e79ad74950e0bd2168f402d18f4de2ffeff0ba7d573092b0d6e588
 DIST Google2SRT-0.5.2.zip 307046 RMD160 2f645b7e3c131144d37674e5856ce6fc8505e847 SHA1 65c3965bbedfac747faaf7203b23e4cdd4eafb84 SHA256 700d182b15ccfcfe52272e5ebd4bd1f1f9e7e4fb370a84f2f019e1e5d3ea71d3
-EBUILD google2srt-0.5.2.ebuild 1477 RMD160 2a7f3df3f891d61d3fd1e23f390b317bd59f243a SHA1 cbcec6a0beda553245358e32f9ae6af79e838fff SHA256 95b948443b9b7d8603af421bfd7127900151c501f5db972a71f81632d1ba9d39
-MISC ChangeLog 405 RMD160 59883ac56e53384634aba64d46a4ea31e2552221 SHA1 5138a7fa5ffed173b23ba690ed8223e132c33bf1 SHA256 a851c1cf149cac5817b40b56f92478f977c8900acbd3d30fec235b25d702801e
+DIST Google2SRT-0.5.3.zip 334238 RMD160 b615bf6ebcc2ffce27d54d2e70bb739bcf60f5fc SHA1 055bae2ea7fa61f06dfe7fbfa60e6dab5029a2d5 SHA256 bcc43a2b50f82373122382adf0e17b0bd3bb0170fd58d74c4582b52faa73a7de
+DIST google2srt-icon.png 1848 RMD160 d220ad5d68350c3a1ba8db73b0d9a03be73d473b SHA1 30eaf51ee09857e97057745d196a29d31dabad74 SHA256 d832d20322e79ad74950e0bd2168f402d18f4de2ffeff0ba7d573092b0d6e588
+EBUILD google2srt-0.5.2.ebuild 1539 RMD160 0e9d18586501fe7495139c2b2a0f5a34b8c7cef9 SHA1 33d484bd99eaa686ce583fe3cfebce32a86e058f SHA256 a56b9c9e58b1763225db1733160d5a802bdacfc9290e28fccf2c98de9ab50fbf
+EBUILD google2srt-0.5.3.ebuild 1539 RMD160 6e23831a9b5732f9c03f317f6885c2215b4609fc SHA1 5432b796295b598c57884f9bb3c885e1693c03f5 SHA256 f763c868d54e05ee355b241ca00379fb2ee61d688bd53c6df644ff31742bc30d
+MISC ChangeLog 609 RMD160 f141fd9574d22984cee30268b90b588d545b2adf SHA1 582cb6fed9b002d600084105ac46d3beb9e30d26 SHA256 fa79170bdaa1410b6b7439eb52146b46047fc086b0c2d3bca2521484f633bafc
 MISC metadata.xml 613 RMD160 c99b26254eeefd61d3fa4a0fe3cc6f1962f29258 SHA1 87eac0d44b08826d64ee0a0dd2d3cd8c36aa85d3 SHA256 461ed8c6e945bb5fa2295869d354c965e27c972e57450675df6c34e518f2311e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk4ZDAYACgkQIaLonLtsQsfH/gQAy+S1FGxancSiE6AtVmNme6EB
+oCGALQLvolw5lPG8G/n6L52GTlKOUZut5pQ1vYvRNbDr4gdixOWJBC7lVC9CKOsg
+k88F59pBvEwUGJpg2mZvWBdZuaUem3zCvQd95ODzZnk5s2N900c810QIxuiuid07
+RUKSm+gIjSnB4UxFoI8=
+=uJ3N
+-----END PGP SIGNATURE-----
diff --git a/media-video/google2srt/files/icon.png b/media-video/google2srt/files/icon.png
deleted file mode 100644
index 1693b02512fa..000000000000
--- a/media-video/google2srt/files/icon.png
+++ /dev/null
diff --git a/media-video/google2srt/google2srt-0.5.2.ebuild b/media-video/google2srt/google2srt-0.5.2.ebuild
index 7b1b11a8ff78..63ecec25e991 100644
--- a/media-video/google2srt/google2srt-0.5.2.ebuild
+++ b/media-video/google2srt/google2srt-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/google2srt/google2srt-0.5.2.ebuild,v 1.1 2010/08/02 23:43:59 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/google2srt/google2srt-0.5.2.ebuild,v 1.2 2011/07/10 02:18:34 sbriesen Exp $
 
 EAPI="2"
 
@@ -14,7 +14,8 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	http://sbriesen.de/gentoo/distfiles/google2srt-icon.png"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -53,7 +54,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar dist/${MY_PN}.jar
 	java-pkg_dolauncher ${MY_PN} --main ${MAINCLASS} --java_args -Xmx256m
-	newicon "${FILESDIR}/icon.png" "${MY_PN}.png"
+	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
diff --git a/media-video/google2srt/google2srt-0.5.3.ebuild b/media-video/google2srt/google2srt-0.5.3.ebuild
new file mode 100644
index 000000000000..decfdfb836c5
--- /dev/null
+++ b/media-video/google2srt/google2srt-0.5.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/google2srt/google2srt-0.5.3.ebuild,v 1.1 2011/07/10 02:18:32 sbriesen Exp $
+
+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
+}