Version bump thanks to Gergan Penkov <gpp666_999@yahoo.de> and Walter Meinl in bug 142791

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 193 insertions, 5 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index fbdd19cb21b1..8b317d100e71 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.1 2006/06/02 01:56:01 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.2 2006/07/27 23:58:32 genstef Exp $
+
+*xulrunner-1.8.0.4 (27 Jul 2006)
+
+  27 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +files/xulrunner.conf,
+  +xulrunner-1.8.0.4.ebuild:
+  Version bump thanks to Gergan Penkov <gpp666_999@yahoo.de> and Walter Meinl
+  in bug 142791
 
 *xulrunner-1.8.0.1 (02 Jun 2006)
 
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 2297d28c1f52..909ece80d45b 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,13 +1,23 @@
+AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
+MD5 1047668b701935bb42659431038d325a files/xulrunner.conf 113
+RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 files/xulrunner.conf 113
+SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 files/xulrunner.conf 113
 DIST xulrunner-1.8.0.1-patches-0.6.tar.bz2 57275 RMD160 4779f4d562aa4e7d306a770912717c3e334dfd9f SHA1 db3e3dba763ae87b02fe87e479502dae1010b80d SHA256 5a1b11bdb234a875cf37d96859a60f4fc2980a85cde64a85c29ba1e0debf86f3
 DIST xulrunner-1.8.0.1-source.tar.bz2 33170371 RMD160 9c85ae4faebb7c47e19d881003f21031d21554ff SHA1 e5051d52f6c3ae066c6a95aff90a84774e24952c SHA256 9410745cad7620bb00798a0c287d90a60abee6c42aa061f908f31e62274a0558
+DIST xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419 RMD160 6285a67d3d94038e90749833e1eb83b423efd1da SHA1 e8dca7c469fbe278580fc378728cf686573168e2 SHA256 96ba130e3ba0315878adc43e12d9c326028b4f583382e9f2eb5ba5824ce0c02c
+DIST xulrunner-1.8.0.4-source.tar.bz2 33846136 RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb SHA1 9484a4783b86c6dc1cb9b99331791be079b8697e SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9
 EBUILD xulrunner-1.8.0.1.ebuild 4456 RMD160 d9c5a49d928aa0171e2a52b699422107b80f4797 SHA1 03e22b70b024d688fa9707f4e0fe015f32507039 SHA256 13f34da6c4902a4a482a48eee75a56fe374c5d20cc7f43e5c1f731fd757ba3f6
 MD5 6ace5a45e8d3b5cc982205a8a7e381b9 xulrunner-1.8.0.1.ebuild 4456
 RMD160 d9c5a49d928aa0171e2a52b699422107b80f4797 xulrunner-1.8.0.1.ebuild 4456
 SHA256 13f34da6c4902a4a482a48eee75a56fe374c5d20cc7f43e5c1f731fd757ba3f6 xulrunner-1.8.0.1.ebuild 4456
-MISC ChangeLog 364 RMD160 c482d3b9b7cb26e0f4cfc12a577a21c9b241ce19 SHA1 3830be702399c81d542759bfddee4c70d01d9753 SHA256 0f0fe9fecfa6ae7eb228ae81db56602a5c15e695db37791bd407d3e44c76202e
-MD5 a5b7c6cfdf023dc715df428a104dba44 ChangeLog 364
-RMD160 c482d3b9b7cb26e0f4cfc12a577a21c9b241ce19 ChangeLog 364
-SHA256 0f0fe9fecfa6ae7eb228ae81db56602a5c15e695db37791bd407d3e44c76202e ChangeLog 364
+EBUILD xulrunner-1.8.0.4.ebuild 4899 RMD160 d40c57ce3396321b06d9967ac94143e93461396e SHA1 3a96a485a33d5e38666d0d7b611e34ff0ca8f440 SHA256 5914770a1267d111d86a32bd00d8c35aab8ff8e0fb5fbf5874cf4a6dcd445ea8
+MD5 5da1e4f76cae21aff5bb2c02cb73b157 xulrunner-1.8.0.4.ebuild 4899
+RMD160 d40c57ce3396321b06d9967ac94143e93461396e xulrunner-1.8.0.4.ebuild 4899
+SHA256 5914770a1267d111d86a32bd00d8c35aab8ff8e0fb5fbf5874cf4a6dcd445ea8 xulrunner-1.8.0.4.ebuild 4899
+MISC ChangeLog 598 RMD160 9f7092e57437ea0b6a4c833e0a16548a00ecb672 SHA1 34fc8630bb61427da86c1e5dbab6a2b954d0c90d SHA256 fc0d7dd4cb4d42ff75cbc181a95c0b295446cfc220c378adbe58a02f76bc649e
+MD5 bc1373f4d82a9cb6c7261f84c3e5a456 ChangeLog 598
+RMD160 9f7092e57437ea0b6a4c833e0a16548a00ecb672 ChangeLog 598
+SHA256 fc0d7dd4cb4d42ff75cbc181a95c0b295446cfc220c378adbe58a02f76bc649e ChangeLog 598
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -15,3 +25,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 69a43303e7c8db7ed76cfff599241c64 files/digest-xulrunner-1.8.0.1 572
 RMD160 a1bb9dc57ba93f648965fb6adc9f9a0db12bfff2 files/digest-xulrunner-1.8.0.1 572
 SHA256 9e06d645e834045d1d6e4884747d4f377f4632259649ddad7ab48d3040553f2f files/digest-xulrunner-1.8.0.1 572
+MD5 1aea79de4dfd93b41d1f877aa3c6d5e4 files/digest-xulrunner-1.8.0.4 572
+RMD160 a69a7f8d7fea8ffe24e14884ec6aeb9986504edc files/digest-xulrunner-1.8.0.4 572
+SHA256 fe21c5f02d4111da20fb08b34a049ae368a91121d60be619d4296ef2934cefd2 files/digest-xulrunner-1.8.0.4 572
diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4 b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4
new file mode 100644
index 000000000000..6992554d03ba
--- /dev/null
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.0.4
@@ -0,0 +1,6 @@
+MD5 ca039de090e8ed299a72c04e015b9cf2 xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
+RMD160 6285a67d3d94038e90749833e1eb83b423efd1da xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
+SHA256 96ba130e3ba0315878adc43e12d9c326028b4f583382e9f2eb5ba5824ce0c02c xulrunner-1.8.0.4-patches-0.8.tar.bz2 62419
+MD5 4dc09831aa4e94fda5182a4897ed08e9 xulrunner-1.8.0.4-source.tar.bz2 33846136
+RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb xulrunner-1.8.0.4-source.tar.bz2 33846136
+SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9 xulrunner-1.8.0.4-source.tar.bz2 33846136
diff --git a/net-libs/xulrunner/files/xulrunner.conf b/net-libs/xulrunner/files/xulrunner.conf
new file mode 100644
index 000000000000..e622e0b7155f
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner.conf
@@ -0,0 +1,6 @@
+# Registration file generated by xulrunner. Do not edit.
+
+[version]
+GRE_PATH=instpath
+xulrunner=true
+javaxpcom=1
diff --git a/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild b/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild
new file mode 100644
index 000000000000..5a80a781ab95
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.0.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2006 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.4.ebuild,v 1.1 2006/07/27 23:58:32 genstef Exp $
+
+inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
+PVER="0.8"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/source/${P}-source.tar.bz2
+	http://gentooexperimental.org/~genstef/dist/${P}-patches-${PVER}.tar.bz2"
+
+LICENSE="MPL-1.1 NPL-1.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+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}/mozilla
+
+# 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}-source.tar.bz2  ${P}-patches-${PVER}.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_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
+
+	WANT_AUTOCONF="2.13" \
+		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 || 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
+}