Version bump to stay in sync with xulrunner. Committed straight to stable as it's identical to 3.6.7-r1 code-wise.

(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 14 insertions, 56 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 8289a8d91d94..3b89baed9b63 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.33 2010/07/26 19:30:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.34 2010/07/31 23:23:41 polynomial-c Exp $
+
+*icecat-3.6.8 (31 Jul 2010)
+
+  31 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -files/mozilla-1.9.2.8.diff, -icecat-3.6.7-r1.ebuild,
+  +icecat-3.6.8.ebuild:
+  Version bump to stay in sync with xulrunner. Committed straight to stable
+  as it's identical to 3.6.7-r1 code-wise.
 
   26 Jul 2010; Markus Meier <maekke@gentoo.org> icecat-3.6.7-r1.ebuild:
   amd64 stable, bug #329279
diff --git a/www-client/icecat/files/mozilla-1.9.2.8.diff b/www-client/icecat/files/mozilla-1.9.2.8.diff
deleted file mode 100644
index e3afbe50941d..000000000000
--- a/www-client/icecat/files/mozilla-1.9.2.8.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- mozilla-1.9.2.7/browser/config/version.txt	2010-07-13 21:10:45.000000000 +0200
-+++ mozilla-1.9.2.8/browser/config/version.txt	2010-07-22 23:55:27.000000000 +0200
-@@ -1 +1 @@
--3.6.7
-+3.6.8
---- mozilla-1.9.2.7/config/milestone.txt	2010-07-13 21:10:45.000000000 +0200
-+++ mozilla-1.9.2.8/config/milestone.txt	2010-07-22 23:55:27.000000000 +0200
-@@ -10,4 +10,4 @@
- # hardcoded milestones in the tree from these two files.
- #--------------------------------------------------------
- 
--1.9.2.7
-+1.9.2.8
---- mozilla-1.9.2.7/js/src/config/milestone.txt	2010-07-13 21:10:45.000000000 +0200
-+++ mozilla-1.9.2.8/js/src/config/milestone.txt	2010-07-22 23:55:27.000000000 +0200
-@@ -10,4 +10,4 @@
- # hardcoded milestones in the tree from these two files.
- #--------------------------------------------------------
- 
--1.9.2.7
-+1.9.2.8
---- mozilla-1.9.2.7/layout/generic/nsObjectFrame.cpp	2010-07-13 21:10:22.000000000 +0200
-+++ mozilla-1.9.2.8/layout/generic/nsObjectFrame.cpp	2010-07-22 23:55:01.000000000 +0200
-@@ -3588,9 +3588,10 @@
-   // to the bottom of the array if there isn't already a "src" specified.
-   PRUint16 numRealAttrs = mNumCachedAttrs;
-   nsAutoString data;
--  if (mContent->Tag() == nsGkAtoms::object
--    && !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src)
--    && mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data)) {
-+  if (mContent->Tag() == nsGkAtoms::object &&
-+      !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) &&
-+      mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data) &&
-+      !data.IsEmpty()) {
-       mNumCachedAttrs++;
-   }
- 
-@@ -3648,7 +3649,7 @@
-   }
- 
-   // if the conditions above were met, copy the "data" attribute to a "src" array entry
--  if (data.Length()) {
-+  if (!data.IsEmpty()) {
-     mCachedAttrParamNames [nextAttrParamIndex] = ToNewUTF8String(NS_LITERAL_STRING("SRC"));
-     mCachedAttrParamValues[nextAttrParamIndex] = ToNewUTF8String(data);
-     nextAttrParamIndex++;
diff --git a/www-client/icecat/icecat-3.6.7-r1.ebuild b/www-client/icecat/icecat-3.6.8.ebuild
index cdfc51249abd..e1759d598e8d 100644
--- a/www-client/icecat/icecat-3.6.7-r1.ebuild
+++ b/www-client/icecat/icecat-3.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.7-r1.ebuild,v 1.2 2010/07/26 19:30:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.8.ebuild,v 1.1 2010/07/31 23:23:41 polynomial-c Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -18,8 +18,7 @@ MAJ_XUL_PV="1.9.2"
 MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
 DESKTOP_PV="3.6"
 MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
-#XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-XUL_PV="${MAJ_XUL_PV}.8"
+XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
 FIREFOX_PN="mozilla-firefox"
 FIREFOX_P="${FIREFOX_PN}-${PV}"
 PATCH="${FIREFOX_PN}-3.6-patches-0.6"
@@ -32,7 +31,7 @@ SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa +ipc java libnotify system-sqlite wifi"
 
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.xz
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
 	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
 LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
 
@@ -106,8 +105,8 @@ pkg_setup() {
 }
 
 src_unpack() {
-	xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
-	unpack ${PATCH}.tar.bz2
+	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
+	unpack ${A} #${PATCH}.tar.bz2
 
 	linguas
 	for X in ${linguas}; do
@@ -136,9 +135,6 @@ src_prepare() {
 	# Enable tracemonkey for amd64 (bug #315997)
 	epatch "${FILESDIR}/801-enable-x86_64-tracemonkey.patch"
 
-	# Convert 3.6.7 into 3.6.8
-	epatch "${FILESDIR}/mozilla-1.9.2.8.diff"
-
 	# Fix rebranding
 	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in