Version bump

Package-Manager: portage-2.1.4.4

4 files changed, 338 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 99135745bd66..5860b2ab5303 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.140 2008/09/09 14:59:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.141 2008/09/24 17:06:13 armin76 Exp $
+
+*xulrunner-1.9.0.2 (24 Sep 2008)
+*xulrunner-1.8.1.17 (24 Sep 2008)
+
+  24 Sep 2008; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.8.1.17.ebuild,
+  +xulrunner-1.9.0.2.ebuild:
+  Version bump
 
   09 Sep 2008; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9.0.1.ebuild:
   Mark -sparc, it sigbuses
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index ff40abc1a9c2..56f5b8071843 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -3,13 +3,18 @@ DIST xulrunner-1.8.1.11-patches-0.3.tar.bz2 62521 RMD160 06cb96500076ed532e5eead
 DIST xulrunner-1.8.1.11-source.tar.bz2 35475483 RMD160 d2edc6abb2733942bbe37709644bddae2f17362b SHA1 87e005deaf13ef4bdc36a2a818a6ae847fde33be SHA256 072fb6dea5f4bc06c94ec237a97b23dabeecc5e6a74754b4259dbf2eb9c00945
 DIST xulrunner-1.8.1.13-patches-0.1.tar.bz2 61868 RMD160 99ae55b9a05904dd59bc700dc1d2676603a60364 SHA1 87a9eb02f8fcb133059cbfb03c03e73bb9df670a SHA256 815efb6b9a0effe6f44016ec022784a3ab9967799dd737a856f7c5424c8f746d
 DIST xulrunner-1.8.1.16-source.tar.bz2 38100993 RMD160 e37ed21c581cb7dbb03fd09b9a6318f56a245a6e SHA1 af36d14a86fa23fbb3cecf73094ef94f3292709e SHA256 d36fed34f33828ee010f6eb6c1d8ed5bc2fcc3e9811545dd78c10073ba20bdb9
+DIST xulrunner-1.8.1.17-source.tar.bz2 38105171 RMD160 b96837a8ea19ae17f55a45ecaed3ca219934aec9 SHA1 687b2f314847afd3eccf2b13e40f56c18604ea9c SHA256 37edd30e20f194c132e050b1be1e41b0ff63df474ac77cf592fc12e93cb0770b
 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.1.tar.bz2 33959004 RMD160 a79ab44824a16a7765fcf0bd0720c75de919e345 SHA1 05455203c552e1a9d9148fb72053ff6ca0b0f2d8 SHA256 cd40bccf9a1c7d945e7bd79f036d38d76e5cc003eeb838bad0a911bc7e337e1c
+DIST xulrunner-1.9.0.2-patches-0.1.tar.bz2 6556 RMD160 766f725f67efcf58511f1dd3e1972fc40261b69b SHA1 52e135c43fcc6412fc2ce56ec3f68b86def5ec44 SHA256 bf82b553aa474cdfc6be395c4fd5813220b9b4e371c60412f83dfa5dc3452691
+DIST xulrunner-1.9.0.2.tar.bz2 34059592 RMD160 6e17594ec1a24f12d1d49317bfd8f64930a6c92b SHA1 227780bfc6cfeaf522d58e34ba52b5f3899ad91a SHA256 1b3e915340970b82e6bec0d20aec0cc1b1e343338d7acd64dadc70f5a8bf5c8d
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD xulrunner-1.8.1.11.ebuild 4850 RMD160 e0bb71f4708d288365f296c8946f69699df1189b SHA1 5a89658ab65739628a324c69ff9622b984564fab SHA256 d0917a1ca8b40876d64ef06dcfeab75812b60156ca0a8e596ca4f1ccf65b8144
 EBUILD xulrunner-1.8.1.16.ebuild 4850 RMD160 394b3d1b77ebcd5bdfeb74cef27a20f4e556d004 SHA1 0ff9a1860f02c6b3cc15c679526246c7fc1b29a6 SHA256 b8ef795125c9266dcc320aed8816f49dfa791ac377acb34fb1f10f8bae131644
+EBUILD xulrunner-1.8.1.17.ebuild 4855 RMD160 aeac027d02cf643339d27cbfcdff2386b64ba003 SHA1 de8e516f488a27f96d769b258bf2d44c28c6df18 SHA256 f1e7d0f68b6475407d00e8194e4e7422018e2cc4349da34000ec953344b291ef
 EBUILD xulrunner-1.9-r2.ebuild 5345 RMD160 8b0073136ff1a9683fc96941947de296b54bd386 SHA1 f97f0b496b2b72e2d451f07e15a00edd7df8b9ff SHA256 ca1e303aad26f1b0f76c101a08c58d3fdf5caa255812b81263fc641aa7b0684c
 EBUILD xulrunner-1.9.0.1.ebuild 4915 RMD160 ef64512de7095fb1a3b6a9e5a9c90f37ff1ac892 SHA1 030b146ecb6d23159d28805a3109a9a0dd20f1bf SHA256 c91b9b26ff1def44162c8cd0cbcc879530b546967c2fe103a2cac4608bb9d4d6
-MISC ChangeLog 17573 RMD160 e8c47015fb0f616b1374adee2f58756cf493e27b SHA1 c0d0ba582d2da420ac7c50cc256aace665d75bd4 SHA256 f6d50ab684749714b2308751a81a9a6204d92e9920d4b54c7f4c03f6a3f03f3a
+EBUILD xulrunner-1.9.0.2.ebuild 4915 RMD160 6ff8eba114a069b5c38499ff30f4739595939773 SHA1 f37660fa17e84b2ee3ec1c48b3c4e336f8e50f07 SHA256 e0b8d5502be4451372ae46c199d866a730eb57c994a019c0cae27994c7ebe5cf
+MISC ChangeLog 17763 RMD160 bf074687eb4c1fdcf513a07ad1329b4dc13e545e SHA1 d97e343b409d572735a1e57337ca123f9620a64a SHA256 4253b476e1d570e3cbd4c3019e8723e8c958e6aa87062343638063e12663e92f
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.17.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.17.ebuild
new file mode 100644
index 000000000000..7daa0f7663fb
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.1.17.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.17.ebuild,v 1.1 2008/09/24 17:06:13 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.2.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.2.ebuild
new file mode 100644
index 000000000000..755e3b438a60
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.0.2.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.2.ebuild,v 1.1 2008/09/24 17:06:13 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
+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://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~armin76/${P}.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~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
+}