Bump to 0.5_pre1 -- keyword-less because it's a pre-release

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 301 insertions, 2 deletions

diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog
index a464fb21ecc4..f2ff5222e93a 100644
--- a/www-plugins/mozilla-weave/ChangeLog
+++ b/www-plugins/mozilla-weave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/mozilla-weave
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.9 2009/07/13 08:25:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.10 2009/07/14 09:42:48 nirbheek Exp $
+
+*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:
diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest
index 4da8e74bd98d..dcc17678b954 100644
--- a/www-plugins/mozilla-weave/Manifest
+++ b/www-plugins/mozilla-weave/Manifest
@@ -1,6 +1,9 @@
+AUX mozilla-weave-use-pkgconfig.patch 5087 RMD160 ed01a135e41fb43437f660b227b138c58398a97d SHA1 5f7eabb047153217578669f5d99497b77ae079c4 SHA256 b9a46fcc6cb6ca01e6e9ef7a6e819f85b3742ecc39d7f9d07a112cebe2b759ea
 DIST mozilla-weave-0.2.104.tar.gz 459124 RMD160 78daa66bc43e018377ab2e8c464530932ab2cb0f SHA1 faf2cac02b7c3018b5c634656795e72fe355d369 SHA256 e80fe8e917ea5fce01fa0e009aec2f95925003ee7dda10e5c30fa22ef1ec0ed0
 DIST mozilla-weave-0.4.0.tar.gz 857762 RMD160 e2f7202ab8d7908786e509c718ee7bd677224e89 SHA1 682381e17b2a57f7fc5df7cd231cdc2b73af01b2 SHA256 ab04866ce73afaadc39cf86bc4835d66c1c778c0e07c33d5aac68a7ed2f48dd2
+DIST mozilla-weave-0.5_pre1.tar.gz 853687 RMD160 3506bfa12d83bd9afc922ed395a98103ed54d0bb SHA1 cd1b32280844544ccd5302bc580e63176a4a74e5 SHA256 c4dc7098f39dbe8352eb99f9cf2fb5d548626b48516b0fbc9efc47702f447564
 EBUILD mozilla-weave-0.2.104.ebuild 2498 RMD160 75c155d3f290952440166506ad68c6efddba358f SHA1 db052949938a29139ea51aad92b1d69c93e37413 SHA256 7b91ba87fc56b4495008b4b0efadb658d0daf7905a13c7815b54e4d27e5bf8f4
 EBUILD mozilla-weave-0.4.0.ebuild 3790 RMD160 130ab2e378a30dedf515d906bb0eb7b3ae2639c5 SHA1 d8544a56483cfe36128437863b452df1f23f347a SHA256 ae1fd6a83123da003b6a0fb9614c8c587922f3062dd0c15406e13482ac01acb0
-MISC ChangeLog 2018 RMD160 323f6fedf248c2d7228a06bad28f32a81be57d6b SHA1 0b8869ba97a21731156b3a1849490ed3480c5777 SHA256 ee15ae72291ae72a541860d3971f62f93c653283a25d39e440c1ccdcf7e3a6e6
+EBUILD mozilla-weave-0.5_pre1.ebuild 3510 RMD160 2d06ccb894513029beab411705fb89317c1f2aa8 SHA1 256f20b2f7ca65f03aed3908d20b572c00f2c3dd SHA256 63b462691584e986d11fb88c4d73c5d85afb0ff58eb7c20334c624f752c23013
+MISC ChangeLog 2251 RMD160 b4216586a838bc23e48873b79becf4071caea1d1 SHA1 0e662a5491541cb6daf1ce0e4a222a531afd5d79 SHA256 187f9573a9e38b22ab37902ec4d5613f49b519eb40e55c5999ddc3efcff98697
 MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch b/www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch
new file mode 100644
index 000000000000..27928b52a05d
--- /dev/null
+++ b/www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch
@@ -0,0 +1,179 @@
+Fix hard-coded paths in Makefiles. Use pkg-config if available instead
+
+bmo: 504022
+
+Nirbheek Chauhan <nirbheek@gentoo.org>
+---
+--- a/Makefile
++++ b/Makefile
+@@ -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
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -37,6 +37,15 @@
+ #
+ # ***** 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
+ 
+ sys := $(shell uname -s)
+@@ -133,7 +142,7 @@
+   cpp_objects = $(cpp_sources:.cpp=.o)
+ endif
+ 
+-# source and path configurations
++# Source and path configurations
+ idl = IWeaveCrypto.idl
+ cpp_sources = WeaveCrypto.cpp WeaveCryptoModule.cpp
+ 
+@@ -141,7 +150,15 @@
+ destdir = ..
+ platformdir = $(destdir)/platform/$(platform)
+ 
+-xpidl = $(sdkdir)/bin/xpidl
++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),)
++  pkgconfig="yes"
++  sdkdir = $(call pkg-config-var,sdkdir,libxul-unstable)
++endif
+ 
+ # FIXME: we don't actually require this for e.g. clean
+ ifeq ($(sdkdir),)
+@@ -149,32 +161,73 @@
+   $(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
+ 
++xpidl = $(sdkdir)/bin/xpidl
+ idl_headers = $(idl:.idl=.h)
+ idl_typelib = $(idl:.idl=.xpt)
+ 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
++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 xpcom
++
++  idl_dir         = $(sdkdir)/idl
++endif
++
++headers = $(nss_includes) \
++          $(nspr_includes) \
++          $(libxul_includes)
+ 
+ # libraries
+-libdirs := $(sdkdir)/lib $(sdkdir)/bin
+-libs := xpcomglue_s xpcom nspr4 \
+-        crmf smime3 ssl3 nss3 nssutil3 \
+-        plds4 plc4
+-
+-ifeq ($(os), linux)
+-  libs := xpcom_core $(libs)
+-endif
++libdirs = $(nss_libdirs) \
++          $(nspr_libdirs) \
++          $(libxul_libdirs)
++
++libs = $(nss_libs) \
++       $(nspr_libs) \
++       $(libxul_libs)
+ 
+ # compiler and Linker Flags
+ 
+@@ -277,10 +340,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/mozilla-weave/mozilla-weave-0.5_pre1.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild
new file mode 100644
index 000000000000..05674a8d452f
--- /dev/null
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild,v 1.1 2009/07/14 09:42:48 nirbheek Exp $
+
+EAPI="2"
+
+inherit mozextension multilib
+
+MY_PN="weave"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Mozilla Labs prototype for online services into Firefox"
+HOMEPAGE="http://labs.mozilla.com/projects/weave/"
+SRC_URI="http://hg.mozilla.org/labs/${MY_PN}/archive/${MY_PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="|| (
+		>=www-client/mozilla-firefox-3.5
+		>=www-client/mozilla-firefox-bin-3.5
+		>=www-client/seamonkey-bin-2.0_alpha3
+		>=www-client/seamonkey-2.0_alpha3
+		>=mail-client/mozilla-thunderbird-bin-3.0_beta2
+		>=mail-client/mozilla-thunderbird-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}"
+
+# XXX: fennec is also listed in install.rdf but not in-tree
+
+src_prepare() {
+	# Fix hard-coded paths in the Makefiles
+	epatch "${FILESDIR}/${PN}-use-pkgconfig.patch"
+
+	# remove compiled files
+	rm -rf platform/*
+}
+
+src_compile() {
+	if has_version '=net-libs/xulrunner-1.9.0*'; then
+		export XULRUNNER_BIN="${ROOT}/usr/bin/xulrunner-1.9"
+	elif has_version '=net-libs/xulrunner-1.9.1*'; then
+		export XULRUNNER_BIN="${ROOT}/usr/bin/xulrunner-1.9.1"
+	fi
+	export WEAVE_BUILDID=${PV}
+
+	emake release_build=1 xpi || die "emake failed"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME xpiname
+
+	mozillas=""
+	xpiname="${MY_P}-rel"
+	xpi_unpack "${S}/${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 "To use Weave, you have to get an account at https://services.mozilla.com/"
+	elog "Otherwise, you can setup your own server, see:"
+	elog "https://wiki.mozilla.org/Labs/Weave/0.3/Setup/Server"
+	elog
+	elog "Weave has been installed for the following packages:"
+	for i in ${mozillas}; do
+		elog "	$i"
+	done
+	elog "After installing other mozilla ebuilds, if you want to use weave with them,"
+	elog "reinstall www-plugins/mozilla-weave"
+}