Version bump to 1.1. Fix bug 297214.

Thanks to Ferdinand Kuhl <fcool@coolys.de>.
Package-Manager: portage-15321-svn/cvs/Linux ppc

4 files changed, 310 insertions, 2 deletions

diff --git a/www-plugins/weave/ChangeLog b/www-plugins/weave/ChangeLog
index 42a809ddc1a1..18d3afb543dc 100644
--- a/www-plugins/weave/ChangeLog
+++ b/www-plugins/weave/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2010/01/01 18:04:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/weave/ChangeLog,v 1.3 2010/03/14 17:49:59 volkmar Exp $
+
+*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:
diff --git a/www-plugins/weave/Manifest b/www-plugins/weave/Manifest
index ff750358d9a4..5416953ec809 100644
--- a/www-plugins/weave/Manifest
+++ b/www-plugins/weave/Manifest
@@ -1,5 +1,8 @@
 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.0_beta2.tar.bz2 445794 RMD160 b5738b2f0064b9d609c4cac9fdf2a16546da386d SHA1 479edf04537c626b5d7ad474f9fe1435a9099d8f SHA256 056a0ca3d766e54d33896b65d4c441c51f5d6144bad38a4f02552ef2873dce18
+DIST weave-1.1.tar.bz2 440430 RMD160 4ed83cbfdebf3148b30d3ca7bb04c4c23de6a737 SHA1 d462092a9e5f37da0afae26b6a8772ad2fa63dcc SHA256 80d30ae19763f3ba020447abf79594e68f1243983b976fc06bdf6b301481d1c9
 EBUILD weave-1.0_beta2.ebuild 3456 RMD160 7680267bc2533c26c8c4b2db5cb9d73800f669ba SHA1 9384d4981f25cfc51575e4b5d45e8d5e7ebadce1 SHA256 ae7b5dc174dcbcadfa13752d04d62e61351710675504e311040ee6e59d987fb4
-MISC ChangeLog 3804 RMD160 e7c9e8528593efbe1de44cc21d84e0e5d04405f5 SHA1 d6be366ed75c94ef3e1372b53d150f9e52bab0ff SHA256 ae784ee062bb51291383cb6a51cc1362860556986cb78c74240b8801e8d18ab3
+EBUILD weave-1.1.ebuild 2959 RMD160 56a688aca385b04528e7cf5ade5133b889b6ee3c SHA1 688645fa27e38e707af706d027657a0906f594f5 SHA256 5e58928eb3f735b07866e715cbcdac5c8d30550a768015fbfbffa2018822e70c
+MISC ChangeLog 4020 RMD160 0bfe45571e9786a90b9b9a59ccfa788615ef76e7 SHA1 50aa96ed356c9df5e5e9b5ad1be819a204fa2a8a SHA256 b5c7625e05edeeccfcd1872e1ba21c09fad21748b1f28bfbb1cce05f42af05a3
 MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/weave/files/weave-1.1-pkgconfig.patch b/www-plugins/weave/files/weave-1.1-pkgconfig.patch
new file mode 100644
index 000000000000..1580dfda0fc7
--- /dev/null
+++ b/www-plugins/weave/files/weave-1.1-pkgconfig.patch
@@ -0,0 +1,192 @@
+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/weave-1.1.ebuild b/www-plugins/weave/weave-1.1.ebuild
new file mode 100644
index 000000000000..c797b1bd9953
--- /dev/null
+++ b/www-plugins/weave/weave-1.1.ebuild
@@ -0,0 +1,106 @@
+# 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.1 2010/03/14 17:49:59 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils mozextension multilib
+
+DESCRIPTION="Synchronize your bookmarks, history, tabs and passwords with Firefox"
+HOMEPAGE="https://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/mozilla-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/mozilla-firefox-3.5'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${WORKDIR}/${xpiname}"
+		mozillas="$(best_version www-client/mozilla-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."
+}