[gentoo-commits] gentoo-x86 commit in net-p2p/vuze: ChangeLog vuze-3.0.4.2-r1.ebuild

[gentoo-commits] gentoo-x86 commit in net-p2p/vuze: ChangeLog vuze-3.0.4.2-r1.ebuild

[Vlastimil Babka (caster)]

caster      09/03/04 18:26:46

  Modified:             ChangeLog vuze-3.0.4.2-r1.ebuild
  Log:
  Use slot dependency for swt, replace the broken built_with_use checks with EAPI=2 use dependencies, fixes bug #259091.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  net-p2p/vuze/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	13 Feb 2009 22:17:21 -0000	1.5
+++ ChangeLog	4 Mar 2009 18:26:43 -0000	1.6
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.5 2009/02/13 22:17:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.6 2009/03/04 18:26:43 caster Exp $
+
+  04 Mar 2009; Vlastimil Babka <caster@gentoo.org> vuze-3.0.4.2-r1.ebuild:
+  Use slot dependency for swt, replace the broken built_with_use checks with
+  EAPI=2 use dependencies, fixes bug #259091.
 
 *vuze-4.1.0.2 (07 Feb 2009)
 



1.3                  net-p2p/vuze/vuze-3.0.4.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?r1=1.2&r2=1.3

Index: vuze-3.0.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vuze-3.0.4.2-r1.ebuild	6 Feb 2009 12:06:46 -0000	1.2
+++ vuze-3.0.4.2-r1.ebuild	4 Mar 2009 18:26:43 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.2 2009/02/06 12:06:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.3 2009/03/04 18:26:43 caster Exp $
 
 ###
 ### @Todo The new Azureus gui requires swt built with embedded mozilla support,
@@ -14,6 +14,7 @@
 ###       script check for swt mozilla support and die...
 ###
 
+EAPI=2
 JAVA_PKG_IUSE="source"
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
@@ -31,7 +32,11 @@
 	>=dev-java/bcprov-1.35
 	>=dev-java/commons-cli-1.0
 	>=dev-java/log4j-1.2.8
-	>=dev-java/swt-3.3_pre3
+	|| (
+		>=dev-java/swt-3.3_pre3:3[xulrunner]
+		>=dev-java/swt-3.3_pre3:3[seamonkey]
+		>=dev-java/swt-3.3_pre3:3[firefox]
+	)
 	!net-p2p/azureus-bin
 	>=virtual/jre-1.4"
 
@@ -43,17 +48,6 @@
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	if ! built_with_use --missing false -o dev-java/swt firefox seamonkey xulrunner; then
-		eerror
-		eerror "dev-java/swt must be compiled with the firefox, seamonkey or xulrunner USE flag"
-		eerror "(support may vary per swt version) or vuze will hang at startup!"
-		eerror
-		die "recompile dev-java/swt with embedded browser"
-	fi
-	java-pkg-2_pkg_setup
-}
-
 src_unpack() {
 	unpack ${A}