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).
(Portage version: 14755-svn/cvs/Linux ppc)

4 files changed, 422 insertions, 0 deletions

diff --git a/www-plugins/weave/ChangeLog b/www-plugins/weave/ChangeLog
new file mode 100644
index 000000000000..db5bf4bce850
--- /dev/null
+++ b/www-plugins/weave/ChangeLog
@@ -0,0 +1,101 @@
+# ChangeLog for www-plugins/weave
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/weave/ChangeLog,v 1.1 2009/11/25 20:35:36 volkmar Exp $
+
+*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/files/weave-0.5.1-pkgconfig.patch b/www-plugins/weave/files/weave-0.5.1-pkgconfig.patch
new file mode 100644
index 000000000000..467344b40bb0
--- /dev/null
+++ b/www-plugins/weave/files/weave-0.5.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-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/metadata.xml b/www-plugins/weave/metadata.xml
new file mode 100644
index 000000000000..7ad0ba3b8bc7
--- /dev/null
+++ b/www-plugins/weave/metadata.xml
@@ -0,0 +1,10 @@
+<?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.0_beta2.ebuild b/www-plugins/weave/weave-1.0_beta2.ebuild
new file mode 100644
index 000000000000..01ab92fd20f1
--- /dev/null
+++ b/www-plugins/weave/weave-1.0_beta2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/weave/weave-1.0_beta2.ebuild,v 1.1 2009/11/25 20:35:36 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils mozextension multilib
+
+MY_PV="1.0b2"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Mozilla Labs prototype for online services"
+HOMEPAGE="http://labs.mozilla.com/projects/weave/"
+SRC_URI="http://hg.mozilla.org/labs/${PN}/archive/${MY_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/mozilla-firefox-bin-3.5
+		>=www-client/seamonkey-2.0_alpha3
+		>=www-client/seamonkey-bin-2.0_alpha3
+		>=mail-client/mozilla-thunderbird-3.0_beta2
+		>=mail-client/mozilla-thunderbird-bin-3.0_beta2
+	)
+	>=net-libs/xulrunner-1.9.1
+	>=dev-libs/nss-3.12
+	>=dev-libs/nspr-4.7.1"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+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
+	epatch "${FILESDIR}"/${PN}-0.5.1-pkgconfig.patch
+}
+
+src_compile() {
+	export WEAVE_BUILDID=${MY_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="${MY_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/mozilla-firefox-bin-3.5'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${WORKDIR}/${xpiname}"
+		mozillas="$(best_version www-client/mozilla-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
+	if has_version '>=mail-client/mozilla-thunderbird-3.0_beta2'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+		xpi_install "${WORKDIR}/${xpiname}"
+		mozillas="$(best_version mail-client/mozilla-thunderbird) ${mozillas}"
+	fi
+	if has_version '>=mail-client/mozilla-thunderbird-bin-3.0_beta2'; then
+		MOZILLA_FIVE_HOME="/opt/thunderbird"
+		xpi_install "${WORKDIR}/${xpiname}"
+		mozillas="$(best_version mail-client/mozilla-thunderbird-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"
+
+	# from to 1.0b2 (keep it a month or two)
+	echo ""
+	ewarn "You should update all your clients to at least 1.0_beta2."
+}