Version bump, remove stricter restrict, use QA_TEXTREL instead.

Package-Manager: portage-2.1.2_rc2-r3

4 files changed, 19 insertions, 149 deletions

diff --git a/dev-java/diablo-jre-bin/Manifest b/dev-java/diablo-jre-bin/Manifest
index 45bdf1a32d51..7ed04398c6b3 100644
--- a/dev-java/diablo-jre-bin/Manifest
+++ b/dev-java/diablo-jre-bin/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX diablo-jre-bin.env 857 RMD160 ecb246ad635588e6f2ce54d94bd23de21929ed31 SHA1 d3625226ee900ae84005ab47c76abbcb956e788a SHA256 e0bde66cd3e560048dfb8cadd51d97a616a051ffc2739d1de24d862e7d4c1db6
-MD5 e40ea86586e0063acb2e4a673971dc75 files/diablo-jre-bin.env 857
-RMD160 ecb246ad635588e6f2ce54d94bd23de21929ed31 files/diablo-jre-bin.env 857
-SHA256 e0bde66cd3e560048dfb8cadd51d97a616a051ffc2739d1de24d862e7d4c1db6 files/diablo-jre-bin.env 857
-DIST diablo-latte-freebsd6-i386-1.5.0_07-b00.tar.bz2 23099246 RMD160 4b6e6abbe1566c8b5d418f6c6d8780c0a5b6fa36 SHA1 bb79faa0aca4204968ccc7f4a9434e1942707fef SHA256 f83d5c7bf7e7346e06dbe45f0953c88882516b76b9047b5e1bd90a71d5598ba5
-EBUILD diablo-jre-bin-1.5.0.07.00.ebuild 2910 RMD160 539ca8146ae62f2f7c332b856fceb0f7dd64b286 SHA1 b1fa891c38aba72fcded2f442e704899ee7194c6 SHA256 0621cb20eb64d926d4475e0e69373c80237c1114a902896571a2dceed5d66829
-MD5 a097629d26e0ef073bcd4c7f23f82a52 diablo-jre-bin-1.5.0.07.00.ebuild 2910
-RMD160 539ca8146ae62f2f7c332b856fceb0f7dd64b286 diablo-jre-bin-1.5.0.07.00.ebuild 2910
-SHA256 0621cb20eb64d926d4475e0e69373c80237c1114a902896571a2dceed5d66829 diablo-jre-bin-1.5.0.07.00.ebuild 2910
-MISC ChangeLog 575 RMD160 a508494e32b26b68c996010b4989aa20236342d1 SHA1 d274dd98060d19501cc4680c971602cd4a78ca25 SHA256 e4e4a10d947730e5601bad9846e948b726c7bbfcd31653ddc259244ed38baa69
-MD5 d5799569d1b3ad13224b9e9f777cdbf5 ChangeLog 575
-RMD160 a508494e32b26b68c996010b4989aa20236342d1 ChangeLog 575
-SHA256 e4e4a10d947730e5601bad9846e948b726c7bbfcd31653ddc259244ed38baa69 ChangeLog 575
+AUX diablo-jre-bin-1.5.env 861 RMD160 f34ba3ad36868cb4615c27be8194583a124d4ec0 SHA1 903913fe34fb8acf01f77d4f523aa74f6af0ac72 SHA256 a69c88c2ef9dda45f2f2a3d4564ea9c82bcab7b46c551255bc7e59ee8c061001
+MD5 8ff8c331a3c0750093ac81c31eea0baf files/diablo-jre-bin-1.5.env 861
+RMD160 f34ba3ad36868cb4615c27be8194583a124d4ec0 files/diablo-jre-bin-1.5.env 861
+SHA256 a69c88c2ef9dda45f2f2a3d4564ea9c82bcab7b46c551255bc7e59ee8c061001 files/diablo-jre-bin-1.5.env 861
+DIST diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2 23104037 RMD160 fa5bc67cfda969fb0dc4d735310cc4f44698000a SHA1 f27c7b48f9a2df51ad5e1f96bc86121474850538 SHA256 4585f35124416de052c8be10f0f48536053ab5c33dc3b7d728bf6e84d9b42c14
+EBUILD diablo-jre-bin-1.5.0.07.01.ebuild 3039 RMD160 d8d3e09c142af32b5c21fb82eea6392bdf174fa7 SHA1 80fd413f86e0aac2b270124187fd5939d9c47a09 SHA256 8c7030a9803ec1b71708d8c7e32edef6112a198e3291ca7aa5169dc2ea9584c4
+MD5 bc0df0d7f4fdacab9f4bfa110b8cd813 diablo-jre-bin-1.5.0.07.01.ebuild 3039
+RMD160 d8d3e09c142af32b5c21fb82eea6392bdf174fa7 diablo-jre-bin-1.5.0.07.01.ebuild 3039
+SHA256 8c7030a9803ec1b71708d8c7e32edef6112a198e3291ca7aa5169dc2ea9584c4 diablo-jre-bin-1.5.0.07.01.ebuild 3039
+MISC ChangeLog 872 RMD160 6fa83ad436716fd7ee4c1a31e9a0a64b4a07a41d SHA1 72247b82dfa727ce9d95ae220ceb137818b3fbeb SHA256 1aa0b91f1356896f747ec464e90d87b4e85d142bc1f8caab1725ca0631ef15c3
+MD5 4538a778e2122fbfe7ed296db9a518b9 ChangeLog 872
+RMD160 6fa83ad436716fd7ee4c1a31e9a0a64b4a07a41d ChangeLog 872
+SHA256 1aa0b91f1356896f747ec464e90d87b4e85d142bc1f8caab1725ca0631ef15c3 ChangeLog 872
 MISC metadata.xml 174 RMD160 ca6c62aed497dda7f37566e87822ecf3d3837307 SHA1 0623170dc79b0b4246516ead7f3c8d7140ebea98 SHA256 a72a4c6c4f49cdb0a9d6077a5eebcb1f6e4e69fb31c201b45cf6fa50dab581f1
 MD5 ac2cc0c9a997d0165cf1db45e97681c9 metadata.xml 174
 RMD160 ca6c62aed497dda7f37566e87822ecf3d3837307 metadata.xml 174
 SHA256 a72a4c6c4f49cdb0a9d6077a5eebcb1f6e4e69fb31c201b45cf6fa50dab581f1 metadata.xml 174
-MD5 9a414bddc2c92426bd47b8053e1ec803 files/digest-diablo-jre-bin-1.5.0.07.00 328
-RMD160 0f5cb86f6b45f13a083f0c9920ec477fb5207494 files/digest-diablo-jre-bin-1.5.0.07.00 328
-SHA256 f7b8c859405b6a438b14c375cc7b4427bf042bf461e7e49c6ac607c92491d8a0 files/digest-diablo-jre-bin-1.5.0.07.00 328
+MD5 efc123d20772296fbc675f994b13c5ca files/digest-diablo-jre-bin-1.5.0.07.01 328
+RMD160 2528415d55d3dcff728637bc3cdc6b45e0c6335a files/digest-diablo-jre-bin-1.5.0.07.01 328
+SHA256 dc96c5437a19ea489e4885027ce6de9af1339b5da119d11e88cb570d4ce1488e files/digest-diablo-jre-bin-1.5.0.07.01 328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBzZSAiZjviIA2XgRAgM1AJ9oWKdH1ZQxC7p2yDt4UFXI5exz8QCgnQak
-r3k6e03j9+MuX7go7pvsjKY=
-=8Zvp
+iD8DBQFFcwJGAiZjviIA2XgRAtw2AKCv7NkCogg3KPNoJRcZ0ACI7W61YACaAv68
+miSmDWlzpNUpxrlaOzsNPQA=
+=sFvO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.00.ebuild b/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.00.ebuild
deleted file mode 100644
index 0ef2d5f64282..000000000000
--- a/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.00.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.00.ebuild,v 1.2 2006/09/12 22:35:56 flameeyes Exp $
-
-inherit java-vm-2 eutils versionator
-
-DESCRIPTION="Java Runtime Environment"
-HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
-MY_PV=$(replace_version_separator 3 '_')
-MY_PVA=$(replace_version_separator 4 '-b' ${MY_PV})
-
-SRC_URI="diablo-latte-freebsd6-i386-${MY_PVA}.tar.bz2"
-
-LICENSE="sun-bcla-java-vm"
-SLOT="1.5"
-KEYWORDS="-* ~x86-fbsd"
-RESTRICT="fetch stricter"
-IUSE="X nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-DEPEND=""
-RDEPEND="X? ( || ( (
-					x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXi
-					x11-libs/libXp
-					x11-libs/libXt
-					x11-libs/libXtst
-				)
-				virtual/x11
-			)
-		)
-		=sys-freebsd/freebsd-lib-6*
-		=virtual/libstdc++-3.3*"
-
-S="${WORKDIR}/diablo-jre$(get_version_component_range 1-4 ${MY_PV})"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from:"
-	einfo "${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_install() {
-	cd "${S}"
-	local dirs="bin lib man plugin javaws"
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT README
-	dohtml Welcome.html
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/plugin/i386/ns7/libjavaplugin_oji.so
-	fi
-
-	# Change libz.so.3 to libz.so.1
-	scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${P}/ | \
-		while read i; do
-		if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; then
-			export SANITY_CHECK_LIBZ_FAILED=1
-			break
-		fi
-		sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
-	done
-	[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/
-	mkdir -p "${PREFS_LOCATION}"/.systemPrefs
-	if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.system.lock ] ; then
-		touch "${PREFS_LOCATION}"/.systemPrefs/.system.lock
-		chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.system.lock
-	fi
-	if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile ] ; then
-		touch "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
-		chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="virtual/x11 and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/diablo-jre-bin/files/diablo-jre-bin.env b/dev-java/diablo-jre-bin/files/diablo-jre-bin.env
deleted file mode 100644
index 22db29fab55c..000000000000
--- a/dev-java/diablo-jre-bin/files/diablo-jre-bin.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/files/diablo-jre-bin.env,v 1.1 2006/07/21 00:25:06 flameeyes Exp $
-
-VERSION="Sun 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/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.00 b/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.00
deleted file mode 100644
index 162a9479d6a8..000000000000
--- a/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a58da6ee530362596226ccb47f837195 diablo-latte-freebsd6-i386-1.5.0_07-b00.tar.bz2 23099246
-RMD160 4b6e6abbe1566c8b5d418f6c6d8780c0a5b6fa36 diablo-latte-freebsd6-i386-1.5.0_07-b00.tar.bz2 23099246
-SHA256 f83d5c7bf7e7346e06dbe45f0953c88882516b76b9047b5e1bd90a71d5598ba5 diablo-latte-freebsd6-i386-1.5.0_07-b00.tar.bz2 23099246