Bump to 0.4.0, clean up old versions, and add mozilla as herd.

Add support for seamonkey, mozilla-thunderbird{,-bin}, and mozilla-firefox
Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 130 insertions, 185 deletions

diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog
index 3b2b9e5282ac..9b59623fa69a 100644
--- a/www-plugins/mozilla-weave/ChangeLog
+++ b/www-plugins/mozilla-weave/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2009/07/06 20:33:27 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.8 2009/07/13 07:52:14 nirbheek Exp $
+
+*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,
diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest
index 50605b7f8580..45a69d8e7147 100644
--- a/www-plugins/mozilla-weave/Manifest
+++ b/www-plugins/mozilla-weave/Manifest
@@ -1,8 +1,6 @@
 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
+DIST mozilla-weave-0.4.0.tar.gz 857762 RMD160 e2f7202ab8d7908786e509c718ee7bd677224e89 SHA1 682381e17b2a57f7fc5df7cd231cdc2b73af01b2 SHA256 ab04866ce73afaadc39cf86bc4835d66c1c778c0e07c33d5aac68a7ed2f48dd2
 EBUILD mozilla-weave-0.2.104.ebuild 2498 RMD160 75c155d3f290952440166506ad68c6efddba358f SHA1 db052949938a29139ea51aad92b1d69c93e37413 SHA256 7b91ba87fc56b4495008b4b0efadb658d0daf7905a13c7815b54e4d27e5bf8f4
-EBUILD mozilla-weave-0.3.0.ebuild 2529 RMD160 018c9ab3b115ff5a4c4c1367bf25e3815e308def SHA1 0a04a43c883abadbdc880faf68df5645b116c3ec SHA256 08d981c1599122bf3f3460bdfa210835f1857d2282bd0dacf73eceea3d12591d
-EBUILD mozilla-weave-0.3.2.ebuild 2858 RMD160 f7d7be49fddfc16b5c3b1eb76f101de18fcabeb6 SHA1 134c676e433b87b9e89f20007aecdcc27c10ef9e SHA256 ef7a8f0c3befff84f0f8e25d56683197e852ea7400bcc03d7a8059487ba6fbf1
-MISC ChangeLog 1549 RMD160 95b310657fddeb9bd0f3d4e9124734f7b3a4af43 SHA1 b5072dce670d554f920ec41817b5d82874504c55 SHA256 8126c7edfe403203e089383a7cbfcef8d5b1cc8115de4a5707912cb87635586d
-MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62
+EBUILD mozilla-weave-0.4.0.ebuild 3792 RMD160 df3e920638c79e2988adc794c77a2e29147035bd SHA1 e4701523f32d22c2809f307da86e82252e7908c1 SHA256 05b7a6beeee5b720a33d968a8b8c35fc6e77cef2d39b16369690f99510f7fc33
+MISC ChangeLog 1869 RMD160 5601a6428095d99ecfeedba5669d79d44e99b703 SHA1 89fd4031150b80e29029ca7173148bb4014f00ef SHA256 d20fef26be4d9b8b7861215510a2a375d4dccddb041e2295c32e0af7c4382710
+MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/mozilla-weave/metadata.xml b/www-plugins/mozilla-weave/metadata.xml
index d44dc8ef07cc..7ad0ba3b8bc7 100644
--- a/www-plugins/mozilla-weave/metadata.xml
+++ b/www-plugins/mozilla-weave/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>mozilla</herd>
 	<maintainer>
 		<email>volkmar@gentoo.org</email>
 		<name>Mounir Lamouri</name>
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild
deleted file mode 100644
index d6de7f9a6a20..000000000000
--- a/www-plugins/mozilla-weave/mozilla-weave-0.3.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.6 2009/07/06 20:33:27 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
-	net-libs/xulrunner:1.9
-	>=dev-libs/nss-3.12
-	>=dev-libs/nspr-4.7.1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-# NOTES:
-# weave is still in heavy development and tests are known to fail so disabled
-# 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
-	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 compiled files
-	rm -fr platform/* || die "rm -rf never dies"
-	rm -f components/WeaveCrypto.so || die "rm -f 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"
-}
-
-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 || die "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_beta'; 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_beta'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		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"
-}
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild
deleted file mode 100644
index 88677049cb30..000000000000
--- a/www-plugins/mozilla-weave/mozilla-weave-0.3.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.4 2009/07/06 20:33:27 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}
-
-RESTRICT="test"
-
-# NOTES:
-# weave is still in heavy development and tests are known to fail so disabled
-# 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 compiled files
-	rm -fr platform/* || die "rm -rf never dies"
-	rm -f components/WeaveCrypto.so || die "rm -f 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 || die "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"
-}
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild
new file mode 100644
index 000000000000..04dcdb4bcc76
--- /dev/null
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild
@@ -0,0 +1,117 @@
+# 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.4.0.ebuild,v 1.1 2009/07/13 07:52:14 nirbheek 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}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+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-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}"
+
+#RESTRICT="test"
+
+# NOTES:
+# weave is still in heavy development and tests are known to fail so disabled
+# fennec is also listed in install.rdf
+
+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"
+	# XXX: this seds only that libdir which starts the line (ie, ^)
+	sed -i -e 's@^\(libdirs\s*:=\s*.*\)$@\1 /usr/lib/nspr /usr/lib/nss@' \
+		src/Makefile || die "patching Makefile failed"
+
+	# remove compiled files
+	rm -fr platform/* || die "rm -rf never dies"
+}
+
+src_compile() {
+	if has_version '=net-libs/xulrunner-1.9.0*'; then
+		XULRUNNER_BIN=/usr/bin/xulrunner-1.9
+		MOZSDKDIR=/usr/$(get_libdir)/xulrunner-1.9
+	elif has_version '=net-libs/xulrunner-1.9.1*'; then
+		XULRUNNER_BIN=/usr/bin/xulrunner-1.9.1
+		MOZSDKDIR=/usr/$(get_libdir)/xulrunner-1.9.1
+	fi
+	WEAVE_BUILDID=${PV}
+
+	emake release_build=1 xpi || die "emake failed"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME xpiname mozillas
+
+	xpiname="${MY_P}-rel.xpi"
+	xpi_unpack "${xpiname}"
+
+	if has_version '>=www-client/mozilla-firefox-3.5'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}/${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 "${S}/${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 "${S}/${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 "${S}/${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 "${S}/${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 "${S}/${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 products, if you want to use weave with them"
+	elog "Reinstall www-plugins/mozilla-weave"
+}