Import changes from Gentoo Prefix overlay. Migrate to EAPI3, add keywords. Approved...

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

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 1d55bd368c3b9780a979d65844f708f37fa7184a..56e3aaf5554ba6373a3fa9ead86639649366e715 100644 (file)
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.1 2010/06/13 02:26:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.2 2010/06/13 03:05:10 darkside Exp $
+
+  13 Jun 2010; Jeremy Olexa <darkside@gentoo.org>
+  thunderbird-3.0.4-r1.ebuild:
+  Import changes from Gentoo Prefix overlay. Migrate to EAPI3, add keywords.
+  Approved by mozilla team
 
 *thunderbird-3.0.4-r1 (13 Jun 2010)
 

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9cfc541157bdd89ddd5ad0018e826a747bf456f5..b4f3aadd19a2fca398683e3680e586f0f5ad073b 100644 (file)
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -41,6 +41,6 @@ DIST thunderbird-3.0.4-uk.xpi 231347 RMD160 0e7886ef0b069ea124bf8815f730086d1a4c
 DIST thunderbird-3.0.4-zh-CN.xpi 208275 RMD160 5e043d2c83ec1c593934de80dfded61a68335d88 SHA1 9052693e710c713c374c56b7d8249341b48f8221 SHA256 f7928b8b9afc85375d50ace6a1053e03098fec0011b2212a5bdc5b04fdcd97ad
 DIST thunderbird-3.0.4-zh-TW.xpi 208650 RMD160 f83b711265b8c276a76903ef1c0a964c2319ccca SHA1 9fede55b4beee3e5ce05bf6653dfe0cd3fd97f91 SHA256 39aa611a7efdf4d92bb8bbdf7c12dcb24fca9e917116787cd1e3b262fc99d2a3
 DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
-EBUILD thunderbird-3.0.4-r1.ebuild 6752 RMD160 e0a829c2bb3cc3b7ab6486a4c0c8758ea9e2cb13 SHA1 e207ab93e2c58b2e2bb6daced4689aae617996e4 SHA256 f52101b487d98d16de3d5d25e792960477c28ad004ca27e5743e4cb398ac57c2
-MISC ChangeLog 50615 RMD160 07c06833daee6361896b482f8c1b4a4ddb767e5b SHA1 e4fc7343b65a03e7eec9509c841cf2aaeefc9806 SHA256 fdd37697ab57b701fc591bb5281d816ec6823f7e9b05a301c3a2bbb4c2044b5c
+EBUILD thunderbird-3.0.4-r1.ebuild 7016 RMD160 603d2f5f49f92d1547f6aa614db7793c799afe0d SHA1 3427bc7eb797a289bbd63e05d631ff4fa9a0182d SHA256 e4927913d0ca0f206b1e9a05f898bb46b0765bbc084b50bbae96dfae90674542
+MISC ChangeLog 50801 RMD160 eb05137ad917b79aa88f0d85cf05e0de74e8b8fb SHA1 ab3a33e3113c28cdf1f42c69e719f8e38ab3faa5 SHA256 f616ed2d5b58c6e5261f5635bccaccb6f1696a2c7cc9ee1f11467eb141015601
 MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3

diff --git a/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild b/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild
index 7319d7669318c840f7f9a72e4eae8f745699f69b..dde39150a7587282e86f09a7c126255439c1d632 100644 (file)
--- a/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild,v 1.1 2010/06/13 02:26:39 nirbheek Exp $
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.0.4-r1.ebuild,v 1.2 2010/06/13 03:05:10 darkside Exp $
+EAPI="3"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
@@ -16,7 +16,7 @@ MY_P="${P/_rc/rc}"
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="alsa ldap crypt bindist lightning mozdom system-sqlite"
@@ -144,8 +144,10 @@ src_configure() {
        mozconfig_use_enable ldap ldap-experimental
        mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
        mozconfig_annotate '' --with-user-appdir=.thunderbird
-       mozconfig_annotate '' --with-system-nspr
-       mozconfig_annotate '' --with-system-nss
+       mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+       mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+       mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
+       mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
        mozconfig_annotate 'broken' --disable-crashreporter
        mozconfig_annotate '' --enable-system-hunspell
 
@@ -204,7 +206,7 @@ src_install() {
                emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
 
                dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-               cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+               cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
                unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
        fi
 
@@ -227,6 +229,6 @@ src_install() {
 
        # Enable very specific settings for thunderbird-3
        cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-               "${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+               "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
                die "failed to cp thunderbird-gentoo-default-prefs.js"
 }