Fix desktop files, bug 185869, and version bump wrt security #185737

Package-Manager: portage-2.1.3_rc8

5 files changed, 304 insertions, 10 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index a76fb4e1a5a2..e135732c88ae 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.71 2007/06/25 10:57:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.72 2007/07/20 16:48:15 armin76 Exp $
+
+*seamonkey-1.1.3 (20 Jul 2007)
+
+  20 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  files/icon/seamonkey.desktop, +seamonkey-1.1.3.ebuild:
+  Fix desktop files, bug 185869, and version bump wrt security #185737
 
   25 Jun 2007; Raúl Porcel <armin76@gentoo.org> -seamonkey-1.0.7.ebuild:
   old
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 511dc2072753..7c705d8fa331 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -6,10 +6,10 @@ AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 files/google.src 706
 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a files/google.src 706
-AUX icon/seamonkey.desktop 149 RMD160 d67c080ce6c4a6841f30c559e8a09b97c6b5e654 SHA1 35c868b48920a8a2b9add0a85fc2e210531a74da SHA256 9ee71b8b06738b6061ff400f6718f3bdc0c27240297de7839e79dd1c822af379
-MD5 85a9dda9cebd7457fe7f5c0ca3775091 files/icon/seamonkey.desktop 149
-RMD160 d67c080ce6c4a6841f30c559e8a09b97c6b5e654 files/icon/seamonkey.desktop 149
-SHA256 9ee71b8b06738b6061ff400f6718f3bdc0c27240297de7839e79dd1c822af379 files/icon/seamonkey.desktop 149
+AUX icon/seamonkey.desktop 148 RMD160 302e3b60ddee68582d80b852561e17106712d5c2 SHA1 4fc5a9df2cfb65526063808ff6cd618a32ddd0da SHA256 165a3063cb9c573b0de9104e542cdae970054e2fd08821934e1b69e4210a7070
+MD5 91f784b68fe394c66651ba9dc882685a files/icon/seamonkey.desktop 148
+RMD160 302e3b60ddee68582d80b852561e17106712d5c2 files/icon/seamonkey.desktop 148
+SHA256 165a3063cb9c573b0de9104e542cdae970054e2fd08821934e1b69e4210a7070 files/icon/seamonkey.desktop 148
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 MD5 433ea976f1e3017e49a49d65a74cae70 files/icon/seamonkey.png 4172
 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 files/icon/seamonkey.png 4172
@@ -19,16 +19,22 @@ MD5 199e59a053b66e9c4d56d9ca1c41d09e files/seamonkey-rebuild-databases.pl 2344
 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e files/seamonkey-rebuild-databases.pl 2344
 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af files/seamonkey-rebuild-databases.pl 2344
 DIST enigmail-0.95.0.tar.gz 568958 RMD160 b9cca2eb05b9c229225d6c7597da7740f47273e5 SHA1 413e30227287ec3f5f00f0589ec7dcdad9ef1c1d SHA256 dc869191953c3d0797f89223a0ad5e8accc009266f1d2ec3adb2f5814ff33b50
+DIST enigmail-0.95.1.tar.gz 1045036 RMD160 3156f4d017c1d635c6fecfa43f3fc5fa301e2461 SHA1 2fbefec2e77fc6547ad7c7433008bf14a22b038f SHA256 0da07991a2d2a1d23643adc026e2bd7dde85833b1b36290df74fd2675b80dbbc
 DIST seamonkey-1.1.1-patches-0.2.tar.bz2 20492 RMD160 19bad75df317d33852514ed8e3f4ce3e91e12616 SHA1 e39cc1c8594ccf3c7f6923b3ef9300fc20beff47 SHA256 029edd8170c6c596050c5399d768b1b224e70ddcbe07ecda10d8c8a2b089441a
 DIST seamonkey-1.1.2.source.tar.bz2 35220020 RMD160 aa681ebe1e68ab8fba0d04e3c0c0434b65e6f1ad SHA1 d0aa219b54a54cd75e690a458280b0d12bcf9607 SHA256 2cf313503cf5e66d3da5471b872f086f656409e031b5f57c8b662d23faab1fda
+DIST seamonkey-1.1.3.source.tar.bz2 35336758 RMD160 6d16c7b7382612c0dfdb6dd7caa22a40b0dce941 SHA1 3f7136c8b746d8c789e41839e99465ad4baa1ccb SHA256 ae716a61e7aeb3288ee5b5357d18921f4a88ff240cd1c5d8ab2d2a73f552a851
 EBUILD seamonkey-1.1.2.ebuild 8634 RMD160 09acfce4f59bd3fa9ae5fe37c3d804af5ff241fb SHA1 65920221d455d0165e4e54867366198a586ba6dd SHA256 f16703d79be156d060795d780019b855b5ffda3fd852db2b0210b3236ec18c5e
 MD5 20937d5874437f1686ae087608ce0dad seamonkey-1.1.2.ebuild 8634
 RMD160 09acfce4f59bd3fa9ae5fe37c3d804af5ff241fb seamonkey-1.1.2.ebuild 8634
 SHA256 f16703d79be156d060795d780019b855b5ffda3fd852db2b0210b3236ec18c5e seamonkey-1.1.2.ebuild 8634
-MISC ChangeLog 9107 RMD160 a6573587a292af6530527de378519e08acec8a92 SHA1 710271ce83c3b12f66728a9dab6f002e3ee47933 SHA256 3a84aa5b8d248fe956d9e24815abbc1aa0b34f2fee3468f487a9c98849be0b09
-MD5 26b6e31bc71395f8eb47fa06ad0cd7a7 ChangeLog 9107
-RMD160 a6573587a292af6530527de378519e08acec8a92 ChangeLog 9107
-SHA256 3a84aa5b8d248fe956d9e24815abbc1aa0b34f2fee3468f487a9c98849be0b09 ChangeLog 9107
+EBUILD seamonkey-1.1.3.ebuild 8083 RMD160 84d821c7f9e0a0bfe86945e110ad04bd3bb16a5e SHA1 cab02352f3558e033be91e01b479a4b49a3e2ab8 SHA256 63e136e15eab575b5e5ea3e93522b9712309e0723db7fbb21209e4bd7cd73ba1
+MD5 206eca9282b77aea59f52442b2e54647 seamonkey-1.1.3.ebuild 8083
+RMD160 84d821c7f9e0a0bfe86945e110ad04bd3bb16a5e seamonkey-1.1.3.ebuild 8083
+SHA256 63e136e15eab575b5e5ea3e93522b9712309e0723db7fbb21209e4bd7cd73ba1 seamonkey-1.1.3.ebuild 8083
+MISC ChangeLog 9317 RMD160 f8687ecaa85390d3368cb98d425be075213993ff SHA1 996fde1fa9e33f7a8e38335851bb8c60a161639a SHA256 62c00b12ff565c3da295973beec1b966d66952459a3ce995ed3dcd2eb5f20b73
+MD5 f544f5e9fa04b5f090e0496681d368f9 ChangeLog 9317
+RMD160 f8687ecaa85390d3368cb98d425be075213993ff ChangeLog 9317
+SHA256 62c00b12ff565c3da295973beec1b966d66952459a3ce995ed3dcd2eb5f20b73 ChangeLog 9317
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -36,3 +42,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 135001309bfa8f5c310c988e4e57aef3 files/digest-seamonkey-1.1.2 807
 RMD160 bf491685e0bedd2e0fcac53c9e4148c700d75e82 files/digest-seamonkey-1.1.2 807
 SHA256 1153c70202a308c807136f94dc731d4329fba612839ecdb2abcf7aefacb6781c files/digest-seamonkey-1.1.2 807
+MD5 1677d0c06dcf285942cd7258fe012b9d files/digest-seamonkey-1.1.3 810
+RMD160 f1633f0b39173413709035940342dd0f3df20735 files/digest-seamonkey-1.1.3 810
+SHA256 04675df6e6cf722e8130e1820e433f5ecf736d611d36a1a6d0fc57dae031aa37 files/digest-seamonkey-1.1.3 810
diff --git a/www-client/seamonkey/files/digest-seamonkey-1.1.3 b/www-client/seamonkey/files/digest-seamonkey-1.1.3
new file mode 100644
index 000000000000..ac16d146d78a
--- /dev/null
+++ b/www-client/seamonkey/files/digest-seamonkey-1.1.3
@@ -0,0 +1,9 @@
+MD5 8c585b6bca96cc1ece50bc850cc99ede enigmail-0.95.1.tar.gz 1045036
+RMD160 3156f4d017c1d635c6fecfa43f3fc5fa301e2461 enigmail-0.95.1.tar.gz 1045036
+SHA256 0da07991a2d2a1d23643adc026e2bd7dde85833b1b36290df74fd2675b80dbbc enigmail-0.95.1.tar.gz 1045036
+MD5 6521660623dd894812228056cf97333d seamonkey-1.1.1-patches-0.2.tar.bz2 20492
+RMD160 19bad75df317d33852514ed8e3f4ce3e91e12616 seamonkey-1.1.1-patches-0.2.tar.bz2 20492
+SHA256 029edd8170c6c596050c5399d768b1b224e70ddcbe07ecda10d8c8a2b089441a seamonkey-1.1.1-patches-0.2.tar.bz2 20492
+MD5 adede0ee02c302011ecd49f8e83e7c0f seamonkey-1.1.3.source.tar.bz2 35336758
+RMD160 6d16c7b7382612c0dfdb6dd7caa22a40b0dce941 seamonkey-1.1.3.source.tar.bz2 35336758
+SHA256 ae716a61e7aeb3288ee5b5357d18921f4a88ff240cd1c5d8ab2d2a73f552a851 seamonkey-1.1.3.source.tar.bz2 35336758
diff --git a/www-client/seamonkey/files/icon/seamonkey.desktop b/www-client/seamonkey/files/icon/seamonkey.desktop
index 1f92f18dad13..eb3ad1a9232a 100644
--- a/www-client/seamonkey/files/icon/seamonkey.desktop
+++ b/www-client/seamonkey/files/icon/seamonkey.desktop
@@ -5,4 +5,4 @@ Exec=seamonkey
 Icon=seamonkey.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Network;WebBrowser;
diff --git a/www-client/seamonkey/seamonkey-1.1.3.ebuild b/www-client/seamonkey/seamonkey-1.1.3.ebuild
new file mode 100644
index 000000000000..e12a07861838
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-1.1.3.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.3.ebuild,v 1.1 2007/07/20 16:48:15 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PATCH="${PN}-1.1.1-patches-0.2"
+EMVER="0.95.1"
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org/projects/seamonkey/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2
+	crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="java ldap mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt xforms"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.56
+	>=dev-libs/nss-3.11.5
+	>=dev-libs/nspr-4.6.5-r1
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=dev-db/postgresql-7.2.0 )"
+
+S="${WORKDIR}/mozilla"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=suite
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+pkg_setup() {
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+	unpack ${P}.source.tar.bz2 ${PATCH}.tar.bz2
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		cd ${S}/mailnews/extensions || die
+		unpack enigmail-${EMVER}.tar.gz
+		cd ${S}/mailnews/extensions/enigmail || die "cd failed"
+		makemake2
+	fi
+
+	# Fix scripts that call for /usr/local/bin/perl #51916
+	ebegin "Patching smime to call perl from /usr/bin"
+	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate 'gentoo' --enable-canvas
+	mozconfig_annotate 'gentoo' --with-system-nspr
+	mozconfig_annotate 'gentoo' --with-system-nss
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate 'galeon' --enable-oji --enable-mathml
+
+	# Other moz-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+
+	if use moznoirc; then
+		mozconfig_annotate '+moznocompose +moznoirc' --enable-extensions=-irc
+	fi
+
+	if use moznoroaming ; then
+		mozconfig_annotate '+moznoroaming' --enable-extensions=-sroaming
+	fi
+
+	if use postgres ; then
+		mozconfig_annotate '+postgres' --enable-extensions=sql
+		export MOZ_ENABLE_PGSQL=1
+		export MOZ_PGSQL_INCLUDES=/usr/include
+		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+	fi
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.mozilla
+
+	if use moznomail; then
+		mozconfig_annotate "+moznomail" --disable-mailnews
+	fi
+
+	if use moznocompose; then
+		if use moznoirc && use moznomail; then
+			mozconfig_annotate "+moznocompose" --disable-composer
+		fi
+	fi
+
+	if use xforms; then
+		mozconfig_annotate "+xforms" --enable-extensions=xforms,schema-validation
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+		filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build Enigmail extension
+	#
+	####################################
+
+	if use crypt && ! use moznomail; then
+		emake -C  ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir "${MOZILLA_FIVE_HOME}"
+	cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed"
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/seamonkey
+	install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	doicon ${FILESDIR}/icon/${PN}-icon.png
+	domenu ${FILESDIR}/icon/${PN}.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against seamonkey
+	#
+	####################################
+
+	elog "Installing includes and idl files..."
+	cp -LfR "${S}"/dist/include "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+	cp -LfR "${S}"/dist/idl "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+
+	# Fix mozilla-config and install it
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/${PN}-config
+
+	# Install pkgconfig files
+	insinto /usr/"$(get_libdir)"/pkgconfig
+	doins "${S}"/build/unix/*.pc
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	doenvd ${FILESDIR}/10${PN}
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
+	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+	# Install docs
+	dodoc ${S}/{LEGAL,LICENSE}
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto ${MOZILLA_FIVE_HOME}/searchplugins
+	doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update the component registry
+	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+			/usr/libexec/mozilla-launcher -register
+	fi
+
+	update_mozilla_launcher_symlinks
+}