Fixed the installation of the icon and the desktop entry reported in bug #108212...

Package-Manager: portage-2.0.53_rc3

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 27fade2a34f8451f981017425a0fcae50a02fca5..421085bbb1c5efccf773bea493abfcbe7c1a7cfe 100644 (file)
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.65 2005/08/26 13:22:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.66 2005/10/06 20:33:29 betelgeuse Exp $
+
+*blackdown-jre-1.4.2.02-r1 (06 Oct 2005)
+
+  06 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +blackdown-jre-1.4.2.02-r1.ebuild:
+  Fixed the installation of the icon and the desktop entry reported in bug
+  #108212. Thanks to Dave Shanker <dshanker@gmail.com> for reporting.
 
   26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   blackdown-jre-1.4.2.02.ebuild:

diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 54bce62d902f674d78212fd49856094e574550a6..7a7e8db08d1ff4d325ab22181ed1ffb91f6d3236 100644 (file)
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 50c63ab99ed317b5df93a6c30867dcd6 ChangeLog 10697
 MD5 d135006f528c94d929ce500cdabb376a blackdown-jre-1.3.1-r9.ebuild 1926
-MD5 fd44a3e6705e26769f5350e8ad1ce5fb blackdown-jre-1.4.2.02.ebuild 3595
-MD5 920c02e106a9ebeb5e0a70ccf9618e23 blackdown-jre-1.4.2.01-r1.ebuild 3596
-MD5 e4a37045e917b08b452c15610d0ef3de ChangeLog 10418
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 8539d8f669acccfd74a0141a492b543c blackdown-jre-1.4.1-r1.ebuild 2928
-MD5 7d186c2364cc118125d06076161306a8 files/digest-blackdown-jre-1.4.2.01-r1 151
+MD5 920c02e106a9ebeb5e0a70ccf9618e23 blackdown-jre-1.4.2.01-r1.ebuild 3596
+MD5 b82d92b2b9de7d5af44a0ea49e7b1310 blackdown-jre-1.4.2.02-r1.ebuild 3845
+MD5 fd44a3e6705e26769f5350e8ad1ce5fb blackdown-jre-1.4.2.02.ebuild 3595
+MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
+MD5 271b1f89b9f0f70dd5154090978263b1 files/blackdown-jre-1.4.1 425
+MD5 57462605c4cce61fe2ac166306c5b491 files/blackdown-jre-1.4.2.01 428
+MD5 d807d4748f853aab768ead08cffd5454 files/blackdown-jre-1.4.2.02 428
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
 MD5 773e3dae29edd26397f43c1e1ab99dae files/digest-blackdown-jre-1.4.1-r1 248
+MD5 7d186c2364cc118125d06076161306a8 files/digest-blackdown-jre-1.4.2.01-r1 151
 MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02 151
-MD5 57462605c4cce61fe2ac166306c5b491 files/blackdown-jre-1.4.2.01 428
-MD5 d807d4748f853aab768ead08cffd5454 files/blackdown-jre-1.4.2.02 428
-MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
-MD5 271b1f89b9f0f70dd5154090978263b1 files/blackdown-jre-1.4.1 425
+MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02-r1 151
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIyEa/rLF9B432nYRAlnWAJ9jZttiwQPfijItRLuHc/2clv9KfQCgicgl
-5JG7sWYIlbpRgbvE+bIPA5U=
-=Cf4A
+iD8DBQFDRYpEQiJ/wx066S4RAjk9AJ4zjSL5tPZP679L/3olbmv0eWymoACggZmU
+rrh2mQGRH9faz4VBQGsW2m0=
+=xnGq
 -----END PGP SIGNATURE-----

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild
new file mode 100644 (file)
index 0000000..57fd6c3
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.1 2005/10/06 20:33:29 betelgeuse Exp $
+
+inherit java versionator
+
+JREV="02"
+
+JV="${PV}"
+JV=$(get_version_component_range 1-3 ${JV})
+DESCRIPTION="Blackdown Java Runtime Environment ${PV}"
+J_URI="mirror://blackdown.org/JDK-${JV}"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
+       x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586.bin )"
+#      sparc? ( ${J_URI}/sparc/${JREV}/j2re-${JV}-${JREV}-linux-sparc.bin )"
+#      ppc? ( ${J_URI}/ppc/${JREV}j2re-${JV}-${JREV}-linux-ppc.bin )"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="browserplugin mozilla"
+DEPEND="virtual/libc
+       >=dev-java/java-config-1.2.11
+       >=sys-apps/sed-4"
+PROVIDE="virtual/jre"
+
+S="${WORKDIR}/j2re${JV}"
+
+JAVAHOME="${D}/opt/${P}"
+
+# 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/`dirname $i`/`basename $i .jar`.pack" ]; then
+                               einfo "Creating ${JAVAHOME}/${i}\n"
+                               "$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $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/`dirname $i`/`basename $i .jar`.pack"
+                       fi
+               done
+       fi
+       rm -f "$UNPACK_CMD"
+}
+
+src_install() {
+       typeset platform
+
+       dodir /opt/${P}
+
+       cp -pPR ${S}/{bin,lib,man,plugin} ${JAVAHOME} || die "failed to copy"
+
+       newicon ${JAVAHOME}/plugin/desktop/sun_java.png ${PN}-${SLOT}.png || die "failed to install icon"
+       rm -fr ${JAVAHOME}/plugin/desktop
+       make_desktop_entry "ControlPanel" "Java Control Panel" "${PN}-${SLOT}.png" "Settings" \
+               || die "failed to make desktop entry"
+
+       dodoc COPYRIGHT README
+       dohtml README.html
+
+       # Install mozilla plugin
+       if use browserplugin || use mozilla; then
+               case ${ARCH} in
+                       x86) platform="i386" ;;
+                       ppc) platform="ppc" ;;
+                       sparc*) platform="sparc" ;;
+                       amd64) platform="amd64" ;;
+               esac
+               install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/libjavaplugin_oji.so
+       fi
+
+       sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+       find ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \;
+
+       # install env into /etc/env.d
+       set_java_env ${FILESDIR}/${VMHANDLE} || die
+
+       # Fix for bug 26629
+       if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+               dosym /opt/${P}/lib/sparc /opt/${P}/lib/sparc64
+       fi
+
+       unpack_jars
+}
+
+pkg_postinst() {
+       java_pkg_postinst
+       if ! use browserplugin && use mozilla; then
+               ewarn
+               ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
+               ewarn "has been renamed to 'browserplugin' please update your USE"
+       fi
+}

diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.02-r1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.02-r1
new file mode 100644 (file)
index 0000000..e503b29
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.02-r1
@@ -0,0 +1,2 @@
+MD5 dc4d79332f7fc5a1a729415584ab0f22 j2re-1.4.2-02-linux-amd64.bin 13173125
+MD5 c209c959ce4ab0188e77d065ec57901a j2re-1.4.2-02-linux-i586.bin 13523250