From c0fc3c5067e1b5cf3c2687905e4ca0feb684cf6e Mon Sep 17 00:00:00 2001 From: Serkan Kaba Date: Tue, 15 Feb 2011 18:32:38 +0000 Subject: Revbump to fix bug #336235 reported by Diego Elio Pettenò . MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.0_alpha19/cvs/Linux x86_64) --- media-video/jubler/ChangeLog | 9 +- media-video/jubler/files/jubler-4.6.1-gentoo.patch | 11 ++- media-video/jubler/jubler-4.6.1-r2.ebuild | 96 ---------------------- media-video/jubler/jubler-4.6.1-r3.ebuild | 96 ++++++++++++++++++++++ 4 files changed, 114 insertions(+), 98 deletions(-) delete mode 100644 media-video/jubler/jubler-4.6.1-r2.ebuild create mode 100644 media-video/jubler/jubler-4.6.1-r3.ebuild (limited to 'media-video/jubler') diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog index 33715460b94a..c58bb4e46d99 100644 --- a/media-video/jubler/ChangeLog +++ b/media-video/jubler/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/jubler # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.37 2011/02/14 20:13:45 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.38 2011/02/15 18:32:38 serkan Exp $ + +*jubler-4.6.1-r3 (15 Feb 2011) + + 15 Feb 2011; Serkan Kaba -jubler-4.6.1-r2.ebuild, + +jubler-4.6.1-r3.ebuild, files/jubler-4.6.1-gentoo.patch: + Revbump to fix bug #336235 reported by Diego Elio Pettenò + . *jubler-4.6.1-r2 (14 Feb 2011) diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch index 3e5675fee7a7..25afdba2fcc9 100644 --- a/media-video/jubler/files/jubler-4.6.1-gentoo.patch +++ b/media-video/jubler/files/jubler-4.6.1-gentoo.patch @@ -116,7 +116,7 @@ diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Ju DEBUG.debug(e); diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile --- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile 2011-01-31 16:26:26.000000000 +0200 -+++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-12 14:30:05.612780001 +0200 ++++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-15 20:26:34.213149001 +0200 @@ -12,9 +12,6 @@ # Name of the produced library PROJ=ffdecode @@ -152,3 +152,12 @@ diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/r develop:javacheck +@@ -208,7 +203,7 @@ + LIB:${LIBNAME} + + ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ} +- ${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS} ++ ${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS} + ${STRIPCMD} ${LIBNAME} + + diff --git a/media-video/jubler/jubler-4.6.1-r2.ebuild b/media-video/jubler/jubler-4.6.1-r2.ebuild deleted file mode 100644 index b6bff9cea79c..000000000000 --- a/media-video/jubler/jubler-4.6.1-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1-r2.ebuild,v 1.1 2011/02/14 20:13:45 serkan Exp $ - -EAPI="2" -WANT_ANT_TASKS="ant-nodeps ant-contrib" -inherit fdo-mime 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="http://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mplayer nls spell" - -RDEPEND=">=virtual/jre-1.5 - >=media-video/ffmpeg-0.4.9_p20080326 - mplayer? ( media-video/mplayer[ass] ) - spell? - ( - app-text/aspell - >=dev-java/zemberek-2.0[linguas_tr] - )" - -DEPEND=">=virtual/jdk-1.5 - >=media-video/ffmpeg-0.4.9_p20080326 - app-text/xmlto - >=dev-java/jupidator-0.6.0 - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_unpack() { - unpack ${A} - cp "${FILESDIR}"/update-${PV}.xml "${S}" || die -} - -java_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - chmod +x resources/installers/linux/iconinstall - #cd resources/libs || die - java-pkg_jarfrom --build-only --into resources/libs jupidator - rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed" - rm -R resources/libs/ant-contrib || die "jar cleanup failed" - if ! use mplayer; then - rm -R plugins/mplayer || die "mplayer plugin removal failed" - fi - if ! use spell; then - rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed" - fi -} - -src_compile() { - java-pkg_filter-compiler ecj-3.2 - ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed" - #cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed" - cd resources/ffmpeg/ffdecode || die - CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed" -} - -src_install() { - java-pkg_dojar dist/Jubler.jar - use nls && java-pkg_dojar dist/i18n/*.jar - insinto /usr/share/jubler/lib/lib - doins dist/lib/*.jar || die "Plugin installation failed" - #java-pkg_dojar dist/lib/*.jar - use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar - use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar - java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so - doicon resources/installers/linux/jubler.png - domenu resources/installers/linux/jubler.desktop - - DESTDIR="${D}" eant linuxdesktopintegration - rm -vr "${D}/usr/share/menu" || die - - java-pkg_dolauncher jubler --main Jubler - 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/* || die "doins failed" -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild new file mode 100644 index 000000000000..a95aee70ec32 --- /dev/null +++ b/media-video/jubler/jubler-4.6.1-r3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1-r3.ebuild,v 1.1 2011/02/15 18:32:38 serkan Exp $ + +EAPI="2" +WANT_ANT_TASKS="ant-nodeps ant-contrib" +inherit fdo-mime 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="http://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mplayer nls spell" + +RDEPEND=">=virtual/jre-1.5 + >=media-video/ffmpeg-0.4.9_p20080326 + mplayer? ( media-video/mplayer[ass] ) + spell? + ( + app-text/aspell + >=dev-java/zemberek-2.0[linguas_tr] + )" + +DEPEND=">=virtual/jdk-1.5 + >=media-video/ffmpeg-0.4.9_p20080326 + app-text/xmlto + >=dev-java/jupidator-0.6.0 + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${MY_PN}-${PV} + +src_unpack() { + unpack ${A} + cp "${FILESDIR}"/update-${PV}.xml "${S}" || die +} + +java_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + chmod +x resources/installers/linux/iconinstall + #cd resources/libs || die + java-pkg_jarfrom --build-only --into resources/libs jupidator + rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed" + rm -R resources/libs/ant-contrib || die "jar cleanup failed" + if ! use mplayer; then + rm -R plugins/mplayer || die "mplayer plugin removal failed" + fi + if ! use spell; then + rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed" + fi +} + +src_compile() { + java-pkg_filter-compiler ecj-3.2 + ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed" + #cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed" + cd resources/ffmpeg/ffdecode || die + CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed" +} + +src_install() { + java-pkg_dojar dist/Jubler.jar + use nls && java-pkg_dojar dist/i18n/*.jar + insinto /usr/share/jubler/lib/lib + doins dist/lib/*.jar || die "Plugin installation failed" + #java-pkg_dojar dist/lib/*.jar + use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar + use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar + java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so + doicon resources/installers/linux/jubler.png + domenu resources/installers/linux/jubler.desktop + + DESTDIR="${D}" eant linuxdesktopintegration + rm -vr "${D}/usr/share/menu" || die + + java-pkg_dolauncher jubler --main Jubler + 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/* || die "doins failed" +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} -- cgit v1.2.3-65-gdbad