Version bump to 0.6_pre2.

Fixing bug 280606.
Package-Manager: portage-14103-svn/cvs/Linux ppc

3 files changed, 116 insertions, 2 deletions

diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog
index 59371d2caecf..9e3ee2f570f8 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.11 2009/08/23 22:25:42 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.12 2009/08/24 17:32:52 volkmar Exp $
+
+*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)
 
diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest
index a8fae166bf57..53eeb9160f22 100644
--- a/www-plugins/mozilla-weave/Manifest
+++ b/www-plugins/mozilla-weave/Manifest
@@ -1,7 +1,9 @@
 AUX mozilla-weave-0.5.1-pkgconfig.patch 5561 RMD160 aff039e39fb676de0ac72ab63ea8c7774fbc83ef SHA1 b2c6907d574da568057b643024fb1ea906626e32 SHA256 3813e0996c97a9188d72e50ff7e074e608430ecd8fe559da8184b6420527a89d
 DIST mozilla-weave-0.2.104.tar.gz 459124 RMD160 78daa66bc43e018377ab2e8c464530932ab2cb0f SHA1 faf2cac02b7c3018b5c634656795e72fe355d369 SHA256 e80fe8e917ea5fce01fa0e009aec2f95925003ee7dda10e5c30fa22ef1ec0ed0
 DIST mozilla-weave-0.5.1.tar.gz 912450 RMD160 b4c65a515620c2e27b62ded8ab0646a594ef3254 SHA1 68ca7232515b378970f17ff2164757aef86f3c47 SHA256 a4a78fc98ee8dbf4db42be8f44e284db430219d2d7a0c8df44da61c937c46f3b
+DIST mozilla-weave-0.6_pre2.tar.gz 912472 RMD160 72a01ab8c812c499e53bc28c28bac051d5dbe9e7 SHA1 00c81b019098b5aa2ddce52368fbb582c750398e SHA256 12a21e6dd3ef9b795f39803bcefb202910e4980134f4d858b52d35acea12dff3
 EBUILD mozilla-weave-0.2.104.ebuild 2498 RMD160 75c155d3f290952440166506ad68c6efddba358f SHA1 db052949938a29139ea51aad92b1d69c93e37413 SHA256 7b91ba87fc56b4495008b4b0efadb658d0daf7905a13c7815b54e4d27e5bf8f4
 EBUILD mozilla-weave-0.5.1.ebuild 3289 RMD160 702696657edb6d9014c8494f37eb1eba659213c7 SHA1 ee4c65863daa16cec42379a8de07cbc7f10dca44 SHA256 3a5d246e9d0187c9b3b1a12bed50b8d39408480757e321f2bf7de0a5dfe4770c
-MISC ChangeLog 2629 RMD160 a26e3c602c1cc514a3746c41759ea520a5a75580 SHA1 48bda307431681c7acfe66a6aab83d2391245dc8 SHA256 f41d6dbcb66ce5329a28e4cc3d8fc28d9e05c09f0ba26b944b50b4e60b94e295
+EBUILD mozilla-weave-0.6_pre2.ebuild 3322 RMD160 4ba5c23489534bb1699e455cc1c4247560ff7175 SHA1 1a9bab3f68a0e9324ec330817b4ff7adee8108c3 SHA256 f86fa75f49c54f3d4ef89e198d42dff7c4fb5b5e595dd253c97f319bf4d3694c
+MISC ChangeLog 2797 RMD160 4669ccfba60b9375619e28fc3de9d91e997cde16 SHA1 5ba7fdf6a5ee2b9abc60c076c62f299195a8d306 SHA256 f16d2c968b98e68d97044a042b4019b3892f693beabca3cd654edec6869051ba
 MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.6_pre2.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.6_pre2.ebuild
new file mode 100644
index 000000000000..76357eef7d99
--- /dev/null
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.6_pre2.ebuild
@@ -0,0 +1,106 @@
+# 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.6_pre2.ebuild,v 1.1 2009/08/24 17:32:52 volkmar 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"
+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}
+
+# XXX: fennec is also listed in install.rdf but not in-tree
+
+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=${PV}
+
+	emake rebuild_crypto=1 release_build=1 xpi || die "emake failed"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME xpiname
+
+	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 "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
+	elog "After installing other mozilla ebuilds, if you want to use weave with them,"
+	elog "reinstall www-plugins/mozilla-weave"
+}