version bump + icon.png moved to distfiles

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

4 files changed, 77 insertions, 6 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/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
+}