From 6d1c2afbd9866d89110c119553357071dfa67533 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Sun, 23 Aug 2009 22:25:42 +0000 Subject: Version bump to 0.5.1 Package-Manager: portage-14103-svn/cvs/Linux ppc --- www-plugins/mozilla-weave/ChangeLog | 11 +- www-plugins/mozilla-weave/Manifest | 10 +- .../files/mozilla-weave-0.5.1-pkgconfig.patch | 192 +++++++++++++++++++++ .../files/mozilla-weave-use-pkgconfig.patch | 179 ------------------- .../mozilla-weave/mozilla-weave-0.4.0.ebuild | 113 ------------ .../mozilla-weave/mozilla-weave-0.5.1.ebuild | 105 +++++++++++ .../mozilla-weave/mozilla-weave-0.5_pre1.ebuild | 111 ------------ 7 files changed, 311 insertions(+), 410 deletions(-) create mode 100644 www-plugins/mozilla-weave/files/mozilla-weave-0.5.1-pkgconfig.patch delete mode 100644 www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch delete mode 100644 www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild create mode 100644 www-plugins/mozilla-weave/mozilla-weave-0.5.1.ebuild delete mode 100644 www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild (limited to 'www-plugins') diff --git a/www-plugins/mozilla-weave/ChangeLog b/www-plugins/mozilla-weave/ChangeLog index f2ff5222e93a..59371d2caecf 100644 --- a/www-plugins/mozilla-weave/ChangeLog +++ b/www-plugins/mozilla-weave/ChangeLog @@ -1,6 +1,15 @@ # 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.10 2009/07/14 09:42:48 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozilla-weave/ChangeLog,v 1.11 2009/08/23 22:25:42 volkmar Exp $ + +*mozilla-weave-0.5.1 (23 Aug 2009) + + 23 Aug 2009; Mounir Lamouri + -mozilla-weave-0.4.0.ebuild, -mozilla-weave-0.5_pre1.ebuild, + +mozilla-weave-0.5.1.ebuild, +files/mozilla-weave-0.5.1-pkgconfig.patch, + -files/mozilla-weave-use-pkgconfig.patch: + Version bump to 0.5.1. Removing old ebuilds except 0.2.104 because only + one working with stable firefox. *mozilla-weave-0.5_pre1 (14 Jul 2009) diff --git a/www-plugins/mozilla-weave/Manifest b/www-plugins/mozilla-weave/Manifest index dcc17678b954..a8fae166bf57 100644 --- a/www-plugins/mozilla-weave/Manifest +++ b/www-plugins/mozilla-weave/Manifest @@ -1,9 +1,7 @@ -AUX mozilla-weave-use-pkgconfig.patch 5087 RMD160 ed01a135e41fb43437f660b227b138c58398a97d SHA1 5f7eabb047153217578669f5d99497b77ae079c4 SHA256 b9a46fcc6cb6ca01e6e9ef7a6e819f85b3742ecc39d7f9d07a112cebe2b759ea +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.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 +DIST mozilla-weave-0.5.1.tar.gz 912450 RMD160 b4c65a515620c2e27b62ded8ab0646a594ef3254 SHA1 68ca7232515b378970f17ff2164757aef86f3c47 SHA256 a4a78fc98ee8dbf4db42be8f44e284db430219d2d7a0c8df44da61c937c46f3b 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 -EBUILD mozilla-weave-0.5_pre1.ebuild 3510 RMD160 2d06ccb894513029beab411705fb89317c1f2aa8 SHA1 256f20b2f7ca65f03aed3908d20b572c00f2c3dd SHA256 63b462691584e986d11fb88c4d73c5d85afb0ff58eb7c20334c624f752c23013 -MISC ChangeLog 2251 RMD160 b4216586a838bc23e48873b79becf4071caea1d1 SHA1 0e662a5491541cb6daf1ce0e4a222a531afd5d79 SHA256 187f9573a9e38b22ab37902ec4d5613f49b519eb40e55c5999ddc3efcff98697 +EBUILD mozilla-weave-0.5.1.ebuild 3289 RMD160 702696657edb6d9014c8494f37eb1eba659213c7 SHA1 ee4c65863daa16cec42379a8de07cbc7f10dca44 SHA256 3a5d246e9d0187c9b3b1a12bed50b8d39408480757e321f2bf7de0a5dfe4770c +MISC ChangeLog 2629 RMD160 a26e3c602c1cc514a3746c41759ea520a5a75580 SHA1 48bda307431681c7acfe66a6aab83d2391245dc8 SHA256 f41d6dbcb66ce5329a28e4cc3d8fc28d9e05c09f0ba26b944b50b4e60b94e295 MISC metadata.xml 257 RMD160 8d2e36f282cfead2c7b4be3b1716c921aecd9106 SHA1 34d268c951ac04897650fceb1e1baa30d28416f3 SHA256 75f7c658303fe9f6cfc205eed90fe90d9de0169ff4f56d68dab4a87622670b44 diff --git a/www-plugins/mozilla-weave/files/mozilla-weave-0.5.1-pkgconfig.patch b/www-plugins/mozilla-weave/files/mozilla-weave-0.5.1-pkgconfig.patch new file mode 100644 index 000000000000..467344b40bb0 --- /dev/null +++ b/www-plugins/mozilla-weave/files/mozilla-weave-0.5.1-pkgconfig.patch @@ -0,0 +1,192 @@ +diff -r adb27ed2f421 crypto/Makefile +--- a/crypto/Makefile Fri Aug 21 17:32:41 2009 -0700 ++++ b/crypto/Makefile Mon Aug 24 00:09:43 2009 +0200 +@@ -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 +diff -r adb27ed2f421 crypto/src/Makefile +--- a/crypto/src/Makefile Fri Aug 21 17:32:41 2009 -0700 ++++ b/crypto/src/Makefile Mon Aug 24 00:09:43 2009 +0200 +@@ -37,9 +37,17 @@ + # + # ***** 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 + +-xpidl = $(sdkdir)/bin/xpidl + link = link + + sys := $(shell uname -s) +@@ -48,7 +56,6 @@ + ifeq ($(wince), 1) + os = WINNT + cxx = $(sdkdir)/sdk/bin/arm-wince-gcc +- xpidl = $(sdkdir)/host/bin/host_xpidl + link = $(sdkdir)/sdk/bin/arm-wince-link + so = dll + else +@@ -165,13 +172,24 @@ + destdir = .. + platformdir = $(destdir)/platform/$(platform) + ++# 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),) + $(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 + + idl_headers = $(idl:.idl=.h) +@@ -179,30 +197,75 @@ + 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 ++xpidl = $(sdkdir)/bin/xpidl ++ifeq ($(wince), 1) ++ xpidl = $(sdkdir)/host/bin/host_xpidl ++endif ++ ++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 ++ ifeq ($(wince),1) ++ libxul_libs = $(libxul_libs) xpcom ++ else ++ libxul_libs = $(libxul_libs) xpcomglue ++ endif ++ ++ ifeq ($(os), linux) ++ libxul_libs = $(libxul_libs) xpcom_core ++ endif ++ ++ idl_dir = $(sdkdir)/idl ++endif ++ ++headers = $(nss_includes) \ ++ $(nspr_includes) \ ++ $(libxul_includes) + + # libraries +-libdirs := $(sdkdir)/lib $(sdkdir)/bin +-ifeq ($(wince),1) +-libs := xpcomglue_s xpcom nspr4 \ +- crmf smime3 ssl3 nss3 nssutil3 \ +- plds4 plc4 +-else +-libs := xpcomglue xpcomglue_s nspr4 \ +- crmf smime3 ssl3 nss3 nssutil3 \ +- plds4 plc4 +-endif ++libdirs = $(nss_libdirs) \ ++ $(nspr_libdirs) \ ++ $(libxul_libdirs) + +-ifeq ($(os), Linux) +- libs := xpcom_core $(libs) +-endif ++libs = $(nss_libs) \ ++ $(nspr_libs) \ ++ $(libxul_libs) + + # compiler and Linker Flags + +@@ -328,10 +391,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/files/mozilla-weave-use-pkgconfig.patch b/www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch deleted file mode 100644 index 27928b52a05d..000000000000 --- a/www-plugins/mozilla-weave/files/mozilla-weave-use-pkgconfig.patch +++ /dev/null @@ -1,179 +0,0 @@ -Fix hard-coded paths in Makefiles. Use pkg-config if available instead - -bmo: 504022 - -Nirbheek Chauhan ---- ---- 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.4.0.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild deleted file mode 100644 index 91dd7b8ef0f9..000000000000 --- a/www-plugins/mozilla-weave/mozilla-weave-0.4.0.ebuild +++ /dev/null @@ -1,113 +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.4.0.ebuild,v 1.2 2009/07/13 08:25:17 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}" - -# XXX: fennec is also listed in install.rdf but not in-tree - -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 - 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 - export XULRUNNER_BIN=/usr/bin/xulrunner-1.9.1 - export MOZSDKDIR=/usr/$(get_libdir)/xulrunner-devel-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" - - 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" -} diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.5.1.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.5.1.ebuild new file mode 100644 index 000000000000..425d5a20bff5 --- /dev/null +++ b/www-plugins/mozilla-weave/mozilla-weave-0.5.1.ebuild @@ -0,0 +1,105 @@ +# 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.1.ebuild,v 1.1 2009/08/23 22:25:42 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}/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-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}"/${P}-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" +} diff --git a/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild b/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild deleted file mode 100644 index 05674a8d452f..000000000000 --- a/www-plugins/mozilla-weave/mozilla-weave-0.5_pre1.ebuild +++ /dev/null @@ -1,111 +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.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" -} -- cgit v1.2.3-65-gdbad