version bump to 0.3.2

Package-Manager: portage-2.1.6.11/cvs/Linux ppc

4 files changed, 106 insertions, 9 deletions

diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog
index be71f1e984d6..c25a74fc68e7 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.3 2009/05/16 13:14:17 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.4 2009/05/16 14:01:31 volkmar Exp $
+
+*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:
diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest
index 7dfcff5a05cf..8e5556f1af92 100644
--- a/www-plugins/mozilla-weave/Manifest
+++ b/www-plugins/mozilla-weave/Manifest
@@ -1,6 +1,8 @@
 DIST mozilla-weave-0.2.104.tar.gz 459124 RMD160 78daa66bc43e018377ab2e8c464530932ab2cb0f SHA1 faf2cac02b7c3018b5c634656795e72fe355d369 SHA256 e80fe8e917ea5fce01fa0e009aec2f95925003ee7dda10e5c30fa22ef1ec0ed0
 DIST mozilla-weave-0.3.0.tar.gz 464374 RMD160 64d3270eaebd2e04b8ccbd01dc9d0e41b08382f5 SHA1 0c0e854228c886331d2adfd353edd5fb7915060e SHA256 620546e16ff444395eace5b2d347b3ad27b1f7dce41d28e554e1c11fad36baf7
+DIST mozilla-weave-0.3.2.tar.gz 567516 RMD160 c6a82c75066339864170b03d7328e307e1a0faaf SHA1 800028bf3ab9800f6eff7ce00b97f2026b1782ef SHA256 2e39e2b5fbc7433fe514819510a5c08457e0243fce4c03e196b9c5575f578d83
 EBUILD mozilla-weave-0.2.104.ebuild 2407 RMD160 127cc8b6d3446ab1af37206b3471d49dbb3ce086 SHA1 23147cb50be3b528e6087b0322a939548d5dd174 SHA256 1bc53dcead563ca2db469325148d9fc6e1bd84e094204aab80d95fd8ab5f42f1
-EBUILD mozilla-weave-0.3.0.ebuild 2501 RMD160 69e7b4e7a089b7acae7ee49b1f4dc216657c199d SHA1 f8016bc2ad802bedcb68cf1155da9ada58842e7e SHA256 b0e5318250c482dc9c440dbb20364e5f59953abd375cd48e57f591be9a596350
-MISC ChangeLog 740 RMD160 62d10d34441d12627a6f7e3877661e64d2988fea SHA1 9c10613199b6474b0364b8558dfcbacca59ddf12 SHA256 e8fbfdf954a35d13408524f0ca38b1588b70ff39d8812ff2da67505c398d8d23
+EBUILD mozilla-weave-0.3.0.ebuild 2438 RMD160 523cb04cbd8b6469a41ece91bf48f4662f2ad903 SHA1 50527a7bb19c125d25a5db85ad8e98167e899759 SHA256 d3f7dcb77edbfb7958b920e51bde0c030e8c42ea6ee3acb121edf9e551008349
+EBUILD mozilla-weave-0.3.2.ebuild 2767 RMD160 093d25830c53882295080b5e8bdcaca5467be60d SHA1 3c4b4b93ad2e900a6a0ee34ba7303876c1edcdc8 SHA256 f3bf8c59c3344826beb45d2d1f88ae50315de4bf74a41389ac5f7596a3fa19cc
+MISC ChangeLog 911 RMD160 ab16a4be5c3072702c867f7cfedc7b8dd5fbc853 SHA1 16b4908108da10d9bce46227796133623db8f9ab SHA256 63f629484a75e1986f60bd1dc421638788cc2008f9625a48a72e58a93e6894eb
 MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild
index 783f7ca17bf4..70dc30243b7e 100644
--- a/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.2 2009/05/16 13:14:17 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild,v 1.3 2009/05/16 14:01:31 volkmar Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND=">=www-client/mozilla-firefox-bin-3.1_beta
+RDEPEND=">=www-client/mozilla-firefox-bin-3.1_beta3
 	net-libs/xulrunner:1.9
 	>=dev-libs/nss-3.12
 	>=dev-libs/nspr-4.7.1"
@@ -27,12 +27,10 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-# TODO: KEYWORDS is empty because it needs to be tested for amd64 and x86 (bin)
-
 # NOTES:
 # there are tests but they don't break the build if not working
-# thunderbird and fennec are in install.rdf
-# mozilla-firefox-3.1_beta is not in the tree atm
+# thunderbird and fennec are listed in install.rdf
+# mozilla-firefox-3.{1,5} (not -bin) is not in the tree atm
 
 src_prepare() {
 	# we want to use system nss and nspr
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild
new file mode 100644
index 000000000000..0c1e64aaa845
--- /dev/null
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild
@@ -0,0 +1,91 @@
+# 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.3.2.ebuild,v 1.1 2009/05/16 14:01:31 volkmar Exp $
+
+EAPI="2"
+
+inherit mozextension multilib
+
+MY_PN="weave"
+MY_P=${MY_PN}-${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}/index.cgi/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="|| (
+		>=www-client/mozilla-firefox-bin-3.1_beta3
+		>=www-client/seamonkey-bin-2.0_alpha3
+	)
+	net-libs/xulrunner:1.9
+	>=dev-libs/nss-3.12
+	>=dev-libs/nspr-4.7.1"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+# NOTES:
+# there are tests but they don't break the build if not working
+# thunderbird and fennec are listed in install.rdf
+# mozilla-firefox-3.{1,5} (not -bin) is not in the tree atm
+# seamonkey-2 (not -bin) is not in the tree atm
+
+src_prepare() {
+	# we want to use system nss and nspr
+	sed -i -e 's@-I\$(sdkdir)\(/include/ns\(s\|pr\)\)@-I/usr\1@' \
+		src/Makefile || die "patching Makefile failed"
+	sed -i -e 's@^\(libdirs\s*:=\s*.*\)$@\1 /usr/lib/nspr /usr/lib/nss@' \
+		src/Makefile || die "patching Makefile failed"
+
+	# remove useless platforms
+	rm -fr platform/* || die "rm -rf never dies"
+
+	# ppc arch is not recognized on Linux
+	# upstream has been contacted w/patch, see bug 486797 in upstream bugtracker
+	sed -i -e "s/Power Macintosh/ppc/" src/Makefile \
+		|| die "patching src/Makefile failed"
+
+	# stupid mistake in a var in Makefile
+	sed -i -e "s/0.3.1/0.3.2/" Makefile || die "sed failed"
+}
+
+src_compile() {
+	export XULRUNNER_BIN=/usr/bin/xulrunner-1.9
+	export WEAVE_BUILDID=${PV}
+	export MOZSDKDIR=/usr/$(get_libdir)/xulrunner-1.9
+
+	emake release_build=1 xpi || "emake failed"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME
+
+	# recommanded usage is to launch firefox with xpi as a parameter
+	# so, we unzip the file and intsall it with mozextension tools
+	unzip -qo "${MY_P}-rel.xpi" -d "${MY_P}"
+
+	if has_version '>=www-client/mozilla-firefox-3.1_beta3'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}/${MY_P}"
+	fi
+	if has_version '>=www-client/mozilla-firefox-bin-3.1_beta3'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${S}/${MY_P}"
+	fi
+	if has_version '>=www-client/seamonkey-bin-2.0_alpha3'; then
+		MOZILLA_FIVE_HOME="/opt/seamonkey"
+		xpi_install "${S}/${MY_P}"
+	fi
+}
+
+pkg_postinst() {
+	einfo "To use Weave, you have to get an account at https://services.mozilla.com/"
+	einfo "Otherwise, you can setup your own server, see:"
+	einfo "https://wiki.mozilla.org/Labs/Weave/0.3/Setup/Server"
+}