diff options
author | 2015-05-23 23:05:43 +0000 | |
---|---|---|
committer | 2015-05-23 23:05:43 +0000 | |
commit | a16c79e435ce15eb8580de51f98c0db62d0ffb0e (patch) | |
tree | 6036a928591d71afbdc1cf7677ccbcb337c43ae3 /dev-java/icedtea | |
parent | ~arm keyword. (diff) | |
download | gentoo-2-a16c79e435ce15eb8580de51f98c0db62d0ffb0e.tar.gz gentoo-2-a16c79e435ce15eb8580de51f98c0db62d0ffb0e.tar.bz2 gentoo-2-a16c79e435ce15eb8580de51f98c0db62d0ffb0e.zip |
~arm keyword but only for 7. We're phasing 6 out so I don't think
we'll bother for arm any more. Disallow building with icedtea-6 until
bug #531082 is resolved.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'dev-java/icedtea')
-rw-r--r-- | dev-java/icedtea/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-7.2.5.5.ebuild | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 8a6455160710..d6e1fab8c9af 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.135 2015/05/21 09:01:24 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.136 2015/05/23 23:05:43 chewi Exp $ + + 23 May 2015; James Le Cuirot <chewi@gentoo.org> icedtea-7.2.5.5.ebuild: + ~arm keyword but only for 7. We're phasing 6 out so I don't think we'll bother + for arm any more. Disallow building with icedtea-6 until bug #531082 is + resolved. 21 May 2015; James Le Cuirot <chewi@gentoo.org> +files/6-more-memory.patch, +files/7-more-memory.patch, icedtea-6.1.13.7.ebuild, icedtea-7.2.5.5.ebuild: diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.5.5.ebuild index 06534feb35a3..d65d1a199e50 100644 --- a/dev-java/icedtea/icedtea-7.2.5.5.ebuild +++ b/dev-java/icedtea/icedtea-7.2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v 1.3 2015/05/21 09:01:24 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v 1.4 2015/05/23 23:05:43 chewi Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -59,7 +59,7 @@ SRC_URI=" ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~x86" RESTRICT="test" IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin @@ -137,9 +137,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 dev-java/icedtea:7 - dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip @@ -182,7 +180,6 @@ pkg_setup() { JAVA_PKG_WANT_BUILD_VM=" icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin gcj-jdk" JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" |