caster 14/10/05 22:16:38
Modified: ChangeLog icedtea-6.1.13.3.ebuild
icedtea-7.2.4.7.ebuild
Removed: icedtea-6.1.13.1.ebuild icedtea-7.2.4.5.ebuild
icedtea-7.2.4.6.ebuild icedtea-6.1.13.2.ebuild
Log:
Fix icedtea-web dependencies, bug #500264.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key 4E61DE84)
Revision Changes Path
1.122 dev-java/icedtea/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.122&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.122&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.121&r2=1.122
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog 17 May 2014 15:22:54 -0000 1.121
+++ ChangeLog 5 Oct 2014 22:16:38 -0000 1.122
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.121
2014/05/17 15:22:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.122
2014/10/05 22:16:38 caster Exp $
+
+ 05 Oct 2014; Vlastimil Babka <cas...@gentoo.org> -icedtea-6.1.13.1.ebuild,
+ -icedtea-6.1.13.2.ebuild, icedtea-6.1.13.3.ebuild, -icedtea-7.2.4.5.ebuild,
+ -icedtea-7.2.4.6.ebuild, icedtea-7.2.4.7.ebuild:
+ Fix icedtea-web dependencies, bug #500264.
17 May 2014; Sven Vermeulen <sw...@gentoo.org> icedtea-6.1.12.7.ebuild,
icedtea-6.1.13.1.ebuild, icedtea-6.1.13.2.ebuild, icedtea-6.1.13.3.ebuild,
1.4 dev-java/icedtea/icedtea-6.1.13.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?r1=1.3&r2=1.4
Index: icedtea-6.1.13.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icedtea-6.1.13.3.ebuild 17 May 2014 15:22:54 -0000 1.3
+++ icedtea-6.1.13.3.ebuild 5 Oct 2014 22:16:38 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v
1.3 2014/05/17 15:22:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v
1.4 2014/10/05 22:16:38 caster Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
# *********************************************************
@@ -116,8 +116,14 @@
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
- nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:6
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[nsplugin]
+ >=dev-java/icedtea-web-1.3.2:6[nsplugin]
+ ) )"
S="${WORKDIR}"/${ICEDTEA_PKG}
1.3 dev-java/icedtea/icedtea-7.2.4.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?r1=1.2&r2=1.3
Index: icedtea-7.2.4.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icedtea-7.2.4.7.ebuild 17 May 2014 15:22:54 -0000 1.2
+++ icedtea-7.2.4.7.ebuild 5 Oct 2014 22:16:38 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v
1.2 2014/05/17 15:22:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v
1.3 2014/10/05 22:16:38 caster Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
# *********************************************************
@@ -148,8 +148,14 @@
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
- nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:7
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[icedtea7,nsplugin]
+ >=dev-java/icedtea-web-1.3.2:7[nsplugin]
+ ) )"
S="${WORKDIR}"/${ICEDTEA_PKG}
