Package-Manager: portage-2.2.28_p3 --- x11-proto/xcb-proto/xcb-proto-1.10.ebuild | 19 +++++-------------- x11-proto/xcb-proto/xcb-proto-1.11.ebuild | 19 +++++-------------- x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild | 19 +++++-------------- x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild | 19 +++++-------------- 4 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild index f0ecc7a..e78ab72 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild +++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,19 +30,11 @@ src_configure() { } multilib_src_configure() { - autotools-utils_src_configure + ECONF_SOURCE="${S}" + econf if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_configure - fi -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_compile -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir econf fi } @@ -58,7 +50,6 @@ multilib_src_install() { default if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_install -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen fi } diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild index 60a5a88..0f10a99 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild +++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,19 +30,11 @@ src_configure() { } multilib_src_configure() { - autotools-utils_src_configure + ECONF_SOURCE="${S}" + econf if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_configure - fi -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_compile -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir econf fi } @@ -58,7 +50,6 @@ multilib_src_install() { default if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_install -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen fi } diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild index 5239a6f..ad3a52a 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild +++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,19 +28,11 @@ src_configure() { } multilib_src_configure() { - autotools-utils_src_configure + ECONF_SOURCE="${S}" + econf if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_configure - fi -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_compile -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir econf fi } @@ -48,8 +40,7 @@ multilib_src_install() { default if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_install -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen fi } diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild index 308ca6d..9992acf 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild +++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -37,19 +37,11 @@ src_configure() { } multilib_src_configure() { - autotools-utils_src_configure + ECONF_SOURCE="${S}" + econf if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_configure - fi -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_compile -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir econf fi } @@ -57,7 +49,6 @@ multilib_src_install() { default if multilib_is_native_abi; then - python_foreach_impl autotools-utils_src_install -C xcbgen \ - top_builddir="${BUILD_DIR}" + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen fi } -- 2.8.1