summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2011-11-18 21:18:40 +0000
committerVlastimil Babka <caster@gentoo.org>2011-11-18 21:18:40 +0000
commit3289a3091f0d3e6f23dcb825e49084b35466dc8e (patch)
tree85bc6b9b132d13447e338b7a64403f29146d5ed6 /dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
parentVersion bump for dev channel release. (diff)
downloadhistorical-3289a3091f0d3e6f23dcb825e49084b35466dc8e.tar.gz
historical-3289a3091f0d3e6f23dcb825e49084b35466dc8e.tar.bz2
historical-3289a3091f0d3e6f23dcb825e49084b35466dc8e.zip
Add missing cpio dep and remove the old libXext version variant, bug #389599.
Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64
Diffstat (limited to 'dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild')
-rw-r--r--dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild16
1 files changed, 6 insertions, 10 deletions
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index 4fe298e14ff4..4540ce103ed7 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.9 2011/11/18 21:18:40 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -90,15 +90,11 @@ DEPEND="${RDEPEND}
app-misc/ca-certificates
dev-lang/perl
dev-libs/openssl
- || (
- (
- >=x11-libs/libXext-1.1.1
- >=x11-proto/xextproto-7.1.1
- x11-proto/xproto
- )
- <x11-libs/libXext-1.1.1
- )
- sys-apps/lsb-release"
+ >=x11-libs/libXext-1.1.1
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xproto
+ sys-apps/lsb-release
+ app-arch/cpio"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"