From: Serkan Kaba <serkan@gentoo.org>
Date: Sat, 17 Apr 2010 04:34:26 +0000 (+0000)
Subject: Fixed eclass usage. Remove call to changelog task to fix bug #315403
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ab1a3d060ddfa1b4fe7f574ca5fd538fd3b8ba5;p=gentoo.git

Fixed eclass usage. Remove call to changelog task to fix bug #315403
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/media-video/jubler/Manifest
index bffc2caf4cf0..f78cf0d0e593 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -7,13 +7,13 @@ AUX jubler-4.0.patch 8113 RMD160 4b4b631625974295126670027a88d0b953b35abf SHA1 0
 DIST Jubler-src-4.0.tar.bz2 1760172 RMD160 48ac22a534d1f3aa9505d54a2a25e2497471bd5e SHA1 566464fd8282e124d34f28ccf2df03a5c45da2d9 SHA256 988317fdd958112dddc8729dd4093df7da91571e6a587e4492b3049748412501
 DIST Jubler-src-4.1.1.tar.bz2 1760728 RMD160 5254dcdc7d4ed160e907547d7899d898af2e3084 SHA1 2c6e3ce228431501fa9a8f82b074633843739b47 SHA256 cfaec92f344da4b35f312a88328aff88b968b2d09213149a9a7e696c9789f7ca
 EBUILD jubler-4.0.ebuild 2247 RMD160 16099620215ec43a577d1e848590e9a59ed8fe3d SHA1 afb0519765c0c28c81495ab017ae801113ac799c SHA256 b8e2c4db45150ad1cfccb09c786b5803666f6cbacc682dbaa8a558eb9f319d93
-EBUILD jubler-4.1.1.ebuild 2352 RMD160 fedf7279eac1de4c5263aa66aab668b31bb08883 SHA1 7cd5e313e1f594c01aae4610f9f4fc2d767ae153 SHA256 927f67f724ed57da116c50b49eed0e7709cff0f7d2212cfdd311fa9012578ea4
-MISC ChangeLog 5323 RMD160 c98e1146ad17bbb706be597f2d93e38a9edb0a89 SHA1 41eadb78e434cc6ae79485fe296a31051ddd54e7 SHA256 6d54fe56a4bcbbfc4a85a10ed142ee3818f4ed705caf4a7cbdd8e259a92c9904
+EBUILD jubler-4.1.1.ebuild 2281 RMD160 5673f3d558c2c56ea04da7ec9a0fbb85cddbcd7a SHA1 2dac5b62dd67b6d28c8d257bd4eee1616ef55914 SHA256 84d861668dee12f12f6b2ea9e1883789042d952a2b33ff3162b072ad3066410e
+MISC ChangeLog 5459 RMD160 7f7bcb8f4f04dfbfe9d9b18f550077d3523ffd25 SHA1 91c263156bbbfa014edf509f4c8bb0703fd0e517 SHA256 7f5fd32b1a0e6341ff69f8601aa66c8c1c5a2802f1c0a1470ff652f07a1f6699
 MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvIKy0ACgkQcxLzpIGCsLRkJwCfQA1ozpcB0y4xz0bvntjr/o9b
-IikAnAsoZDOcdFesBqG8QIQgwAFlOhxh
-=4FlJ
+iEYEARECAAYFAkvJOmIACgkQRh6X64ivZaK2CACffvWosCxsBjBkad1gWQXgrbjG
+pzAAn3se9934fovY8r+hNtXABHpCCiwT
+=0l72
 -----END PGP SIGNATURE-----
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
 }