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

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 23 insertions, 49 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/Manifest b/mail-client/thunderbird-bin/Manifest
index 856cf77b1bcd..0685148edde8 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -250,23 +250,17 @@ EBUILD thunderbird-bin-3.1.10.ebuild 4847 RMD160 2c4e73727c70f630c9231c618880541
 EBUILD thunderbird-bin-3.1.12.ebuild 4847 RMD160 8ba9f37aa11d9875793bec7895c5decebb3d5510 SHA1 e76357f1bf5039a7cedb481f94bbc7d305c5398c SHA256 b36b78fd249880313848b77eb9f14f40f3e25fa041dbae34c0555668dcbef5d9
 EBUILD thunderbird-bin-3.1.16.ebuild 4859 RMD160 df542ba9a85cbeab45a808a166a4d969e9c7412b SHA1 c53b8b2347111d4be49902c8e71570b3f08babc3 SHA256 f8ac78482629c42b67345b66b4513d6d500f661d40952ea4664af676969477c7
 EBUILD thunderbird-bin-6.0.ebuild 4661 RMD160 8613ff56a292ac911ac74895265ea7081cd64128 SHA1 00b265c623b54e43dd4f766324b9ab0b822fe9d1 SHA256 ca1d7de64449b7f8e548c35fca6491562e1af90d87cbeb4970258e2ae8dd1c8e
-EBUILD thunderbird-bin-8.0.ebuild 4688 RMD160 69884b9859be142f082f8a2bf9cf10def4502dee SHA1 c641d153f54eb25b0aa915bda666010621246a59 SHA256 88b05538c4c8951225e3509536d90867d972d105000ccd61311cc5412836f97d
-MISC ChangeLog 32514 RMD160 6ffe27ec96f173445d47b492b1d73958a6e1a600 SHA1 51721674f707307498d8fc5b5b6022d3774bf77f SHA256 a76cc8d2113aaf1470e2eac7ae187e74b9755ddc587afbd085d4cb10383348fd
-MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
+EBUILD thunderbird-bin-8.0.ebuild 3931 RMD160 81c4b9dc3f0b3738a6f9113ce9a7699f1d7ea446 SHA1 ed721aedc25101246416e6a65760e7ad19b0626b SHA256 6aa2f80fc62afb1380b4681546de4c3e03e94466523d36acd77ea7c1af7292da
+MISC ChangeLog 32670 RMD160 1fc4ff25a4aeef0336f2f08a56066700e14e3bc4 SHA1 23663fdc068b9b38b41d2bcfd34724babc63fc57 SHA256 37f4085db9da4e2ddf66e478c2a77db68075cc22591580b28fc25fe89cc42fcc
+MISC metadata.xml 239 RMD160 1ae864a1acabe6bbce1c44a39d0ea55e04ccfaa7 SHA1 2760f4017fb87bfec958b0472cd86151bb3c3ab3 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOwTTBAAoJEO/kOhxWD91kXCkP/3uvUvgmszZpKJ8oSx7VfLLH
-6EG7fbXE8LjlbI84efVvQUTXAsHV/f5v4JkYwAg9oGHhTbxwMqC3+MLOnj5PtUDD
-fNZxGuvOxalrIsgloQ3zXQMV8iWr54isX+ySThcPWxBCGWbCoUSliddW6uNXVtj8
-xsFBGad+CrefwkfHfIPZ2AtYB7KeroOQnlMq3z1D+4rvfMc9xd8bYLL7YWiI1NFn
-Ts1X7ahC31Z4ytP+CyBtESqBDdytytUuXTWqwaH/yUN+Ln+We8tF2EPVzC5Icv6+
-U/Bvo+XXKOoErfb0bzlUf33lRmHC83njauaWGcVA2VOLn0TSSoN9auZ1nl/RRowq
-1g7JO0ZRzFFmU0eeYRZtvKNF3/ZjGgk9vLomGHYagpjNw76ZOAWG8RPMlmatINUr
-M7uGAbpex3ztPuzl5ltRV1Uwabx6HtziCLInuI0ci5pEy+PRi8Bu7OIL8zNHhcHt
-nonxmvPSqpUzA5HzzPSHD7RsSOJ3Iv1bUEzO162w29g8rPIiZqugJFZFHdjRgnnd
-pqZan2ziyz1HqhfzrfVsTVmfphvSaUyJ453fwcwhRCsGO3Jfs97XIfpazZRD3JYs
-GaJ55nivmJpZwxJDI5I4JfGEwoXj/lEJxhEv3t2EMTuKu5x4x4o9AJl4UWwl9COl
-5MI/g01Crjqg4stUB5Yl
-=tC8m
+iQEcBAEBAgAGBQJOwmfWAAoJEIXV9xahDnCox/cH/jh278ppU0bXGPbbqxGOlxfJ
+xRckZ05Lsp1eb4lOrg3uevrRPceSAm5ikDLaj24k1upUmrRLjI5CahAeqE1xu4c1
+0BQWmohvb39vmLIbm1SGbQSeqTuuAtCdsIR6TmF4d1wdZxmKPL1vgK0ASVWTl2IH
+4ahKEhxnUdO9q3/yrkNsn1WZMyCwN1A+PCziDJUwHck7Dj1DptuNLgeCk+BGYc7b
+N61YjrQi0M5RGooJrWGYQ0DB0lXGaO2IBeUEyCGVknXWsD+h892UhzWNGW5+8Lcw
+BuWE0oDqpJhH333CSAuJ6iGFIdJGc4+pjU7ZB95aasTEHzTGE1qRK20spdR0l14=
+=UKNY
 -----END PGP SIGNATURE-----
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
 }