Use QA_TEXTREL for the known textrels, remove old version.

(Portage version: 2.1.2_rc2-r3)
 (Signed Manifest commit)

3 files changed, 11 insertions, 172 deletions

diff --git a/dev-java/diablo-jdk/Manifest b/dev-java/diablo-jdk/Manifest
index 80df4e940f5e..cdbe8041bafd 100644
--- a/dev-java/diablo-jdk/Manifest
+++ b/dev-java/diablo-jdk/Manifest
@@ -5,35 +5,26 @@ AUX diablo-jdk-1.5.env 931 RMD160 cdd7b0c36df2afb06aa08e47467d683afb10d3e7 SHA1
 MD5 76584a3430393a1962cd786f393abddb files/diablo-jdk-1.5.env 931
 RMD160 cdd7b0c36df2afb06aa08e47467d683afb10d3e7 files/diablo-jdk-1.5.env 931
 SHA256 7259d151c8ec3158e968338a1651f4c3e42a0af3b5b36d831fcf46ebb9a33cec files/diablo-jdk-1.5.env 931
-DIST diablo-caffe-freebsd6-i386-1.5.0_07-b00.tar.bz2 54346328 RMD160 6a2153e40a104f7caf4ab817afa4ba012d0b55cf SHA1 d0b602d0084fb74c210072f16abaae1e816cb0be SHA256 cbd165dbc285907f9802b6a3a87014ddef1ef568ca2bd120273aa356efbc4429
 DIST diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2 54347274 RMD160 b49c88ebd63b23a0e322f7a5809a303d0aa487fc SHA1 1a5bf35b745880a0326b9dca370d72fd95fae5a6 SHA256 b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
-DIST jce_policy-1_5_0.zip 8826 RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 SHA1 f0e887b91b4499142285633e65c5710c3a133a16 SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
-EBUILD diablo-jdk-1.5.0.07.00.ebuild 4324 RMD160 ea4f25c2df919ab982817a9187575ec184010f80 SHA1 72ee80108415448c7f164b3b6c0cb63da081f050 SHA256 195ab2ca5a92f313462e26d3d2db7bd0b6de5c8885a3320721edc879afd63c78
-MD5 f68075bac2638a34d3adbc9c838b2c72 diablo-jdk-1.5.0.07.00.ebuild 4324
-RMD160 ea4f25c2df919ab982817a9187575ec184010f80 diablo-jdk-1.5.0.07.00.ebuild 4324
-SHA256 195ab2ca5a92f313462e26d3d2db7bd0b6de5c8885a3320721edc879afd63c78 diablo-jdk-1.5.0.07.00.ebuild 4324
-EBUILD diablo-jdk-1.5.0.07.01.ebuild 3846 RMD160 76b964a77716c1f4564c4fbd558c66e29fd50e82 SHA1 142710f3fec7155fde3eabae6082adf39d712a64 SHA256 8012571ba50d49e027d1d010d13ac79959a29bc2ef809c285e4cebeabb79f14e
-MD5 daa0689ef17612b3ebe847993194f94b diablo-jdk-1.5.0.07.01.ebuild 3846
-RMD160 76b964a77716c1f4564c4fbd558c66e29fd50e82 diablo-jdk-1.5.0.07.01.ebuild 3846
-SHA256 8012571ba50d49e027d1d010d13ac79959a29bc2ef809c285e4cebeabb79f14e diablo-jdk-1.5.0.07.01.ebuild 3846
-MISC ChangeLog 779 RMD160 6abf0aa41ef1ca4e4c02fa31d91d2476c69c2166 SHA1 b9fd318c2907f7542dabeac1d474a67557243ea4 SHA256 899fe6b2d99560cab0f6dd16e5cd221c0572ece6e52d069da7592b9daed0319f
-MD5 13350c2d10e1a7f0ddcc02593a265d5f ChangeLog 779
-RMD160 6abf0aa41ef1ca4e4c02fa31d91d2476c69c2166 ChangeLog 779
-SHA256 899fe6b2d99560cab0f6dd16e5cd221c0572ece6e52d069da7592b9daed0319f ChangeLog 779
+EBUILD diablo-jdk-1.5.0.07.01.ebuild 3987 RMD160 b49973db428c023e69774ed7207e29963334087f SHA1 7fd81bef15ff4f5a43791474e660b75dfab16b15 SHA256 dba3fddb1f9dfe51c9f159f5e1780b1c3f783597f7da7ddac6a489d27e28b00b
+MD5 d52ac80e1e61cafaa8b691bdb38dc214 diablo-jdk-1.5.0.07.01.ebuild 3987
+RMD160 b49973db428c023e69774ed7207e29963334087f diablo-jdk-1.5.0.07.01.ebuild 3987
+SHA256 dba3fddb1f9dfe51c9f159f5e1780b1c3f783597f7da7ddac6a489d27e28b00b diablo-jdk-1.5.0.07.01.ebuild 3987
+MISC ChangeLog 962 RMD160 f5192fb07a2d16957f21b2aa23f6311c58c97c64 SHA1 9ad137fb75a251bea657b95b58f70ec652a5a886 SHA256 32e130946b8df1208c14c430cb2217199ca26a0ef59d4407c229d1e333243468
+MD5 934767cf70d1a9a512c6e3be0ae814f2 ChangeLog 962
+RMD160 f5192fb07a2d16957f21b2aa23f6311c58c97c64 ChangeLog 962
+SHA256 32e130946b8df1208c14c430cb2217199ca26a0ef59d4407c229d1e333243468 ChangeLog 962
 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 de73719e35ac239adc1d0adf920f3ff2 files/digest-diablo-jdk-1.5.0.07.00 563
-RMD160 e61ed3a2f622cdee75f37c8f4c8e2212fe597b2c files/digest-diablo-jdk-1.5.0.07.00 563
-SHA256 0e822aa6449f803a1a0989ad0abebbb64e8d99fbcc9d0d662e39ea3bac1e2b94 files/digest-diablo-jdk-1.5.0.07.00 563
 MD5 7fa7b8966d4a2752dd0ec3f7e0ca090e files/digest-diablo-jdk-1.5.0.07.01 328
 RMD160 8457365f13161f51894eb3b8cb09e7669e72a8d0 files/digest-diablo-jdk-1.5.0.07.01 328
 SHA256 b8b06245ef48a1704c058821f6fff26ab6dcaf753eb96ccb777506379fe9d227 files/digest-diablo-jdk-1.5.0.07.01 328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLBQVGDyatLGpTbYRAvYLAJ4xgFwtXek1p0w+iHdkIUZXTrBGyQCgneNF
-m4ZQ6KCCJwR3zJ9SVVWubsE=
-=iZPL
+iD8DBQFFcwA0AiZjviIA2XgRApxRAKC3Hl0Q207AhRKXBOYmiodvkAVaNwCgnhE5
+UpMPDsJKe0MCFvV6q8zmD24=
+=lRvR
 -----END PGP SIGNATURE-----
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.00.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.00.ebuild
deleted file mode 100644
index ffe3ad9227fd..000000000000
--- a/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.00.ebuild
+++ /dev/null
@@ -1,146 +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-jdk/diablo-jdk-1.5.0.07.00.ebuild,v 1.2 2006/09/12 22:34:12 flameeyes Exp $
-
-inherit java-vm-2 eutils versionator
-
-DESCRIPTION="Java Development Kit"
-HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
-MY_PV=$(replace_version_separator 3 '_')
-MY_PVL=$(get_version_component_range 1-3)
-
-javafile="diablo-caffe-freebsd6-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
-jcefile="jce_policy-$(replace_all_version_separators '_' ${MY_PVL}).zip"
-
-SRC_URI="$javafile
-	jce? ( $jcefile )"
-
-LICENSE="sun-bcla-java-vm"
-SLOT="1.5"
-KEYWORDS="-* ~x86-fbsd"
-RESTRICT="fetch nofetch"
-IUSE="X doc examples nsplugin jce"
-
-JAVA_VM_NO_GENERATION1=true
-
-DEPEND="jce? ( app-arch/unzip )"
-RDEPEND="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
-			)
-		)
-		=sys-freebsd/freebsd-lib-6*
-		=virtual/libstdc++-3.3*"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"
-
-pkg_nofetch() {
-	einfo "Please download ${javafile} from:"
-	einfo "${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		echo
-		einfo "Also download ${jcefile} from:"
-		einfo "http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip "${D}"/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo "${D}"/opt/${P}/share/
-		cp -pRR sample "${D}"/opt/${P}/share/
-	fi
-
-	if use jce ; then
-		cd "${D}"/opt/${P}/jre/lib/security
-		unzip "${DISTDIR}"/${jcefile} || die "failed to unzip jce"
-		mv jce unlimited-jce
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/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}/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
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# 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."
-
-	echo
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.00 b/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.00
deleted file mode 100644
index 31c41a098544..000000000000
--- a/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.00
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6895c81a112dca63b29945543959cd29 diablo-caffe-freebsd6-i386-1.5.0_07-b00.tar.bz2 54346328
-RMD160 6a2153e40a104f7caf4ab817afa4ba012d0b55cf diablo-caffe-freebsd6-i386-1.5.0_07-b00.tar.bz2 54346328
-SHA256 cbd165dbc285907f9802b6a3a87014ddef1ef568ca2bd120273aa356efbc4429 diablo-caffe-freebsd6-i386-1.5.0_07-b00.tar.bz2 54346328
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
-RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 jce_policy-1_5_0.zip 8826
-SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b jce_policy-1_5_0.zip 8826