Version bump

Package-Manager: portage-2.1.6.7/cvs/Linux ia64

3 files changed, 23 insertions, 30 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index a1b6048bd2d8..f707987ecc55 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.201 2009/04/22 18:03:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.202 2009/04/28 14:05:48 armin76 Exp $
+
+*xulrunner-1.9.0.10 (28 Apr 2009)
+
+  28 Apr 2009; Raúl Porcel <armin76@gentoo.org> -xulrunner-1.9.0.9.ebuild,
+  +xulrunner-1.9.0.10.ebuild:
+  Version bump
 
 *xulrunner-1.9.0.9 (22 Apr 2009)
 
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 4b0aa4343ed8..32f74eb41245 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,12 +1,12 @@
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73
 DIST xulrunner-1.8.1.19-source.tar.bz2 38110248 RMD160 2b742243c6370a2790f48d2ceae2be756b4737ce SHA1 fb1b85088000142e24609d5ab9e6e483a82f8917 SHA256 3c1873b3e6c660acdae9e102391bbc64274cea3ed6238d9d693ab09fcf2b53ee
+DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8318afe192e435e42 SHA1 8a48e53951216c330d4908def93a5c0201f5a890 SHA256 bc0c0d26258bc17ffa5cd513089fe94395ff8f6c17023cd363fac30cdd675410
+DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea660870a8c096 SHA1 926d9042557e2d767db91b1d183327713fb090d3 SHA256 fe4091f4de50278567b4e26effea66a998dd41f455077e1e37cff8b3417a8f34
 DIST xulrunner-1.9.0.8-patches-0.2.tar.bz2 7023 RMD160 526c6d01fa42d5d958e0504ccf8dc43362ebf292 SHA1 be8fd86abc065579e16ba7cc5e3aa7496c8782a3 SHA256 6fed6085f59534b9595fe2c13fd892695ffed5413228e1da21ae0455adbb635c
 DIST xulrunner-1.9.0.8.tar.bz2 34169400 RMD160 5b04b74bedfe6cdc023248b6b8e7b8a1a72499a2 SHA1 99adcd31779105778d03b2cfdbe59fb1d3607f7e SHA256 ac1dad103922f8c11f4f88174f21acd841e5a7fcb40ac9702707b59f0a287960
-DIST xulrunner-1.9.0.9-patches-0.1.tar.bz2 7072 RMD160 36b8fd973da54f396adc276b7f0864c0bc5c0a73 SHA1 63f68e771136c1b048d87fc510370df3d60d24f9 SHA256 198dd2bceab568e21bc0b853e314edd07cf964833e4401ab9d15f2c60dc31425
-DIST xulrunner-1.9.0.9.tar.bz2 34147943 RMD160 977711d628752098d7a3ad6b48b5d4e42100bb33 SHA1 05531747889a2529eec1e87986e870c51007a21b SHA256 251a960faa180ff46c97570c45bb8d895215b66fa21406561a0280232252dae8
 EBUILD xulrunner-1.8.1.19.ebuild 5022 RMD160 22bdb064b24d37257aebb27335243f2a6703e7c4 SHA1 52870fb58e61cd22d8b5cd459a7002201125d64d SHA256 7888b47136eab95aee6da57942b653df474732ce7c9ef1b73842d2900a9b10c9
+EBUILD xulrunner-1.9.0.10.ebuild 4714 RMD160 7253bdb44672cf8cd24dd280944201b0e70ace94 SHA1 956034f417b3411873bea1e82e52c054c1ab81cf SHA256 1fa82c798d066b467fa967dedd18397031d20252b68a1584668c5a4d1e05d7e1
 EBUILD xulrunner-1.9.0.8.ebuild 5079 RMD160 495c8093f5cd3bedef03ecfa04e0826df9562442 SHA1 0f8023fd254209a04b05f728be31f0e433d24e1c SHA256 61c02138eae32635c84dacd7e1009b43221f3bb629af9f100fb6d6d6def6b72f
-EBUILD xulrunner-1.9.0.9.ebuild 5087 RMD160 e3beb550373c1ccfda63a265e603242a45b42a8d SHA1 1cb9ca816e9fff3f48b7592dcfb1916149a4db4c SHA256 88a0bcbf9720a07a0d55eb7f643945b72d629ded9c934d97a9f744fde57e4111
-MISC ChangeLog 25786 RMD160 d4b0720027168bd75416308f26ba5379fbc2d126 SHA1 3a6199f1097cc5d9143ed565e7166b5592f4e3e1 SHA256 cff77707b261de38e49b0f11440ba03b48188e53090eada3ba745c2751fca6da
+MISC ChangeLog 25943 RMD160 4304213b7e6000001c948edda86fcf9ca1b869c2 SHA1 6ff4da59159542c4c9dacacaeca42edaf1972321 SHA256 bfaec07122dc08143b8640b0d4a1f0d0a1fa2f659bff2b05bcdfa89507fe79f1
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.9.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.10.ebuild
index 5f9b1553dd3e..991eeba1860b 100644
--- a/net-libs/xulrunner/xulrunner-1.9.0.9.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.0.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2009 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.9.ebuild,v 1.1 2009/04/22 18:03:32 armin76 Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.10.ebuild,v 1.1 2009/04/28 14:05:48 armin76 Exp $
+EAPI="2"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
@@ -24,7 +24,9 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 	>=dev-libs/nss-3.12.2
 	>=dev-libs/nspr-4.7.4
 	>=app-text/hunspell-1.1.9
-	>=media-libs/lcms-1.17"
+	>=media-libs/lcms-1.17
+	x11-libs/cairo[X]
+	x11-libs/pango[X]"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}
@@ -39,24 +41,11 @@ 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
+pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# Apply our patches
 	cd "${S}" || die "cd failed"
 	EPATCH_SUFFIX="patch" \
@@ -69,7 +58,7 @@ src_unpack() {
 	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
 }
 
-src_compile() {
+src_configure() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}-1.9"
 
 	####################################
@@ -122,16 +111,16 @@ src_compile() {
 	# Finalize and report settings
 	mozconfig_final
 
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
 	####################################
 	#
 	#  Configure and build
 	#
 	####################################
 
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
 	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	econf || die
@@ -142,8 +131,6 @@ src_compile() {
 		'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() {