From a7c180e6468d964beb59f8f3f8ca80208283e1f9 Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Sat, 10 Feb 2007 19:35:52 +0000 Subject: [PATCH] Pruned old revisions with same keywords. Package-Manager: portage-2.1.2-r9 --- app-emulation/emul-linux-x86-java/ChangeLog | 7 +- app-emulation/emul-linux-x86-java/Manifest | 23 +-- .../emul-linux-x86-java-1.4.2.03-r1.ebuild | 120 --------------- .../emul-linux-x86-java-1.5.0.08.ebuild | 141 ------------------ .../digest-emul-linux-x86-java-1.4.2.03-r1 | 3 - .../files/digest-emul-linux-x86-java-1.5.0.08 | 3 - 6 files changed, 10 insertions(+), 287 deletions(-) delete mode 100644 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild delete mode 100644 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.08.ebuild delete mode 100644 app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1 delete mode 100644 app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.08 diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 5e4f275af25f..1e8dc6943f88 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,11 @@ # 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.18 2007/02/03 05:17:53 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.19 2007/02/10 19:35:52 nichoj Exp $ + + 10 Feb 2007; Joshua Nichols + -emul-linux-x86-java-1.4.2.03-r1.ebuild, + -emul-linux-x86-java-1.5.0.08.ebuild: + Pruned old revisions with same keywords. 03 Feb 2007; Steve Dibb metadata.xml, emul-linux-x86-java-1.5.0.10.ebuild: diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index d64cdff3d2fd..30868edb80d3 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -23,21 +23,12 @@ MD5 40fcbcc585ad443b5bf473228c8ef18d files/javasettings_Linux_x86.xml 1601 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml 1601 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_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 -EBUILD emul-linux-x86-java-1.4.2.03-r1.ebuild 3098 RMD160 4cd5ee03d4bb9898da9a9f0e3fb6bf4e4f3be29c SHA1 81ae71ef019662a5667e88c445da5f7c3b681fb4 SHA256 44c0f286fb1bf112ed4f5c53d4f294dbbe34a8f0d53507a297d7c6f5665af59e -MD5 3068277991ae1d4daef6dd14fd0d67d3 emul-linux-x86-java-1.4.2.03-r1.ebuild 3098 -RMD160 4cd5ee03d4bb9898da9a9f0e3fb6bf4e4f3be29c emul-linux-x86-java-1.4.2.03-r1.ebuild 3098 -SHA256 44c0f286fb1bf112ed4f5c53d4f294dbbe34a8f0d53507a297d7c6f5665af59e emul-linux-x86-java-1.4.2.03-r1.ebuild 3098 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 RMD160 0ff0c7c84086a3152a9e4e27f8795ea581e5936e emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 SHA256 5152d941145c78fb93e9600d3098563fffac5aa1122a3d97c1efd86b9418fc1d emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 -EBUILD emul-linux-x86-java-1.5.0.08.ebuild 4005 RMD160 92997aa71d4987ef748ca1bde956e5896ddce6eb SHA1 2f89db7b6bd952bf70b35054174ae5461c669c62 SHA256 372cad57538cda2c2d33bf8ae1c802483c9797a03dcfa6b33055dc00b889ce2b -MD5 dd62a084f8299d052d875476070455a5 emul-linux-x86-java-1.5.0.08.ebuild 4005 -RMD160 92997aa71d4987ef748ca1bde956e5896ddce6eb emul-linux-x86-java-1.5.0.08.ebuild 4005 -SHA256 372cad57538cda2c2d33bf8ae1c802483c9797a03dcfa6b33055dc00b889ce2b emul-linux-x86-java-1.5.0.08.ebuild 4005 EBUILD emul-linux-x86-java-1.5.0.10.ebuild 4005 RMD160 e01649fd8a77cf3ee246bbb53ba12f8e49e6b066 SHA1 bf211f7c90f1016c6f40e907c82beddccc25630f SHA256 66716890d7644cebca97172f8ff45ab811943bc53edcbdd67e99c09c7e1e538e MD5 cbdd19236681beec2d108c38701212ee emul-linux-x86-java-1.5.0.10.ebuild 4005 RMD160 e01649fd8a77cf3ee246bbb53ba12f8e49e6b066 emul-linux-x86-java-1.5.0.10.ebuild 4005 @@ -46,23 +37,17 @@ EBUILD emul-linux-x86-java-1.6.0.ebuild 3637 RMD160 a778ffc88f39d8a1ba4fcc33f3aa MD5 6d925fd9a6df47549407fe6543b6ea5f emul-linux-x86-java-1.6.0.ebuild 3637 RMD160 a778ffc88f39d8a1ba4fcc33f3aafcb9dc297b87 emul-linux-x86-java-1.6.0.ebuild 3637 SHA256 48f0b5df1fcc414edb4edb9794bd76103d42761829cbf4e102d5e7502faed6be emul-linux-x86-java-1.6.0.ebuild 3637 -MISC ChangeLog 3722 RMD160 24c17d01680e7c72f51419c0d2d4d5cf5d60ea7f SHA1 231d76b7d6b165e6a492ca4524024c3229011b1d SHA256 e3237ad69239ec68a5786935202e84841d7ed139551b5bad5a6116fa8a12d29b -MD5 cc87793dd806a70f3bf2a1a98823ea3b ChangeLog 3722 -RMD160 24c17d01680e7c72f51419c0d2d4d5cf5d60ea7f ChangeLog 3722 -SHA256 e3237ad69239ec68a5786935202e84841d7ed139551b5bad5a6116fa8a12d29b ChangeLog 3722 +MISC ChangeLog 3898 RMD160 242ece12481a18f8a6fef6eaf360bc54c1acbca5 SHA1 93ba095a2d8220416a247d8a381c0723526cf0dc SHA256 23f15e339a1a7cdc24cb8cb1d0437b988ba088b27fb5a170ddad8252c750fe59 +MD5 ee96a04659d3da8129c03986993f0797 ChangeLog 3898 +RMD160 242ece12481a18f8a6fef6eaf360bc54c1acbca5 ChangeLog 3898 +SHA256 23f15e339a1a7cdc24cb8cb1d0437b988ba088b27fb5a170ddad8252c750fe59 ChangeLog 3898 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4 metadata.xml 242 -MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r1 271 -RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r1 271 -SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r1 271 MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r2 271 RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r2 271 SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r2 271 -MD5 f6d9b4f7871723b537a0d7c3ee6d776c files/digest-emul-linux-x86-java-1.5.0.08 280 -RMD160 b66681eb3d4866d9411362fa20d7cf55f8d93f27 files/digest-emul-linux-x86-java-1.5.0.08 280 -SHA256 3ee0c46629a8afb9fcbab31de25bd98ad094b95a0c4968637cebdf794be4d5f4 files/digest-emul-linux-x86-java-1.5.0.08 280 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 diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild deleted file mode 100644 index d896760e3268..000000000000 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2006 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.4.2.03-r1.ebuild,v 1.5 2006/03/09 01:49:19 flameeyes Exp $ - -inherit multilib java versionator - -JREV="03" - -JV="${PV}" -JV=$(get_version_component_range 1-3 ${JV}) -DESCRIPTION="32bit java emulation for amd64" -J_URI="mirror://blackdown.org/JDK-${JV}" -SRC_URI="${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586.bin" - -HOMEPAGE="http://www.blackdown.org" - -SLOT="1.4.2" -LICENSE="sun-bcla-java-vm" -KEYWORDS="-* amd64" -IUSE="nsplugin" -DEPEND="virtual/libc - >=sys-apps/sed-4" -RDEPEND="virtual/libc - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-soundlibs" - -S="${WORKDIR}/j2re${JV}" - -JAVAHOME="${D}/opt/java32" - -# 32bit binary package -pkg_setup() { - ABI="x86" -} - -RESTRICT="nostrip" - -# Extract the 'skip' value (offset of tarball) we should pass to tail -get_offset() { - [ ! -f "$1" ] && return - - local offset="`gawk ' - /^[[:space:]]*skip[[:space:]]*=/ { - - sub(/^[[:space:]]*skip[[:space:]]*=/, "") - SKIP = $0 - } - - END { print SKIP } - ' $1`" - - eval echo $offset -} - -src_unpack () { - local offset="`get_offset ${DISTDIR}/${A}`" - - if [ -z "${offset}" ] ; then - eerror "Failed to get offset of tarball!" - die "Failed to get offset of tarball!" - fi - - echo ">>> Unpacking ${A}..." - tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf - -} - -unpack_jars() { - # New to 1.4.2 - local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" - local UNPACK_CMD="" - if [ -f "$JAVAHOME/lib/unpack" ]; then - UNPACK_CMD="$JAVAHOME/lib/unpack" - chmod +x "$UNPACK_CMD" - #packerror="" - sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD - for i in $PACKED_JARS; do - if [ -f "$JAVAHOME/${i%.jar}.pack" ]; then - einfo "Creating ${JAVAHOME}/${i}" - "$UNPACK_CMD" "$JAVAHOME/${i%.jar}.pack" "$JAVAHOME/$i" - if [ ! -f "$JAVAHOME/$i" ]; then - die "Failed to unpack jar files ${i}." # Please refer\n" - #ewarn "to the Troubleshooting section of the Installation\n" - #ewarn "Instructions on the download page for more information.n" - #packerror="1" - fi - rm -f "$JAVAHOME/${i%.jar}.pack" - fi - done - fi - rm -f "$UNPACK_CMD" -} - -src_install() { - typeset platform - - dodir /opt/java32 - - cp -pPR ${S}/{bin,lib,man,plugin,javaws} ${JAVAHOME} || die "failed to copy" - - dodoc COPYRIGHT README - dohtml README.html - - # Install mozilla plugin - if use nsplugin ; then - install_mozilla_plugin /opt/java32/plugin/i386/mozilla/libjavaplugin_oji.so - fi - - sed -i "s/standard symbols l/symbol/g" ${D}/opt/java32/lib/font.properties - - find ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \; - - unpack_jars - - # Install java settings file for openoffice so that it will not try - # to use the native 64bit jre and cause 2 minute startup... - dodir /usr/$(get_libdir)/openoffice/share/config - insinto /usr/$(get_libdir)/openoffice/share/config - doins ${FILESDIR}/javasettings_Linux_x86.xml -} - diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.08.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.08.ebuild deleted file mode 100644 index ed6e81d67993..000000000000 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.08.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# 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.08.ebuild,v 1.2 2007/01/23 10:50:33 beandog 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.4.2.03-r1 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1 deleted file mode 100644 index 6903ab4b3355..000000000000 --- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431 -RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431 -SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431 diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.08 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.08 deleted file mode 100644 index d00d890f6ddf..000000000000 --- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.08 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3e2935cca24ceb54dd2181892a3d5456 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 -RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 -SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 -- 2.26.2