Fix libvpx-1.0.0 support, bug #401985

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

3 files changed, 304 insertions, 7 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index ba7f053b9d6e..22c12b8befc2 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.124 2012/02/20 11:26:26 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.125 2012/03/01 13:19:11 anarchy Exp $
+
+*thunderbird-10.0.1-r1 (01 Mar 2012)
+
+  01 Mar 2012; Jory A. Pratt <anarchy@gentoo.org>
+  +thunderbird-10.0.1-r1.ebuild:
+  Fix libvpx-1.0.0 support, bug #401985
 
   20 Feb 2012; Thomas Kahle <tomka@gentoo.org> thunderbird-10.0.1.ebuild:
   marked x86 per bug 403183
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 357d97731f9c..71270b639129 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
@@ -28,6 +28,7 @@ DIST enigmail-1.3.4.tar.gz 1369381 RMD160 5691a644368982038352c9da45a633ca72e85c
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
 DIST firefox-10.0-patches-0.4.tar.xz 14044 RMD160 4ed929b42bc272606a67783ea31b4562fc4d939a SHA1 09ecb7c8c06064eb1c5416ccdc5483d472765f66 SHA256 ac2ce062aa23e9ad269b4a151bebbb2ce3affcd4df0002b6dd53f0ceb52f8eb2
 DIST firefox-10.0-patches-0.5.tar.xz 16708 RMD160 40ccd212e16d4e5dd389db95aa7be0fe68361073 SHA1 3ca7cb54cdc2b704fe468cc26e1818648635b514 SHA256 981f40b1f2f12439d1301a0f7f4171aee4b84b16fe6b926344b63750efb21158
+DIST firefox-10.0-patches-0.6.tar.xz 17400 RMD160 aef02ec0471a0136a0f60ad08874f688afa66d15 SHA1 48d8a41370c052e7efaa9af25c9da95e03d38f2e SHA256 7cd959597a45fdbd6acbb8092c63d1fcf58beb32b99140f6c05109005a0db05d
 DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
 DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
 DIST firefox-9.0-patches-0.5.tar.xz 18580 RMD160 66870e2e194454cda309458d3793bfbe659d0598 SHA1 9f1f60e68330462e24eb81b27f2e3348689321ef SHA256 dc88f027f73bc6352da0dc873bc5ed63e72ea4d7db0aebfc44834f0b967ecd4f
@@ -417,6 +418,7 @@ DIST thunderbird-9.0-vi.xpi 429543 RMD160 8705ee88da51d9bd92fe063ac948aa875fc72d
 DIST thunderbird-9.0-zh-CN.xpi 426797 RMD160 13da2b2fe191b792546e274611ad1fc3d5cec351 SHA1 4f90b87183e41c71400d955a0eb6bfceebb61ca0 SHA256 7bc4f2a2cb338f57969630e0a1abd7b05360a66934170d52d383a69d877d45e7
 DIST thunderbird-9.0-zh-TW.xpi 427199 RMD160 28db91466f45b6c3395186cef32cd7ae3c921ed1 SHA1 7503c57eae25a435bef5bfec71ddb9561e12ceb3 SHA256 3f321e139f9f52eb1df044b4ef2c2cf35193a24e9ed2f3eafea905b7cfaeb959
 DIST thunderbird-9.0.source.tar.bz2 96194907 RMD160 12899236ee7106b32f8e1343c566396fc4980c85 SHA1 16fda096809d2eaf069458553ceb370f512337b3 SHA256 6f6c40b1c1e3c3cbf3de4dbd9465a5383b0596cb9a97ba8eee7daaade52aa40c
+EBUILD thunderbird-10.0.1-r1.ebuild 8724 RMD160 14d24ca4cc8cf74549eaabd40de7d1af220e10fb SHA1 69f7f3c810c16106d1dd02ee323adcc67f6eec09 SHA256 d838ab156c928a863b92c0d9812647437005db2ce725e29e89d41252a06c0747
 EBUILD thunderbird-10.0.1.ebuild 8687 RMD160 7e24d672729e02959e1a450ec7c65864fe3bd944 SHA1 1769acd84e719bf5f337cad59b3b46c210c4a646 SHA256 789c1a73032ab0c8ae3cde18b24bd9aeaef3c2d24cef52ea54b45a937840eb8f
 EBUILD thunderbird-10.0.ebuild 8419 RMD160 dd148c2893f674aae743b65c330bb7a84e9717d1 SHA1 e53d2578017924b1d16b94d1ec5012e83e2a2767 SHA256 1195d363de82246f850db10da02b147c3f1ddc74590d6582552d9249a6e80601
 EBUILD thunderbird-3.1.12.ebuild 8075 RMD160 2d883f455650b5c1d1a5388241b36b5b4ac28e87 SHA1 2e335bd19fe7205ebfe2f7020bb0db42431b5b08 SHA256 2f234bf655d1b533104e2fb46cedea9c9b61b5f4f5df8ea27d754c83aa8ec385
@@ -425,12 +427,16 @@ EBUILD thunderbird-3.1.14.ebuild 8082 RMD160 140c386b6ee48b9526fc4dfcc7b556752a0
 EBUILD thunderbird-7.0.1-r1.ebuild 9078 RMD160 08b11d7d9b9b766909f81864e207723743090f8c SHA1 12da3854d321a5ea859ae12bcbd4b93cfb6ea272 SHA256 3ec97264dbe0beabe991632b58c0cd3b42de119d2643bcbbc1a6c74c70029410
 EBUILD thunderbird-8.0-r1.ebuild 9921 RMD160 5ef83da31f3d2379d90f201addb63d0cd38ac17f SHA1 8d4659616eddcdd70892a69d414e3ee86dc7359f SHA256 b832be0c528a9a0a4fa966c2bcb8b0e3d672daf59b5f46ef0e0961de0062b562
 EBUILD thunderbird-9.0.ebuild 10036 RMD160 0c5c7cd574cc2aba2bcf337bd8889425f20ec415 SHA1 2b417849aa917ed14985555e120c69f9203fb849 SHA256 bf90243ddf17364798e3dc7203a442463a5d090731dfe999048daeab0fefaf00
-MISC ChangeLog 69759 RMD160 88cc4e1cb00baf50b333a580d9d08f82ef12bad1 SHA1 1a116a44d533013af0905c3251349eec31dc675e SHA256 b54b90c6882a9ffac05a08ec6829c6a18a1c1c7fb9c2a54adaaf04295c945444
+MISC ChangeLog 69923 RMD160 5eab7e372fac51fc7bf3915c7a95fd74bdce0822 SHA1 9fa4019ee612fda7a65cd375c2f910929a58b54c SHA256 93c45214d2df0cc22d7453af7c1539918887ad3b7736296fd73d30cef87e121a
 MISC metadata.xml 1115 RMD160 b5671b22eef5dc7eb948a98ff32144d0edbff008 SHA1 a566c73c286e01fcc59c6c6ee1117b4df891671f SHA256 08f047bd344a5e947e84e794a20c2d0bddcb476edb5ca4867ab26dd865d682b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9CLe0ACgkQodBTJSDyo65NnAD8C0rfDaAAd3dD6J0vbOkLa+Sd
-bBzd01vNw9pivdTY/o8A/0sOH2dLh6wKZur8Q63NbaVlwayEedZFMm8CI0QWqwpE
-=1RHR
+iQEcBAEBAgAGBQJPT3dIAAoJEIXV9xahDnCoCyUIAJSIV7iIXj9rVfzpVmqLdZI2
+PPJa47HdNv/aoJg/01KAzmX4vETE2slTCpesIUpn3rsJod1QW1NKhzGNB7kO1HMi
+yT0XGBxxdK/9P59n/CGDhWXdld+wTsIWeDORKDgIyhI4AVvA8yy7tB5x43bnqYtl
+bF4a7GxZ+tlEalZ6Q25dnV74AvXnCWF8bW7P0wvh8rUXuS+0+cVCn36dsKCj/3yk
+oDIDa9MtXI16RLsozHE3JTWnuJyFTGx+aLh5jBOV3IPe+Hf71o9f16OV0X6p9+kX
+SHxmOdq8X6qUOzzXZmM68bwgTfydr24K7DfsZi++Qp0rel2AIO4oSHgnPSZuVw8=
+=i/IX
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild
new file mode 100644
index 000000000000..6a5806bf8968
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild,v 1.1 2012/03/01 13:19:11 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi
+fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT
+rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.3.5"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
+
+PATCH="thunderbird-10.0-patches-0.1"
+PATCHFF="firefox-10.0-patches-0.6"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.13.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/glib-2.26
+	crashreporter? ( net-misc/curl )
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	media-libs/libpng[apng]
+	>=x11-libs/cairo-1.10
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14
+	webm? ( >=media-libs/libvpx-1.0.0
+		media-libs/alsa-lib )
+	virtual/libffi
+	!x11-plugins/enigmail
+	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
+
+S="${WORKDIR}"/comm-release
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"
+	fi
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/mozilla/config/system-headers \
+		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+	cd "${S}"/mozilla
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable gconf
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake -f client.mk || die
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/tbird/mailnews/extensions/enigmail
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
+	local obj_dir="tbird"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
+
+		emid="calendar-timezones@mozilla.org"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	share_plugins_dir
+
+	if use minimal; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you are experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+}