diff options
-rw-r--r-- | mail-client/thunderbird/ChangeLog | 6 | ||||
-rw-r--r-- | mail-client/thunderbird/thunderbird-17.0-r2.ebuild | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index f8d3dfad0812..98b239e9ec30 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,10 @@ # 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.181 2012/12/09 18:48:53 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.182 2012/12/10 18:08:00 polynomial-c Exp $ + + 10 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> + thunderbird-17.0-r2.ebuild: + Removed webm and jit USE flag as per request by Anarchy. *thunderbird-17.0-r2 (09 Dec 2012) diff --git a/mail-client/thunderbird/thunderbird-17.0-r2.ebuild b/mail-client/thunderbird/thunderbird-17.0-r2.ebuild index 4eb54114866b..42881ae34a09 100644 --- a/mail-client/thunderbird/thunderbird-17.0-r2.ebuild +++ b/mail-client/thunderbird/thunderbird-17.0-r2.ebuild @@ -1,6 +1,6 @@ # 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-17.0-r2.ebuild,v 1.1 2012/12/09 18:48:53 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-17.0-r2.ebuild,v 1.2 2012/12/10 18:08:00 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -34,7 +34,7 @@ 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-2.0 GPL-2 LGPL-2.1" -IUSE="bindist gconf +crypt +ipc +jit ldap +lightning +minimal mozdom +webm selinux" +IUSE="bindist gconf +crypt +ipc ldap +lightning +minimal mozdom selinux" PATCH="thunderbird-17.0-patches-01" PATCHFF="firefox-17.0-patches-0.3" @@ -58,8 +58,8 @@ RDEPEND=">=sys-devel/binutils-2.16.1 >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 - webm? ( >=media-libs/libvpx-1.0.0 - kernel_linux? ( media-libs/alsa-lib ) ) + >=media-libs/libvpx-1.0.0 + elibc_glibc? ( media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) @@ -78,8 +78,9 @@ DEPEND="${RDEPEND} dev-python/pysqlite !elibc_glibc? ( dev-libs/libexecinfo ) virtual/pkgconfig - webm? ( x86? ( ${ASM_DEPEND} ) - amd64? ( ${ASM_DEPEND} ) + amd64? ( ${ASM_DEPEND} + virtual/opengl ) + x86? ( ${ASM_DEPEND} virtual/opengl )" if [[ ${PV} =~ beta ]]; then @@ -198,9 +199,6 @@ src_configure() { mozconfig_use_enable lightning calendar mozconfig_use_enable gconf mozconfig_use_enable ldap - # Both methodjit and tracejit conflict with PaX - mozconfig_use_enable jit methodjit - mozconfig_use_enable jit tracejit # Bug #72667 if use mozdom; then |