vapier 14/11/21 09:52:17 Modified: icedtea-7.2.4.3.ebuild icedtea-7.2.4.7.ebuild icedtea-6.1.12.7.ebuild icedtea-6.1.13.3.ebuild icedtea-6.1.13.4.ebuild ChangeLog Log: Backport makeopts_jobs to older ebuilds to stop parsing MAKEOPTS directly. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.9 dev-java/icedtea/icedtea-7.2.4.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild?r1=1.8&r2=1.9 Index: icedtea-7.2.4.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- icedtea-7.2.4.3.ebuild 2 Nov 2014 08:28:40 -0000 1.8 +++ icedtea-7.2.4.3.ebuild 21 Nov 2014 09:52:17 -0000 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.8 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.9 2014/11/21 09:52:17 vapier Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) # ********************************************************* @@ -11,7 +11,7 @@ CHECKREQS_DISK_BUILD="9G" -inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic +inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx flag-o-matic ICEDTEA_VER=$(get_version_component_range 2-) ICEDTEA_BRANCH=$(get_version_component_range 2-3) @@ -242,12 +242,7 @@ ;; esac - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" + config+=" --with-parallel-jobs=$(makeopts_jobs)" if use javascript ; then config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" 1.7 dev-java/icedtea/icedtea-7.2.4.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild?r1=1.6&r2=1.7 Index: icedtea-7.2.4.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- icedtea-7.2.4.7.ebuild 2 Nov 2014 08:28:40 -0000 1.6 +++ icedtea-7.2.4.7.ebuild 21 Nov 2014 09:52:17 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v 1.6 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.7.ebuild,v 1.7 2014/11/21 09:52:17 vapier Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) # ********************************************************* @@ -9,7 +9,7 @@ EAPI="5" -inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx +inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_VER=$(get_version_component_range 2-) ICEDTEA_BRANCH=$(get_version_component_range 2-3) @@ -233,12 +233,7 @@ zero_config="--enable-zero"; fi - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" + config+=" --with-parallel-jobs=$(makeopts_jobs)" if use javascript ; then config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" 1.6 dev-java/icedtea/icedtea-6.1.12.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild?r1=1.5&r2=1.6 Index: icedtea-6.1.12.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- icedtea-6.1.12.7.ebuild 2 Nov 2014 08:28:40 -0000 1.5 +++ icedtea-6.1.12.7.ebuild 21 Nov 2014 09:52:17 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v 1.5 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v 1.6 2014/11/21 09:52:17 vapier Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) # ********************************************************* @@ -9,7 +9,7 @@ EAPI="5" -inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx +inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) ICEDTEA_BRANCH=$(get_version_component_range 2-3) @@ -188,12 +188,7 @@ config="${config} --enable-cacao" fi - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" + config+=" --with-parallel-jobs=$(makeopts_jobs)" if use javascript ; then config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" 1.7 dev-java/icedtea/icedtea-6.1.13.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild?r1=1.6&r2=1.7 Index: icedtea-6.1.13.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- icedtea-6.1.13.3.ebuild 2 Nov 2014 08:28:40 -0000 1.6 +++ icedtea-6.1.13.3.ebuild 21 Nov 2014 09:52:17 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v 1.6 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.3.ebuild,v 1.7 2014/11/21 09:52:17 vapier Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) # ********************************************************* @@ -9,7 +9,7 @@ EAPI="5" -inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx +inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) ICEDTEA_BRANCH=$(get_version_component_range 1-3) @@ -192,12 +192,7 @@ config="${config} --enable-cacao" fi - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" + config+=" --with-parallel-jobs=$(makeopts_jobs)" if use javascript ; then config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" 1.3 dev-java/icedtea/icedtea-6.1.13.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild?r1=1.2&r2=1.3 Index: icedtea-6.1.13.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- icedtea-6.1.13.4.ebuild 2 Nov 2014 08:28:40 -0000 1.2 +++ icedtea-6.1.13.4.ebuild 21 Nov 2014 09:52:17 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.2 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.3 2014/11/21 09:52:17 vapier Exp $ # Build written by Andrew John Hughes (gnu_and...@member.fsf.org) # ********************************************************* @@ -9,7 +9,7 @@ EAPI="5" -inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx +inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) ICEDTEA_BRANCH=$(get_version_component_range 1-3) @@ -193,12 +193,7 @@ config="${config} --enable-cacao" fi - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" + config+=" --with-parallel-jobs=$(makeopts_jobs)" if use javascript ; then config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" 1.130 dev-java/icedtea/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.130&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.130&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.129&r2=1.130 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ChangeLog 2 Nov 2014 08:28:40 -0000 1.129 +++ ChangeLog 21 Nov 2014 09:52:17 -0000 1.130 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.129 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.130 2014/11/21 09:52:17 vapier Exp $ + + 21 Nov 2014; Mike Frysinger <vap...@gentoo.org> icedtea-6.1.12.7.ebuild, + icedtea-6.1.13.3.ebuild, icedtea-6.1.13.4.ebuild, icedtea-7.2.4.3.ebuild, + icedtea-7.2.4.7.ebuild, icedtea-7.2.4.8.ebuild, icedtea-7.2.5.3.ebuild: + Backport makeopts_jobs to older ebuilds to stop parsing MAKEOPTS directly. 02 Nov 2014; Sven Vermeulen <sw...@gentoo.org> icedtea-6.1.12.7.ebuild, icedtea-6.1.13.3.ebuild, icedtea-6.1.13.4.ebuild, icedtea-6.1.13.5-r1.ebuild,