From b8a626114df24a81f214f209cee6dce60591c27c Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 19 Dec 2011 23:13:07 +0100 Subject: [PATCH] dev-java/sun-jre-bin: correct java config file for libjvm.so and correct fetch restrict notice (Portage version: 2.2.0_alpha78/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- dev-java/sun-jre-bin/ChangeLog | 4 ++++ dev-java/sun-jre-bin/Manifest | 6 +++--- dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env | 4 ++-- dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild | 8 +++++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 5eef090..8f66608 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Dec 2011; Mario Fetka sun-jre-bin-1.6.0.27.ebuild, + files/sun-jre-bin-1.6.env: + correct java config file for libjvm.so and correct fetch restrict notice + 11 Dec 2011; Mario Fetka -sun-jre-bin-1.6.0.10.ebuild, -sun-jre-bin-1.6.0.21.ebuild, -sun-jre-bin-1.6.0.25.ebuild, sun-jre-bin-1.6.0.27.ebuild: diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index b4b03f5..557bf2c 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,8 +1,8 @@ AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 -AUX sun-jre-bin-1.6.env 900 RMD160 e9e219f6096b0cbf35315f5e6015ff0facfef9cd SHA1 dcb469843756552757a3e99df0e2da055eeeb3ea SHA256 aa111a700e2029ca6b4c3dca0183d59121275822c702bae14f41242d677ca5f1 +AUX sun-jre-bin-1.6.env 936 RMD160 830d1fee15dc2ba8dab9b4c78d2b072ba5e29f0f SHA1 3ee1d036d214d0bd1254be0cecefaf94224cefe9 SHA256 0d4cf9f8c6cd3e1e466e215f3f90c696802910f39f8e33f6ff7a6a9ca87d58d9 DIST ejre-1_6_0_27-fcs-b07-linux-arm-sflt-eabi-headless-18_jul_2011.tar.gz 27858955 RMD160 a47a72111b531ef750bfd8f9ddec24ad408cdcda SHA1 90eeda6bc1cb11fbc4460e5644de7d35a2de3681 SHA256 55e063836f3ea5e98f020fbc44898c89b74f2770f29b286f27fbac30e0ad4a4d DIST ejre-1_6_0_27-fcs-b07-linux-arm-vfp-eabi-headful-18_jul_2011.tar.gz 34316063 RMD160 6f2adbbd0f206f920f1beb1ced6e7ff462841dfa SHA1 3a85b0df7f0c8967a5801615f90293b76ce0fa7f SHA256 d65f89fd537b4c912348b3f651ca6fb6c7726115b6882440e10b95f52ed681f5 DIST ejre-1_6_0_27-fcs-b07-linux-arm-vfp-eabi-headless-18_jul_2011.tar.gz 27726930 RMD160 398d69394cf0caba9f78b749c806aa6545f21535 SHA1 bf66081cca44e008cf1d9d576fcc39c88d9232cf SHA256 d8b02bd16c95435d9c460cea060bc10b6eda00a2e8864d6412074903dd73243c -EBUILD sun-jre-bin-1.6.0.27.ebuild 3395 RMD160 b7773438bfcf8a5fb0899b68bc612b49ac2648b2 SHA1 c3e79a78f056e623812f6e6a599c8a603692688c SHA256 6c7a96580f40178aaa887b6183e8ddf9658fbafb9779d97c99cf0fe66197a633 -MISC ChangeLog 1186 RMD160 4eceb073dff6297558708a1b2cff233d51ae4d77 SHA1 385adba4057dfd43dc08dbae558f7ebfe7400b2f SHA256 a47556ee0b1dac515d44b8398a534990cb7f89dbb46cf65fcb7ac00ac2098aee +EBUILD sun-jre-bin-1.6.0.27.ebuild 3582 RMD160 47d74d226a5c920687174d6407983881bf7736cb SHA1 aae85c8eda16e4a59bbb025ae4e55b75fc6e258a SHA256 ff233dcff2af900508980e53c938cc373e01fb018a3c2793c2be802bcfe04113 +MISC ChangeLog 1371 RMD160 e823834b2b7b9c812bf1a29bdc8376f425e5c16c SHA1 07734e5a67e5d5a2c2ad603ff825f2877a861e6e SHA256 8969e2dc9c913ce5951ce0e439016db83e8d4d06c482128f64285d5e2f95d4f1 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env index 1af8ae0..0c4348b 100644 --- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env +++ b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env @@ -1,4 +1,4 @@ -# Copyright 1999-2005 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/sun-jre-bin/files/sun-jre-bin-1.6.env,v 1.2 2007/06/02 16:23:14 betelgeuse Exp $ @@ -7,7 +7,7 @@ JAVA_HOME=/opt/@P@ JRE_HOME=/opt/@P@ PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws" ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws" -LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/" +LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/:${JAVA_HOME}/lib/@PLATFORM@/client/" MANPATH="/opt/@P@/man" PROVIDES_TYPE="JRE" PROVIDES_VERSION="1.6" diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild index 16fee00..2840efa 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild @@ -105,7 +105,13 @@ pkg_postinst() { pkg_nofetch() { einfo "This files require you to register at ${HOMEPAGE} (free account)" einfo "Please download following file:" - einfo " - ${ARMV5_AT}" + if [[ ${CHOST/-*/} -eq "armv5tel" ]]; then + einfo " - ${ARMV5_AT}" + elif [[ ${CHOST/-*/} -eq "armv6j" ]]; then + einfo " - ${ARMV6_AT}" + elif [[ ${CHOST/-*/} -eq "armv7a" ]]; then + einfo " - ${ARMV7_AT}" + fi einfo "from ${HOMEPAGE}" einfo "and place them in ${DISTDIR}" } \ No newline at end of file