Remove weave as per package.mask, was merged into firefox itself

6 files changed, 0 insertions, 626 deletions

diff --git a/www-plugins/weave/ChangeLog b/www-plugins/weave/ChangeLog
deleted file mode 100644
index e545b2aa6094..000000000000
--- a/www-plugins/weave/ChangeLog
+++ /dev/null
@@ -1,120 +0,0 @@
-# ChangeLog for www-plugins/weave
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/weave/ChangeLog,v 1.5 2010/07/25 19:10:58 nirbheek Exp $
-
-  25 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> weave-1.1.ebuild:
-  Fix references for pkgmove from www-client/mozilla-firefox ->
-  www-client/firefox
-
-  10 Apr 2010; Mounir Lamouri <volkmar@gentoo.org> -weave-1.0_beta2.ebuild,
-  weave-1.1.ebuild:
-  Change HOMEPAGE, fixing bug 313073 and removing old ebuilds.
-
-*weave-1.1 (14 Mar 2010)
-
-  14 Mar 2010; Mounir Lamouri <volkmar@gentoo.org> +weave-1.1.ebuild,
-  +files/weave-1.1-pkgconfig.patch:
-  Version bump to 1.1. Fix bug 297214.
-  Thanks to Ferdinand Kuhl <fcool@coolys.de>.
-
-  01 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  weave-1.0_beta2.ebuild:
-  mozilla-firefox-bin -> firefox-bin
-
-*weave-1.0_beta2 (25 Nov 2009)
-
-  25 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
-  +files/weave-0.5.1-pkgconfig.patch, +weave-1.0_beta2.ebuild,
-  +metadata.xml:
-  Moving from www-plugins/mozilla-weave to www-plugins/weave.
-  Version bump to 1.0_beta2 and removing old ebuilds (0.6 and 0.7).
-
-  01 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
-  -mozilla-weave-0.2.104.ebuild, -mozilla-weave-0.5.1.ebuild:
-  Removing ebuilds not compatible anymore with official servers.
-
-*mozilla-weave-0.7 (01 Oct 2009)
-
-  01 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
-  +mozilla-weave-0.7.ebuild:
-  Version bump to 0.7.
-
-  30 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> mozilla-weave-0.6.ebuild:
-  Workaround for parallel compilation issues
-
-*mozilla-weave-0.6 (28 Aug 2009)
-
-  28 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
-  -mozilla-weave-0.6_pre2.ebuild, +mozilla-weave-0.6.ebuild:
-  Version bump to 0.6
-
-*mozilla-weave-0.6_pre2 (24 Aug 2009)
-
-  24 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
-  +mozilla-weave-0.6_pre2.ebuild:
-  Version bump to 0.6_pre2. Fix bug 280606
-
-*mozilla-weave-0.5.1 (23 Aug 2009)
-
-  23 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
-  -mozilla-weave-0.4.0.ebuild, -mozilla-weave-0.5_pre1.ebuild,
-  +mozilla-weave-0.5.1.ebuild, +files/mozilla-weave-0.5.1-pkgconfig.patch,
-  -files/mozilla-weave-use-pkgconfig.patch:
-  Version bump to 0.5.1. Removing old ebuilds except 0.2.104 because only
-  one working with stable firefox.
-
-*mozilla-weave-0.5_pre1 (14 Jul 2009)
-
-  14 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +mozilla-weave-0.5_pre1.ebuild, +files/mozilla-weave-use-pkgconfig.patch:
-  Bump to 0.5_pre1 -- keyword-less because it's a pre-release
-
-  13 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
-  mozilla-weave-0.4.0.ebuild:
-  Committed too soon. Fixes to allow 0.4.0 to build and install
-
-*mozilla-weave-0.4.0 (13 Jul 2009)
-
-  13 Jul 2009; <nirbheek@gentoo.org> -mozilla-weave-0.3.0.ebuild,
-  -mozilla-weave-0.3.2.ebuild, +mozilla-weave-0.4.0.ebuild, metadata.xml:
-  Bump to 0.4.0, clean up old versions, and add mozilla as herd.
-  Add support for seamonkey, mozilla-thunderbird{,-bin}, and mozilla-firefox
-
-  06 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
-  mozilla-weave-0.2.104.ebuild, mozilla-weave-0.3.0.ebuild,
-  mozilla-weave-0.3.2.ebuild:
-  Package still in heavy development and tests are known to fail so disabling
-  them. Fixing bug 276321
-
-  05 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
-  mozilla-weave-0.2.104.ebuild, mozilla-weave-0.3.0.ebuild,
-  mozilla-weave-0.3.2.ebuild:
-  Remove file components/WeaveCrypto.so compiled for ARM. Fix bug 276323
-
-  13 Jun 2009; Torsten Veller <tove@gentoo.org>
-  mozilla-weave-0.2.104.ebuild, mozilla-weave-0.3.0.ebuild,
-  mozilla-weave-0.3.2.ebuild:
-  Add missing die: "..." -> die "..."
-
-*mozilla-weave-0.3.2 (16 May 2009)
-
-  16 May 2009; Mounir Lamouri <volkmar@gentoo.org>
-  mozilla-weave-0.3.0.ebuild, +mozilla-weave-0.3.2.ebuild:
-  Version bump to 0.3.2
-
-  16 May 2009; Mounir Lamouri <volkmar@gentoo.org>
-  mozilla-weave-0.2.104.ebuild, mozilla-weave-0.3.0.ebuild:
-  Add ~x86 keyword as maintainer. Fixing firefox dependency for 0.2.104.
-
-*mozilla-weave-0.3.0 (15 Apr 2009)
-
-  15 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
-  +mozilla-weave-0.3.0.ebuild:
-  Last version which needs firefox-3.1.
-
-*mozilla-weave-0.2.104 (15 Apr 2009)
-
-  15 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> +metadata.xml,
-  +mozilla-weave-0.2.104.ebuild:
-  Initial commit. See bug 235397.
-
diff --git a/www-plugins/weave/Manifest b/www-plugins/weave/Manifest
deleted file mode 100644
index 1d6e4878fa9c..000000000000
--- a/www-plugins/weave/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX weave-0.5.1-pkgconfig.patch 5561 RMD160 aff039e39fb676de0ac72ab63ea8c7774fbc83ef SHA1 b2c6907d574da568057b643024fb1ea906626e32 SHA256 3813e0996c97a9188d72e50ff7e074e608430ecd8fe559da8184b6420527a89d
-AUX weave-1.1-pkgconfig.patch 5450 RMD160 36781a3f0b250805d09a21ae7e3ae0e8c76754f5 SHA1 15380118964e86ce9cb6cebd49d3846a683af231 SHA256 e74e81abbaf2c0ff805998e624c8c0bdae4eec3d192b45ec20855e349f4192d8
-DIST weave-1.1.tar.bz2 440430 RMD160 4ed83cbfdebf3148b30d3ca7bb04c4c23de6a737 SHA1 d462092a9e5f37da0afae26b6a8772ad2fa63dcc SHA256 80d30ae19763f3ba020447abf79594e68f1243983b976fc06bdf6b301481d1c9
-EBUILD weave-1.1.ebuild 2935 RMD160 b89c76b8a4791517a960c51e4d9129f87bb7317a SHA1 dec5360dd923ee2d04dc1750d52db7da2003ad31 SHA256 c47765e8f1ebb58c65515f88c30eadb6b0a39b5056b4bdbd6f2e6ef5c13d89cf
-MISC ChangeLog 4339 RMD160 4e8b34630cd1c357ff8d45f68d003c85bd675a0e SHA1 405dd962c59f11bfb62d9699a74edde1b1e49f59 SHA256 b1465f51085251899c332acb753207c5e155da097ba68bd77327fde084f3d3da
-MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/weave/files/weave-0.5.1-pkgconfig.patch b/www-plugins/weave/files/weave-0.5.1-pkgconfig.patch
deleted file mode 100644
index 467344b40bb0..000000000000
--- a/www-plugins/weave/files/weave-0.5.1-pkgconfig.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -r adb27ed2f421 crypto/Makefile
---- a/crypto/Makefile	Fri Aug 21 17:32:41 2009 -0700
-+++ b/crypto/Makefile	Mon Aug 24 00:09:43 2009 +0200
-@@ -39,12 +39,23 @@
- stage_dir=../dist/stage
- 
- sdkdir ?= ${MOZSDKDIR}
-+
-+# If blank, try to use pkg-config
-+# To add a path to pkg-config search path, use PKG_CONFIG_PATH
-+# (see man pkg-config)
-+ifeq ($(sdkdir),)
-+	sdkdir = $(shell pkg-config --variable sdkdir libxul-unstable)
-+endif
-+
- ifeq ($(sdkdir),)
-   $(warning No 'sdkdir' variable given)
-   $(warning It should point to the location of the Gecko SDK)
-   $(warning For example: "make sdkdir=/foo/bar/baz")
-   $(warning Or set the MOZSDKDIR environment variable to point to it)
-+  $(warning Or fix your xulrunner pkg-config files)
-   $(error)
-+else
-+  $(info Using Mozilla SDKDIR as: ${sdkdir})
- endif
- 
- all: build
-diff -r adb27ed2f421 crypto/src/Makefile
---- a/crypto/src/Makefile	Fri Aug 21 17:32:41 2009 -0700
-+++ b/crypto/src/Makefile	Mon Aug 24 00:09:43 2009 +0200
-@@ -37,9 +37,17 @@
- #
- # ***** END LICENSE BLOCK *****
- 
-+# Define some custom pkg-config functions
-+pkg-config-var	= $(shell pkg-config --variable $(1) $(2))
-+pkg-config-I	= $(shell pkg-config --cflags-only-I $(1) $(2))
-+pkg-config-l	= $(patsubst -l%,%,$(shell pkg-config --libs-only-l $(1)))
-+pkg-config-L	= $(patsubst -L%,%,$(shell pkg-config --libs-only-L $(1)))
-+
-+# Actually use pkg-config?
-+pkgconfig = "no"
-+
- # OS detection
- 
--xpidl = $(sdkdir)/bin/xpidl
- link = link
- 
- sys := $(shell uname -s)
-@@ -48,7 +56,6 @@
- ifeq ($(wince), 1)
-   os = WINNT
-   cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
--  xpidl = $(sdkdir)/host/bin/host_xpidl
-   link = $(sdkdir)/sdk/bin/arm-wince-link
-   so = dll
- else
-@@ -165,13 +172,24 @@
- destdir = ..
- platformdir = $(destdir)/platform/$(platform)
- 
-+# If blank, try to use pkg-config
-+# To add a path to pkg-config search path, use PKG_CONFIG_PATH
-+# (see man pkg-config)
-+ifeq ($(sdkdir),)
-+  pkgconfig="yes"
-+  sdkdir = $(call pkg-config-var,sdkdir,libxul-unstable)
-+endif
-+
- # FIXME: we don't actually require this for e.g. clean
- ifeq ($(sdkdir),)
-   $(warning No 'sdkdir' variable given)
-   $(warning It should point to the location of the Gecko SDK)
-   $(warning For example: "make sdkdir=/foo/bar/baz")
-   $(warning Or set the MOZSDKDIR environment variable to point to it)
-+  $(warning Or fix your xulrunner pkg-config files)
-   $(error )
-+else
-+  $(info Using Mozilla SDKDIR as: ${sdkdir})
- endif
- 
- idl_headers = $(idl:.idl=.h)
-@@ -179,30 +197,75 @@
- cpp_objects = $(cpp_sources:.cpp=.o)
- so_target = $(target:=.$(so))
- 
--headers = -I$(sdkdir)/include \
--          -I$(sdkdir)/include/system_wrappers \
--          -I$(sdkdir)/include/nss \
--          -I$(sdkdir)/include/xpcom \
--          -I$(sdkdir)/include/string \
--          -I$(sdkdir)/include/pipnss \
--          -I$(sdkdir)/include/nspr \
--          -I$(sdkdir)/sdk/include
-+xpidl = $(sdkdir)/bin/xpidl
-+ifeq ($(wince), 1)
-+  xpidl = $(sdkdir)/host/bin/host_xpidl
-+endif
-+
-+ifeq ($(pkgconfig),"yes")
-+  # Include dirs
-+  nss_includes    = $(call pkg-config-I,mozilla-nss)
-+  nspr_includes   = $(call pkg-config-I,mozilla-nspr)
-+  libxul_includes = $(call pkg-config-I,libxul-unstable)
-+
-+  # Library dirs
-+  nss_libdirs     = $(call pkg-config-L,mozilla-nss)
-+  nspr_libdirs    = $(call pkg-config-L,mozilla-nspr)
-+  libxul_libdirs  = $(call pkg-config-L,libxul-unstable)
-+
-+  # Libs
-+  nss_libs        = $(call pkg-config-l,mozilla-nss)
-+  nspr_libs       = $(call pkg-config-l,mozilla-nspr)
-+  libxul_libs     = $(call pkg-config-l,libxul-unstable)
-+
-+  idl_dir         = $(call pkg-config-var,idldir,libxul-unstable)/unstable
-+
-+# Fallback to Hard-coded
-+else
-+  # Include dirs
-+  nss_includes    = -I$(sdkdir)/include/nss
-+  nspr_includes   = -I$(sdkdir)/include/nspr
-+  libxul_includes = -I$(sdkdir)/include \
-+                    -I$(sdkdir)/include/system_wrappers \
-+                    -I$(sdkdir)/include/xpcom \
-+                    -I$(sdkdir)/include/string \
-+                    -I$(sdkdir)/include/pipnss \
-+                    -I$(sdkdir)/sdk/include
-+
-+  # Library dirs
-+  libxul_libdirs  = $(sdkdir)/lib $(sdkdir)/bin
-+  nss_libdirs     = $(libxul_libdirs)
-+  nspr_libdirs    = $(libxul_libdirs)
-+
-+  # Libs
-+  nss_libs        = ssl3 smime3 nss3 nssutil3
-+  nspr_libs       = nspr4 plds4 plc4
-+  libxul_libs     = xpcomglue_s
-+  ifeq ($(wince),1)
-+    libxul_libs = $(libxul_libs) xpcom
-+  else
-+    libxul_libs = $(libxul_libs) xpcomglue
-+  endif
-+
-+  ifeq ($(os), linux)
-+	  libxul_libs = $(libxul_libs) xpcom_core
-+  endif
-+
-+  idl_dir         = $(sdkdir)/idl
-+endif
-+
-+headers = $(nss_includes) \
-+          $(nspr_includes) \
-+          $(libxul_includes)
- 
- # libraries
--libdirs := $(sdkdir)/lib $(sdkdir)/bin
--ifeq ($(wince),1)
--libs := xpcomglue_s xpcom nspr4 \
--        crmf smime3 ssl3 nss3 nssutil3 \
--        plds4 plc4
--else
--libs := xpcomglue xpcomglue_s nspr4 \
--        crmf smime3 ssl3 nss3 nssutil3 \
--        plds4 plc4
--endif
-+libdirs = $(nss_libdirs) \
-+          $(nspr_libdirs) \
-+          $(libxul_libdirs)
- 
--ifeq ($(os), Linux)
--  libs := xpcom_core $(libs)
--endif
-+libs = $(nss_libs) \
-+       $(nspr_libs) \
-+       $(libxul_libs)
- 
- # compiler and Linker Flags
- 
-@@ -328,10 +391,10 @@
- 
- # rules to build the c headers and .xpt from idl
- $(idl_headers): $(idl)
--	$(xpidl) -m header -I$(sdkdir)/idl $(@:.h=.idl)
-+	$(xpidl) -m header -I$(idl_dir) $(@:.h=.idl)
- 
- $(idl_typelib): $(idl)
--	$(xpidl) -m typelib -I$(sdkdir)/idl $(@:.xpt=.idl)
-+	$(xpidl) -m typelib -I$(idl_dir) $(@:.xpt=.idl)
- 
- # build and link rules
- ifeq ($(os), Darwin)
diff --git a/www-plugins/weave/files/weave-1.1-pkgconfig.patch b/www-plugins/weave/files/weave-1.1-pkgconfig.patch
deleted file mode 100644
index 1580dfda0fc7..000000000000
--- a/www-plugins/weave/files/weave-1.1-pkgconfig.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -r adb27ed2f421 crypto/Makefile
---- a/crypto/Makefile	Fri Aug 21 17:32:41 2009 -0700
-+++ b/crypto/Makefile	Mon Aug 24 00:09:43 2009 +0200
-@@ -39,12 +39,23 @@
- stage_dir=../dist/stage
- 
- sdkdir ?= ${MOZSDKDIR}
-+
-+# If blank, try to use pkg-config
-+# To add a path to pkg-config search path, use PKG_CONFIG_PATH
-+# (see man pkg-config)
-+ifeq ($(sdkdir),)
-+	sdkdir = $(shell pkg-config --variable sdkdir libxul)
-+endif
-+
- ifeq ($(sdkdir),)
-   $(warning No 'sdkdir' variable given)
-   $(warning It should point to the location of the Gecko SDK)
-   $(warning For example: "make sdkdir=/foo/bar/baz")
-   $(warning Or set the MOZSDKDIR environment variable to point to it)
-+  $(warning Or fix your xulrunner pkg-config files)
-   $(error)
-+else
-+  $(info Using Mozilla SDKDIR as: ${sdkdir})
- endif
- 
- all: build
-diff -r adb27ed2f421 crypto/src/Makefile
---- a/crypto/src/Makefile	Fri Aug 21 17:32:41 2009 -0700
-+++ b/crypto/src/Makefile	Mon Aug 24 00:09:43 2009 +0200
-@@ -37,9 +37,17 @@
- #
- # ***** END LICENSE BLOCK *****
- 
-+# Define some custom pkg-config functions
-+pkg-config-var	= $(shell pkg-config --variable $(1) $(2))
-+pkg-config-I	= $(shell pkg-config --cflags-only-I $(1) $(2))
-+pkg-config-l	= $(patsubst -l%,%,$(shell pkg-config --libs-only-l $(1)))
-+pkg-config-L	= $(patsubst -L%,%,$(shell pkg-config --libs-only-L $(1)))
-+
-+# Actually use pkg-config?
-+pkgconfig = "no"
-+
- # OS detection
- 
--xpidl = $(sdkdir)/bin/xpidl
- link = link
- 
- sys := $(shell uname -s)
-@@ -48,7 +56,6 @@
- ifeq ($(wince), 1)
-   os = WINNT
-   cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
--  xpidl = $(sdkdir)/host/bin/host_xpidl
-   link = $(sdkdir)/sdk/bin/arm-wince-link
-   so = dll
- else
-@@ -165,13 +172,24 @@
- destdir = ..
- platformdir = $(destdir)/platform/$(platform)
- 
-+# If blank, try to use pkg-config
-+# To add a path to pkg-config search path, use PKG_CONFIG_PATH
-+# (see man pkg-config)
-+ifeq ($(sdkdir),)
-+  pkgconfig="yes"
-+  sdkdir = $(call pkg-config-var,sdkdir,libxul)
-+endif
-+
- # FIXME: we don't actually require this for e.g. clean
- ifeq ($(sdkdir),)
-   $(warning No 'sdkdir' variable given)
-   $(warning It should point to the location of the Gecko SDK)
-   $(warning For example: "make sdkdir=/foo/bar/baz")
-   $(warning Or set the MOZSDKDIR environment variable to point to it)
-+  $(warning Or fix your xulrunner pkg-config files)
-   $(error )
-+else
-+  $(info Using Mozilla SDKDIR as: ${sdkdir})
- endif
- 
- idl_headers = $(idl:.idl=.h)
-@@ -179,30 +197,75 @@
- cpp_objects = $(cpp_sources:.cpp=.o)
- so_target = $(target:=.$(so))
- 
--headers = -I$(sdkdir)/include \
--          -I$(sdkdir)/include/system_wrappers \
--          -I$(sdkdir)/include/nss \
--          -I$(sdkdir)/include/xpcom \
--          -I$(sdkdir)/include/string \
--          -I$(sdkdir)/include/pipnss \
--          -I$(sdkdir)/include/nspr \
--          -I$(sdkdir)/sdk/include
-+xpidl = $(sdkdir)/bin/xpidl
-+ifeq ($(wince), 1)
-+  xpidl = $(sdkdir)/host/bin/host_xpidl
-+endif
-+
-+ifeq ($(pkgconfig),"yes")
-+  # Include dirs
-+  nss_includes    = $(call pkg-config-I,nss)
-+  nspr_includes   = $(call pkg-config-I,nspr)
-+  libxul_includes = $(call pkg-config-I,libxul)
-+
-+  # Library dirs
-+  nss_libdirs     = $(call pkg-config-L,nss)
-+  nspr_libdirs    = $(call pkg-config-L,nspr)
-+  libxul_libdirs  = $(call pkg-config-L,libxul)
-+
-+  # Libs
-+  nss_libs        = $(call pkg-config-l,nss)
-+  nspr_libs       = $(call pkg-config-l,nspr)
-+  libxul_libs     = $(call pkg-config-l,libxul)
-+
-+  idl_dir         = $(call pkg-config-var,idldir,libxul)
-+
-+# Fallback to Hard-coded
-+else
-+  # Include dirs
-+  nss_includes    = -I$(sdkdir)/include/nss
-+  nspr_includes   = -I$(sdkdir)/include/nspr
-+  libxul_includes = -I$(sdkdir)/include \
-+                    -I$(sdkdir)/include/system_wrappers \
-+                    -I$(sdkdir)/include/xpcom \
-+                    -I$(sdkdir)/include/string \
-+                    -I$(sdkdir)/include/pipnss \
-+                    -I$(sdkdir)/sdk/include
-+
-+  # Library dirs
-+  libxul_libdirs  = $(sdkdir)/lib $(sdkdir)/bin
-+  nss_libdirs     = $(libxul_libdirs)
-+  nspr_libdirs    = $(libxul_libdirs)
-+
-+  # Libs
-+  nss_libs        = ssl3 smime3 nss3 nssutil3
-+  nspr_libs       = nspr4 plds4 plc4
-+  libxul_libs     = xpcomglue_s
-+  ifeq ($(wince),1)
-+    libxul_libs = $(libxul_libs) xpcom
-+  else
-+    libxul_libs = $(libxul_libs) xpcomglue
-+  endif
-+
-+  ifeq ($(os), linux)
-+	  libxul_libs = $(libxul_libs) xpcom_core
-+  endif
-+
-+  idl_dir         = $(sdkdir)/idl
-+endif
-+
-+headers = $(nss_includes) \
-+          $(nspr_includes) \
-+          $(libxul_includes)
- 
- # libraries
--libdirs := $(sdkdir)/lib $(sdkdir)/bin
--ifeq ($(wince),1)
--libs := xpcomglue_s xpcom nspr4 \
--        crmf smime3 ssl3 nss3 nssutil3 \
--        plds4 plc4
--else
--libs := xpcomglue xpcomglue_s nspr4 \
--        crmf smime3 ssl3 nss3 nssutil3 \
--        plds4 plc4
--endif
-+libdirs = $(nss_libdirs) \
-+          $(nspr_libdirs) \
-+          $(libxul_libdirs)
- 
--ifeq ($(os), Linux)
--  libs := xpcom_core $(libs)
--endif
-+libs = $(nss_libs) \
-+       $(nspr_libs) \
-+       $(libxul_libs)
- 
- # compiler and Linker Flags
- 
-@@ -328,10 +391,10 @@
- 
- # rules to build the c headers and .xpt from idl
- $(idl_headers): $(idl)
--	$(xpidl) -m header -I$(sdkdir)/idl $(@:.h=.idl)
-+	$(xpidl) -m header -I$(idl_dir) $(@:.h=.idl)
- 
- $(idl_typelib): $(idl)
--	$(xpidl) -m typelib -I$(sdkdir)/idl $(@:.xpt=.idl)
-+	$(xpidl) -m typelib -I$(idl_dir) $(@:.xpt=.idl)
- 
- # build and link rules
- ifeq ($(os), Darwin)
diff --git a/www-plugins/weave/metadata.xml b/www-plugins/weave/metadata.xml
deleted file mode 100644
index 7ad0ba3b8bc7..000000000000
--- a/www-plugins/weave/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>mozilla</herd>
-	<maintainer>
-		<email>volkmar@gentoo.org</email>
-		<name>Mounir Lamouri</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/www-plugins/weave/weave-1.1.ebuild b/www-plugins/weave/weave-1.1.ebuild
deleted file mode 100644
index 7cbdba5edf58..000000000000
--- a/www-plugins/weave/weave-1.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/weave/weave-1.1.ebuild,v 1.3 2010/07/25 19:10:58 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils mozextension multilib
-
-DESCRIPTION="Synchronize your bookmarks, history, tabs and passwords with Firefox"
-HOMEPAGE="http://mozillalabs.com/weave/"
-SRC_URI="http://hg.mozilla.org/labs/${PN}/archive/${PV}.tar.bz2
-	-> ${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		>=www-client/firefox-3.5
-		>=www-client/firefox-bin-3.5
-		>=www-client/seamonkey-2.0_alpha3
-		>=www-client/seamonkey-bin-2.0_alpha3
-	)
-	>=net-libs/xulrunner-1.9.1
-	>=dev-libs/nss-3.12
-	>=dev-libs/nspr-4.7.1"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-# NOTES:
-# fennec is also listed in install.rdf but not in-tree
-
-# TODO:
-# tests are failing because they are not using pkgconfig
-# parallel compilation isssues
-# server ebuild: https://wiki.mozilla.org/Labs/Weave/0.5/Setup/Storage
-
-src_prepare() {
-	# remove compiled files
-	rm -rf crypto/platform/* || die "rm -rf never dies"
-
-	# upstream bug 504022
-	if has_version '>=net-libs/xulrunner-1.9.2'; then
-		epatch "${FILESDIR}"/${P}-pkgconfig.patch
-	else
-		epatch "${FILESDIR}"/${PN}-0.5.1-pkgconfig.patch
-	fi
-}
-
-src_compile() {
-	export WEAVE_BUILDID=${PV}
-
-	emake -j1 rebuild_crypto=1 build || die "emake failed"
-}
-
-#src_test() {
-#	emake -j1 test || die "emake test"
-#}
-
-src_install() {
-	local MOZILLA_FIVE_HOME xpiname
-
-	emake release_build=1 xpi || die "emake xpi failed"
-
-	mozillas=""
-	xpiname="${P}-rel"
-	xpi_unpack "${S}/dist/xpi/${xpiname}.xpi"
-
-	# FIXME: Hard-coded MOZILLA_FIVE_HOME dirs
-	if has_version '>=www-client/firefox-3.5'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-		xpi_install "${WORKDIR}/${xpiname}"
-		mozillas="$(best_version www-client/firefox) ${mozillas}"
-	fi
-	if has_version '>=www-client/firefox-bin-3.5'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		xpi_install "${WORKDIR}/${xpiname}"
-		mozillas="$(best_version www-client/firefox-bin) ${mozillas}"
-	fi
-	if has_version '>=www-client/seamonkey-2.0_alpha3'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/seamonkey"
-		xpi_install "${WORKDIR}/${xpiname}"
-		mozillas="$(best_version www-client/seamonkey) ${mozillas}"
-	fi
-	if has_version '>=www-client/seamonkey-bin-2.0_alpha3'; then
-		MOZILLA_FIVE_HOME="/opt/seamonkey"
-		xpi_install "${WORKDIR}/${xpiname}"
-		mozillas="$(best_version www-client/seamonkey-bin) ${mozillas}"
-	fi
-}
-
-pkg_postinst() {
-	elog "Weave has been installed for the following packages:"
-	for i in ${mozillas}; do
-		elog "	$i"
-	done
-	elog
-	elog "After installing other mozilla ebuilds, if you want to use weave with them,"
-	elog "reinstall www-plugins/weave"
-
-	echo ""
-	elog "If weave from https://addons.mozilla.org/en-US/firefox/addon/10868 is working"
-	elog "please, use it instead of that ebuild."
-}