Version bump, wrt security fixes, and stable to x86

Package-Manager: portage-2.1.2.3

4 files changed, 185 insertions, 5 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 1728c603efb3..df9a909d0473 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2007/03/29 21:06:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.17 2007/04/14 16:13:04 armin76 Exp $
+
+*xulrunner-1.8.0.11 (14 Apr 2007)
+
+  14 Apr 2007; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.8.0.11.ebuild:
+  Version bump, wrt security fixes, and stable to x86
 
   29 Mar 2007; Jeroen Roovers <jer@gentoo.org> :
   Marked ~hppa (bug #172559).
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 4fa65dd83d06..09a820552ac2 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -2,20 +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.1.tar.bz2 93146 RMD160 11dbe3622021338085660312873a50305879b162 SHA1 67daa752f9b1ece173f1b0cc1b27f33359b0ce98 SHA256 f71afb193093d0a3d237bf9b3150159c0cb9b7592edf201a1bb3ec4230f2964c
 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 5fe6d5784f8e1f9fdde8fd5f500377ee2c3cdec3 SHA1 2df0fd087acf093901ce531a5932c6d8cd3866f5 SHA256 9a240eb5796c841e407268b39e85efe8caff78e7747169fe10687cdf7a4f1ea1
+MD5 5515ba6a33ebb1c2451c093af5d2b079 xulrunner-1.8.0.11.ebuild 4925
+RMD160 5fe6d5784f8e1f9fdde8fd5f500377ee2c3cdec3 xulrunner-1.8.0.11.ebuild 4925
+SHA256 9a240eb5796c841e407268b39e85efe8caff78e7747169fe10687cdf7a4f1ea1 xulrunner-1.8.0.11.ebuild 4925
 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 2288 RMD160 835fa27b9b074724d4cd1b4fb8426b269583f94f SHA1 8d26e0bb2828bdbea5f8dfbab9ded11ce35ec3e4 SHA256 b14cfca7a231b549df70e2c8598549acc741ef710d234ba5bef00f22fc2f16a6
-MD5 2e5c598979f0eabd1cf0990136fc17a0 ChangeLog 2288
-RMD160 835fa27b9b074724d4cd1b4fb8426b269583f94f ChangeLog 2288
-SHA256 b14cfca7a231b549df70e2c8598549acc741ef710d234ba5bef00f22fc2f16a6 ChangeLog 2288
+MISC ChangeLog 2459 RMD160 0336117e846e1861233b54227c1ba5901c809368 SHA1 51d3fae3de2d57e92a0b4855591b7cfa20fce5d5 SHA256 21878593201657e65a4fced39115942ea59c30ec8e525495b999bdd581d2ff15
+MD5 b4a0ab5d29e58f69ff8c2023a2da3226 ChangeLog 2459
+RMD160 0336117e846e1861233b54227c1ba5901c809368 ChangeLog 2459
+SHA256 21878593201657e65a4fced39115942ea59c30ec8e525495b999bdd581d2ff15 ChangeLog 2459
 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 1fe9f627945402b4fb61f681592f49d8 files/digest-xulrunner-1.8.0.11 569
+RMD160 017d0f3bf2a50aed5645d6cf4d83572f07c6bf81 files/digest-xulrunner-1.8.0.11 569
+SHA256 9cf0584ceeef7427ddafe9412a8fb38b9da3630f88db4de7c46788a616c32675 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
diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11 b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11
new file mode 100644
index 000000000000..db064d8697a6
--- /dev/null
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.11
@@ -0,0 +1,6 @@
+MD5 839d8c91d6efc5b787aa46eef85707ea xulrunner-1.8.0.11-patches-0.1.tar.bz2 93146
+RMD160 11dbe3622021338085660312873a50305879b162 xulrunner-1.8.0.11-patches-0.1.tar.bz2 93146
+SHA256 f71afb193093d0a3d237bf9b3150159c0cb9b7592edf201a1bb3ec4230f2964c xulrunner-1.8.0.11-patches-0.1.tar.bz2 93146
+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/xulrunner-1.8.0.11.ebuild b/net-libs/xulrunner/xulrunner-1.8.0.11.ebuild
new file mode 100644
index 000000000000..a766e4547b2b
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.0.11.ebuild
@@ -0,0 +1,160 @@
+# 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.1 2007/04/14 16:13:04 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.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
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 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
+	java? ( >=virtual/jre-1.4 )"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P}.orig"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=xulrunner
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+src_unpack() {
+	unpack ${P/-/_}.orig.tar.gz  ${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"
+
+	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}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-extensions="default,cookie,permissions"
+	mozconfig_annotate '' --enable-native-uconv
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	#mozconfig_annotate '' --enable-js-binary
+	mozconfig_annotate '' --enable-embedding-tests
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-xpctools
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	#disable java 
+	if ! use java ; then
+	    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
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake -j1 || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+	einstall || die "failed running make install"
+
+	if use java ; then
+	    java-pkg_dojar ${D}${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	    rm -f ${D}${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	fi
+
+	# xulrunner registration, the gentoo way
+	insinto /etc/gre.d
+	newins ${FILESDIR}/${PN}.conf ${PV}.conf
+	sed -i -e \
+		"s|version|${PV}|
+			s|instpath|${MOZILLA_FIVE_HOME}|" \
+		${D}/etc/gre.d/${PV}.conf
+}