From b9bfa9dff082e956890c81d9901013c64a691510 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sun, 17 Dec 2006 13:53:03 +0000 Subject: [PATCH] Further improvements to the desktop entry. Package-Manager: portage-2.1.2_rc3-r6 --- dev-java/sun-jdk/Manifest | 14 +++++++------- dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index a2d68f9ad683..6ac69573445f 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -52,10 +52,10 @@ EBUILD sun-jdk-1.5.0.10.ebuild 4609 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b MD5 0398222bf82947653361b77d469b66ef sun-jdk-1.5.0.10.ebuild 4609 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b08a sun-jdk-1.5.0.10.ebuild 4609 SHA256 1d8c680beb034af272bb74d08df9188d89c52dc5a9ea189a267af9ee478ab7c0 sun-jdk-1.5.0.10.ebuild 4609 -EBUILD sun-jdk-1.6.0-r1.ebuild 4709 RMD160 9c61305b3e4439c44576b3e4a70fd4d255dbd4b8 SHA1 4f8bd5fd51175f0a419c79090a0c8afb056ad671 SHA256 230ac101eee0512acc3449682f52f2ab73257f5e0448851f6ff8f6e74fbc4b9c -MD5 79a3cca0d50e1540cd523751b25f8622 sun-jdk-1.6.0-r1.ebuild 4709 -RMD160 9c61305b3e4439c44576b3e4a70fd4d255dbd4b8 sun-jdk-1.6.0-r1.ebuild 4709 -SHA256 230ac101eee0512acc3449682f52f2ab73257f5e0448851f6ff8f6e74fbc4b9c sun-jdk-1.6.0-r1.ebuild 4709 +EBUILD sun-jdk-1.6.0-r1.ebuild 4800 RMD160 e7eb2a5c492a5b9000b1e016b184e4831611016c SHA1 ae3d2c06626e8d2756d354ff730577dc5ac86e65 SHA256 9e2fe17509fab1177e664aa3e14d1f6c882f6ec4407a99f9866f47de1067ac0f +MD5 e5ac899b212de5abdecbe8e1dda1cc99 sun-jdk-1.6.0-r1.ebuild 4800 +RMD160 e7eb2a5c492a5b9000b1e016b184e4831611016c sun-jdk-1.6.0-r1.ebuild 4800 +SHA256 9e2fe17509fab1177e664aa3e14d1f6c882f6ec4407a99f9866f47de1067ac0f sun-jdk-1.6.0-r1.ebuild 4800 EBUILD sun-jdk-1.6.0.ebuild 4631 RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 SHA1 1c4156581260485573da3fea61436a30db271fcc SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23 MD5 d72a0e789e04a3f5f960e8ae37103aaa sun-jdk-1.6.0.ebuild 4631 RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 sun-jdk-1.6.0.ebuild 4631 @@ -95,7 +95,7 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFhT4VcxLzpIGCsLQRAgS+AJ9yNm9oO8XGZz/OB8y3dVJrINeHJACfQIvi -JXDzcvjxQiUV7NJ1WbMrisk= -=V+Gt +iD8DBQFFhUvgcxLzpIGCsLQRAonvAJ9inwnovDx+pS2B3X7jbSvf+etElwCcDT0C +1EJKhFqlpF/CFtRwIC6ful8= +=WO1D -----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild index 713e94384738..60609872ba91 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.2 2006/12/17 12:54:24 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.3 2006/12/17 13:53:03 betelgeuse Exp $ inherit java-vm-2 eutils pax-utils @@ -117,7 +117,9 @@ src_install() { chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile # install control panel for Gnome/KDE - sed -e "s/\(Name=\)Java/\1 Sun Java Control Panel ${SLOT}/" \ + # The jre also installs these so make sure that they do not have the same + # Name + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ -- 2.26.2