| 1 |
vapier 13/04/29 16:46:25 |
| 2 |
|
| 3 |
Modified: phantomjs-1.9.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Clean up random problems (but does not fix them all -- see #409991). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 www-client/phantomjs/phantomjs-1.9.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: phantomjs-1.9.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- phantomjs-1.9.0.ebuild 25 Apr 2013 22:16:43 -0000 1.4 |
| 23 |
+++ phantomjs-1.9.0.ebuild 29 Apr 2013 16:46:25 -0000 1.5 |
| 24 |
@@ -1,12 +1,12 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.4 2013/04/25 22:16:43 zx2c4 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.0.ebuild,v 1.5 2013/04/29 16:46:25 vapier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
-inherit toolchain-funcs pax-utils |
| 33 |
+inherit toolchain-funcs pax-utils multiprocessing |
| 34 |
|
| 35 |
-DESCRIPTION="A headless WebKit scriptable with a JavaScript API." |
| 36 |
+DESCRIPTION="A headless WebKit scriptable with a JavaScript API" |
| 37 |
HOMEPAGE="http://phantomjs.org/" |
| 38 |
SRC_URI="https://phantomjs.googlecode.com/files/${P}-source.zip" |
| 39 |
|
| 40 |
@@ -15,15 +15,22 @@ |
| 41 |
KEYWORDS="~amd64 ~x86" |
| 42 |
IUSE="examples" |
| 43 |
|
| 44 |
-DEPEND="media-libs/fontconfig media-libs/freetype dev-libs/icu" |
| 45 |
-RDEPEND="${DEPEND}" |
| 46 |
- |
| 47 |
+RDEPEND="dev-libs/icu |
| 48 |
+ dev-libs/openssl |
| 49 |
+ media-libs/fontconfig |
| 50 |
+ media-libs/freetype" |
| 51 |
+DEPEND="${RDEPEND} |
| 52 |
+ virtual/pkgconfig" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
- sed -i 's/# CONFIG += text_breaking_with_icu/CONFIG += text_breaking_with_icu/' \ |
| 56 |
- src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri |
| 57 |
+ sed -i \ |
| 58 |
+ -e '/^# CONFIG += text_breaking_with_icu/s:#::' \ |
| 59 |
+ src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \ |
| 60 |
+ || die |
| 61 |
+ |
| 62 |
# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache |
| 63 |
- sed -e "/^SYSTEM_VARIABLES=/i \ |
| 64 |
+ sed -i \ |
| 65 |
+ -e "/^SYSTEM_VARIABLES=/i \ |
| 66 |
CC='$(tc-getCC)'\n\ |
| 67 |
CXX='$(tc-getCXX)'\n\ |
| 68 |
CFLAGS='${CFLAGS}'\n\ |
| 69 |
@@ -35,19 +42,23 @@ |
| 70 |
QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\ |
| 71 |
QMakeVar set QMAKE_LFLAGS_RELEASE\n\ |
| 72 |
QMakeVar set QMAKE_LFLAGS_DEBUG\n"\ |
| 73 |
- -i src/qt/configure \ |
| 74 |
- || die "sed SYSTEM_VARIABLES failed" |
| 75 |
+ src/qt/configure \ |
| 76 |
+ || die |
| 77 |
|
| 78 |
# Respect CC, CXX, LINK and *FLAGS in config.tests |
| 79 |
- find src/qt/config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ |
| 80 |
+ find src/qt/config.tests/unix -name '*.test' -type f -exec \ |
| 81 |
sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \ |
| 82 |
'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ |
| 83 |
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ |
| 84 |
- || die "sed config.tests failed" |
| 85 |
+ {} + || die |
| 86 |
} |
| 87 |
|
| 88 |
src_compile() { |
| 89 |
- ./build.sh --confirm --qt-config $(pkg-config --cflags-only-I freetype2) || die |
| 90 |
+ ./build.sh \ |
| 91 |
+ --confirm \ |
| 92 |
+ --jobs $(makeopts_jobs) \ |
| 93 |
+ --qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \ |
| 94 |
+ || die |
| 95 |
} |
| 96 |
|
| 97 |
src_test() { |
| 98 |
@@ -56,10 +67,10 @@ |
| 99 |
|
| 100 |
src_install() { |
| 101 |
pax-mark m bin/phantomjs || die |
| 102 |
- dobin bin/phantomjs || die |
| 103 |
+ dobin bin/phantomjs |
| 104 |
dodoc ChangeLog README.md |
| 105 |
if use examples ; then |
| 106 |
docinto examples |
| 107 |
- dodoc examples/* || die |
| 108 |
+ dodoc examples/* |
| 109 |
fi |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
1.9 www-client/phantomjs/ChangeLog |
| 115 |
|
| 116 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.9&view=markup |
| 117 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?rev=1.9&content-type=text/plain |
| 118 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/phantomjs/ChangeLog?r1=1.8&r2=1.9 |
| 119 |
|
| 120 |
Index: ChangeLog |
| 121 |
=================================================================== |
| 122 |
RCS file: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v |
| 123 |
retrieving revision 1.8 |
| 124 |
retrieving revision 1.9 |
| 125 |
diff -u -r1.8 -r1.9 |
| 126 |
--- ChangeLog 25 Apr 2013 22:06:45 -0000 1.8 |
| 127 |
+++ ChangeLog 29 Apr 2013 16:46:25 -0000 1.9 |
| 128 |
@@ -1,6 +1,9 @@ |
| 129 |
# ChangeLog for www-client/phantomjs |
| 130 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 131 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.8 2013/04/25 22:06:45 zx2c4 Exp $ |
| 132 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/ChangeLog,v 1.9 2013/04/29 16:46:25 vapier Exp $ |
| 133 |
+ |
| 134 |
+ 29 Apr 2013; Mike Frysinger <vapier@g.o> phantomjs-1.9.0.ebuild: |
| 135 |
+ Clean up random problems (but does not fix them all -- see #409991). |
| 136 |
|
| 137 |
25 Apr 2013; Jason A. Donenfeld <zx2c4@g.o> phantomjs-1.9.0.ebuild: |
| 138 |
Respect CFLAGS. |
Archives