diff options
author | Vlastimil Babka <caster@gentoo.org> | 2009-03-04 18:26:43 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2009-03-04 18:26:43 +0000 |
commit | 26803515e0042bf69979ebb6eb5ee712f2cb6906 (patch) | |
tree | 4218105c9738c87cbea01d264860ae42749988f2 /net-p2p/vuze | |
parent | Fixed dependency. (diff) | |
download | gentoo-2-26803515e0042bf69979ebb6eb5ee712f2cb6906.tar.gz gentoo-2-26803515e0042bf69979ebb6eb5ee712f2cb6906.tar.bz2 gentoo-2-26803515e0042bf69979ebb6eb5ee712f2cb6906.zip |
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)
Diffstat (limited to 'net-p2p/vuze')
-rw-r--r-- | net-p2p/vuze/ChangeLog | 6 | ||||
-rw-r--r-- | net-p2p/vuze/vuze-3.0.4.2-r1.ebuild | 20 |
2 files changed, 12 insertions, 14 deletions
diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog index e9556b038a8a..09c044c93cd5 100644 --- a/net-p2p/vuze/ChangeLog +++ b/net-p2p/vuze/ChangeLog @@ -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) diff --git a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild index 4f3ffb51cad8..59dec92958e0 100644 --- a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild +++ b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild @@ -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 @@ RDEPEND=" >=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 @@ JAVA_PKG_FILTER_COMPILER="jikes" 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} |