patrick 15/04/02 07:18:51 Modified: metadata.xml ChangeLog Added: iojs-1.6.3-r1.ebuild Log: Improvements and optional use of bundled libs by jbergstroem (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 net-libs/iojs/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/iojs/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 27 Jan 2015 03:01:33 -0000 1.1 +++ metadata.xml 2 Apr 2015 07:18:51 -0000 1.2 @@ -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> 1.14 net-libs/iojs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?r1=1.13&r2=1.14 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ChangeLog 2 Apr 2015 06:48:25 -0000 1.13 +++ ChangeLog 2 Apr 2015 07:18:51 -0000 1.14 @@ -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 <patr...@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) 1.1 net-libs/iojs/iojs-1.6.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/iojs-1.6.3-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/iojs-1.6.3-r1.ebuild?rev=1.1&content-type=text/plain Index: iojs-1.6.3-r1.ebuild =================================================================== # 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 }
