Add 1.9

Package-Manager: portage-2.1.4.4

3 files changed, 51 insertions, 40 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index aa2924e39d49..de537bba96f9 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,12 @@
 # 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.98 2008/03/28 01:05:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.99 2008/04/08 20:12:50 armin76 Exp $
+
+*xulrunner-1.9_beta5 (08 Apr 2008)
+
+  08 Apr 2008; Raúl Porcel <armin76@gentoo.org> -xulrunner-1.8.1.12.ebuild,
+  +xulrunner-1.9_beta5.ebuild:
+  Add 1.9
 
   28 Mar 2008; Jeroen Roovers <jer@gentoo.org> xulrunner-1.8.1.13.ebuild:
   Stable for HPPA (bug #214816).
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index a0875cea5530..0dc06711b92e 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,11 +1,12 @@
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST xulrunner-1.8.1.11-patches-0.3.tar.bz2 62521 RMD160 06cb96500076ed532e5eead97b9fa4b10039baf9 SHA1 aac43a59f72343d4e7a5ff93fbb08ff683288176 SHA256 7211b85d309039907a4acb320f6434ddca36e600cf52ea709f4faf7a89a20eed
 DIST xulrunner-1.8.1.11-source.tar.bz2 35475483 RMD160 d2edc6abb2733942bbe37709644bddae2f17362b SHA1 87e005deaf13ef4bdc36a2a818a6ae847fde33be SHA256 072fb6dea5f4bc06c94ec237a97b23dabeecc5e6a74754b4259dbf2eb9c00945
-DIST xulrunner-1.8.1.12-source.tar.bz2 35446410 RMD160 245d9274a89e00af9ae7f012df4cac8f0477bcca SHA1 841eecac53198ed59cb00a419a789a8ce7cc614f SHA256 d21e4ba50a227f33ba5b47602e2cfef4bf233c41442f680c0038e64710f2d45d
 DIST xulrunner-1.8.1.13-patches-0.1.tar.bz2 61868 RMD160 99ae55b9a05904dd59bc700dc1d2676603a60364 SHA1 87a9eb02f8fcb133059cbfb03c03e73bb9df670a SHA256 815efb6b9a0effe6f44016ec022784a3ab9967799dd737a856f7c5424c8f746d
 DIST xulrunner-1.8.1.13-source.tar.bz2 35394606 RMD160 9b95f0df76596f4d0e50e65bf732b60e3ece8f8b SHA1 3e9ea898c90e36e95fc4a3cc6e9218374f327097 SHA256 23034b56f397c716af6225300907d62b4c4a09ff50d31e00c87c769eea01503e
+DIST xulrunner-1.9_beta5-patches-0.1.tar.bz2 5112 RMD160 d851c1cb927dc63963880a1f6286c425111a739a SHA1 784dfa444370e5fe19548aafbe09225ff1e78cdf SHA256 fdec53524d40f1222569e55b16f717715276ca68e8bbcfebe50d02a8f18253a6
+DIST xulrunner-1.9_beta5.tar.bz2 33648303 RMD160 771c4c5f26cda935335554961a8eb99a1e33277a SHA1 97afbca3bda1a25d0e9755c70da9376e1425b47b SHA256 e9424d7ab292bdc1c9909ee1820a77e88a136805129ef8d252de9ff4d4b2c116
 EBUILD xulrunner-1.8.1.11.ebuild 4858 RMD160 17de41e45e8b18be49bcbdc12d70ff06ced7ce60 SHA1 0e12768437e8dca58af17cc0330e003bca575e76 SHA256 d8fc4b0b29beecbd73135ed4d51bed81476dde139eb604e1a20fe3725dc453ab
-EBUILD xulrunner-1.8.1.12.ebuild 4837 RMD160 4ce9c81c21f70b317894567ff42e29ced772e674 SHA1 95d7bf42e6c09d244ea45547e98eb89ebe569bc0 SHA256 643cf7c131d24a89ca84c5dbb5c1742c8526ede4eeff6607557dfb7d8f612a97
 EBUILD xulrunner-1.8.1.13.ebuild 4822 RMD160 9128cc494c1826e8fc2ad77c4ec7a934506d033e SHA1 a5127b29d9b81c2d616554e45ed336595edc6fa0 SHA256 4f0b26d61ca958619ff3ba75092c79b5005ccabeba8716dc26247fa03d8b66e2
-MISC ChangeLog 12097 RMD160 a174c76291fad86924fdd6234dc16b9c9f83f8d0 SHA1 baf64c274f9cbf130ab5575553e4593000198a22 SHA256 575595a0ef0aece0494212c8f9bbac48291c76cb4a0d67348757756b55094f8a
+EBUILD xulrunner-1.9_beta5.ebuild 4847 RMD160 da7cc43dfcdf64d9cfcf5a2e3b53049bf4720bf6 SHA1 b73d52de8ec235053b2763ef145cb58b60ee4205 SHA256 daa7e3dabf89973e88ae3edbd29156d5871e05fdcdcc3b2c4e50326318f6f169
+MISC ChangeLog 12256 RMD160 d40a6fd06ab4a0aa7efeb94b1dd2aa4a4faa2c06 SHA1 09e2056b7a707ee44720412cea66978576e0ebfa SHA256 c3020d55b302a4fef3906542c92e82ca1b3c6f27c198e255fabcc9ee35f1dcf6
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.12.ebuild b/net-libs/xulrunner/xulrunner-1.9_beta5.ebuild
index 2cdbf4dc8c75..7ee87c18fc99 100644
--- a/net-libs/xulrunner/xulrunner-1.8.1.12.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9_beta5.ebuild
@@ -1,27 +1,29 @@
 # 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.12.ebuild,v 1.10 2008/03/18 17:18:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9_beta5.ebuild,v 1.1 2008/04/08 20:12:50 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.11-patches-0.3"
+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}-source.tar.bz2
+SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${PATCH}.tar.bz2"
 
-SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="1.9"
 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
+RDEPEND="java? ( >=virtual/jre-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 )"
+	>=dev-libs/nss-3.12_beta3
+	>=dev-libs/nspr-4.7.1_beta2
+	>=app-text/hunspell-1.1.9
+	>=media-libs/lcms-1.17
+	>=dev-db/sqlite-3.5"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}
@@ -37,7 +39,7 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
 src_unpack() {
-	unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
+	unpack ${A}
 
 	# Apply our patches
 	cd "${S}" || die "cd failed"
@@ -49,7 +51,7 @@ src_unpack() {
 }
 
 src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
 
 	####################################
 	#
@@ -60,23 +62,32 @@ src_compile() {
 	mozconfig_init
 	mozconfig_config
 
-	mozconfig_annotate '' --enable-extensions="default,cookie,permissions,spellcheck"
-	mozconfig_annotate '' --enable-native-uconv
+	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
-	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 'places' --enable-storage --enable-places --enable-places_bookmarks
+
+	# 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
+	#disable java 
 	if ! use java ; then
 		mozconfig_annotate '-java' --disable-javaxpcom
 	fi
@@ -106,8 +117,8 @@ src_compile() {
 	# 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
+		${S}/config/autoconf.mk \
+		${S}/toolkit/content/buildconfig.html
 
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
@@ -117,8 +128,15 @@ src_compile() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	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 ${D}${MOZILLA_FIVE_HOME}/xulrunner-bin /usr/bin/xulrunner-1.9
+
 	X_DATE=`date +%Y%m%d`
 
 	# Add Gentoo package version to preferences - copied from debian rules
@@ -132,22 +150,8 @@ src_install() {
 		>> "${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
+	    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."
-}