summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2014-11-01 18:01:59 +0000
committerVlastimil Babka <caster@gentoo.org>2014-11-01 18:01:59 +0000
commit01377b3101d611b665c713f9743ef5a439579e2f (patch)
tree209ff8a2d5e8c7c9a2043529ae86e7d353745f5e /dev-java/icedtea-web
parentBump the openjdk tarball; switch to icedtea-web:0 unconditionally and block i... (diff)
downloadgentoo-2-01377b3101d611b665c713f9743ef5a439579e2f.tar.gz
gentoo-2-01377b3101d611b665c713f9743ef5a439579e2f.tar.bz2
gentoo-2-01377b3101d611b665c713f9743ef5a439579e2f.zip
Block >=icedtea-6.1.13.5-r1 to make the block mutual.
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-java/icedtea-web')
-rw-r--r--dev-java/icedtea-web/ChangeLog5
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.3.2.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 016020dc83c7..f3ccce42218c 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/icedtea-web
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.42 2014/07/01 05:36:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.43 2014/11/01 18:01:59 caster Exp $
+
+ 01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.3.2.ebuild:
+ Block >=icedtea-6.1.13.5-r1 to make the block mutual.
01 Jul 2014; Agostino Sarubbo <ago@gentoo.org> icedtea-web-1.4.2.ebuild:
Stable for x86, wrt bug #501472
diff --git a/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild
index 45d61494af42..1b4d2f8cd287 100644
--- a/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild,v 1.1 2013/07/23 21:08:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.2.ebuild,v 1.2 2014/11/01 18:01:59 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
@@ -19,6 +19,7 @@ IUSE="build doc javascript +nsplugin test"
COMMON_DEP="
dev-java/icedtea:${SLOT}
+ !>=dev-java/icedtea-6.1.13.5-r1:6
nsplugin? (
>=dev-libs/glib-2.16
)"