Re-added 1.9.2.21 version for icecat-3.6.16-r4

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 283 insertions, 15 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 6220d1c845dd..0b58651407f7 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.442 2011/12/21 16:16:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.443 2011/12/22 08:25:27 polynomial-c Exp $
+
+  22 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +xulrunner-1.9.2.21.ebuild:
+  Re-added 1.9.2.21 version for icecat-3.6.16-r4.
 
   21 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
   -xulrunner-1.9.2.12.ebuild, -xulrunner-1.9.2.21.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index be39463b45a0..6aea0e89d565 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -12,30 +12,32 @@ AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 DIST firefox-3.6.17.source.tar.bz2 51522989 RMD160 af7320c7447dea4b1722b937bb77b20943e9e68d SHA1 1ae71e8e2838d438de2f6f860fe77d067f3629ee SHA256 a07abc8faba26fb613d69c3cff810542dd2da11d8892f8b57602486f7e8d6457
 DIST firefox-3.6.20.source.tar.bz2 51564376 RMD160 b2314d50020815ab432ce91931266884410bedec SHA1 d25d892b3214f92f0799ecdaf6ea6414a8950eb2 SHA256 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18
+DIST firefox-3.6.21.source.tar.bz2 51556131 RMD160 b883221eca22ddb4a9f2ce2c966d4bf406051c34 SHA1 3c1f001ad22d93b48e191999f548b4382db3d36c SHA256 1abaa7d44033601ffccdfef8f02e684d83d8a08c6c4ddb8ae862683da87b89b7
 DIST firefox-3.6.22.source.tar.bz2 51675082 RMD160 7b5cd6bb9264b97b0059bb254c383d9237982e4c SHA1 db7953b20568126a3ffe7c5a89ab0cecac4b0a53 SHA256 788e5a64f8bdb07183405c568fda70d8cb7759d3a8d75c404f3589fe8a039229
 DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
 DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a1cb086651940 SHA1 bac72e12bfc1150ed116ba5e930688ec72157671 SHA256 88950bf5bdc34cf96bf79e1e1d2f2a4071e1f9e9d53e52f400c433f2f661b77f
 EBUILD xulrunner-1.9.2.17.ebuild 8521 RMD160 318ad1e4b62e02b05dbf7f05e4490b2fedb62e29 SHA1 3f70f9a35b73250e377a4784d72cf92733009910 SHA256 01a2b5246c95150f61a0ef12f54b9f3b6b95fdf0df2bf0e9ced8a5f61573b63a
 EBUILD xulrunner-1.9.2.20.ebuild 8520 RMD160 dae458c7b65164917c305114b38733dffd4975a5 SHA1 eeaf844973fb4689b0beb1f84f05556bc6d71db6 SHA256 1d85c052d75f32f108db40deca934c1e77ff877815292f12286460cf57eb7c5b
+EBUILD xulrunner-1.9.2.21.ebuild 8536 RMD160 8c06156cdfaf0afb6ed3a86c48cc27ef53ce9cd9 SHA1 4e546c9170fe0487d85274a472a5f026bc63e2be SHA256 8029ffeac583a0f578e9773e1056c99fbcb3cafb12b5d15faa2e4869f344660a
 EBUILD xulrunner-1.9.2.22.ebuild 8530 RMD160 637e2122e9ba71cd1f8cf24380e4ba7da803de94 SHA1 445d8e9d32070433d7d6c6182bc78c506402c9cb SHA256 3fed2088af183f102b012cd9c54cd740b20c96d9c45d3c17c0431a8ac628378b
 EBUILD xulrunner-2.0.1-r1.ebuild 6546 RMD160 d56e68fbd36391dfca602ea0f32c7bf61a7d5696 SHA1 25e6bffcbdb5a918a56b0a0e8dc4e150640341c9 SHA256 d1ae52e4b916df0f1a1355802e3a775da633ea45f6d32b1cdd91bcb26e3182c0
-MISC ChangeLog 61820 RMD160 4e2cec1c51c89f19e3675abe33c70beb507129f3 SHA1 5d573f2daa9ec0964a3fa202986f81aeeb2db592 SHA256 ae4da88b66e08e2ebfac60a604c3680319615e10c0caffe362470810985ea849
+MISC ChangeLog 61955 RMD160 077c03f766d369f0687d6c109cb5a105e82a578c SHA1 84f1e55e132babc6e9d5e596dad770cbe46a79e6 SHA256 c42382a39878064a732f3d073fc462f8a895dc882db4e9dd5f9e2e2aec1bfa36
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO8gZnAAoJEPiazRVxLXTFKHsP/R7M8O6M6+C6BK610d1AEPy+
-3uUnMGARg1+Ib83iMpwxV5tuUmd9PyXGD2jg3U/usCCofp9ksWQQrvt8nwDiH2Od
-MNRrFGzOa/c31qrtBUYvBfoPFgrI4/2Kgh0LaQehRcJEEIGDVd+KgHaTHZ9NXLJ6
-PONmpLB2ok8MPCutt+mNPJ6DCWQAbLWeFx1jxj2YldbAJbzrpVgkyxRJStXCvsNr
-y7j4vceFVhSVe9kGB+/7D8qXfrJV0ymsYhX3h5JliNpXqfyCOFigS+cuyR9prnv3
-e3mBEX0puzMd0UhsmDE8OI0KDNs/D5KYcKaidQKVlHM3kchoSWT7KZ9ZDcn9ETPw
-64A/0OEtgfJ1ehkqFoH/hYiB+FhqtczpHp4iat59JOsVRe0qzqVbB8QFIaQfb4gL
-RY6xvFxp66n8/it2Ehy9QSR8P8UVblm2ZxLPM7qmd6fxe7CO1OkwqPS4RE1DOr9r
-inIS/JbpILvZKRJiyHI5A/j71MEO8Mi1RhnUGArb7wA8qvu4l5CEpgJKgwWvCugD
-N9Ypp786KxPxI/6d0ZMBkqbjzTipauOmFYWbjq7keRub63GpYVdQ43QHuD+Hxewh
-OxLBGYeJNcPQhct8iw3foFiZIMig6BN0I05DH+fhlLT3F8yIxv0d2EXy+8qMEHlf
-S0+adP/U4pXp5FFxs+hS
-=NZIK
+iQIcBAEBCgAGBQJO8ul9AAoJEPiazRVxLXTFo+8QAIR6YPpS9Q99pTowdBkZTOPI
+H7bmjZMjQ3KgS91TzBbuv0dZtAjuiCf6MOiRX7MEDqtArBw8wVsHoWcNawt0ufWq
+hfFoSYmgBbfAGBLjhYXcg6H2CgClpKpTbV6FRFW5TIUhFL82GJCWKiHj/V82VAZ2
+1SloiZDdQCBFS9M7CP9iu6Pwa74T8aztzIqKUIsq9nQozOrHR8stnjJnFrfna6lH
+20VPdn9tMm6qDNjJ5M/eP5NWz7iV/LlScNgZ7frBPJ2TWtfBLl64bJGnRE1Yd5nF
+MxrzSIs/I0FEN1/Py9pFHFbh6oKuKzBy05+8JCfXix7a83cBafA/x85nmwx++3i+
+Q4QQavW/tNm0vrL5yDPbP8Vm3lbRBUiDtFuLPx+lgj/BYqcVgTbKK7pkWlY66R6+
+ubB6hT/w6tfUPc1uRxPWhU6TXkocYneRIt1ZRa7z1sXcCKa9gQJf5NWsPkCjXekp
+3Odq+0X5vPWXjOL/rLvYSxQ3qdejVw8dBg157mYH77PxYZ3tSz0+y/Xs4/yFsPDX
+AV9hvMO5XfMJS1hA/rLqe+KNTu/ahNkcr9XuJMglbeh+sxK4RrJGKnhTpYgwZXBv
+B4Gj1Uaa5ExZx+OrhqNUAVxniTkYnEvOwPN3WI3/KMCQgKkiqLFfRd668f/iiaox
+QTQWRtlO5j+39aoLYhYk
+=A+kL
 -----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.21.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.21.ebuild
new file mode 100644
index 000000000000..f976e0d22c27
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.2.21.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.21.ebuild,v 1.4 2011/12/22 08:25:27 polynomial-c Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils
+
+MY_PV="${PV/_rc/rc}" # Handle beta
+MY_PV="${MY_PV/1.9.2/3.6}"
+MAJ_PV="1.9.2" # from mozilla-* branch name
+PATCH="${PN}-1.9.2-patches-0.9"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.8
+	>=dev-libs/nspr-4.8.6
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
+	alsa? ( media-libs/alsa-lib )
+	>=app-text/hunspell-1.2
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/libXt
+	x11-libs/pixman
+	>=dev-libs/libevent-1.4.7
+	gnome? ( >=gnome-base/gnome-vfs-2.16.3
+		>=gnome-base/libgnomeui-2.16.1
+		>=gnome-base/gconf-2.16.0
+		>=gnome-base/libgnome-2.16.0 )
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	=dev-lang/python-2*[threads]
+	dev-util/pkgconfig"
+
+# virtual/jre should not be in DEPEND. bug 325981
+RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
+
+S="${WORKDIR}/mozilla-${MAJ_PV}"
+
+pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	epatch "${FILESDIR}/bug-606109.patch"
+
+	eprefixify \
+		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
+		xpcom/build/nsXPCOMPrivate.h \
+		xulrunner/installer/Makefile.in \
+		xulrunner/app/nsRegisterGREUnix.cpp
+
+	# fix double symbols due to double -ljemalloc
+	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
+		xulrunner/stub/Makefile.in || die
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types\.h>/d' \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+			|| die
+	sed -e '/curl\/types\.h/d' \
+		-i "${S}"/config/system-headers \
+		-i "${S}"/js/src/config/system-headers \
+			|| die
+
+	# Allow user to apply additional patches without modifing ebuild
+	epatch_user
+
+	# Same as in config/autoconf.mk.in
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	# Gentoo install dirs
+	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
+		|| die "${MAJ_PV} sed failed!"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	MEXTENSIONS="default"
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --enable-crypto
+	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=xulrunner
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_enable gnome gnomeui
+	mozconfig_use_enable ipc # +ipc, upstream default
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
+
+	# Debug
+	if use debug ; then
+		mozconfig_annotate 'debug' --disable-optimize
+		mozconfig_annotate 'debug' --enable-debug=-ggdb
+		mozconfig_annotate 'debug' --enable-debug-modules=all
+		mozconfig_annotate 'debug' --enable-debugger-info-modules
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-flags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	# hack added to workaround bug 299905 on hosts with libc that doesn't
+	# support tls, (probably will only hit this condition with Gentoo Prefix)
+	tc-has-tls -l || export ac_cv_thread_keyword=no
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${ED}"/usr/bin/xulrunner
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	if has_multilib_profile; then
+		local config
+		for config in "${ED}"/etc/gre.d/*.system.conf ; do
+			mv "${config}" "${config%.conf}.${CHOST}.conf"
+		done
+	fi
+
+	dodir /usr/bin
+	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
+
+	# env.d file for ld search path
+	dodir /etc/env.d
+	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
+
+	# Add our defaults to xulrunner and out of firefox
+	cp "${FILESDIR}"/xulrunner-default-prefs.js \
+		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
+			die "failed to cp xulrunner-default-prefs.js"
+
+	pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
+
+	if use java ; then
+		java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
+		java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
+		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
+		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
+	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
+	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
+
+	einfo
+	einfo "All prefs can be overridden by the user. The preferences are to make"
+	einfo "use of xulrunner out of the box on an average system without the user"
+	einfo "having to go through and enable the basics."
+
+	einfo
+	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
+	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
+	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
+}