Improvements and optional use of bundled libs by jbergstroem

Package-Manager: portage-2.2.18/cvs/Linux x86_64

diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog
index 4ea8c8934dbc323d43ae1c5d19863b52dd3f6a04..c35b6e9321906204f01556c3d381e3f960e957b6 100644 (file)
--- a/net-libs/iojs/ChangeLog
+++ b/net-libs/iojs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/iojs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.13 2015/04/02 06:48:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.14 2015/04/02 07:18:51 patrick Exp $
+
+*iojs-1.6.3-r1 (02 Apr 2015)
+
+  02 Apr 2015; Patrick Lauer <patrick@gentoo.org> +iojs-1.6.3-r1.ebuild,
+  metadata.xml:
+  Improvements and optional use of bundled libs by jbergstroem
 
 *iojs-1.6.3 (02 Apr 2015)
 

diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
index ee8fe16e424e9314d649763acd1c250177b880fc..16e3eb1627d7807557d3a4b8833ddddfe24e935f 100644 (file)
--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@@ -15,6 +15,7 @@ EBUILD iojs-1.3.0.ebuild 3196 SHA256 992dfefa9ff65b9b86a261eed75076e238d41032415
 EBUILD iojs-1.4.1.ebuild 3196 SHA256 4edbc85d2e893e861eccd72cdb8575a1c45961b4f2735eaff9cb2b236f8c05f6 SHA512 0424719885e619245b56b8e3f35e035df19a7fb29279ccea6779aafca1418f370292c8fbc204ee8750101b800c9ccea29f2fb2491c1a5fd6080d1c6b3e106301 WHIRLPOOL f23a3f5074f495b5ea45b4c90bcf3a745655f0e42acba2a2e360a40f2d0bcbbca572432733520d91e5aee250e123a08327d01a7dc21ba72f502ab52a49aa0a6e
 EBUILD iojs-1.5.1.ebuild 3230 SHA256 589222f34461e454c76013385280878ac4bf2998c7df7553ef68f7f85aeb2508 SHA512 4da8364afaa14724474c0fc6a7354bc6d4bac4347ba2ebc2f95ed13d3ccc63b56c133e44ea7f044781ae57b2f4451a6c6e27807fc3dd7c01259413c5c16851d9 WHIRLPOOL de3290b1a4a69e3ed3435c947804716a250f979032dc3ac33104d1531bcc7ea291e1c2f4a5f7ef236d7fd95c57164eb09540c73c9083e67a1e2f4c88131da506
 EBUILD iojs-1.6.2.ebuild 3194 SHA256 16d3351798df810d7a65a3e040e01fc030447406a09443a2c4ae1720d4dd47b9 SHA512 6692d158e946bea196a5792d9ea493d6c6f8e2e3dbd0e320b48bc6b45409270babca96a901cdce2145da883f9304db73b233fb9a4f33b28242d9dee56178f39e WHIRLPOOL 5f12144db7748a6f23bc297f8f264844ac2446a40c67dc3d3a69f9c0e284902f92f219d1e6326bb7f4a9603f0c1f5a2bbdd3443ffa2a8b3fec6143dd7e5e72d8
+EBUILD iojs-1.6.3-r1.ebuild 3316 SHA256 2fa94cceebd91f4ab8da42dda44728fd9a53c20c44273ade80540f8e695932af SHA512 e5c0bb26b2cdefce72ba437feac789da59f8cb062900ebc81e1c6160e74cda7fc9eb3f1b620ab6fedb1209b58dd788ecd08a312bc9775a752ef171458c1b1223 WHIRLPOOL 108a655524271d60ac6a24c55bda310282a621c0ddb1425ad313d35244793309baeca2f58d6a1a1495730d9f53aa1f7c26862f50ba96ffbca06104e890541df7
 EBUILD iojs-1.6.3.ebuild 3194 SHA256 8895cae3249eb4e23fea9a8f169f4ce1d6ff07314eaa39a641b8d1a474c93514 SHA512 b82ea099551d4720cad4b49f8a463f6ee0d285f49f979d1e87ad55dfbd1d8273d0f3e9555e7b81b310a418302ace4871f4eba609fa821d27f22e616b883b2d58 WHIRLPOOL f8ef47a138ae118b6e75327ce3a914235839689d43eb20f881c0963a21baf8de82a01cea37bd0b0166d460ba044ca1f7960cae456e72b3eee9b9c7ae386bb123
-MISC ChangeLog 1882 SHA256 671fb1b514d3f16722fff3899081d8f4b399a358612db731f69ca04ecdc43be6 SHA512 9baf44fc677a8c38bebad93e1fa62b77c908fb61d3c0b5088d45c59fdbba5e4dfde82f0195c56685c18638ec76bdd3641d8da15dabf35c696de893a6aaef8130 WHIRLPOOL 12c0d4ee8ac56e09e55381f81752c44eccf70e773be3b14d46a291db4f21ab67a6374349c452ac3a0a565bf59bd1b9bea4df45573f5d77c2a62929e4e8edd9ab
-MISC metadata.xml 545 SHA256 ea98b41b3fe8288a7b38649098871f33c897916aaa34c718f8b849bc35d15c12 SHA512 f32b1eced5dada7827c10bb7b59986400d8dce58dc8c2c0b03d3acd0886b539d2c0afa7956c8a0d1b1ae1894eae31c520368c524bd4c7fb5930180fc8bc4b035 WHIRLPOOL f3fe5d3c70386787eae1cc856f7a57d775738096777074b50678f45ed7e5c9c2575c21a452e75d9a5d06245c85c17434593a7b3d0b5f0c4ec932fd3c7a8b84aa
+MISC ChangeLog 2065 SHA256 e3c188387c6393cc6ad67121f460f855dd56a2e12ed10f23d61c28ec56ec7c00 SHA512 71629856710b802145c4a93402b8269847e494c57467672ab9183f542c1fa1835a74d85bae7bcf5ab6bdf861aa4b53be4e7e80f48f2ff41259512bdb43328bde WHIRLPOOL 55628366bfb0526705533b9c88d8f60b19438ee1de33d286d39586f1f5fdf4191161e9d1ecf690a902b0eb6ff759c5dd885273be955d14fabb3fd33abe26e9c0
+MISC metadata.xml 619 SHA256 8f10a6ab63addd0163f1e9fdaca6967afd042984e7d87156a279c172bb8d33af SHA512 466393773f8b103604eb68890bd75ee3a1d308d9ec7e330c1b926d766cf015133fc75ec5dfef60014a8c01f0160d1e6efccfcdb27f656c2405a0c60b5c4baff6 WHIRLPOOL ec7d788a32828fe33b991b46e32a121b6ea914cbdf487cebd4a5d4058fdc1e611fbfc737fd448dcf195c90d1e2162e953cd141da51eba448336c7fda5d717032

diff --git a/net-libs/iojs/iojs-1.6.3-r1.ebuild b/net-libs/iojs/iojs-1.6.3-r1.ebuild
new file mode 100644 (file)
index 0000000..712ffdb
--- /dev/null
+++ b/net-libs/iojs/iojs-1.6.3-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.6.3-r1.ebuild,v 1.1 2015/04/02 07:18:51 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit python-any-r1 pax-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bundled-libs icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+       !bundled-libs? (
+               >=net-libs/http-parser-2.3
+               >=dev-libs/libuv-1.4.2
+               >=dev-libs/openssl-1.0.1m[-bindist]
+       )"
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
+       !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+       if ! test-flag-CXX -std=c++11 ; then
+               die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+       fi
+}
+
+src_prepare() {
+       # fix compilation on Darwin
+       # http://code.google.com/p/gyp/issues/detail?id=260
+       sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+       # make sure we use python2.* while using gyp
+       sed -i -e "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+       sed -i -e "s/|| 'python'/|| 'python2'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+       # less verbose install output (stating the same as portage, basically)
+       sed -i -e "/print/d" tools/install.py || die
+
+       # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+       local LIBDIR=$(get_libdir)
+       sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+       sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+       sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+       epatch "${FILESDIR}"/${PN}-1.2.0-pkgconfig.patch
+
+       # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+       # seem sandbox related either (invoking it from a sandbox works fine).
+       # The issue is that no stdin handle is openened when asked for one.
+       # It doesn't really belong upstream , so it'll just be removed until someone
+       # with more gentoo-knowledge than me (jbergstroem) figures it out.
+       rm test/parallel/test-stdout-close-unref.js
+}
+
+src_configure() {
+       tc-export CC CXX PKG_CONFIG
+       export V=1
+
+       local myconf=()
+       local myarch=""
+       use bundled-libs || myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+       use npm || myconf+=( --without-npm )
+       use icu && myconf+=( --with-intl=system-icu )
+       use snapshot && myconf+=( --with-snapshot )
+       use ssl || myconf+=( --without-ssl )
+
+       case ${ARCH} in
+       x86) myarch="ia32";;
+       amd64)
+               case ${ABI} in
+               x86) myarch="ia32";;
+               x32) myarch="x32";;
+               *) myarch="x64";;
+               esac
+               ;;
+       arm) myarch="arm";;
+       arm64) myarch="arm64";;
+       *) die "Unrecognized ARCH ${ARCH}";;
+       esac
+
+       "${PYTHON}" configure \
+               --prefix="${EPREFIX}"/usr \
+               --dest-cpu=${myarch} \
+               --without-dtrace \
+               "${myconf[@]}" || die
+}
+
+src_install() {
+       local LIBDIR="${ED}/usr/$(get_libdir)"
+       emake install DESTDIR="${ED}"
+
+       use npm && dohtml -r "${LIBDIR}"/node_modules/npm/html/*
+       rm -rf "${LIBDIR}"/node_modules/npm/{doc,html}
+       rm -rf "${LIBDIR}"/dtrace
+       find "${LIBDIR}"/node_modules -type f -name "LICENSE" -delete
+
+       pax-mark -m "${ED}"/usr/bin/iojs
+}
\ No newline at end of file

diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml
index 4dbbc90e24fd1859d6e4be0b63d2d0525329ca55..d4e6fdc6ff1ffd830e6df5f62a08b30f84b5a255 100644 (file)
--- a/net-libs/iojs/metadata.xml
+++ b/net-libs/iojs/metadata.xml
@@ -11,6 +11,7 @@
                <name>Patrick Lauer</name>
        </maintainer>
        <use>
+       <flag name='bundled-libs'>Use bundled libs instead of system libs</flag>
        <flag name='npm'>Enable NPM package manager</flag>
        <flag name='snapshot'>Enable snapshot creation for faster startup</flag>
        </use>