[gentoo-commits] proj/mozilla:master commit in: www-plugins/gecko-mediaplayer/files/, media-libs/libpng/files/, ...

[Jory Pratt]

commit:     f4ee139cb1efc93e97f3e30572a57f33e400fe7a
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 04:23:27 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 04:23:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f4ee139c

remove stale versions, add libvpx-1.0.0 for staging.

---
 media-libs/libpng/Manifest                         |    9 -
 media-libs/libpng/files/libpng-1.4.5-apng.patch.gz |  Bin 9734 -> 0 bytes
 media-libs/libpng/files/libpng-1.4.7-apng.patch.gz |  Bin 9724 -> 0 bytes
 media-libs/libpng/files/libpng-1.5.2-apng.patch.gz |  Bin 9732 -> 0 bytes
 media-libs/libpng/libpng-1.4.5.ebuild              |   46 ------
 media-libs/libpng/libpng-1.4.7.ebuild              |   48 ------
 media-libs/libpng/libpng-1.5.2.ebuild              |   49 ------
 media-libs/libvpx/Manifest                         |    3 +
 .../libvpx/files/libvpx-0.9.5-enable-shared.patch  |   18 +++
 media-libs/libvpx/libvpx-1.0.0.ebuild              |   83 ++++++++++
 profiles/package.mask                              |    3 +
 www-plugins/gecko-mediaplayer/Manifest             |    3 -
 .../gecko-mediaplayer-1.0.5_beta1-npapi-sdk.patch  |   38 -----
 .../gecko-mediaplayer-1.0.5_beta1.ebuild           |   49 ------
 x11-plugins/enigmail/Manifest                      |    6 -
 x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild      |  157 --------------------
 x11-plugins/enigmail/files/70_enigmail-fix.patch   |   11 --
 .../enigmail/files/75_enigmai-js-fixup.patch       |   27 ----
 18 files changed, 107 insertions(+), 443 deletions(-)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
deleted file mode 100644
index af0b481..0000000
--- a/media-libs/libpng/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX libpng-1.4.5-apng.patch.gz 9734 RMD160 925323c7dd73a123e08301007486f76046847a73 SHA1 6b3c4827bdf6f6f5a37fdb28a74087249ab49339 SHA256 aa170f664c3368181758cb82c6dcdeddfb89887919bcc270f8ea8e1924d5b3c4
-AUX libpng-1.4.7-apng.patch.gz 9724 RMD160 44410bcabc6e7e940408afd0554e4f7313fe916a SHA1 c4766c389d659c3652b2f1bd41c10d6da96f7c07 SHA256 b2ae32c3deb1ad17c89bb6dd973887db69ec61b9b8a1cb3acf1f67a27f34ac40
-AUX libpng-1.5.2-apng.patch.gz 9732 RMD160 3a038985a27171d6ed127888261989d2ba60462a SHA1 e17b45fac9bc61c66c6967d8032c3859d5f31be6 SHA256 46637619fa54e77a160843aed5344faead54d6bc8d65c38759dbdb38dd4fd64b
-DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
-DIST libpng-1.4.7.tar.xz 547660 RMD160 5bc7f8931fac08655f42890b6d5423762f2747a9 SHA1 49ed9977bf7450089d2c156db3d28f772a4c9a87 SHA256 326d226e987973a05be2ac8ab9edc6c69bf3b5ba6a7886fad55d6c38199e807f
-DIST libpng-1.5.2.tar.xz 636256 RMD160 5334e340825dc097692358660ca95d4bc6697ef2 SHA1 50243a46c4745b39e7fcda7a39f498f38e084ad6 SHA256 f2bb6be8202af630fc7615fe3ff529aeb45be6ceeb3ad459f94edbf4e01d1cae
-EBUILD libpng-1.4.5.ebuild 1327 RMD160 45cc54587ac70391d435a3da4597b1f1cfd8a29c SHA1 d52d23398dfcd601328c0e47ee3effa986acc99f SHA256 7c6518d4e87560e47048fefc57605103040d9eb8e7af9b9313df1b8dd0afb9d0
-EBUILD libpng-1.4.7.ebuild 1384 RMD160 181374b71113846fdf1c9fa6f7b71fa082c38dc9 SHA1 e0cd8ef592117e0e375a81469c16aad6b067a7d4 SHA256 871a038464881972ec4448d4f2d3e449e86a6de2301a05ca1702fe45613a6782
-EBUILD libpng-1.5.2.ebuild 1404 RMD160 9238ac7c546d156d340f1d20b540810fa749b671 SHA1 e17c4533a91ee40b4cdc999f4358805184550ad5 SHA256 3083022be5425f3692d7c3a7f5e59909c3f03b988c1a3e0e6b2684325be7ebfa

diff --git a/media-libs/libpng/files/libpng-1.4.5-apng.patch.gz b/media-libs/libpng/files/libpng-1.4.5-apng.patch.gz
deleted file mode 100644
index fbe599e..0000000
Binary files a/media-libs/libpng/files/libpng-1.4.5-apng.patch.gz and /dev/null differ

diff --git a/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz b/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz
deleted file mode 100644
index 6ccb028..0000000
Binary files a/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz and /dev/null differ

diff --git a/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz b/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz
deleted file mode 100644
index c4dd9a4..0000000
Binary files a/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz and /dev/null differ

diff --git a/media-libs/libpng/libpng-1.4.5.ebuild b/media-libs/libpng/libpng-1.4.5.ebuild
deleted file mode 100644
index dc3dea3..0000000
--- a/media-libs/libpng/libpng-1.4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.5.ebuild,v 1.1 2010/12/22 15:36:51 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	use apng && epatch "${FILESDIR}"/${P}-apng.patch.gz
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES README TODO libpng-*.txt
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
-}
-
-pkg_postinst() {
-	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
-}

diff --git a/media-libs/libpng/libpng-1.4.7.ebuild b/media-libs/libpng/libpng-1.4.7.ebuild
deleted file mode 100644
index 1846b54..0000000
--- a/media-libs/libpng/libpng-1.4.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.7.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	use apng && epatch "${FILESDIR}"/${P}-apng.patch.gz
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES README TODO libpng-*.txt
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
-}
-
-pkg_postinst() {
-	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
-}

diff --git a/media-libs/libpng/libpng-1.5.2.ebuild b/media-libs/libpng/libpng-1.5.2.ebuild
deleted file mode 100644
index 148eeef..0000000
--- a/media-libs/libpng/libpng-1.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.2.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	use apng && epatch "${FILESDIR}"/${P}-apng.patch.gz
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-#	has_version ${CATEGORY}/${PN}:1.4 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0)
-}
-
-pkg_postinst() {
-#	has_version ${CATEGORY}/${PN}:1.4 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
-}

diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
new file mode 100644
index 0000000..bc8791b
--- /dev/null
+++ b/media-libs/libvpx/Manifest
@@ -0,0 +1,3 @@
+AUX libvpx-0.9.5-enable-shared.patch 655 RMD160 a72ba77666e088103a48fb31c445fc12f8163959 SHA1 4ee0feade82667b1e6d42cafcbe4113205482011 SHA256 44239d453714ca62523b299612d2ec279eceb2e74c296de1ef8eb5c8575ad86e
+DIST libvpx-v1.0.0.tar.bz2 1641411 RMD160 2ee5a2e7f4cb2f126c6d0d9a36e8636455f42915 SHA1 2919e11074fef72fc61ef1a75160050ffaad6074 SHA256 07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21
+EBUILD libvpx-1.0.0.ebuild 2138 RMD160 5b7cdc0f82e426a46653bef941274c7cd5b6e8b1 SHA1 35cc84f8da6ffa43d3f60da2ef58d31c79f3c4a2 SHA256 52dcf8a2a578c7e5a62b07443f075ffba259f76b4dc42332d0c02f5c872ba06c

diff --git a/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch b/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch
new file mode 100644
index 0000000..0b99f7e
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-0.9.5-enable-shared.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/351496
+http://patch-tracker.debian.org/patch/series/view/libvpx/0.9.5-1/01_enable-shared.patch
+
+--- configure
++++ configure
+@@ -415,12 +415,6 @@
+ }
+ 
+ process_detect() {
+-    if enabled shared; then
+-        # Can only build shared libs on a subset of platforms. Doing this check
+-        # here rather than at option parse time because the target auto-detect
+-        # magic happens after the command line has been parsed.
+-        enabled linux || die "--enable-shared only supported on ELF for now"
+-    fi
+     if [ -z "$CC" ]; then
+         echo "Bypassing toolchain for environment detection."
+         enable external_build

diff --git a/media-libs/libvpx/libvpx-1.0.0.ebuild b/media-libs/libvpx/libvpx-1.0.0.ebuild
new file mode 100644
index 0000000..37b7672
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.7-r1.ebuild,v 1.3 2011/12/26 11:07:28 armin76 Exp $
+
+EAPI=4
+inherit eutils multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+	KEYWORDS=""
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="http://webm.googlecode.com/files/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 static-libs +threads"
+
+RDEPEND=""
+DEPEND="amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+REQUIRED_USE="
+	sse2? ( mmx )
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.5-enable-shared.patch
+}
+
+src_configure() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=384585
+	addpredict /usr/share/snmp/mibs/.index
+
+	tc-export CC
+	local archparams=""
+	[ "$ABI" = "x86" ] && archparams=" --target=x86-linux-gcc"
+	[ "$ABI" = "amd64" ] && archparams=" --target=x86_64-linux-gcc"
+	( use x86 || use amd64 ) && archparams+=" --as=yasm"
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-pic \
+		--enable-vp8 \
+		--enable-shared \
+		$(use_enable altivec) \
+		$(use_enable debug debug-libs) \
+		$(use_enable debug) \
+		$(use_enable doc install-docs) \
+		$(use_enable mmx) \
+		$(use_enable postproc) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable sse3) \
+		$(use_enable ssse3) \
+		$(use_enable static-libs static) \
+		$(use_enable threads multithread) \
+		$archparams \
+		|| die
+}
+
+src_install() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=323805
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS CHANGELOG README
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index b8ee312..638a322 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -7,3 +7,6 @@
 
 # These are experimental use with caution!!
 =www-client/seamonkey-2.7*
+
+# Only avaliable for testing and staging changes!!!
+=media-libs/libvpx-1.0.0

diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
deleted file mode 100644
index 8c9b76e..0000000
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX gecko-mediaplayer-1.0.5_beta1-npapi-sdk.patch 1195 RMD160 178ee3f2bfe3445fac4a854366d8cf2acdf0d53e SHA1 5a57cec08a1d840ec0fafa5a021430e809b84283 SHA256 ea17929cd8c10ebd54d4b3a919c1a8bb033f347625ecc0941b5b3421ab8bba15
-DIST gecko-mediaplayer-1.0.5b1.tar.gz 260120 RMD160 30722136572f350400220d08ff58cd98f74aae15 SHA1 c5e8e927325b7503d8dc082407a89177ef93874e SHA256 1fb2dc17060e9748ead2e0ad2b37824e48c529af4718e939dbff5b8f5736f973
-EBUILD gecko-mediaplayer-1.0.5_beta1.ebuild 1155 RMD160 01a8bd3642752c5a8a730d9a05143140a109d8c7 SHA1 69f768a3ce1aedea788af01b082121ae4a57fc0a SHA256 422a3fbde0959506917175d1db2eae594d222b9a2eb1b988c79be028dd1c9cbf

diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-npapi-sdk.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-npapi-sdk.patch
deleted file mode 100644
index 95caaa4..0000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-npapi-sdk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.in	2011-07-01 19:40:13.000000000 +0300
-+++ b/configure.in	2011-09-15 21:10:22.000000000 +0300
-@@ -109,8 +109,17 @@
-     ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
- fi
- 
-+if test "$GECKO_CFLAGS" = ""; then
-+PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
-+    AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher])
-+    ],[AC_MSG_ERROR([npapi-sdk not found, all out ot tries])])
-+fi
-+    
-+
- PKG_CHECK_MODULES(NSPR, [nspr],[
-     libdir=`$PKG_CONFIG --variable=libdir nspr`
-+    GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
-+    AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
-     AC_SUBST(libdir)
-    ],[AC_MSG_WARN([nspr not found, may not be needed])])
- 
---- a/src/plugin.cpp	2011-11-29 14:20:21.000000000 -0500
-+++ b/src/plugin.cpp	2011-11-29 14:22:52.000000000 -0500
-@@ -42,10 +42,14 @@
- #include "plugin_setup.h"
- #include "plugin_types.h"
- #include "plugin_dbus.h"
-+#ifdef HAVE_NSPR
-+#include <nspr/nspr.h>
-+#else
- #include <nsIPrefBranch.h>
- #include <nsIPrefService.h>
- #include <nsIServiceManager.h>
- #include <nsISupportsPrimitives.h>
-+#endif
- #include <dlfcn.h>
- 
- static NPObject *sWindowObj;
-

diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild
deleted file mode 100644
index 86328e0..0000000
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild,v 1.2 2011/11/24 21:41:09 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib nsplugins
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="A browser plugin that uses GNOME MPlayer"
-HOMEPAGE="http://code.google.com/p/gecko-mediaplayer/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+curl"
-
-RDEPEND=">=dev-libs/dbus-glib-0.92
-	>=dev-libs/glib-2.26:2
-	dev-libs/nspr
-	>=media-libs/gmtk-${PV}
-	>=media-video/gnome-mplayer-${PV}[dbus]
-	=net-misc/npapi-sdk-0.27
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-DOCS="ChangeLog DOCS/tech/*.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.5_beta1-npapi-sdk.patch"
-}
-
-src_configure() {
-	export PKG_CONFIG_PATH="${T}"
-
-	econf \
-		--with-plugin-dir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-		$(use_with curl libcurl)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
deleted file mode 100644
index 63e7006..0000000
--- a/x11-plugins/enigmail/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
-AUX 75_enigmai-js-fixup.patch 1260 RMD160 b89620f3495a286c1e5636b0c65b423d3a158944 SHA1 033b817e08acd35c9d4e943b24f07d9191900912 SHA256 66e3e9ddce9d191ce1417e364757f1d35873f031abd94c817e069249d18a3dd3
-DIST enigmail-1.1.2.tar.gz 1280923 RMD160 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 SHA1 d29fce2b20a36d210b12c28fcbbee965007c95aa SHA256 dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
-DIST thunderbird-3.1-patches-1.1.tar.bz2 3702 RMD160 24538a1db5256e33692181266704100071c66d74 SHA1 4a70aa3c8c21736c0d9588eca7c0bf50b5d5adfb SHA256 1b9358ba174180d64106d3656fa0623847fdb2197039de23a7f9cf63d9c764de
-DIST thunderbird-3.1.4.source.tar.bz2 66636919 RMD160 9c9275960fa3a50d77f3a4998329ac5f307bbc83 SHA1 54f4f735982cad3ab721ab0aaea641f7febe85c3 SHA256 788905714e768c94025a954e1bea281f8e728d52b8249f2df43e6732d2ea7a08
-EBUILD enigmail-1.1.2-r3.ebuild 4234 RMD160 1c3efeba0bb47c0709a8742cad3f95ba729a14c8 SHA1 d08ee12b1df544969a876a381f391a1faca575c3 SHA256 8b6e1b82f925567635ab65a99bce5916f86e0108fb1362850e2d78865cec09c9

diff --git a/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild b/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild
deleted file mode 100644
index 7e65991..0000000
--- a/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2-r2.ebuild,v 1.7 2010/09/14 17:03:15 fauli Exp $
-
-WANT_AUTOCONF="2.1"
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
-MY_P="${P/_beta/b}"
-EMVER="${PV}"
-TBVER="3.1.4"
-PATCH="thunderbird-3.1-patches-1.1"
-
-DESCRIPTION="GnuPG encryption plugin for thunderbird."
-HOMEPAGE="http://enigmail.mozdev.org"
-REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
-	http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE="system-sqlite"
-
-DEPEND=">=mail-client/thunderbird-3.1.1-r1[system-sqlite=]"
-RDEPEND="${DEPEND}
-	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
-	|| (
-		(
-			>=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-
-S="${WORKDIR}"/comm-1.9.2
-
-pkg_setup() {
-	# EAPI=2 ensures they are set properly.
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export MOZ_CO_PROJECT=mail
-}
-
-src_unpack() {
-	unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
-}
-
-src_prepare(){
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	cd mozilla
-	eautoreconf
-	cd js/src
-	eautoreconf
-
-	# Unpack the enigmail plugin
-	cd "${S}"/mailnews/extensions || die
-	unpack enigmail-${EMVER}.tar.gz
-	cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
-	makemake2
-
-	cd "${S}"
-
-	# Fix installation of enigmail.js
-	epatch "${FILESDIR}"/70_enigmail-fix.patch
-	epatch "${FILESDIR}"/75_enigmai-js-fixup.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	touch mail/config/mozconfig
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_annotate '' \
-		--with-system-nspr \
-		--with-system-nss \
-		--disable-wave \
-		--disable-ogg \
-		--with-default-mozilla-five-home="${EPREFIX}"${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird \
-		--enable-application=mail \
-		--disable-necko-wifi \
-		--disable-libnotify
-
-	mozconfig_use_enable system-sqlite
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-}
-
-src_compile() {
-	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C mozilla/modules/libreg || die "make modules/libreg failed"
-	emake -C mozilla/xpcom/string || die "make xpcom/string failed"
-	emake -C mozilla/xpcom || die "make xpcom failed"
-	emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed"
-
-	# Build the enigmail plugin
-	einfo "Building Enigmail plugin..."
-	emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-
-	# Package the enigmail plugin; this may be the easiest way to collect the
-	# necessary files
-	emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-	declare emid
-
-	cd "${T}"
-	unzip "${S}"/mozilla/dist/bin/*.xpi install.rdf
-	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-	cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-	unzip "${S}"/mozilla/dist/bin/*.xpi
-}

diff --git a/x11-plugins/enigmail/files/70_enigmail-fix.patch b/x11-plugins/enigmail/files/70_enigmail-fix.patch
deleted file mode 100644
index 0acf0c8..0000000
--- a/x11-plugins/enigmail/files/70_enigmail-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/extensions/enigmail/package/Makefile.in	14 Mar 2004 16:39:18 -0000	1.73
-+++ mozilla/extensions/enigmail/package/Makefile.in	20 Mar 2004 18:20:08 -0000
-@@ -48,6 +48,8 @@
- 
- XPIDLSRCS     = nsIEnigmail.idl
- 
-+PREF_JS_EXPORTS=prefs/enigmail.js
-+
- include $(topsrcdir)/config/rules.mk
- 
- XPIFILE = $(XPI_MODULE)-$(XPI_MODULE_VERS).xpi

diff --git a/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
deleted file mode 100644
index 8e85cfc..0000000
--- a/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mailnews/extensions/enigmail/package/enigmail.js	2010-06-26 19:51:30.000000000 +0200
-+++ mailnews/extensions/enigmail/package/enigmail.js	2010-07-10 17:34:46.000000000 +0200
-@@ -1231,7 +1231,10 @@ function () {
-                .getInstallLocation(ENIGMAIL_EXTENSION_ID);
-       var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
-       extensionLoc.append("gpg-agent-wrapper.sh");
--			extensionLoc.permissions=0755;
-+      try {
-+        extensionLoc.permissions=0755;
-+      }
-+      catch(ex) {}
-       agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
-       agentProcess.init(extensionLoc);
-       agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
-@@ -1758,7 +1761,10 @@ function (domWindow) {
-                    .getInstallLocation(ENIGMAIL_EXTENSION_ID);
-           var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
-           extensionLoc.append("gpg-agent-wrapper.sh");
--          extensionLoc.permissions=0755;
-+          try {
-+            extensionLoc.permissions=0755;
-+          }
-+          catch(ex) {}
-           args.unshift(command.path);
-           args.unshift("start");
-           command = extensionLoc;
-