From 410a56622d4fd3698d3a52f99ea5e603a665db57 Mon Sep 17 00:00:00 2001 From: Serkan Kaba Date: Thu, 15 Sep 2011 04:13:15 +0000 Subject: [PATCH] Add prefix to env file. Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- dev-java/icedtea6-bin/ChangeLog | 6 ++++- dev-java/icedtea6-bin/Manifest | 26 ++++++------------- dev-java/icedtea6-bin/files/icedtea6-bin.env | 10 +++---- .../icedtea6-bin/icedtea6-bin-1.10.2.ebuild | 4 +-- .../icedtea6-bin/icedtea6-bin-1.10.3.ebuild | 4 +-- 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog index 85e1d3dd6fd6..3e6c6ef1a8b2 100644 --- a/dev-java/icedtea6-bin/ChangeLog +++ b/dev-java/icedtea6-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea6-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.62 2011/08/02 14:59:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.63 2011/09/15 04:13:15 serkan Exp $ + + 15 Sep 2011; Serkan Kaba files/icedtea6-bin.env, + icedtea6-bin-1.10.2.ebuild, icedtea6-bin-1.10.3.ebuild: + Add prefix to env file. 02 Aug 2011; Markos Chandras icedtea6-bin-1.10.3.ebuild: diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest index 51ed3e4cc816..b9bc31e05daa 100644 --- a/dev-java/icedtea6-bin/Manifest +++ b/dev-java/icedtea6-bin/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 -AUX icedtea6-bin.env 947 RMD160 8f72b884c823f408755a3b06daea5af7705da488 SHA1 7473e4d987d5b0e9f1dbf48fbf4978e37d2f64b9 SHA256 b0f675b427f42d7fd1bbf1314523144a2bfc9f5ad44f89568adce120929f74e3 +AUX icedtea6-bin.env 1023 RMD160 6b5de5f11b11cecc72dc89077ec7795f322f030b SHA1 3392ee66d94e952ec63e682f5f1ad8cbb8b1d4a2 SHA256 729a1f5ee5c64c0270ae12acafd6a73dac0858edb5493868a98a2de4b606d0ff DIST icedtea6-bin-core-1.10.2-amd64.tar.bz2 35149854 RMD160 00100a4689a85bb5f8275d80385ba83159b30808 SHA1 7c7adffe4915d30258e394e8d24a5db2ad57b222 SHA256 457961a0bbf2b57d6cdbbf365c9c975f9cc23e3f80e620c285ddd3c8496651b1 DIST icedtea6-bin-core-1.10.2-x86.tar.bz2 36115323 RMD160 0b75fb16d32d2d03cc45794e8bf2329c05c8ae04 SHA1 fc3a459853dcd42889a713da908383c7acfd9be7 SHA256 0f36d76c67dd8cb285b0a08695286cc71dd4e4dda5ce71f51fb6cb1b318f33e8 DIST icedtea6-bin-core-1.10.3-amd64.tar.bz2 35157530 RMD160 6cdd0bca9ebdbbdf647870c9ae2d6a9d15550161 SHA1 534e5a75d61d1c28d765abbe13f4961789209c47 SHA256 45f7bab3c49b7dba40f3909164efd9992ca78de8b1d1b7641efb2647500ba257 @@ -18,24 +18,14 @@ DIST icedtea6-bin-nsplugin-1.10.3-amd64.tar.bz2 901853 RMD160 8f0a7466b923f7e74b DIST icedtea6-bin-nsplugin-1.10.3-x86.tar.bz2 895214 RMD160 56f2d1167d3979c42823c325ff89437a9725640c SHA1 f9709e44fd9719f023f50839bf16fba2f10bcb26 SHA256 4583fa09fb83ec79e4ac71b7b423453877bf613cb4e3dfe02f169383f3b92503 DIST icedtea6-bin-src-1.10.2.tar.bz2 40817645 RMD160 5331ebd98d5a480a8a02ae85ba15dec18e81f05c SHA1 c0bf5e7e6dbfc29c68656a38db160aaf565dca8a SHA256 1cc7f91f6849cc40b1b924e71d404910f45d74668cd6eb32439bc4d77adb76ff DIST icedtea6-bin-src-1.10.3.tar.bz2 40818662 RMD160 6285f875e59cd1f6423a45f975cae0dfc9945392 SHA1 d22efefbdefcf1e1e4476dbde44554b96e9f9dd9 SHA256 8a81efcf7ef34b64e1306b041b886a4281a28d9a21ea6cae2f899993d01394dd -EBUILD icedtea6-bin-1.10.2.ebuild 2805 RMD160 f0f0e61a1609b3080a8742289724466611bf0fd9 SHA1 c6c9cdb6145d33635db85d00558202cd36d96789 SHA256 09622cad26498a5cdf4acf0bc8362929c11f60a9cf37628c6acb67ca4c253bc3 -EBUILD icedtea6-bin-1.10.3.ebuild 2805 RMD160 8006271ae80dbe765c88c491b67413cd0ab98fde SHA1 cd6a2587e9f8b0e26b1db4c8b9166cc46624b315 SHA256 41f30f1b69f533ae496d6e01da0ccb74a291195d97a17bae5f767f3fb5104fed -MISC ChangeLog 10217 RMD160 a1cf62a432923c8df242bbb3504615e0f13bc562 SHA1 656dce9b307776a991e11ec3a04596f94a1e5667 SHA256 0a97eea99998cb2d4e113bcd90e32b3ee72ccc2c54d98f5a3dad9f1abf2df243 +EBUILD icedtea6-bin-1.10.2.ebuild 2827 RMD160 a6d43b51bcde6376e531888a92c18800b26562bf SHA1 1c32b1c81813588ad175aaebb2c7821305da8940 SHA256 3fa9dfafed806802c1c7ab2f472f31c6baa35aea28dbb252294f2a3bb7af5eb0 +EBUILD icedtea6-bin-1.10.3.ebuild 2827 RMD160 655fb819dd69a3bf750ab2f05f412743a180e5e9 SHA1 a4a54e0e2b8d55ede51da550c073c0cc552e2b81 SHA256 b80ab4a5304136af21e8ea338c8b75fdb3ca872638dbf20af8c49c7f4773c0f4 +MISC ChangeLog 10371 RMD160 55792f2497ba2bbabbbab0043d4bbd577b0d51fc SHA1 a9bb55b4202727463c9451ae909cca689edf7cb2 SHA256 4390d952675d2fae578501cbf3942d2624eb69fa7717a9e355c2183ea5517e52 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOOBDhAAoJEPqDWhW0r/LCkL0P/1ECd8YEpavNys33wIAiQIjN -N6qVjnvbKcakFrMJ97quyQeDc3dGTrAKTzl4ymDjnJ9XrJemhuSOlYJkxUerVm8r -jOWcOr0kaRJaD/z1vi6+o5QIYkrP55q3OSK47VHb65Yq5T4I9UB9XXBxz5TBqBxH -0P1p+KTyZYyL7RfFO9nSMGjbjgZJvfVcPT+6A1TkZZe6bw/a4e4bQTj04Ir4ZOAf -V1UxxO1c85qBfMEaLRfJY1f9ShODAfzta+gvrQnzqUTfT0G4Nec/cF9ZqJ6wIMNA -dUT+saJA87Kgi72kG6BdmzCN/5bZekfjZz4ZYptita7ISp/ex6X3JacRetfkSnUV -JmXNYpP4+IV1DOd5KjSy3M3C9YIKJXC5nTG+n7E+2dQPLdHWSNTJxHVj0Cb69OXC -kWQWPbLcEyOKyoS1ApaKnUcEgMjX57Er8JVNtRMdSe9I8DXnH4N1q0nuOlHowvlC -RWJppzNwFgsUeSr1ynjFYG1t5e8G+yj6/4EtoGfvGYX4o5ht6mNG52Y4XYKqL44e -uN1OK4CmH8m49QkR9dIcIVhNAYpfChc8L4FrIUj7aUpSdMlLy3aGD+vky78WqaGF -Ixd47d+ofwF2l6rzdwu7SEdHUtc75kxJLBcez521Jw95ewdZFN+q4aZ/fqqa9Tou -dzfcccCkUJptIl6G2TVA -=nk1c +iEYEARECAAYFAk5xe2QACgkQRh6X64ivZaJnbACfSXcPUtbnMpUBWWCzXyYELDla +yqcAnRZcbJvxtWqIRC4NwDYuMkfKiWC0 +=B+OK -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea6-bin/files/icedtea6-bin.env b/dev-java/icedtea6-bin/files/icedtea6-bin.env index c896da51d737..60a44b98c848 100644 --- a/dev-java/icedtea6-bin/files/icedtea6-bin.env +++ b/dev-java/icedtea6-bin/files/icedtea6-bin.env @@ -1,15 +1,15 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/files/icedtea6-bin.env,v 1.1 2008/12/24 22:22:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/files/icedtea6-bin.env,v 1.2 2011/09/15 04:13:15 serkan Exp $ VERSION="IcedTea6-bin @PV@" -JAVA_HOME=/opt/@P@ -JDK_HOME=/opt/@P@ +JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" +JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" JAVAC=${JAVA_HOME}/bin/javac PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="/opt/@P@/man" +MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" PROVIDES_TYPE="JDK JRE" PROVIDES_VERSION="1.6" # Taken from sun.boot.class.path property diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild index daf3765f6bd7..fd6c322cc436 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild,v 1.3 2011/06/20 11:43:21 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild,v 1.4 2011/09/15 04:13:15 serkan Exp $ EAPI="1" @@ -28,7 +28,7 @@ RESTRICT="strip" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${TARBALL_VERSION}" diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild index c4b8fa1483b5..f8d834fc0ae2 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild,v 1.3 2011/08/02 14:59:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild,v 1.4 2011/09/15 04:13:15 serkan Exp $ EAPI="1" @@ -28,7 +28,7 @@ RESTRICT="strip" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${TARBALL_VERSION}" -- 2.26.2