summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2010-04-17 04:34:26 +0000
committerSerkan Kaba <serkan@gentoo.org>2010-04-17 04:34:26 +0000
commit7b9afaf5aaa7ae88d5ca7ded86f822433b8890ac (patch)
tree5fa4cd71f4c4129cf7cb3419a9a7b3af9cee35e7 /media-video
parentVersion bump for bug 311309 (diff)
downloadgentoo-2-7b9afaf5aaa7ae88d5ca7ded86f822433b8890ac.tar.gz
gentoo-2-7b9afaf5aaa7ae88d5ca7ded86f822433b8890ac.tar.bz2
gentoo-2-7b9afaf5aaa7ae88d5ca7ded86f822433b8890ac.zip
Fixed eclass usage. Remove call to changelog task to fix bug #315403
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/jubler/ChangeLog5
-rw-r--r--media-video/jubler/jubler-4.1.1.ebuild11
2 files changed, 7 insertions, 9 deletions
diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 61fa47c44089..1bc861bb725b 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/jubler
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.33 2010/04/16 09:17:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.34 2010/04/17 04:34:26 serkan Exp $
+
+ 17 Apr 2010; Serkan Kaba <serkan@gentoo.org> jubler-4.1.1.ebuild:
+ Fixed eclass usage. Remove call to changelog task to fix bug #315403
16 Apr 2010; Petteri Räty <betelgeuse@gentoo.org> jubler-4.1.1.ebuild:
inherit gnome2 instead of gnome2-utils so we have access to
diff --git a/media-video/jubler/jubler-4.1.1.ebuild b/media-video/jubler/jubler-4.1.1.ebuild
index 5082016cff76..8b338df1e8b2 100644
--- a/media-video/jubler/jubler-4.1.1.ebuild
+++ b/media-video/jubler/jubler-4.1.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.1.1.ebuild,v 1.2 2010/04/16 09:17:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.1.1.ebuild,v 1.3 2010/04/17 04:34:26 serkan Exp $
EAPI="2"
-inherit gnome2 eutils java-pkg-2 java-ant-2 toolchain-funcs
+inherit gnome2-utils eutils java-pkg-2 java-ant-2 toolchain-funcs
MY_PN=${PN/#j/J}
DESCRIPTION="Java subtitle editor"
@@ -43,7 +43,7 @@ java_prepare() {
src_compile() {
java-pkg_filter-compiler ecj-3.2
- eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq changelog || die "eant failed"
+ eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq || 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"
@@ -68,11 +68,6 @@ src_install() {
doins dist/help/* || die "doins failed"
}
-pkg_preinst() {
- gnome2_pkg_preinst
- java-pkg-2_pkg_preinst
-}
-
pkg_postinst() {
gnome2_icon_cache_update
}