Fix icon installation

(Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 23E9E900)

3 files changed, 7 insertions, 111 deletions

diff --git a/www-client/seamonkey-bin/ChangeLog b/www-client/seamonkey-bin/ChangeLog
index e011a2b5df27..dddbe2bf295c 100644
--- a/www-client/seamonkey-bin/ChangeLog
+++ b/www-client/seamonkey-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/seamonkey-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.177 2013/04/11 02:19:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.178 2013/05/07 01:32:39 jdhore Exp $
+
+  07 May 2013; Jeff Horelick <jdhore@gentoo.org> -seamonkey-bin-2.16.2.ebuild,
+  seamonkey-bin-2.17.ebuild:
+  Fix icon installation
 
   11 Apr 2013; Jeff Horelick <jdhore@gentoo.org> -files/icon/seamonkey-bin.png,
   seamonkey-bin-2.16.2.ebuild, seamonkey-bin-2.17.ebuild:
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.16.2.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.16.2.ebuild
deleted file mode 100644
index e68dd464833c..000000000000
--- a/www-client/seamonkey-bin/seamonkey-bin-2.16.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.16.2.ebuild,v 1.4 2013/04/11 02:19:46 jdhore Exp $
-
-EAPI="4"
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
-pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
-
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
-MOZ_LANGPACK_SUFFIX=".langpack.xpi"
-
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.seamonkey-project.org/"
-RESTRICT="strip mirror binchecks"
-QA_EXECSTACK="opt/seamonkey/*"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/dbus-glib
-	>=media-libs/alsa-lib-1.0.16
-	virtual/freedesktop-icon-theme
-	>=x11-libs/gtk+-2.10:2
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/seamonkey
-
-	# Install seamonkey in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	# Create /usr/bin/seamonkey-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/seamonkey-bin
-#!/bin/sh
-unset LD_PRELOAD
-exec /opt/seamonkey/seamonkey "\$@"
-EOF
-	fperms 0755 /usr/bin/seamonkey-bin
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
-	domenu "${FILESDIR}/icon/${PN}.desktop"
-
-	if use startup-notification; then
-	    echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN} || die
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild
index 6d47dd1d0a19..e0fcaaf27d1d 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild,v 1.4 2013/04/11 02:19:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.17.ebuild,v 1.5 2013/05/07 01:32:39 jdhore Exp $
 
 EAPI="4"
 
@@ -75,7 +75,7 @@ EOF
 	fperms 0755 /usr/bin/seamonkey-bin
 
 	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	newicon "${D}${MOZILLA_FIVE_HOME}"/chrome/icons/default/default48.png ${PN}-icon.png
 	domenu "${FILESDIR}/icon/${PN}.desktop"
 
 	if use startup-notification; then