summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbrana <wbrana@gmail.com>2012-08-30 23:54:01 +0200
committerwbrana <wbrana@gmail.com>2012-08-30 23:54:01 +0200
commitd629d14bdc759a8f8e4b0b43744c2a77100710f6 (patch)
treef4e28550e2bafc0b02ed307c06af76007facb4a0
parentremove nvidia-drivers-304.43 (diff)
downloadwbrana-d629d14bdc759a8f8e4b0b43744c2a77100710f6.tar.gz
wbrana-d629d14bdc759a8f8e4b0b43744c2a77100710f6.tar.bz2
wbrana-d629d14bdc759a8f8e4b0b43744c2a77100710f6.zip
version bump oracle32-jdk-bin to 1.7.0.7
-rw-r--r--dev-java/oracle32-jdk-bin/Manifest5
-rw-r--r--dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild (renamed from dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.6.ebuild)34
2 files changed, 6 insertions, 33 deletions
diff --git a/dev-java/oracle32-jdk-bin/Manifest b/dev-java/oracle32-jdk-bin/Manifest
index 4bcc374..a460ffb 100644
--- a/dev-java/oracle32-jdk-bin/Manifest
+++ b/dev-java/oracle32-jdk-bin/Manifest
@@ -1,6 +1,5 @@
AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
AUX oracle32-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
-DIST jdk-7u6-linux-i586-demos.tar.gz 14741227 SHA256 15001be7615e92ffb21e805fdd17b56e2ac7cfa29eb7e429c8d2a81e9cff3dfc SHA512 aa43805ab2c87a06b3fadd0af02aeb005731bd8a423b15f92e32b2cbde48820880be4bf1ae92261c81f7d660341169f4d00a8281756b26b99470704942ff1541 WHIRLPOOL 393efe2d4dbc320f5f7495fb05504384169f56d7fbde5cda8688c8f45121ca52a94b3acaea9f5353bb9c1fc8b366a347d8dbc91f12f14a31ee64a25542b9444e
-DIST jdk-7u6-linux-i586.tar.gz 97360299 SHA256 852cf2db507d1ff831dec01e757912023bb6219f32de83912ba52f04af6a8275 SHA512 d60865f340b19bbf78c24f2a05674b123cfae1efc551d131b84f881ae373bd13ed9c889145f58a3a5ba393aca85dd61915d2dc02313af6c61cc654960af3a478 WHIRLPOOL 60288919615b0ef054a2779a904ed623a7074498582015c0d9d35f94b33e79742bb4fd5e04fb7116c73c19a0808d0ae31b4d85b2f012cc85a475134e1268eb40
-EBUILD oracle32-jdk-bin-1.7.0.6.ebuild 10748 SHA256 e3c022c5837d302ebcb035b62ab2d629b21101c57d8ee61ee287cf81edc0cbb0 SHA512 1cc81f36707827e3d72dcd2daea4c4959bf9adff4d5d9eb12a0cdce46ac1cc983829cc28669de590ee49c5faeb5e30485d1bb72c6b84022a68ac642a7f903d13 WHIRLPOOL 8e61af6c56ad39519bd8064ffc1a435326a778d772355f020c19c0e0f1eb4f89873c670de4b3d30b779e94d9ecf8fd2f278274267d06de540572cd64321853ec
+DIST jdk-7u7-linux-i586.tar.gz 97373835 SHA256 d54497580794091831cac86f93b066e0a4105b08acaf2c5d430dea87d2bf7ffe SHA512 67b45f68cffd4212abfe7b4ec2ddab06214ba38b45bdf6cff96ec51be4c57d33e6ccceab75655b2d08b6c88aedc423372b80ef1d7a7a4b326696b89808329cc3 WHIRLPOOL 50d1ffb69dab9e2eaac02eb6e3d3f0aac4ef1317ec1b1f55a11dc7d21944e37170d0ab9c5516d23452b8bd17e3d49a0cf4f09649bdd92b9058931a169f6da0fc
+EBUILD oracle32-jdk-bin-1.7.0.7.ebuild 10086 SHA256 8af49611f55fd259878de4e6b7da564351b34c28e8f0052dc6b6bb0ac7c2b4f7 SHA512 21c990bfc407c952f3e64cbf127b2235d17cfcdb20d632e05e7ee73606bf5595778896a7632c51200af11938babf4fa0a76e79852926ec1bd3411015f6c96924 WHIRLPOOL 82b1bc6701c7404376f6431571cea65270bd51a23c6f9eb1f96e1caae7bbbfb394b2dabebfa74bc3254a1ad3429513d8d7b01d3f554ca0d1cec4155f68e182b2
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.6.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild
index f903f21..8364eba 100644
--- a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.6.ebuild
+++ b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild
@@ -7,7 +7,7 @@ EAPI="4"
inherit java-vm-2 eutils prefix versionator
# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1637583.html"
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7u7-downloads-1836413.html"
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
UPDATE="$(get_version_component_range 4)"
@@ -15,7 +15,6 @@ MY_PV="$(get_version_component_range 2)u${UPDATE}"
S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
AMD64_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
JCE_DIR="UnlimitedJCEPolicy"
JCE_FILE="${JCE_DIR}JDK7.zip"
@@ -23,15 +22,14 @@ JCE_FILE="${JCE_DIR}JDK7.zip"
DESCRIPTION="Oracle's Java SE Development Kit"
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
SRC_URI="
- amd64? ( ${AMD64_AT}
- examples? ( ${AMD64_DEMOS} ) )
+ amd64? ( ${AMD64_AT} )
jce? ( ${JCE_FILE} )"
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.7"
KEYWORDS="~amd64"
-IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
+IUSE="+X alsa derby doc +fontconfig jce nsplugin pax_kernel +source"
RESTRICT="fetch strip"
RDEPEND="
@@ -69,30 +67,10 @@ pkg_nofetch() {
AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
fi
- if use x86; then
- DEMOS=${X86_DEMOS}
- elif use amd64; then
- DEMOS=${AMD64_DEMOS}
- elif use x86-solaris; then
- DEMOS=${SOL_X86_DEMOS}
- elif use x64-solaris; then
- DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
- elif use sparc-solaris; then
- DEMOS=${SOL_SPARC_AT}
- elif use sparc64-solaris; then
- DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
- fi
-
einfo "Please download ${AT} from:"
einfo "${JDK_URI}"
einfo "and move it to ${DISTDIR}"
- if use examples; then
- einfo "Also download ${DEMOS} from:"
- einfo "${JDK_URI}"
- einfo "and move it to ${DISTDIR}"
- fi
-
if use jce; then
einfo "Also download ${JCE_FILE} from:"
einfo "${JCE_URI}"
@@ -149,10 +127,6 @@ src_install() {
cp -pPR db "${ddest}" || die
fi
- if use examples; then
- cp -pPR demo sample "${ddest}" || die
- fi
-
# Remove empty dirs we might have copied
find "${D}" -type d -empty -exec rmdir {} + || die