pax-mark thunderbird-bin for hardened support, fix crashreporter dep

(Portage version: 2.1.10.34/cvs/Linux x86_64)

3 files changed, 12 insertions, 32 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 7cbad222db14..80bf484b5402 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.42 2011/11/14 15:33:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.43 2011/11/15 13:23:23 anarchy Exp $
+
+  15 Nov 2011; Jory A. Pratt <anarchy@gentoo.org> thunderbird-bin-8.0.ebuild:
+  pax-mark thunderbird-bin for hardened, fix crashreporter dep when requested
 
 *thunderbird-bin-8.0 (14 Nov 2011)
 *thunderbird-bin-3.1.16 (14 Nov 2011)
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
index 74d9257900cf..898de1be8c0f 100644
--- a/mail-client/thunderbird-bin/metadata.xml
+++ b/mail-client/thunderbird-bin/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mozilla</herd>
+<use>
+	<flag name="crashreporter">Enable crash reporter for bugs</flag>
+</use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild
index 40e86e2ac96e..c37ddab5e76f 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild,v 1.1 2011/11/14 15:33:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-8.0.ebuild,v 1.2 2011/11/15 13:23:23 anarchy Exp $
 
 EAPI="3"
 
-inherit eutils multilib mozextension
+inherit eutils multilib mozextension pax-utils
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr
@@ -27,7 +27,7 @@ RESTRICT="strip"
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
+IUSE="+crashreporter"
 
 for X in "${LANGS[@]}" ; do
 	# en and en_US are handled internally
@@ -49,10 +49,8 @@ DEPEND="app-arch/unzip"
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXmu
-
 	>=x11-libs/gtk+-2.2:2
-	net-misc/curl[nss]
-"
+	crashreporter? ( net-misc/curl ) "
 
 S="${WORKDIR}/thunderbird"
 
@@ -127,30 +125,6 @@ EOF
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
 		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
 		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
-
-pkg_postinst() {
-	#elog "For enigmail, please see instructions at"
-	#elog "  http://enigmail.mozdev.org/"
-
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
-		einfo
-		einfo "Crashreporter won't work on amd64"
-		einfo
-	fi
 
-	einfo
-	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
-	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
-	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
-	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
 }