Version bump. Uses patched tarball created from upstream scm. Clean old.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 37 insertions, 33 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 585df80d87a1..ac111b60fdfe 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/jubler
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.30 2009/04/04 15:20:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.31 2009/05/06 18:06:21 serkan Exp $
+
+*jubler-4.1 (06 May 2009)
+
+  06 May 2009; Serkan Kaba <serkan@gentoo.org> -jubler-3.9.6.ebuild,
+  +jubler-4.1.ebuild:
+  Version bump. Uses patched tarball created from upstream scm. Clean old.
 
   04 Apr 2009; Markus Meier <maekke@gentoo.org> jubler-4.0.ebuild:
   amd64/x86 stable, bug #263071
diff --git a/media-video/jubler/jubler-3.9.6.ebuild b/media-video/jubler/jubler-4.1.ebuild
index 26c651a289b8..2f91879431d0 100644
--- a/media-video/jubler/jubler-3.9.6.ebuild
+++ b/media-video/jubler/jubler-4.1.ebuild
@@ -1,61 +1,49 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.9.6.ebuild,v 1.6 2008/12/20 12:03:47 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.1.ebuild,v 1.1 2009/05/06 18:06:21 serkan Exp $
 
-inherit gnome2 eutils java-pkg-2 java-ant-2 toolchain-funcs
+EAPI="2"
+inherit gnome2-utils eutils java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN=${PN/#j/J}
 DESCRIPTION="Java subtitle editor"
 HOMEPAGE="http://www.jubler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_PN}-src-${PV}.tar.bz2"
+# This is a patched tarball generated from Mercurial.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mplayer nls spell"
 
 RDEPEND=">=virtual/jre-1.5
 	>=media-video/ffmpeg-0.4.9_p20080326
-	mplayer? ( media-video/mplayer )
+	mplayer? ( media-video/mplayer[ass] )
 	spell?
 	(
 		app-text/aspell
-		>=dev-java/zemberek-2.0
-	)"
+		>=dev-java/zemberek-2.0[linguas_tr]
+	)
+	dev-java/jupidator"
 
 DEPEND=">=virtual/jdk-1.5
-	media-video/ffmpeg
+	>=media-video/ffmpeg-0.4.9_p20080326
 	app-text/docbook-sgml-utils
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	dev-java/jupidator"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-pkg_setup() {
-	if use spell && ! built_with_use dev-java/zemberek linguas_tr; then
-		die "dev-java/zemberek should be built with Turkish language support"
-	fi
-	if use mplayer &&
-		(  ! built_with_use --missing true media-video/mplayer ass \
-                || ! built_with_use --missing true media-video/mplayer srt ); then
-		msg="media-video/mplayer needs to be built with the srt or ass USE flag"
-		eerror ${msg}
-		die ${msg}
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P}-ffmpegfix.patch"
+java_prepare() {
 	chmod +x resources/installers/linux/iconinstall
+	JAVA_ANT_CLASSPATH_TAGS="java javac" java-ant_rewrite-classpath
+	java-ant_rewrite-classpath nbproject/build-impl.xml
 }
 
 src_compile() {
 	java-pkg_filter-compiler ecj-3.2
-	eant $(use nls && echo i18n) jar faq || die "eant failed"
+	eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq changelog || die "eant failed"
 	cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
 	cd resources/ffdecode || die
 	CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
@@ -73,12 +61,22 @@ src_install() {
 	rm -vr "${D}/usr/share/menu" || die
 
 	java-pkg_dolauncher jubler --main com.panayotis.jubler.Main
-	doman resources/installers/linux/jubler.1
+	dohtml ChangeLog.html || die "dohtml failed"
+	dodoc README || die "dodoc failed"
+	doman resources/installers/linux/jubler.1 || die "doman fialed"
 	insinto /usr/share/jubler/help
-	doins dist/help/*
+	doins dist/help/* || die "doins failed"
 }
 
 pkg_preinst() {
 	gnome2_pkg_preinst
 	java-pkg-2_pkg_preinst
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}