version bump; bug 166305

Package-Manager: portage-2.1.2-r7

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 16c00962a10c7089382aedff9de9e8052edd14e6..5e33815cbefae9681a20437d744c93b322a9ba2b 100644 (file)
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.20 2007/02/11 22:32:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.21 2007/02/11 22:47:48 blubb Exp $
+
+*emul-linux-x86-java-1.5.0.11 (11 Feb 2007)
+
+  11 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +emul-linux-x86-java-1.5.0.11.ebuild:
+  version bump; bug 166305
 
   11 Feb 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-java-1.6.0.ebuild:

diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 0f27952555c6a471617428e167ee5313aff4ce0c..d19c1cf15f3b0c0b1bcce71710d045a759461aea 100644 (file)
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -24,6 +24,7 @@ RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
 DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa
+DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 RMD160 0ff0c7c84086a3152a9e4e27f8795ea581e5936e SHA1 6cb2a5f91ef016509663f1008edcaef7c0ee3d5b SHA256 5152d941145c78fb93e9600d3098563fffac5aa1122a3d97c1efd86b9418fc1d
 MD5 d7233867c69e3bce503bd78c955e41de emul-linux-x86-java-1.4.2.03-r2.ebuild 3115
@@ -33,14 +34,18 @@ EBUILD emul-linux-x86-java-1.5.0.10.ebuild 4005 RMD160 e01649fd8a77cf3ee246bbb53
 MD5 cbdd19236681beec2d108c38701212ee emul-linux-x86-java-1.5.0.10.ebuild 4005
 RMD160 e01649fd8a77cf3ee246bbb53ba12f8e49e6b066 emul-linux-x86-java-1.5.0.10.ebuild 4005
 SHA256 66716890d7644cebca97172f8ff45ab811943bc53edcbdd67e99c09c7e1e538e emul-linux-x86-java-1.5.0.10.ebuild 4005
+EBUILD emul-linux-x86-java-1.5.0.11.ebuild 4004 RMD160 ae275cfd19a3bdfc723a7eaee4695f10da3e951d SHA1 9814a37b1dec84ce7eecefec957e6ea0ae2c3beb SHA256 3c000f83d0c5b8040866104766534019659e1b53bedbc3728b2aeef3a63ec5f9
+MD5 d41a56ed80e761e7bdcb8424f6fff4a0 emul-linux-x86-java-1.5.0.11.ebuild 4004
+RMD160 ae275cfd19a3bdfc723a7eaee4695f10da3e951d emul-linux-x86-java-1.5.0.11.ebuild 4004
+SHA256 3c000f83d0c5b8040866104766534019659e1b53bedbc3728b2aeef3a63ec5f9 emul-linux-x86-java-1.5.0.11.ebuild 4004
 EBUILD emul-linux-x86-java-1.6.0.ebuild 3709 RMD160 788e8c081735286753717e760cda298397759e9b SHA1 ef93b298cf84e8206796194e86779bbd27da7074 SHA256 02475dcb74b7bd2227da4ab8adc2a7a17785be730405fc09436654ba8f9e7b66
 MD5 bb167a976c47a0e2f06bad7a72d6aa76 emul-linux-x86-java-1.6.0.ebuild 3709
 RMD160 788e8c081735286753717e760cda298397759e9b emul-linux-x86-java-1.6.0.ebuild 3709
 SHA256 02475dcb74b7bd2227da4ab8adc2a7a17785be730405fc09436654ba8f9e7b66 emul-linux-x86-java-1.6.0.ebuild 3709
-MISC ChangeLog 4011 RMD160 62db69fce6415af850f6ae53f3f2834fb43cddd5 SHA1 4325ae8abbb7d257c5389829c2f81223497727ee SHA256 4462e757a5c12f97f97525574805de704465643fdaa443e73943e53b68244623
-MD5 40a512fa4d739ce95bfc9c1ef79ba112 ChangeLog 4011
-RMD160 62db69fce6415af850f6ae53f3f2834fb43cddd5 ChangeLog 4011
-SHA256 4462e757a5c12f97f97525574805de704465643fdaa443e73943e53b68244623 ChangeLog 4011
+MISC ChangeLog 4173 RMD160 b3a225b8613798f71fcb22033b8dc1cee7628175 SHA1 bdbebc8c8f2c3c3833007f1850328f59c5c608e9 SHA256 766ff361d313fd015dbf323709c5d5f68b95a9462cf697173a6f09dc432f9785
+MD5 dc750fa6ec9ebc54138a40407c876aa1 ChangeLog 4173
+RMD160 b3a225b8613798f71fcb22033b8dc1cee7628175 ChangeLog 4173
+SHA256 766ff361d313fd015dbf323709c5d5f68b95a9462cf697173a6f09dc432f9785 ChangeLog 4173
 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4
 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242
 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242
@@ -51,6 +56,9 @@ SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/di
 MD5 4121668bffa114e96d47967ddf45c8ab files/digest-emul-linux-x86-java-1.5.0.10 280
 RMD160 4e4287a55e5706d8cf3cc76047ab07e4addb0673 files/digest-emul-linux-x86-java-1.5.0.10 280
 SHA256 07c9cbdd3dcd7b5cf04289e64f12cb8cbc36c67626cc4752b30a0ee18090dffe files/digest-emul-linux-x86-java-1.5.0.10 280
+MD5 ab159652e4126c0070640bec7ba9e05f files/digest-emul-linux-x86-java-1.5.0.11 280
+RMD160 2c4fc8a7626a73fc519c7a15952fcdb4ba615b96 files/digest-emul-linux-x86-java-1.5.0.11 280
+SHA256 d45f41801f33a45e20fcd5d142301f5ab50e31d8964f7aafa1af837c3bde052f files/digest-emul-linux-x86-java-1.5.0.11 280
 MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0 259
 RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0 259
 SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0 259

diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild
new file mode 100644 (file)
index 0000000..7380b45
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2007 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.5.0.11.ebuild,v 1.1 2007/02/11 22:47:48 blubb Exp $
+
+inherit java-vm-2 eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+At="jdk-${MY_PVA}-dlj-linux-i586.bin"
+DESCRIPTION="32bit version Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+       X? ( || ( ( x11-libs/libICE
+                               x11-libs/libSM
+                               x11-libs/libX11
+                               x11-libs/libXau
+                               x11-libs/libXdmcp
+                               x11-libs/libXext
+                               x11-libs/libXi
+                               x11-libs/libXp
+                               x11-libs/libXt
+                               x11-libs/libXtst
+                         )
+                               virtual/x11
+                       )
+               )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+       opt/${P}/lib/i386/libdeploy.so"
+
+src_unpack() {
+       if [ ! -r ${DISTDIR}/${At} ]; then
+               die "cannot read ${At}. Please check the permission and try again."
+       fi
+
+       mkdir bundled-jdk
+       cd bundled-jdk
+       sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+
+       cd ..
+       bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+       ${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+       local dirs="bin lib man javaws plugin"
+       dodir /opt/${P}
+
+       for i in $dirs ; do
+               cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+       done
+       dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
+       dohtml Welcome.html
+       dodir /opt/${P}/share/
+
+       if use nsplugin; then
+               local plugin_dir="ns7-gcc29"
+               if has_version '>=sys-devel/gcc-3' ; then
+                       plugin_dir="ns7"
+               fi
+
+               install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+       fi
+
+       # TODO Don't think we still needs these -nichoj
+       # create dir for system preferences
+       #dodir /opt/${P}/jre/.systemPrefs
+       # Create files used as storage for system preferences.
+       #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+       #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+       #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+       #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+       # FIXME figure out how to handle the control pannel conflict with
+       # sun-jdk-bin
+
+       # install control panel for Gnome/KDE
+#      sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+#              -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#              ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#              ${T}/sun_java-${SLOT}.desktop
+
+#      domenu ${T}/sun_java-${SLOT}.desktop
+
+       set_java_env
+}
+
+pkg_postinst() {
+       # Set as default VM if none exists
+       java-vm-2_pkg_postinst
+
+       # if chpax is on the target system, set the appropriate PaX flags
+       # this will not hurt the binary, it modifies only unused ELF bits
+       # but may confuse things like AV scanners and automatic tripwire
+       if has_version sys-apps/chpax
+       then
+               echo
+               einfo "setting up conservative PaX flags for java"
+
+               for paxkills in "java"
+               do
+                       chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+               done
+
+               # /opt/$VM/jre/bin/java_vm
+               chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
+
+               einfo "you should have seen lots of chpax output above now"
+               ewarn "make sure the grsec ACL contains those entries also"
+               ewarn "because enabling it will override the chpax setting"
+               ewarn "on the physical files - help for PaX and grsecurity"
+               ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
+       fi
+
+       if ! use X; then
+               local xwarn="virtual/x11 and/or"
+       fi
+
+       echo
+       ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+       ewarn "Be careful which Java libraries you attempt to use."
+}

diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.11 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.11
new file mode 100644 (file)
index 0000000..77d5a8b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.11
@@ -0,0 +1,3 @@
+MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681
+RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681
+SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681