summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-12-19 18:55:08 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-12-19 18:55:08 +0000
commit469c1485305de1eaa3b00df095544692ec845659 (patch)
tree02db5b57fb4a31f213ee0fdb9c9815e4ab6d628c /app-emulation
parentMigrate to distutils-r1 and clean up. (diff)
downloadhistorical-469c1485305de1eaa3b00df095544692ec845659.tar.gz
historical-469c1485305de1eaa3b00df095544692ec845659.tar.bz2
historical-469c1485305de1eaa3b00df095544692ec845659.zip
Version bump.
Remove vulnerable. Remove unused auxiliary files. Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 Manifest-Sign-Key: 0x3C5CF75A
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/emul-linux-x86-java/ChangeLog11
-rw-r--r--app-emulation/emul-linux-x86-java/Manifest21
-rw-r--r--app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.38.ebuild (renamed from app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild)81
-rw-r--r--app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.6.env17
4 files changed, 38 insertions, 92 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 687f662f7c26..691efa236376 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for app-emulation/emul-linux-x86-java
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.120 2012/10/21 10:59:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.121 2012/12/19 18:54:58 sera Exp $
+
+*emul-linux-x86-java-1.6.0.38 (19 Dec 2012)
+
+ 19 Dec 2012; Ralph Sennhauser <sera@gentoo.org>
+ -emul-linux-x86-java-1.6.0.35.ebuild, +emul-linux-x86-java-1.6.0.38.ebuild,
+ -files/emul-linux-x86-java-1.6.env:
+ Version bump.
+ Remove vulnerable.
+ Remove unused auxiliary files.
21 Oct 2012; Agostino Sarubbo <ago@gentoo.org>
emul-linux-x86-java-1.6.0.37.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index a4142998b0d4..53c522d0b943 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48
-AUX emul-linux-x86-java-1.6.env 894 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df SHA512 5d48ae911515c8390d1ecefadd91249061ed156bcf8658139fb3437228603d2a281f27881699db7b81b7bc28e9e15e8c763e2b5f8529144c4b8876ef008da5ee WHIRLPOOL 232faadb734f1701a2363567754287c56e2bdc7824ad517c5a9b9b90b27b7e3f605d79f2a4b8803f7859da665d27eb4716199957d8202db3c6eadae7483e7119
AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
-DIST jre-6u35-linux-i586.bin 21697122 SHA256 55959143e602cb4edf2786d0f78c288eb44e7f105836aa949f2e0081a2fbd70c SHA512 981c9177b910f3530acf9b0998e33c79c9d5e0bb6da73694d87d48be50a30ba349e088e7b32ba8bf3b3c6b48789d12948eb82477123944dfef61d2972ddf88a5 WHIRLPOOL 8313107f4aee0b877bc4ba4f4fe22738a41a0229e04af7b0b528fe23b820ec207efff6a7565c97985e8b9497ff73c1b7f4117b281ab286b49d91583f45a67835
DIST jre-6u37-linux-i586.bin 21704353 SHA256 aeba98f45e3dcddd460e28165d89de521e69dfa69b76ca6aa21bda633dce4776 SHA512 5f80c83c4b359d044c09b8854536a04c59f0e8d0699c29920114866b348c666f6227719bdf2236961cd0ee2bbaf82d3d75f97d413e6a26a02a4b075ac0d0907c WHIRLPOOL 6ebdc24c344173fe2011cf3197e66f7291b2985e99357740d543e3f715dce14101cac7213ff2e782b0a1af328e94d813e8843a5fe22b12dc96002b97e05cd8b1
-EBUILD emul-linux-x86-java-1.6.0.35.ebuild 5333 SHA256 de4e2f9466a424530255acc5f942071bf9c2c4e0fdd02f662fbd536abb1f0301 SHA512 67e76acc742027d33ca7a507c9acdf9dae59cf87d461738167cd25fbee52b1a81736e855224ed58bccd5d589f97ff6fe357d76c3063e11a13f3cbabba8fec4e9 WHIRLPOOL cf5a9ae6c91c7c21c307567dff17c78deb56bcb3b90ae012575f0774c9b3ff028cbecf47decbdb6ba40856741c1ebe0cf1d73c4d72a14ea7b169b9445c74e9ff
+DIST jre-6u38-linux-i586.bin 21709114 SHA256 26ffa4f61d0dd542f3fe80a55cef43504263d3656953e37a9ca670e8e183b5ba SHA512 cf36e75f037722a5dc5fd30f1caef1b9da3f76c4435f5439be2d405e5d3f90a40bf79562a62345bb9c6d90d89bdc1e0628ed103ca93dc205d797552d104c4bf7 WHIRLPOOL f1e02a2dbf7b1370a3ab9c801d441a4723ee36fcbab7799119ad353b5dd81461227a1885f18a7a09153951e17b7681a06e6523fef77281d800d4ceaf34b7b133
EBUILD emul-linux-x86-java-1.6.0.37.ebuild 3464 SHA256 a0d8e3291dc94db05ae92f6a7a1b44918660952efe98e92440390b11d0ef0bc5 SHA512 11f71545d3d3fde2d4778f86070a643479642497ccf88577fe46a0ead4b263f6184dde1e4c8a20086bf16e5104424b1a173fd808918a37cf0956002387b4466f WHIRLPOOL ed536f544f882f9f57e4ae8c1f1712a4023e768772bbb95d9c02b611628088dc637e56ab7db6592fc76eff7149104ed8ee2345fd4d7b74f8f80bca877d81cd2f
-MISC ChangeLog 24289 SHA256 b7ff0945e45b0b26825d8b7e710fb0f9d1659f00c85741e6bba7fd0b448a746f SHA512 0ddcf8d564a639ecb239c14e5ee3fa488b484e348f679c707d7f01dbd85be0641c4d00d758178600a6dd92a2f3b7177d6a08d241d89ab2e1adfb58970225c2b9 WHIRLPOOL 78c6d8445ce118164e1219ff58fa90d153ede894055aeeba03ce9c9edd61ee70b52727cbe9cf5a02664d473b44361718feb232b6d12b8ee45f014bcc1c8b23f3
+EBUILD emul-linux-x86-java-1.6.0.38.ebuild 3467 SHA256 137e9d8a0fc683a8b64e58585cb20d9d09289a8a8e16110d509372d0b160a449 SHA512 71c32804dad90a8ed735de8a3649e27a25808435fd0f63d7948b13952c4446ec026ac772563899c013b2fcd55c63349387809c5a678fcc3b63a33d8eeefc2127 WHIRLPOOL 4425a152a4ab0c8def973c2abcf319ddeb58d3bc1d79a6d95400f378701e758249b2848acccdf164d3046e79f6076aa6fd3954ffc4e6d0b29ffd07b77024967c
+MISC ChangeLog 24572 SHA256 62bfedb1771b39cb0063b52a5ca75828cac6b7164a43916baca556e83fd70cea SHA512 823b100fd620feefa30dd6c9206e486be62b6cc181159514d67ee043f4da34fa9e8cb63e90dca5b74089646c72ba57afc84c6ad8c6fe3b75cf714b52cf99a2bf WHIRLPOOL b6b5a17c8d0ca89038b7d27f19349ad0fd13c351564046ffcafd893a764d693f9083d24c26103b6ecee5dbf900b44cc44c51ddefceccec76b4c9a97e4247896b
MISC metadata.xml 270 SHA256 68c40f50bd74b9038081e459c015f5786407bce5a45e2e1614566739d70cb21c SHA512 58bf7182934eb5030bae7032efde8e8b277fb4820a256d271a501904ded69b19937b1d17058ef770e3ecb7a526739bd1fae7d2163b5332fdd7e5c782cfbc647d WHIRLPOOL bf2557c8836c581b51c65a2f2488c77192072524696f36615a309d2bdb74ea7ed069f73438fe7ee0b5b83aaa7cf20162ffcdd5cbc6469411116e75805b67aeb4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ0g3xAAoJELjwI6Q8XPdaWHEH+QEWqklHVBU/TXoC9Qj5ZyTJ
+t68LIue3yVIkdnsK+o8dNqB5oK2LCNh+yv22Z/bWkVx3MclmRo2DaCwgAaoj2Kym
+HzJte/encDNPUrkru3jF/WjGwptA4IPPYJfb0iRTZGzyl/CT3/MyWcAQEPDTksyE
+CRPeva+vzs+NpAvPZvQfvlZDTtwbd7mpJYGnHTMYgq/xwdgKZP/7TtMm2ahCyOkf
+15wN1pvMyiTlkmI0dp7nDzNtwoqf84dzmd+oodkq0n7AOige7Jqc3nPgYDslj5u4
+zWUXGdbZ+VliTAe/43FC3h5a2m3F5X1cgPpcJzR47URQg7rA8LptJavVy+vD5B4=
+=GlLd
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.38.ebuild
index e049f32e5eac..2b9858c22fcd 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.38.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild,v 1.3 2012/09/02 18:04:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.38.ebuild,v 1.1 2012/12/19 18:54:58 sera Exp $
EAPI="4"
inherit java-vm-2 eutils prefix versionator
# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6u35-downloads-1836473.html"
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6u38-downloads-1877409.html"
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
S_PV="$(replace_version_separator 3 '_')"
@@ -20,14 +20,11 @@ SRC_URI="${X86_AT}"
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.6"
-KEYWORDS="-* amd64"
-IUSE="X alsa nsplugin pax_kernel"
+KEYWORDS="-* ~amd64"
+IUSE="+X alsa nsplugin pax_kernel"
RESTRICT="fetch strip"
-QA_TEXTRELS="
- opt/${P}/lib/i386/client/libjvm.so
- opt/${P}/lib/i386/motif21/libmawt.so
- opt/${P}/lib/i386/server/libjvm.so"
+QA_PREBUILT="*"
RDEPEND="
X? ( app-emulation/emul-linux-x86-xlibs )
@@ -42,9 +39,9 @@ S="${WORKDIR}/jre${S_PV}"
pkg_nofetch() {
einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
einfo ""
- einfo "Please download ${X86_AT} from:"
- einfo "${JRE_URI}"
- einfo "and move it to ${DISTDIR}"
+ einfo "Please download '${X86_AT}' from:"
+ einfo "'${JRE_URI}'"
+ einfo "and move it to '${DISTDIR}'"
}
src_unpack() {
@@ -96,7 +93,9 @@ src_install() {
sun-jcontrol-${PN}-${SLOT}.png || die
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
- -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+ -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+ -e "s#Application;##" \
+ -e "/Encoding/d" \
lib/desktop/applications/sun_java.desktop > \
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
@@ -111,61 +110,3 @@ src_install() {
set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
java-vm_revdep-mask
}
-
-QA_FLAGS_IGNORED="
- /opt/${P}/bin/java
- /opt/${P}/bin/java_vm
- /opt/${P}/bin/javaws
- /opt/${P}/bin/keytool
- /opt/${P}/bin/orbd
- /opt/${P}/bin/pack200
- /opt/${P}/bin/policytool
- /opt/${P}/bin/rmid
- /opt/${P}/bin/rmiregistry
- /opt/${P}/bin/servertool
- /opt/${P}/bin/tnameserv
- /opt/${P}/bin/unpack200
- /opt/${P}/lib/i386/client/libjvm.so
- /opt/${P}/lib/i386/headless/libmawt.so
- /opt/${P}/lib/i386/jli/libjli.so
- /opt/${P}/lib/i386/libawt.so
- /opt/${P}/lib/i386/libcmm.so
- /opt/${P}/lib/i386/libdcpr.so
- /opt/${P}/lib/i386/libdeploy.so
- /opt/${P}/lib/i386/libdt_socket.so
- /opt/${P}/lib/i386/libfontmanager.so
- /opt/${P}/lib/i386/libhprof.so
- /opt/${P}/lib/i386/libinstrument.so
- /opt/${P}/lib/i386/libioser12.so
- /opt/${P}/lib/i386/libj2gss.so
- /opt/${P}/lib/i386/libj2pcsc.so
- /opt/${P}/lib/i386/libj2pkcs11.so
- /opt/${P}/lib/i386/libjaas_unix.so
- /opt/${P}/lib/i386/libjava_crw_demo.so
- /opt/${P}/lib/i386/libjavaplugin_jni.so
- /opt/${P}/lib/i386/libjava.so
- /opt/${P}/lib/i386/libjawt.so
- /opt/${P}/lib/i386/libJdbcOdbc.so
- /opt/${P}/lib/i386/libjdwp.so
- /opt/${P}/lib/i386/libjpeg.so
- /opt/${P}/lib/i386/libjsig.so
- /opt/${P}/lib/i386/libjsoundalsa.so
- /opt/${P}/lib/i386/libjsound.so
- /opt/${P}/lib/i386/libmanagement.so
- /opt/${P}/lib/i386/libmlib_image.so
- /opt/${P}/lib/i386/libnative_chmod_g.so
- /opt/${P}/lib/i386/libnative_chmod.so
- /opt/${P}/lib/i386/libnet.so
- /opt/${P}/lib/i386/libnio.so
- /opt/${P}/lib/i386/libnpjp2.so
- /opt/${P}/lib/i386/libnpt.so
- /opt/${P}/lib/i386/librmi.so
- /opt/${P}/lib/i386/libsplashscreen.so
- /opt/${P}/lib/i386/libunpack.so
- /opt/${P}/lib/i386/libverify.so
- /opt/${P}/lib/i386/libzip.so
- /opt/${P}/lib/i386/motif21/libmawt.so
- /opt/${P}/lib/i386/native_threads/libhpi.so
- /opt/${P}/lib/i386/server/libjvm.so
- /opt/${P}/lib/i386/xawt/libmawt.so
- /opt/${P}/lib/jexec"
diff --git a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.6.env b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.6.env
deleted file mode 100644
index 211cd57e3cf9..000000000000
--- a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.6.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.6.env,v 1.2 2007/06/02 16:47:44 betelgeuse Exp $
-
-VERSION="Sun 32bit JRE @PV@"
-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/i386/:${JAVA_HOME}/lib/i386/native_threads/:${JAVA_HOME}/lib/i386/xawt/:${JAVA_HOME}/lib/i386/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.6"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"