Committed too soon. Fixes to allow 0.4.0 to build and install

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

3 files changed, 24 insertions, 24 deletions

diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog
index 9b59623fa69a..a464fb21ecc4 100644
--- a/www-plugins/mozilla-weave/ChangeLog
+++ b/www-plugins/mozilla-weave/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2009/07/13 07:52:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.9 2009/07/13 08:25:17 nirbheek Exp $
+
+  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)
 
diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest
index 45a69d8e7147..4da8e74bd98d 100644
--- a/www-plugins/mozilla-weave/Manifest
+++ b/www-plugins/mozilla-weave/Manifest
@@ -1,6 +1,6 @@
 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
 EBUILD mozilla-weave-0.2.104.ebuild 2498 RMD160 75c155d3f290952440166506ad68c6efddba358f SHA1 db052949938a29139ea51aad92b1d69c93e37413 SHA256 7b91ba87fc56b4495008b4b0efadb658d0daf7905a13c7815b54e4d27e5bf8f4
-EBUILD mozilla-weave-0.4.0.ebuild 3792 RMD160 df3e920638c79e2988adc794c77a2e29147035bd SHA1 e4701523f32d22c2809f307da86e82252e7908c1 SHA256 05b7a6beeee5b720a33d968a8b8c35fc6e77cef2d39b16369690f99510f7fc33
-MISC ChangeLog 1869 RMD160 5601a6428095d99ecfeedba5669d79d44e99b703 SHA1 89fd4031150b80e29029ca7173148bb4014f00ef SHA256 d20fef26be4d9b8b7861215510a2a375d4dccddb041e2295c32e0af7c4382710
+EBUILD mozilla-weave-0.4.0.ebuild 3790 RMD160 130ab2e378a30dedf515d906bb0eb7b3ae2639c5 SHA1 d8544a56483cfe36128437863b452df1f23f347a SHA256 ae1fd6a83123da003b6a0fb9614c8c587922f3062dd0c15406e13482ac01acb0
+MISC ChangeLog 2018 RMD160 323f6fedf248c2d7228a06bad28f32a81be57d6b SHA1 0b8869ba97a21731156b3a1849490ed3480c5777 SHA256 ee15ae72291ae72a541860d3971f62f93c653283a25d39e440c1ccdcf7e3a6e6
 MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44
diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild
index 04dcdb4bcc76..91dd7b8ef0f9 100644
--- a/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild
+++ b/www-plugins/mozilla-weave/mozilla-weave-0.4.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.4.0.ebuild,v 1.1 2009/07/13 07:52:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild,v 1.2 2009/07/13 08:25:17 nirbheek Exp $
 
 EAPI="2"
 
@@ -34,11 +34,7 @@ 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
+# XXX: fennec is also listed in install.rdf but not in-tree
 
 src_prepare() {
 	# We want to use system nss and nspr
@@ -54,13 +50,13 @@ src_prepare() {
 
 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
+		export XULRUNNER_BIN=/usr/bin/xulrunner-1.9
+		export 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
+		export XULRUNNER_BIN=/usr/bin/xulrunner-1.9.1
+		export MOZSDKDIR=/usr/$(get_libdir)/xulrunner-devel-1.9.1
 	fi
-	WEAVE_BUILDID=${PV}
+	export WEAVE_BUILDID=${PV}
 
 	emake release_build=1 xpi || die "emake failed"
 }
@@ -68,37 +64,37 @@ src_compile() {
 src_install() {
 	local MOZILLA_FIVE_HOME xpiname mozillas
 
-	xpiname="${MY_P}-rel.xpi"
-	xpi_unpack "${xpiname}"
+	xpiname="${MY_P}-rel"
+	xpi_unpack "${S}/${xpiname}.xpi"
 
 	if has_version '>=www-client/mozilla-firefox-3.5'; then
 		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-		xpi_install "${S}/${xpiname}"
+		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 "${S}/${xpiname}"
+		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 "${S}/${xpiname}"
+		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 "${S}/${xpiname}"
+		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 "${S}/${xpiname}"
+		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 "${S}/${xpiname}"
+		xpi_install "${WORKDIR}/${xpiname}"
 		mozillas="$(best_version mail-client/mozilla-thunderbird-bin) ${mozillas}"
 	fi
 }
@@ -112,6 +108,6 @@ pkg_postinst() {
 	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"
+	elog "After installing other mozilla ebuilds, if you want to use weave with them,"
+	elog "reinstall www-plugins/mozilla-weave"
 }