From 0a8325b8a26338187825d03f77a52acac42881cc Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 17 Oct 2012 15:54:08 +0200 Subject: [PATCH] no Desktop files (Portage version: 2.2.0_alpha123/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- dev-java/oracle-jdk-bin/ChangeLog | 4 ++++ dev-java/oracle-jdk-bin/Manifest | 4 ++-- .../oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild | 16 ++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog index 64ff9d7..8538323 100644 --- a/dev-java/oracle-jdk-bin/ChangeLog +++ b/dev-java/oracle-jdk-bin/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Oct 2012; Mario Fetka + oracle-jdk-bin-1.7.0.6.ebuild: + no Desktop files + 17 Oct 2012; Mario Fetka oracle-jdk-bin-1.7.0.6.ebuild: Dumping a shared archive is not supported on the Server JVM. diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 4f00bba..0ede97c 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -3,6 +3,6 @@ AUX oracle-jdk-bin-1.7.env 1000 SHA256 a10be01ee79265a932214698958b3be88404f8ba7 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac DIST jdk-7u6-linux-arm-sfp-demos.tar.gz 14083570 SHA256 3a1f8fab45077885ff07289af2432331ca9b02d9ecef77058bceb70cfae4b449 SHA512 672eec4a115930ed4f3897d3ed8280611fd2b7c0b10b89ca302ecac28494453e370cc6dd7e19b7cbe78b49e5ca1b2ecab7827c2f016c150cea53675e312f1abb WHIRLPOOL 55fa12f92c8841d270e076b0f13ff1a1292354e8610458c85872dfeb2702b9307aa230f70169abf04cd08805c238773d8740b2f10194eb797637d874a74023a1 DIST jdk-7u6-linux-arm-sfp.tar.gz 68197004 SHA256 696d623bba3e74dbb5edb464d2a452dda07364ceb3bb81b8b9df1cc5bdb7fde3 SHA512 6738f3134d66ccb83d99558ebc8c0f1b6eaf6de5b24b3cbec93d8abfb5f0cddde5549d05363f6304aa46d1382c87eeb7e4c7b6cc259d8f2c6f5397e9da11ba11 WHIRLPOOL aa9f6a5d28b7bdc9d285ae3bcbf9ca09c8b53ecd750aad83cde614535fd3bd37e0afac2f0f579a13a69c5a03c7e532603eb46aeded070f888cde4a31b13c49f6 -EBUILD oracle-jdk-bin-1.7.0.6.ebuild 10130 SHA256 0ddbcb8040f3be05d8cb83c4826030e5462d831021ffa83b7a8fd78d35ef23e1 SHA512 deef1ca8a3a1a57f852b9d9434496ca5cde9668a625929fdc78e9949ebfa5797bd627b4a86c1e341f0851f1099bd1a7105ba80ca39f232a8f8b600492f59ff18 WHIRLPOOL 9997d774f4de11392a52b2abb91103c3a1a546d3e34816ce5accd20efcc5d7555250bc6a066968417ae4dac641ad38923896acef6e906fe1569b1aff43c8d608 -MISC ChangeLog 511 SHA256 0af94a863bfc82e0ddd1e5ca2205b6e0ded7b906273f41db67ff2a28eaa45fec SHA512 b86798029b230dec0ca850baae9272e9c0e9b8a58d2906a8919f411c20a3449bd2e9ef4f6d1f0e189f450134ec4c14299ca0af7a86a7cb97082e4e168178c44a WHIRLPOOL bf70b91e7426428aaa571e5a96a430be508b15c04e4d52729f8b37b53fc529a1f47ff91ac8be81851ca2d35f576055e4271cfc029bd4d3bb98fc82d4d46572a9 +EBUILD oracle-jdk-bin-1.7.0.6.ebuild 10138 SHA256 2cfd8617c688ed33012daac7f4accc8ba4c859aabb9cfdfcb9cc89a93ec9d1a8 SHA512 2296744b282534634b5b6978da752a7d1527567cf4e05397213be62f024e129907627bfeb2212f7e88abc18465b54278f3163be896a6a7e98ed365fa6a366b3f WHIRLPOOL 0f4607053a322ed197ba75eabd3a31092661b9600cbdd919c5a87181ff1307b0e9f0b6a4bad07e8d060e031aa031126d2287ef658280faedb15389148ce486f2 +MISC ChangeLog 615 SHA256 6299eeac3e7675e22e554dcc7b07ca0bae60a1413f1569131cb2c4b1291e02de SHA512 5a5d4edad816efd59a4e636d9b657b27189463a81a6fb36cb57145997717a612180020976e73d9c5c04205b07ff27e06419140ea6f423358ff0c728ac85cd59a WHIRLPOOL 97998c7051fd8e0c4571bbb2ca0fd671388515757f5238e8cb3cb7ead2a6ec42ec05d66d64204c1595a79ef574fadd1ae4fc1662cb7445902af3cf2746e90823 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild index 19939d3..30461ec 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild @@ -163,14 +163,14 @@ src_install() { # Install desktop file for the Java Control Panel. # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. # make_desktop_entry can't be used as ${P} would end up in filename. - newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \ - jre/lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + #newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + # sun-jcontrol-${PN}-${SLOT}.png || die + #sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ + # -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + # -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \ + # jre/lib/desktop/applications/sun_java.desktop > \ + # "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + #domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop # Prune all fontconfig files so libfontconfig will be used and only install # a Gentoo specific one if fontconfig is disabled.