Bump to 1.8.1.3, many thanks to Gergan Penkov <gergan at gmail dot com> for the patch...

Package-Manager: portage-2.1.2.4

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index afbafbfa6339623fea46f900783a035be7a12a20..313a8a7248d3eeee438554dc36860f5aca4c9d9e 100644 (file)
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.18 2007/04/15 10:25:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.19 2007/04/16 15:04:57 armin76 Exp $
+
+*xulrunner-1.8.1.3 (16 Apr 2007)
+
+  16 Apr 2007; Raúl Porcel <armin76@gentoo.org> -xulrunner-1.8.0.11.ebuild,
+  +xulrunner-1.8.1.3.ebuild:
+  Bump to 1.8.1.3, many thanks to Gergan Penkov <gergan at gmail dot com> for
+  the patchset
 
   15 Apr 2007; Raúl Porcel <armin76@gentoo.org> xulrunner-1.8.0.11.ebuild:
   Fix patchset, bug 174645

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 27cc8ebb42cefa853ab3c9488d1e89b96365157c..0bf5882b7f0126fe5394ba3b918ffec6dfefa30b 100644 (file)
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -2,29 +2,29 @@ AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cc
 MD5 1047668b701935bb42659431038d325a files/xulrunner.conf 113
 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 files/xulrunner.conf 113
 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 files/xulrunner.conf 113
-DIST xulrunner-1.8.0.11-patches-0.2.tar.bz2 92684 RMD160 ff8d6cab7c3ba8c0a6a3a77e994173af4096d3c9 SHA1 57252724d65bf7f53284ed003f19ecf3fb12e194 SHA256 12a0f7383df19d88182caa415bda0d3951d68069d8954cc16412fa3088241e74
 DIST xulrunner-1.8.0.4-patches-1.1.tar.bz2 48808 RMD160 b9399adec6688d019a4b9065520845b74a45b52f SHA1 8363602654721b3a5db96d00085170572a9c803e SHA256 b50daa61a6dbc0557fb54de3844bdd3407beb224b119e332dd6231b06f84e482
 DIST xulrunner-1.8.0.4-source.tar.bz2 33846136 RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb SHA1 9484a4783b86c6dc1cb9b99331791be079b8697e SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9
-DIST xulrunner_1.8.0.11.orig.tar.gz 40237017 RMD160 2651cb315a3465acc32ee770b8386bec39ad5969 SHA1 85fd4c7790792b433612abcfea1c41dadb1cb7f3 SHA256 cc3cd44bbeb4112112c1ae6ab420177a6b1266d060eab7da1ae926fea57c5f24
-EBUILD xulrunner-1.8.0.11.ebuild 4925 RMD160 736fa7e20b05502bcd01d1524764c69660b937f5 SHA1 15f75c23037e7eb9cf92ddac809daf2fe06e0a47 SHA256 ba8298a08ef702a8d6a80232f1323c5649720168f4cd25c396b3ad0475cf0132
-MD5 9b34855cd1a21c6970a02139a51f96e0 xulrunner-1.8.0.11.ebuild 4925
-RMD160 736fa7e20b05502bcd01d1524764c69660b937f5 xulrunner-1.8.0.11.ebuild 4925
-SHA256 ba8298a08ef702a8d6a80232f1323c5649720168f4cd25c396b3ad0475cf0132 xulrunner-1.8.0.11.ebuild 4925
+DIST xulrunner-1.8.1.3-patches-0.1.tar.bz2 62246 RMD160 a8029fae194f86e5772abb5e06bc76ffcf459228 SHA1 6b761231ee6d521979a06ab27d1ae2314307b8bd SHA256 f129063137ae9d54a982c08800ac177f64b37cb0d236a689c3d8e69006691641
+DIST xulrunner-1.8.1.3-source.tar.bz2 35258868 RMD160 f7d5bdbaeffa33d3789cc80adc107885bb80e029 SHA1 51b18537ff54c6fee7d6ecab783ce8f5703cbdc8 SHA256 bfff1ff35ef23edb40532ee7fde042671ee659ec6ed3a341d8925c7aa8954702
 EBUILD xulrunner-1.8.0.4.ebuild 4941 RMD160 627ceafdcb54bc0ca637af749f607fee14a70eee SHA1 d74cff40c144641723e08a9464db026f71974656 SHA256 387b068133fffd7c713278dbe98432de54ecf9b6a9221ff4525e483f253021c3
 MD5 9a6fe676f44c428b8b437ccaa00d0723 xulrunner-1.8.0.4.ebuild 4941
 RMD160 627ceafdcb54bc0ca637af749f607fee14a70eee xulrunner-1.8.0.4.ebuild 4941
 SHA256 387b068133fffd7c713278dbe98432de54ecf9b6a9221ff4525e483f253021c3 xulrunner-1.8.0.4.ebuild 4941
-MISC ChangeLog 2563 RMD160 7ee99686d577c1ad323dd305414522ed796ecfac SHA1 b4f84b93fffeb2460cd5c602920e3f4e462edb87 SHA256 46835d3da8078b67ce94d5a36b770bd5abe82237231b0e15ee6c9b3fb45da4d9
-MD5 4540b34060681127b422366819598b19 ChangeLog 2563
-RMD160 7ee99686d577c1ad323dd305414522ed796ecfac ChangeLog 2563
-SHA256 46835d3da8078b67ce94d5a36b770bd5abe82237231b0e15ee6c9b3fb45da4d9 ChangeLog 2563
+EBUILD xulrunner-1.8.1.3.ebuild 4547 RMD160 770888009a524502be3682513f81f02422599cc6 SHA1 4e3ed4b0d50f00bc0040885f573c0a0a7bd0867b SHA256 0e3448aaaf02a62eed428825cb22e0e0def6dcba465e366bc8d5790505a981ee
+MD5 7c496f81fdc420fe6b6c82000ff63160 xulrunner-1.8.1.3.ebuild 4547
+RMD160 770888009a524502be3682513f81f02422599cc6 xulrunner-1.8.1.3.ebuild 4547
+SHA256 0e3448aaaf02a62eed428825cb22e0e0def6dcba465e366bc8d5790505a981ee xulrunner-1.8.1.3.ebuild 4547
+MISC ChangeLog 2797 RMD160 b8298f0d1715cd78a87a385541a2746cb549f778 SHA1 42844b3ff9adbb935a1d590cb0c27565bc951168 SHA256 f79139d33c977c31fedde3efa92ff583f3adba90cf72cc518ec6f56d12e2f66a
+MD5 1c7602280d057927676d7335d8652aaa ChangeLog 2797
+RMD160 b8298f0d1715cd78a87a385541a2746cb549f778 ChangeLog 2797
+SHA256 f79139d33c977c31fedde3efa92ff583f3adba90cf72cc518ec6f56d12e2f66a ChangeLog 2797
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
-MD5 081ddd8186f91fef30c124b30d1ae6d7 files/digest-xulrunner-1.8.0.11 569
-RMD160 e2c7d9cfbb5af98cd485908edf66d68c7a690572 files/digest-xulrunner-1.8.0.11 569
-SHA256 27624bebaf6904db657b567244f372a346b917c862bb593c17580ac20a4185f4 files/digest-xulrunner-1.8.0.11 569
 MD5 7af0621098dd2b39628f117b74f0d705 files/digest-xulrunner-1.8.0.4 572
 RMD160 9d6978a4e082fbdc9ac0758ee5e116b6e7083c7a files/digest-xulrunner-1.8.0.4 572
 SHA256 cdf6a3c41ea585fccd20c927a1492f4418e721b8194afe383f8814f006422865 files/digest-xulrunner-1.8.0.4 572
+MD5 77cabaa41a8f8211d94652b65a3cde98 files/digest-xulrunner-1.8.1.3 572
+RMD160 fae387251001d7f7734cddbed7670bf4e8a5afa5 files/digest-xulrunner-1.8.1.3 572
+SHA256 b42c552496a1c2797b8444923232123e82a2f2708ddcaff14fb9e91f66da0c08 files/digest-xulrunner-1.8.1.3 572

diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11 b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11
deleted file mode 100644 (file)
index b69b0c2..0000000
--- a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 acf887830402eb4b82befe190d13fbe8 xulrunner-1.8.0.11-patches-0.2.tar.bz2 92684
-RMD160 ff8d6cab7c3ba8c0a6a3a77e994173af4096d3c9 xulrunner-1.8.0.11-patches-0.2.tar.bz2 92684
-SHA256 12a0f7383df19d88182caa415bda0d3951d68069d8954cc16412fa3088241e74 xulrunner-1.8.0.11-patches-0.2.tar.bz2 92684
-MD5 e0e4c609c50ae171c65d5c454aa0e94f xulrunner_1.8.0.11.orig.tar.gz 40237017
-RMD160 2651cb315a3465acc32ee770b8386bec39ad5969 xulrunner_1.8.0.11.orig.tar.gz 40237017
-SHA256 cc3cd44bbeb4112112c1ae6ab420177a6b1266d060eab7da1ae926fea57c5f24 xulrunner_1.8.0.11.orig.tar.gz 40237017

diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.1.3 b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.3
new file mode 100644 (file)
index 0000000..a15a137
--- /dev/null
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.3
@@ -0,0 +1,6 @@
+MD5 23f0be2a0b044285a3f5879371b5eb42 xulrunner-1.8.1.3-patches-0.1.tar.bz2 62246
+RMD160 a8029fae194f86e5772abb5e06bc76ffcf459228 xulrunner-1.8.1.3-patches-0.1.tar.bz2 62246
+SHA256 f129063137ae9d54a982c08800ac177f64b37cb0d236a689c3d8e69006691641 xulrunner-1.8.1.3-patches-0.1.tar.bz2 62246
+MD5 6403897d08f05de680452bee03609153 xulrunner-1.8.1.3-source.tar.bz2 35258868
+RMD160 f7d5bdbaeffa33d3789cc80adc107885bb80e029 xulrunner-1.8.1.3-source.tar.bz2 35258868
+SHA256 bfff1ff35ef23edb40532ee7fde042671ee659ec6ed3a341d8925c7aa8954702 xulrunner-1.8.1.3-source.tar.bz2 35258868

diff --git a/net-libs/xulrunner/xulrunner-1.8.0.11.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.3.ebuild
similarity index 64%
rename from net-libs/xulrunner/xulrunner-1.8.0.11.ebuild
rename to net-libs/xulrunner/xulrunner-1.8.1.3.ebuild
index ae1005092e67752b5f6638e0f506dbc885837711..472d2ab68e32b7f4b53a86d7b072f5855094dbc3 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.8.0.11.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.8.1.3.ebuild
@@ -1,33 +1,34 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.0.11.ebuild,v 1.2 2007/04/15 10:25:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.3.ebuild,v 1.1 2007/04/16 15:04:57 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
-PATCH="${P}-patches-0.2"
+PATCH="${P}-patches-0.1"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="mirror://debian/pool/main/x/xulrunner/xulrunner_1.8.0.11.orig.tar.gz
+SRC_URI="http://www.archlinux.org/~jgc/mozilla/${P}-source.tar.bz2
        mirror://gentoo/${PATCH}.tar.bz2"
 
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+KEYWORDS="-* ~amd64 ia64 x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
        >=sys-devel/binutils-2.16.1
-       >=dev-libs/nss-3.10
-       >=dev-libs/nspr-4.6.1
+       >=dev-libs/nss-3.11.5
+       >=dev-libs/nspr-4.6.5-r1
        java? ( >=virtual/jre-1.4 )"
 
+
 DEPEND="java? ( >=virtual/jdk-1.4 )
        ${RDEPEND}
        dev-util/pkgconfig"
 
-S="${WORKDIR}/${P}.orig"
+S="${WORKDIR}/mozilla"
 
 # Needed by src_compile() and src_install().
 # Would do in pkg_setup but that loses the export attribute, they
@@ -37,34 +38,19 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
 src_unpack() {
-       unpack ${P/-/_}.orig.tar.gz  ${PATCH}.tar.bz2
+       unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
 
        # Apply our patches
-       cd ${S} || die "cd failed"
-
-       # exclude the xpcomglue-shared.patch from debian for now
-       # until we figured out if we need also the versioning patch
-       EPATCH_EXCLUDE="030_pango-cairo-1.patch.bz2"
-
+       cd "${S}" || die "cd failed"
        EPATCH_SUFFIX="patch" \
        EPATCH_FORCE="yes" \
        epatch "${WORKDIR}"/patch
 
-       # Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-       # PowerPC, because with that configuration, it detects a ppc64 system.
-       # -- hansmi, 2005-11-13
-       if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-               sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-                       ${S}/configure
-               sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-                       ${S}/security/coreconf/arch.mk
-       fi
-
        eautoreconf || die "failed  running eautoreconf"
 }
 
 src_compile() {
-       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 
        ####################################
        #
@@ -75,7 +61,7 @@ src_compile() {
        mozconfig_init
        mozconfig_config
 
-       mozconfig_annotate '' --enable-extensions="default,cookie,permissions"
+       mozconfig_annotate '' --enable-extensions="default,cookie,permissions,spellcheck,python/xpcom"
        mozconfig_annotate '' --enable-native-uconv
        mozconfig_annotate '' --enable-image-encoder=all
        mozconfig_annotate '' --enable-canvas
@@ -93,29 +79,19 @@ src_compile() {
 
        #disable java 
        if ! use java ; then
-           mozconfig_annotate '-java' --disable-javaxpcom
+               mozconfig_annotate '-java' --disable-javaxpcom
        fi
 
        # Finalize and report settings
        mozconfig_final
 
-       # hardened GCC uses -fstack-protector-all by default, which breaks us
-       gcc-specs-ssp && append-flags -fno-stack-protector-all
-       # remove -fstack-protector because now it borks firefox
-       CFLAGS=${CFLAGS/-fstack-protector-all/}
-       CFLAGS=${CFLAGS/-fstack-protector/}
-       CXXFLAGS=${CXXFLAGS/-fstack-protector-all/}
-       CXXFLAGS=${CXXFLAGS/-fstack-protector/}
-
-       append-flags -freorder-blocks -fno-reorder-functions
-
-       # Export CPU_ARCH_TEST  as it is not exported by default.
-       case $(tc-arch) in
-       amd64) [[ ${ABI} == "x86" ]] && CPU_ARCH_TEST="x86" || CPU_ARCH_TEST="x86_64" ;;
-       *) CPU_ARCH_TEST=$(tc-arch) ;;
-       esac
-
-       export CPU_ARCH_TEST
+       # -fstack-protector breaks us
+       if gcc-version ge 4 1; then
+               gcc-specs-ssp && append-flags -fno-stack-protector
+       else
+               gcc-specs-ssp && append-flags -fno-stack-protector-all
+       fi
+       filter-flags -fstack-protector -fstack-protector-all
 
        ####################################
        #
@@ -138,12 +114,23 @@ src_compile() {
        # requirements while compiling
        edit_makefiles
 
-       emake -j1 || die
+       emake -j1 || die "emake failed"
 }
 
 src_install() {
-       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-       einstall || die "failed running make install"
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+       emake DESTDIR="${D}" install || die "emake install failed"
+       X_DATE=`date +%Y%m%d`
+
+       # Add Gentoo package version to preferences - copied from debian rules
+       echo // Gentoo package version \
+               > ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+       echo "pref(\"general.useragent.product\",\"Gecko\");" \
+               >> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+       echo "pref(\"general.useragent.productSub\",\"${X_DATE}\");" \
+               >> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+       echo "pref(\"general.useragent.productComment\",\"Gentoo\");" \
+               >> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
 
        if use java ; then
            java-pkg_dojar ${D}${MOZILLA_FIVE_HOME}/javaxpcom.jar