diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild index 792d890..ba8b3cf 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.21.ebuild @@ -209,16 +209,18 @@ 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}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + if ! use arm; then + 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}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + jre/lib/desktop/applications/sun_java.desktop \ + > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + fi # Prune all fontconfig files so libfontconfig will be used and only install # a Gentoo specific one if fontconfig is disabled.