diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-05-10 16:50:07 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-05-10 16:50:07 +0000 |
| commit | ebb7088a50394b66def99ff58763e0de625f068b (patch) | |
| tree | ce4584e64e1238320179d58c1351846dd322bbbc | |
| parent | Added ~mips, bug 396669. (diff) | |
| download | gentoo-2-ebb7088a50394b66def99ff58763e0de625f068b.tar.gz gentoo-2-ebb7088a50394b66def99ff58763e0de625f068b.tar.bz2 gentoo-2-ebb7088a50394b66def99ff58763e0de625f068b.zip | |
Backport missing jdk-defaults.conf for arm #305773 and amd64-fbsd #415397
(Portage version: 2.1.10.57/cvs/Linux x86_64)
| -rw-r--r-- | dev-java/java-config/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.1.11-r3.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog index df1bba31d63f..d806a2bcb595 100644 --- a/dev-java/java-config/ChangeLog +++ b/dev-java/java-config/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/java-config # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.266 2012/04/15 18:30:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.267 2012/05/10 16:50:07 sera Exp $ + + 10 May 2012; Ralph Sennhauser <sera@gentoo.org> java-config-2.1.11-r3.ebuild: + Backport missing jdk-defaults.conf for arm #305773 and amd64-fbsd #415397 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> java-config-2.1.11-r3.ebuild: Add back ia64 love #349020 by Dennis Schridde. diff --git a/dev-java/java-config/java-config-2.1.11-r3.ebuild b/dev-java/java-config/java-config-2.1.11-r3.ebuild index 0a302d6bf669..a3a818c508b9 100644 --- a/dev-java/java-config/java-config-2.1.11-r3.ebuild +++ b/dev-java/java-config/java-config-2.1.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11-r3.ebuild,v 1.8 2012/04/15 18:30:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11-r3.ebuild,v 1.9 2012/05/10 16:50:07 sera Exp $ EAPI="2" PYTHON_DEPEND="*:2.6" @@ -31,6 +31,10 @@ src_prepare() { distutils_src_prepare epatch "${FILESDIR}/${P}-python3.patch" epatch "${FILESDIR}/python-abi-support.patch" + + cp config/jdk-defaults-{x86,amd64}-fbsd.conf || die #415397 + echo "*= icedtea-7 icedtea-6 icedtea-bin-7 icedtea-bin-6" \ + > config/jdk-defaults-arm.conf || die #305773 } src_test() { |