Clean up random problems (but does not fix them all -- see #409991).

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 55 insertions, 21 deletions

diff --git a/www-client/phantomjs/ChangeLog b/www-client/phantomjs/ChangeLog
index 9de2e6908eb5..d51d86d02b06 100644
--- a/www-client/phantomjs/ChangeLog
+++ b/www-client/phantomjs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/phantomjs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.8 2013/04/25 22:06:45 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.9 2013/04/29 16:46:25 vapier Exp $
+
+  29 Apr 2013; Mike Frysinger <vapier@gentoo.org> phantomjs-1.9.0.ebuild:
+  Clean up random problems (but does not fix them all -- see #409991).
 
   25 Apr 2013; Jason A. Donenfeld <zx2c4@gentoo.org> phantomjs-1.9.0.ebuild:
   Respect CFLAGS.
diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
index 623dbb35fbae..b9d1359e3382 100644
--- a/www-client/phantomjs/Manifest
+++ b/www-client/phantomjs/Manifest
@@ -1,8 +1,28 @@
-DIST phantomjs-1.3.0-source.tar.gz 409428 SHA256 1402aed67db7298f1dad54755e16c49e12201b5dbbb8bc895d966c4a648ee25f
-DIST phantomjs-1.4.1-source.tar.gz 497856 SHA256 93df6e2125d560c10519a79b5502833b37a4986a2bc9fc42cc6d65e3536d20a4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST phantomjs-1.3.0-source.tar.gz 409428 SHA256 1402aed67db7298f1dad54755e16c49e12201b5dbbb8bc895d966c4a648ee25f SHA512 451a95461d3158af05094f87a2a442497cef3058937704948d3e9e17ac897db4a06f3b1cd9f3a455f308769a5292a150388755152dde45e74dae2e8d1df43269 WHIRLPOOL 17bee4c72af0848bf00d82c0c6e8c381bf26f1b15ec357d4842961f710e729d51197e32a86cd8ecbafa1a2dded74e4001f92913687848f1217f337ba588dd526
+DIST phantomjs-1.4.1-source.tar.gz 497856 SHA256 93df6e2125d560c10519a79b5502833b37a4986a2bc9fc42cc6d65e3536d20a4 SHA512 ac608b3efe99b76fa3b8394eb76ca551a742ee7c3c2205936a4ab9b029fd48984ac059cde37c17894f4d1e110c3d2649978fceaa53056e146558fd95addb976b WHIRLPOOL d02a38b2accb8556688a8f644efd0c802fdad523c7cc112dc68493f85607eebec93b044b9247a75b4a92c958b2a5f80ab54ab839c5a0900508f931fc292a94c0
 DIST phantomjs-1.9.0-source.zip 40903639 SHA256 f51ebd98df9fd628544b719b41bb5b42a180afa603888c62a04e5e5ace588d0b SHA512 3631008ba0f133282801acee7d7b1af04f7bc30025331ab7da6ffc8c7a80961533d8985809198989d0fb6f8e8d57b6e3576363e9fb457fc438b3a4a148e75595 WHIRLPOOL f04dc1a6e6f1a63a8993304d62846524ca69a2f1be03a9ac4ecc1cc19d95d5bfbd06d8a435495b72d43f32080367187b40a0b106adbc766f0ec7e2ec5844f848
 EBUILD phantomjs-1.3.0.ebuild 1450 SHA256 2bab9b723b6d424948106df6b5648eeb4689ec8bf794c3492a6fa79eea8c2943 SHA512 2132b44fb02670dc5a372e66c88985d51444f2b21157c3be45f9537bf50b880b18b5e2c1c6b7a43b918051cad4266b8683f67ccf799a51e2f891adc57fd50876 WHIRLPOOL b76ebe97e2c0d896d3d21a9046b1a88fbd8b9545a806b6e15ffb0d7670b927ef5564e3eae5e741d2e30cf2c43c437fa4f41e129f3da5f74c6fb6b3e07f534a3a
 EBUILD phantomjs-1.4.1.ebuild 1508 SHA256 0fc41bed966d3508db0777b69e5a9415cfdb0ea8b333f1ba9a532588768f9a4c SHA512 fdda7b98b9c12e4de7f7e7e531a2c5f12d3303ba5e6baa89df213e8059916e87a7d2f964e6f9e2e419a092b5b1fb78c3d4ff6c8fc4ff8e4a8310f345af219f55 WHIRLPOOL aa83fc5066fe68d2f380e1f3dec170c6c31c78b06288ca4ed0f0dad784ab786cac01b330422329f33df698d65c27d2ffbc9733be299f151d13443a995af23740
-EBUILD phantomjs-1.9.0.ebuild 1980 SHA256 07aead5717854e1f5e64526f982487dbbe7206e97c22c96339199c61c55a73e4 SHA512 8c603da10c88fdf2dfcfdc2fff8f8373581d3f962c19290702861177f108bbcad17162c9817e1e2464aa92f42b4ba37bd6d8c14ee00cb0da7991b0d330c74d77 WHIRLPOOL 49da42fa2aa514a72a29b38690bf349fb57040c88c440cf74836e36f59b92d75cdc669c385f23eb13a5d16a838d56268003a5654852508c342a7ccd5a1c13334
-MISC ChangeLog 1378 SHA256 80c69a115c839885f13e1bef38391d85cbae26052da3c3e8c23f929894225c56 SHA512 ab47226e1663439530285892907d0f5efad9d31b8943ea4c4e9481b699ffc42f6716970a5303099231db4fa6e72c20ba2c26bb6bd291ef10c58177d2b6d639b5 WHIRLPOOL 612a55acab29d7dffc56316f3f52692f7724ec5c71a8c9136a5716d8c1925d632729f152f431fee7121b2213949dfca2e5611ddf468d9d07f303229712757af8
+EBUILD phantomjs-1.9.0.ebuild 2004 SHA256 e33115e2244eccbbc32918d1b4d259e8ee0f21d46bdb1c60e33cbed45feb4b92 SHA512 9e258db76fbc3f6c24fc783596d07bac41aebc329177a2118347f4a6cb97e88a6467cd26563c4b0cc5eafecc0a2fde4988c7b92c53e7d41c7937c6f2746e7ab6 WHIRLPOOL 098d8a44b1a44d91daf7b855d5f10eb191dc8fa38c55e7b8d813ae937979982357cb702a50c2c7e9c5d7d2309fab3c3a8b1deed4c491fa7757a16ecd0fc71a91
+MISC ChangeLog 1525 SHA256 728e5e1b5d7f9b5fc40afa22d3e252311339ac73761889579039cbb327344538 SHA512 50431d2a0f3bd8044bf4848b6f73010b07a811478309eaebae7d3f3a684b37b4f5eabcf35c8199a5cfa00b1b2b6c5f9bb85aef3ba24e28919c4e3b5659f7e1c5 WHIRLPOOL beda0181bc87e697996a9464509796ba14fb5127aa9933efad4c57854b0d56a1645a95e2b40310f5e730267b786524b100ec0a2483ca28adf0bbf2088fbe1bb2
 MISC metadata.xml 420 SHA256 2a3b76c80d96c1cc0597842dd6fbdb4b8a891088a2a4bb2edb386fda5feabea3 SHA512 5760edb22a893ffdb13b9aefd3947d5413277cd6e3f4882f5241835d8bca4e519a8e4a61377239b426810d8999138a67acc9d6dbe39a397128adc2dc81f00988 WHIRLPOOL fedfeb03f2024a71713c0aa306268bd6b187743b136f1c8ba7e023ec91a01df974a649ac22fbfddaae43b0083fc40972df73f13338972d464672b732be5b571c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRfqPlAAoJELEHsLL7fEFWGCUP/RU2oQI/Fr1OClWCTpzKpBeP
+fdEWQjcI5JZe9ltylMk4d0i4DSS2LAiF9EoWKRfl5jePGk4cHKQsfOmwrIaO3Yvg
+seAEOyQlVCeBUbkZzrKgFGNMwUmLGFpby03grasck+xdCyhs7FMpoeFCVuuAGUm7
+RlWc9y2ZUSi3TQ42d/UX1/uAscnUiNzaD+OBig9j1uRwfYS7yj304+Jf01fahzlZ
+wD5nIDbZgl36Qldu1OrOR1rypNXpBGV0iHbs8KKBmPPiHi6G9UduQZM/2AGKmhQR
+bN8BZM4mlVKQMdCLeaD8LdEj6vs8ny1H7KzWubwGyD8lMKKcHDoGy36sZJ6kz0qW
+MIXlkPqmNQno+sha9JW56m1xDOPxLAzIDUWq3Hg3ggWOABs9XjN6x2frq6/EP4xV
+jGEsviLdb//SzNHPX7vRXk+0fdvEzgFnuehZlU9tXAMq1INrASjFg+GTVwsRkIgC
+9T5NVD+ICQQ6gRUC/WCS469U8O5pfOdKEzeA4tN9BWnEt+xeEfrcQfsmElzwqPF8
+spfT34DjwRIJh0O2uImW+1Zoxv0A7WTBglqpHdv0NNQedK863gAcmUeRnJLcJxk0
+hySGzfCTx6NAMl+2eXlK6TS5FAZyspncoK86BUuroDQFnDq+aYuBFv7ahSNLJNIu
+11JcniGOELMopn60i8oP
+=g3dU
+-----END PGP SIGNATURE-----
diff --git a/www-client/phantomjs/phantomjs-1.9.0.ebuild b/www-client/phantomjs/phantomjs-1.9.0.ebuild
index 79fe28be1f5e..810019df7607 100644
--- a/www-client/phantomjs/phantomjs-1.9.0.ebuild
+++ b/www-client/phantomjs/phantomjs-1.9.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.4 2013/04/25 22:16:43 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.5 2013/04/29 16:46:25 vapier Exp $
 
 EAPI=5
 
-inherit toolchain-funcs pax-utils
+inherit toolchain-funcs pax-utils multiprocessing
 
-DESCRIPTION="A headless WebKit scriptable with a JavaScript API."
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
 HOMEPAGE="http://phantomjs.org/"
 SRC_URI="https://phantomjs.googlecode.com/files/${P}-source.zip"
 
@@ -15,15 +15,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="media-libs/fontconfig media-libs/freetype dev-libs/icu"
-RDEPEND="${DEPEND}"
-
+RDEPEND="dev-libs/icu
+	dev-libs/openssl
+	media-libs/fontconfig
+	media-libs/freetype"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
-	sed -i 's/# CONFIG += text_breaking_with_icu/CONFIG += text_breaking_with_icu/' \
-	src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
+	sed -i \
+		-e '/^# CONFIG += text_breaking_with_icu/s:#::' \
+		src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \
+		|| die
+
 	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
-	sed -e "/^SYSTEM_VARIABLES=/i \
+	sed -i \
+		-e "/^SYSTEM_VARIABLES=/i \
 		CC='$(tc-getCC)'\n\
 		CXX='$(tc-getCXX)'\n\
 		CFLAGS='${CFLAGS}'\n\
@@ -35,19 +42,23 @@ src_prepare() {
 		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
 		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
 		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
-		-i src/qt/configure \
-		|| die "sed SYSTEM_VARIABLES failed"
+		src/qt/configure \
+		|| die
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
-	find src/qt/config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+	find src/qt/config.tests/unix -name '*.test' -type f -exec \
 		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
 			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		|| die "sed config.tests failed"
+		{} + || die
 }
 
 src_compile() {
-	./build.sh --confirm --qt-config $(pkg-config --cflags-only-I freetype2) || die
+	./build.sh \
+		--confirm \
+		--jobs $(makeopts_jobs) \
+		--qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
+		|| die
 }
 
 src_test() {
@@ -56,10 +67,10 @@ src_test() {
 
 src_install() {
 	pax-mark m bin/phantomjs || die
-	dobin bin/phantomjs || die
+	dobin bin/phantomjs
 	dodoc ChangeLog README.md
 	if use examples ; then
 		docinto examples
-		dodoc examples/* || die
+		dodoc examples/*
 	fi
 }