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 | 2cbb0b111dc958d2a97cc4d0000b62a92341d88a (patch) | |
| tree | ba8fe64c13a7b3614191d974e4a205a7bf8854f2 /dev-java | |
| parent | Added ~mips, bug 408735. (diff) | |
| download | historical-2cbb0b111dc958d2a97cc4d0000b62a92341d88a.tar.gz historical-2cbb0b111dc958d2a97cc4d0000b62a92341d88a.tar.bz2 historical-2cbb0b111dc958d2a97cc4d0000b62a92341d88a.zip | |
Backport missing jdk-defaults.conf for arm #305773 and amd64-fbsd #415397
Package-Manager: portage-2.1.10.57/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/java-config/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/java-config/Manifest | 26 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.1.11-r3.ebuild | 6 |
3 files changed, 19 insertions, 18 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/Manifest b/dev-java/java-config/Manifest index 3f14b95ae497..4fec43a042f0 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -8,24 +8,18 @@ DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2f EBUILD java-config-2.1.10.ebuild 1368 RMD160 c91091f756d1c33f28555d807230ffea9df45d0f SHA1 651c977d85abad03029bbcd4c061ffdf0b7a94fd SHA256 73209555523d3ec6c19c440393044e974d84bd9bed1123590ccd4bb4f5214c89 EBUILD java-config-2.1.11-r1.ebuild 1341 RMD160 268aa628995bb218f5df2e5b2fe7e712ffdb8aa1 SHA1 71ae57e5d3ffeeca16927959e28df81c90de3281 SHA256 25713fe9936ac1e2901521a768bc2f0bb49223e652b79cef57a877e1bf6d962b EBUILD java-config-2.1.11-r2.ebuild 1426 RMD160 4efd855ccf8a1b8aeb2f6edcbdd2f7dc352eefa0 SHA1 bb79ce99a0d0cc6bcfbc04883e8f456362c5c391 SHA256 05c8ffb8543c203d8e59162b6b4db0de187ecb258524ff6f97c37f484b9c0f98 -EBUILD java-config-2.1.11-r3.ebuild 1518 RMD160 7494d8b02c5762c575c81a4b4c9178131e5b5837 SHA1 aeb617bf198dd452d7e3cda4d829f11782bc835d SHA256 2158025a144ec121b5e9f34ff5d48a4a6b0606432956d12babaf1caefa48abc7 +EBUILD java-config-2.1.11-r3.ebuild 1687 RMD160 8a452b3fe11143d8cde94769d13a946c5e837f04 SHA1 c460e63bb4e62507906d16fbc5532ebcd0b78c7a SHA256 67b1fd986466ac1d3b3bd434b67ab619de396ab63a637c261cde3f2ddd625bcb EBUILD java-config-2.1.11.ebuild 1272 RMD160 997e00744aa15351357c2eece275a254ff10a0cd SHA1 51b1e198f45b9e517b44a908679fdc540fdfbb9d SHA256 3ccd0248a12676812dfcbb7a9840339d4fd15941765f3fe37beb59175d9c61e8 -MISC ChangeLog 45240 RMD160 536a30cf5a7ab80f202b032723a5a2d5a89b9ce8 SHA1 2893cefc064d5af078286e0ce953d66a01f79656 SHA256 d0a5e1de8c2eea6516f3de6c75a0e7b48f38d649fb7f0577f91acd3d85766af6 +MISC ChangeLog 45395 RMD160 bfc5c8321609afbddff0467d6e276917613251a3 SHA1 3d67c24936470ba9ed65ad93006b3289fdc3fa8f SHA256 daec89dc5ac00b5297bb9fc97fb11a7ac8372f3a75ffed266ebdd20f47ff5d98 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPixPpAAoJELEHsLL7fEFWWqYQAKxPSFMmfjnMfOVtDM5FIpR+ -qYJjXEKOiVhBx31hdjb7/0X1SbzC7OG2/isK3MRJf9yHjVJQO9LrDz84FxLotiBs -T8WE9kxOsceEKB312wnU/Eu2+ok3GaR0KIcQ5vZwIqCikkZut5KsJ5nxpkTx6wRh -cWWtQAylJTg0lNPX/C1T8jbQoQEhbAdTqnYhewpmBNM24NMhvVu+wD0zGDhXdtTk -BURgUVIpRvno5vSxn4Wg6/1FoNkj6dBb9Xakvt8f9YwkT+pTpz3pJ1R7IU3iAN0S -XHksHcVP+MjlQpQ3/DqmUUxFr0xYqk7zvW9IzD4YJSlH8inb/QynjkBZzME3DNx4 -H90uV8WvCcWK5SQ1cQvIsPfk3mbispdZlK+OvBWb8p4GilM3qqR0+6mLnLHVYdWh -R5wTyEcg0ezjYRzphhkDSPJYSmBDy8EcexRgltXbuCWxSFLoV27qPZg+cSezJ1si -tUPAmuuIMZ3RFQmvkU8sxohnde+i2V49bFbYxqdVWQUsDrtbC9cBTO0TjhzgGOJZ -uE18ZBMCduKDpsrM8j9eXDS1rVZ7dLt+6uCbjpLgwwDuusHPmCza2JocRrlBvGzY -+rWHE2XN/6/LUcsaVHpn7bJbAHTvydROvZGIYVyLbQrMXtoZ4DhuR1kV7rjvKaAx -rhkxNt9C6MPB5BAkuTAr -=4W3W +iQEcBAEBAgAGBQJPq/HNAAoJEIUJ+svaV163/UMH/1AWOXKcj9vdSczN7gUS1kIj +d8e6MZTs2VQjLTYFEgJGrZlXCd7LsKxWkAa9g+B1NVupfogApQsGcs0398bJcFoT +3UkE0Xxa/2UyRzjyiNqoWcIDtERu4gxx8P+dONxwk6fde5LyNUiXYZ96n7B4VrQy +zJSINJJt6NBz/mfghycGiCMJXbT+GWABxuCs7FusrGBzebwjcwt4AiZMbpg7pbQF +mI7kiCO8DwOXHA5Dabri1a7Ze0ZYpjrIqjZcdsl+xBE7DmAgECZH1J4OAkZnn4Hq +csaNRj4whHY/HRB/msm0rkgJLYknea1diqOdc/Z30ProPMRW1tPiF2D1TYm9xAI= +=Mqze -----END PGP SIGNATURE----- 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() { |