summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Xavier Barrachina <xabarci@ega.upv.es> 2009-10-16 00:44:54 +0200
committerAvatar Mike Kelly <pioto@exherbo.org> 2009-10-15 18:52:10 -0400
commit0dfad79a07d3f069c4610360d145a05f7b77f16e (patch)
tree4c8d7e4cf714573dc4bcad68933a544875f4402a
parent6a044050bdb418b30293a4baec308d2bcc0e80ac (diff)
downloadmozilla-0dfad79a07d3f069c4610360d145a05f7b77f16e.tar.gz
mozilla-0dfad79a07d3f069c4610360d145a05f7b77f16e.tar.xz
Version bump firefox-3.6_beta1
masked beta versions, modified firefox and xulrunner exlibs.
-rw-r--r--metadata/repository_mask.conf5
-rw-r--r--packages/dev-libs/xulrunner/xulrunner-1.9.2_beta1.exheres-019
-rw-r--r--packages/dev-libs/xulrunner/xulrunner.exlib8
-rw-r--r--packages/net-www/firefox/firefox-3.6_beta1.exheres-016
-rw-r--r--packages/net-www/firefox/firefox.exlib7
5 files changed, 50 insertions, 5 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 8b13789..31deff3 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -1 +1,4 @@
-
+# Xavier Barrachina <xabarci@ega.upv.es> (16 Oct 2009)
+# Mask beta versions of xulrunner and firefox.
+dev-libs/xulrunner[>=1.9.2_beta1]
+net-www/firefox[>=3.6_beta1]
diff --git a/packages/dev-libs/xulrunner/xulrunner-1.9.2_beta1.exheres-0 b/packages/dev-libs/xulrunner/xulrunner-1.9.2_beta1.exheres-0
new file mode 100644
index 0000000..9dc5d73
--- /dev/null
+++ b/packages/dev-libs/xulrunner/xulrunner-1.9.2_beta1.exheres-0
@@ -0,0 +1,19 @@
+# Copyright 2008 Ingmar Vanhassel <ingmar@exherbo.org>
+# Copyright 2009 Xavier Barrachina <xabarci@ega.upv.es>
+# Distributed under the terms of the GNU General Public License v2
+
+require xulrunner
+
+SLOT="0"
+PLATFORMS="~amd64 ~ppc64 ~x86"
+DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${FIREFOX_PV}-candidates/build1/source/firefox-${FIREFOX_PV}.source.tar.bz2"
+
+DEPENDENCIES="
+ build+run:
+ x11-libs/libnotify[>=0.4]
+"
+
+MOZILLA_SRC_CONFIGURE_PARAMS+=(
+ --disable-necko-wifi
+)
+
diff --git a/packages/dev-libs/xulrunner/xulrunner.exlib b/packages/dev-libs/xulrunner/xulrunner.exlib
index 2c1488a..8e1c24b 100644
--- a/packages/dev-libs/xulrunner/xulrunner.exlib
+++ b/packages/dev-libs/xulrunner/xulrunner.exlib
@@ -2,7 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
MY_PV="${MY_PV:-${PV/_beta/b}}"
-if ever at_least '1.9.1_beta' ; then
+if ever at_least '1.9.2_beta' ; then
+ FIREFOX_PV="${MY_PV/#1.9.2/3.6}"
+ NSPR_VER="[>=4.8]"
+ NSS_VER="[>=3.12.3]"
+elif ever at_least '1.9.1_beta' ; then
FIREFOX_PV="${MY_PV/#1.9.1/3.5}"
NSPR_VER="[>=4.8]"
NSS_VER="[>=3.12.3]"
@@ -52,7 +56,7 @@ DEPENDENCIES+="
ECONF_SOURCE="${WORKBASE}"/mozilla
if ever at_least '1.9.1_beta' ; then
- ECONF_SOURCE+="-$(ever range 1-3 ${MY_PV})"
+ ECONF_SOURCE+="-$(ever range 1-3 ${PV})"
fi
src_prepare() {
diff --git a/packages/net-www/firefox/firefox-3.6_beta1.exheres-0 b/packages/net-www/firefox/firefox-3.6_beta1.exheres-0
new file mode 100644
index 0000000..c22dbfb
--- /dev/null
+++ b/packages/net-www/firefox/firefox-3.6_beta1.exheres-0
@@ -0,0 +1,16 @@
+# Copyright 2007-2008 Alexander Færøy <eroyf@exherbo.org>
+# Copyright 2008 Bernd Steinhauser <berniyh@exherbo.org>
+# Copyright 2008 Ingmar Vanhassel <ingmar@exherbo.org>
+# Copyright 2009 Xavier Barrachina <xabarci@ega.upv.es>
+# Distributed under the terms of the GNU General Public License v2
+
+require firefox [ codename="Namoroka" ]
+
+SLOT="0"
+PLATFORMS="~amd64 ~ppc64 ~x86"
+DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build1/source/${PN}-${MY_PV}.source.tar.bz2"
+
+MOZILLA_SRC_CONFIGURE_PARAMS+=(
+ --disable-necko-wifi
+)
+
diff --git a/packages/net-www/firefox/firefox.exlib b/packages/net-www/firefox/firefox.exlib
index 65a0552..c0aa3a4 100644
--- a/packages/net-www/firefox/firefox.exlib
+++ b/packages/net-www/firefox/firefox.exlib
@@ -18,7 +18,10 @@ exparam -v codename codename
MY_PV="${MY_PV:-${PV/_beta/b}}"
-if ever at_least '3.1_beta' ; then
+if ever at_least '3.6_beta' ; then
+ XULRUNNER_PV="${PV/#3.6/1.9.2}"
+ XULRUNNER_MY_PV="${MY_PV/#3.6/1.9.2}"
+elif ever at_least '3.1_beta' ; then
XULRUNNER_PV="${PV/#3.5/1.9.1}"
XULRUNNER_MY_PV="${MY_PV/#3.5/1.9.1}"
else
@@ -48,7 +51,7 @@ DEPENDENCIES="
ECONF_SOURCE="${WORKBASE}"/mozilla
if ever at_least '3.1_beta' ; then
- ECONF_SOURCE+="-$(ever range 1-3 ${XULRUNNER_MY_PV})"
+ ECONF_SOURCE+="-$(ever range 1-3 ${XULRUNNER_PV})"
fi
MOZILLA_SRC_CONFIGURE_PARAMS=(