Version bump

Package-Manager: portage-2.1.4.5

4 files changed, 337 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 4e324d174d75..2742ad991b28 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.146 2008/09/28 13:14:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.147 2008/11/13 19:34:07 armin76 Exp $
+
+*xulrunner-1.9.0.4 (13 Nov 2008)
+*xulrunner-1.8.1.18 (13 Nov 2008)
+
+  13 Nov 2008; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.8.1.18.ebuild,
+  +xulrunner-1.9.0.4.ebuild:
+  Version bump
 
   28 Sep 2008; Markus Meier <maekke@gentoo.org> xulrunner-1.8.1.17.ebuild:
   amd64 stable, bug #238535
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 2a4ad1194ec2..cdf41f577d46 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,12 +1,16 @@
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST xulrunner-1.8.1.13-patches-0.1.tar.bz2 61868 RMD160 99ae55b9a05904dd59bc700dc1d2676603a60364 SHA1 87a9eb02f8fcb133059cbfb03c03e73bb9df670a SHA256 815efb6b9a0effe6f44016ec022784a3ab9967799dd737a856f7c5424c8f746d
 DIST xulrunner-1.8.1.17-source.tar.bz2 38105171 RMD160 b96837a8ea19ae17f55a45ecaed3ca219934aec9 SHA1 687b2f314847afd3eccf2b13e40f56c18604ea9c SHA256 37edd30e20f194c132e050b1be1e41b0ff63df474ac77cf592fc12e93cb0770b
+DIST xulrunner-1.8.1.18-source.tar.bz2 38102841 RMD160 df43bdcdf472db3c41677c8070e5f39f408c8a71 SHA1 c5ee2ca36abbda3f14108a8bb60a6c2c7ec9baef SHA256 4d3165cad4b3250a50b70ced306e064f3727d790e9b39843fbe7666ff387070f
 DIST xulrunner-1.9-patches-0.1.tar.bz2 5880 RMD160 bd5475536e06b81f08aaa9d43e8ff2f7afa380ed SHA1 399989329935c2b31797e2eb363684dba5eef908 SHA256 b0ae8dd3ac55a0caf720e3fe162d758f58d30e8ce874e9b7d87de23377896007
 DIST xulrunner-1.9.0.1-patches-0.1.tar.bz2 5730 RMD160 3b5acec5d09a1c818c51e794889a113fb2fcddf9 SHA1 74638b82cd9afd26530facd8ddc336edcc6daad0 SHA256 986f32661f6f3452f95da833b1a73dfdd8d6c6f18e0759cb7910b53709c21bf0
 DIST xulrunner-1.9.0.3.tar.bz2 34068790 RMD160 45316848a67791be739cc371eb93a3f716e1347a SHA1 b76921388bc6601aebdff3e9b3e2a2e5c6f21d29 SHA256 8f145ee2b9857ef58203d9486ab9892c57dbd20c6eea48596604742710892831
+DIST xulrunner-1.9.0.4.tar.bz2 34070622 RMD160 13d5054b6967ee8290bcc098592c7848bbdb6bbd SHA1 75725d0e10c5c65b70a539f01f9c3f49008e262f SHA256 51846df9417f346b747bb51e79b0f99b7ecbf1cf9eabee047c302b6b66dd13c1
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD xulrunner-1.8.1.17.ebuild 4845 RMD160 2f90b0b6a43d9380d3f34a2f7328f7dbb69f6fbb SHA1 4c07fdf332824dafaa69b05afbc90b7d3ad86614 SHA256 53e132178f61996e4387091ac4817520ea2bd749bffdb9ba6a39294f52badc2f
+EBUILD xulrunner-1.8.1.18.ebuild 4855 RMD160 ec08b7e60a32205c665debfadc99e098a95357c5 SHA1 dddab390b40e0038dc3955eeb43f9b66d4db3a98 SHA256 6c0f4faa9c3889354292c221530cc3a94022bcd90691d6d9cd45b4b0583f0929
 EBUILD xulrunner-1.9-r2.ebuild 5345 RMD160 8b0073136ff1a9683fc96941947de296b54bd386 SHA1 f97f0b496b2b72e2d451f07e15a00edd7df8b9ff SHA256 ca1e303aad26f1b0f76c101a08c58d3fdf5caa255812b81263fc641aa7b0684c
 EBUILD xulrunner-1.9.0.3.ebuild 4933 RMD160 9d9f0c3d41f4b4c8ba737e0bb913e6b249316fb1 SHA1 bc018c71e4f5a32c6215d317d594bcbae4fce0ad SHA256 56829d6029514a76292c169b30617b724dee4c429ff90cc6b8000336ae737b0e
-MISC ChangeLog 18529 RMD160 0c9ec7131528b790cac3e058ee4648056164712a SHA1 074621a8146bacf1c144f71f96e7a258a3b43cca SHA256 9acaea91208ac30a860707108a70b37460a7fad7fa11138425676a26fd8a9afd
+EBUILD xulrunner-1.9.0.4.ebuild 4934 RMD160 1b77583c65d2ad922f212d0009097029b4f3b83f SHA1 4be8eaa2ab058fe5bd0011829ed48bae9eb78391 SHA256 a138594611ae2ffaf9422f4d2f8ab40b239906122fee7e197b312f89cd8fd9db
+MISC ChangeLog 18720 RMD160 b98545bf3435656f12803f797cf1df942362b9ff SHA1 0d9051c0e3818018e67ad757c6d34e8e21f3ab75 SHA256 6eac34a812c3559f27f80b1a9d54d007b20eb0ddab445aee319603fc59e76323
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.18.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.18.ebuild
new file mode 100644
index 000000000000..130718c131ca
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.1.18.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.18.ebuild,v 1.1 2008/11/13 19:34:07 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
+PATCH="${PN}-1.8.1.13-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://gentoo/${P}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+SLOT="1.8"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-devel/binutils-2.16.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}/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
+
+pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	if ! built_with_use --missing true x11-libs/pango X; then
+		eerror "Pango is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge pango."
+		die "Pango needs X"
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	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,spellcheck"
+	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
+
+	# -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
+
+	####################################
+	#
+	#  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}"/toolkit/content/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Add vendor
+	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
+		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+
+	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
+}
+
+pkg_postinst() {
+	elog "Please remember to rebuild any packages that you have built"
+	elog "against xulrunner. Some packages might be broken by the upgrade; if this"
+	elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
+	elog "if one does not exist."
+}
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.4.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.4.ebuild
new file mode 100644
index 000000000000..54d37ea446b0
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.0.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.4.ebuild,v 1.1 2008/11/13 19:34:07 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
+PATCH="${PN}-1.9.0.1-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://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE=""
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12
+	>=dev-libs/nspr-4.7.1
+	>=app-text/hunspell-1.1.9
+	>=media-libs/lcms-1.17"
+
+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
+
+pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	if ! built_with_use --missing true x11-libs/pango X; then
+		eerror "Pango is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge pango."
+		die "Pango needs X"
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	eautoreconf || die "failed  running eautoreconf"
+
+	# We need to re-patch this because autoreconf overwrites it
+	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-mochitest
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-hunspell
+	#mozconfig_annotate '' --enable-system-sqlite
+	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 '' --enable-system-lcms
+	mozconfig_annotate '' --with-system-bz2
+	# 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 --enable-places_bookmarks
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-xpctools
+	mozconfig_annotate '' --disable-libxul
+	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
+
+	# -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
+
+	####################################
+	#
+	#  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}"/toolkit/content/buildconfig.html
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}"/usr/bin/xulrunner
+
+	dodir /usr/bin
+	dosym ${MOZILLA_FIVE_HOME}/xulrunner /usr/bin/xulrunner-1.9
+
+	# Add vendor
+	echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
+		>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+
+	if use java ; then
+	    java-pkg_dojar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	    rm -f "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	fi
+}