Change the desktop entry to be more similar to earlier slots.

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ff9ab5b1100a4345ed49f9d495cce57e4dca0000..375de87c4684e8581077121f6e9adcdd0707dfd3 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.171 2006/12/16 22:56:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.172 2006/12/17 12:54:24 betelgeuse Exp $
+
+  17 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jdk-1.6.0-r1.ebuild:
+  Change the desktop entry to be more similar to earlier slots.
 
 *sun-jdk-1.6.0-r1 (16 Dec 2006)
 

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index ee6583a490be5cc104dd965db023891552a67e93..a2d68f9ad683eef5c0b1ec9f3089bea95ae3b026 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932
 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932
@@ -49,22 +52,22 @@ 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 4704 RMD160 7996ef040d66c9ac97ad4d07941d5b2ebc878dd0 SHA1 c9d85eed724b0e3f63c1fb19cae6e78131762b9e SHA256 4db01eb2e32b69b30c9d405123bf1ca598e956edf9f4abf915bb1ed5c98f9f36
-MD5 4e8f6bf6367875a1ebb88920b39b2058 sun-jdk-1.6.0-r1.ebuild 4704
-RMD160 7996ef040d66c9ac97ad4d07941d5b2ebc878dd0 sun-jdk-1.6.0-r1.ebuild 4704
-SHA256 4db01eb2e32b69b30c9d405123bf1ca598e956edf9f4abf915bb1ed5c98f9f36 sun-jdk-1.6.0-r1.ebuild 4704
+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.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
 SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23 sun-jdk-1.6.0.ebuild 4631
-MISC ChangeLog 34618 RMD160 424c19b7ec42e7ba7e5be90b21c636b616c92e52 SHA1 80510b1d67428e588b77365c867826a5cf33f2aa SHA256 6dca5794d59bd5e670a5c38e4f17535baf2ae0d6aee0d32779bf1aa33a427835
-MD5 ed385a8aab322798189d8ecb7f2db20f ChangeLog 34618
-RMD160 424c19b7ec42e7ba7e5be90b21c636b616c92e52 ChangeLog 34618
-SHA256 6dca5794d59bd5e670a5c38e4f17535baf2ae0d6aee0d32779bf1aa33a427835 ChangeLog 34618
-MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
-MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
-RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
-SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 metadata.xml 239
+MISC ChangeLog 34767 RMD160 52a1ab90ff98dda426363fda5b16d6b7d1bef71d SHA1 4024d425a14e8bbbb5c8d9b12254a72143e11025 SHA256 bae49a8706eaecba02686916720e75bf4a93818d9d16b1e45c1a8b1cb5ad82f0
+MD5 8e02105633f2bb26bddbadc164e6d7bf ChangeLog 34767
+RMD160 52a1ab90ff98dda426363fda5b16d6b7d1bef71d ChangeLog 34767
+SHA256 bae49a8706eaecba02686916720e75bf4a93818d9d16b1e45c1a8b1cb5ad82f0 ChangeLog 34767
+MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
+MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
+RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
+SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d metadata.xml 237
 MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r2 512
 RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r2 512
 SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r2 512
@@ -89,3 +92,10 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFhT4VcxLzpIGCsLQRAgS+AJ9yNm9oO8XGZz/OB8y3dVJrINeHJACfQIvi
+JXDzcvjxQiUV7NJ1WbMrisk=
+=V+Gt
+-----END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
index 9127d732d6a75f5d90a7c9d8475a864f4ce8cf53..8f2a797fcb844fe05e98803600e972b30e1c051b 100644 (file)
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
+       <herd>java</herd>
+       <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
 </pkgmetadata>

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 3eadba653c7b48ffabfaa15e4de2d1cad6639caf..713e94384738ff87cee52f8437bbf7228407b1a5 100644 (file)
--- 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.1 2006/12/16 22:56:30 caster Exp $
+# $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 $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -117,7 +117,7 @@ src_install() {
        chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
 
        # install control panel for Gnome/KDE
-       sed -e "s/\(Name=Java\)/\1 Control Panel (${PN}-${SLOT})/" \
+       sed -e "s/\(Name=\)Java/\1 Sun Java Control Panel ${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 > \