[gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

The xorg-2 eclass currently uses the deprecated autotools-utils and
autotools-multilib eclasses, which are banned in EAPI 6.

This patchset attempts to remove any trace of autotools-utils from ebuilds
using xorg-2.

Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
eclass. If there is a strong feeling that this is too dangerous, I can alter
my approach. I have build tested most packages using xorg-2, and only a few
had issues.

This patchset is also on github: https://github.com/gentoo/gentoo/pull/1289

Mike Gilbert (7):
  xorg-2.eclass: drop autotools-utils
  x11-base/xorg-server: remove reference to AUTOTOOLS_BUILD_DIR
  x11-apps/intel-gpu-tools: remove reference to AUTOTOOLS_BUILD_DIR
  x11-proto/xcb-proto: drop autotools-utils
  x11-apps/xauth: drop autotools-utils
  x11-libs/glamor: drop autotools-utils
  x11-libs/xpyb: set XORG_EAUTORECONF instead of AUTOTOOLS_AUTORECONF

 eclass/xorg-2.eclass                               | 73 +++++++++++++++-------
 .../intel-gpu-tools/intel-gpu-tools-1.10.ebuild    | 16 ++---
 .../intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild | 16 ++---
 .../intel-gpu-tools/intel-gpu-tools-1.12.ebuild    | 16 ++---
 x11-apps/xauth/xauth-1.0.9-r1.ebuild               |  7 ++-
 x11-apps/xauth/xauth-1.0.9-r2.ebuild               |  7 ++-
 x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.16.4.ebuild     |  4 +-
 x11-base/xorg-server/xorg-server-1.17.4.ebuild     |  4 +-
 x11-base/xorg-server/xorg-server-1.18.0.ebuild     |  2 +-
 x11-base/xorg-server/xorg-server-1.18.1.ebuild     |  2 +-
 x11-base/xorg-server/xorg-server-1.18.2.ebuild     |  2 +-
 x11-base/xorg-server/xorg-server-1.18.3.ebuild     |  2 +-
 x11-libs/glamor/glamor-0.6.0-r1.ebuild             |  6 +-
 x11-libs/glamor/glamor-0.6.0.ebuild                |  6 +-
 x11-libs/xpyb/xpyb-1.3.1-r2.ebuild                 |  4 +-
 x11-libs/xpyb/xpyb-1.3.1-r3.ebuild                 |  2 +-
 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 ++----
 25 files changed, 128 insertions(+), 137 deletions(-)

-- 
2.8.1

[gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

---
 eclass/xorg-2.eclass | 73 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 437265a..f6cf1f9 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -43,12 +43,14 @@ fi
 # before inheriting this eclass.
 : ${XORG_MULTILIB:="no"}
 
-# we need to inherit autotools first to get the deps
-inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
+# Manage AUTOTOOLS_DEPEND ourselves
+: ${AUTOTOOLS_AUTO_DEPEND:="no"}
+
+inherit autotools eutils libtool multilib toolchain-funcs \
 	flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
 
 if [[ ${XORG_MULTILIB} == yes ]]; then
-	inherit autotools-multilib
+	inherit multilib-minimal
 fi
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
@@ -124,13 +126,11 @@ if [[ ${PN} != util-macros ]] ; then
 	# Required even by xorg-server
 	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
 fi
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 for arch in ${XORG_EAUTORECONF_ARCHES}; do
-	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
+	EAUTORECONF_DEPENDS+=" ${arch}? ( ${AUTOTOOLS_DEPEND} ${EAUTORECONF_DEPEND} )"
 done
 DEPEND+=" ${EAUTORECONF_DEPENDS}"
-[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
+[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${AUTOTOOLS_DEPEND} ${EAUTORECONF_DEPEND}"
 unset EAUTORECONF_DEPENDS
 unset EAUTORECONF_DEPEND
 
@@ -350,6 +350,14 @@ xorg-2_patch_source() {
 	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
 
 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
+
+	if [[ "$(declare -p PATCHES 2>/dev/null)" == "declare -a"* ]]; then
+		epatch "${PATCHES[@]}"
+	elif [[ -n ${PATCHES} ]]; then
+		epatch ${PATCHES}
+	fi
+
+	epatch_user
 }
 
 # @FUNCTION: xorg-2_reconf_source
@@ -358,18 +366,15 @@ xorg-2_patch_source() {
 xorg-2_reconf_source() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ -e configure.ac || -e configure.in ]] || return 0
+
+	local run_ea=${XORG_EAUTORECONF}
+
 	case ${CHOST} in
-		*-interix* | *-aix* | *-winnt*)
-			# some hosts need full eautoreconf
-			[[ -e "./configure.ac" || -e "./configure.in" ]] \
-				&& AUTOTOOLS_AUTORECONF=1
-			;;
-		*)
-			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
-				&& AUTOTOOLS_AUTORECONF=1
-			;;
+		*-interix* | *-aix* | *-winnt*) run_ea=yes ;;
 	esac
+
+	[[ ${run_ea} == no ]] || eautoreconf
 }
 
 # @FUNCTION: xorg-2_src_prepare
@@ -380,7 +385,6 @@ xorg-2_src_prepare() {
 
 	xorg-2_patch_source
 	xorg-2_reconf_source
-	autotools-utils_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_font_configure
@@ -472,12 +476,18 @@ xorg-2_src_configure() {
 		${dep_track}
 		${FONT_OPTIONS}
 		"${xorgconfadd[@]}"
+		"$@"
 	)
 
 	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_configure "$@"
+		if ! declare -f multilib_src_configure >/dev/null; then
+			multilib_src_configure() {
+				ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+			}
+		fi
+		multilib-minimal_src_configure
 	else
-		autotools-utils_src_configure "$@"
+		econf "${myeconfargs[@]}"
 	fi
 }
 
@@ -487,10 +497,17 @@ xorg-2_src_configure() {
 xorg-2_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	local makeargs=( "$@" )
+
 	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_compile "$@"
+		if ! declare -f multilib_src_compile >/dev/null; then
+			multilib_src_compile() {
+				emake "${makeargs[@]}"
+			}
+		fi
+		multilib-minimal_src_compile
 	else
-		autotools-utils_src_compile "$@"
+		emake "${makeargs[@]}"
 	fi
 }
 
@@ -509,10 +526,18 @@ xorg-2_src_install() {
 		)
 	fi
 
+	install_args+=( "$@" )
+
 	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_install "${install_args[@]}"
+		if ! declare -f multilib_src_install >/dev/null; then
+			multilib_src_install() {
+				emake DESTDIR="${D}" install "${install_args[@]}"
+			}
+		fi
+		multilib-minimal_src_install
 	else
-		autotools-utils_src_install "${install_args[@]}"
+		emake DESTDIR="${D}" install "${install_args[@]}"
+		einstalldocs
 	fi
 
 	if [[ -n ${GIT_ECLASS} ]]; then
-- 
2.8.1

[gentoo-dev] [PATCH 2/7] x11-base/xorg-server: remove reference to AUTOTOOLS_BUILD_DIR

[Mike Gilbert]

Package-Manager: portage-2.2.28_p64
---
 x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.16.4.ebuild    | 4 ++--
 x11-base/xorg-server/xorg-server-1.17.4.ebuild    | 4 ++--
 x11-base/xorg-server/xorg-server-1.18.0.ebuild    | 2 +-
 x11-base/xorg-server/xorg-server-1.18.1.ebuild    | 2 +-
 x11-base/xorg-server/xorg-server-1.18.2.ebuild    | 2 +-
 x11-base/xorg-server/xorg-server-1.18.3.ebuild    | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
index a8e3006..df3c50b 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.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$
 
@@ -192,7 +192,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
index eb381fc..4edb74a 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.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$
 
@@ -180,7 +180,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
index 2aefe0c..b7d4699 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r2.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$
 
@@ -203,7 +203,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
index b16ac10..9001060 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.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$
 
@@ -190,7 +190,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
index 3176198..dd8b490 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r5.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$
 
@@ -203,7 +203,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
index a8b2e71..d74b972 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4.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$
 
@@ -211,7 +211,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.17.4.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild
index f32ec6f..89527b1 100644
--- a/x11-base/xorg-server/xorg-server-1.17.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.17.4.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$
 
@@ -211,7 +211,7 @@ src_install() {
 
 	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.18.0.ebuild b/x11-base/xorg-server/xorg-server-1.18.0.ebuild
index d222570..d543b8b 100644
--- a/x11-base/xorg-server/xorg-server-1.18.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.0.ebuild
@@ -208,7 +208,7 @@ src_install() {
 
 	if ! use minimal && use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.18.1.ebuild b/x11-base/xorg-server/xorg-server-1.18.1.ebuild
index d222570..d543b8b 100644
--- a/x11-base/xorg-server/xorg-server-1.18.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.1.ebuild
@@ -208,7 +208,7 @@ src_install() {
 
 	if ! use minimal && use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.18.2.ebuild b/x11-base/xorg-server/xorg-server-1.18.2.ebuild
index d222570..d543b8b 100644
--- a/x11-base/xorg-server/xorg-server-1.18.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.2.ebuild
@@ -208,7 +208,7 @@ src_install() {
 
 	if ! use minimal && use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.18.3.ebuild b/x11-base/xorg-server/xorg-server-1.18.3.ebuild
index d222570..d543b8b 100644
--- a/x11-base/xorg-server/xorg-server-1.18.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.3.ebuild
@@ -208,7 +208,7 @@ src_install() {
 
 	if ! use minimal && use xorg; then
 		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+		dodoc hw/xfree86/xorg.conf.example
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-- 
2.8.1

[gentoo-dev] [PATCH 3/7] x11-apps/intel-gpu-tools: remove reference to AUTOTOOLS_BUILD_DIR

[Mike Gilbert]

Package-Manager: portage-2.2.28_p64
---
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild    | 16 ++++++++--------
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild | 16 ++++++++--------
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild    | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
index e0296a1..6092121 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-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$
 
@@ -40,13 +40,13 @@ src_install() {
 	xorg-2_src_install
 	if use test-programs; then
 		local testprogram
-		pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-			for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
-				if [[ -f ${testprogram} ]]; then
-					dobin "${testprogram}"
-				fi
-			done
-		popd
+		pushd tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null || die
 	fi
 }
 
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
index 8251c6f..6b331c4 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-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$
 
@@ -40,13 +40,13 @@ src_install() {
 	xorg-2_src_install
 	if use test-programs; then
 		local testprogram
-		pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-			for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
-				if [[ -f ${testprogram} ]]; then
-					dobin "${testprogram}"
-				fi
-			done
-		popd
+		pushd tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null || die
 	fi
 }
 
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
index 6ce5c35..69b9b8e 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.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$
 
@@ -40,13 +40,13 @@ src_install() {
 	xorg-2_src_install
 	if use test-programs; then
 		local testprogram
-		pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-			for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
-				if [[ -f ${testprogram} ]]; then
-					dobin "${testprogram}"
-				fi
-			done
-		popd
+		pushd tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null || die
 	fi
 }
 
-- 
2.8.1

[gentoo-dev] [PATCH 4/7] x11-proto/xcb-proto: drop autotools-utils

[Mike Gilbert]

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

[gentoo-dev] [PATCH 5/7] x11-apps/xauth: drop autotools-utils

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-apps/xauth/xauth-1.0.9-r1.ebuild | 7 ++++---
 x11-apps/xauth/xauth-1.0.9-r2.ebuild | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x11-apps/xauth/xauth-1.0.9-r1.ebuild b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
index ed1c75e..38553ba 100644
--- a/x11-apps/xauth/xauth-1.0.9-r1.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
 
-inherit autotools-utils xorg-2
+inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
@@ -30,6 +30,7 @@ src_configure() {
 
 src_test() {
 	# Address sandbox failure, bug #527574
+	local -x SANDBOX_WRITE=${SANDBOX_WRITE}
 	addwrite /proc/self/comm
-	autotools-utils_src_test
+	default
 }
diff --git a/x11-apps/xauth/xauth-1.0.9-r2.ebuild b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
index 6e13214..9079f66 100644
--- a/x11-apps/xauth/xauth-1.0.9-r2.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
 
-inherit autotools-utils xorg-2
+inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
@@ -29,6 +29,7 @@ src_configure() {
 
 src_test() {
 	# Address sandbox failure, bug #527574
+	local -x SANDBOX_WRITE=${SANDBOX_WRITE}
 	addwrite /proc/self/comm
-	autotools-utils_src_test
+	default
 }
-- 
2.8.1

[gentoo-dev] [PATCH 6/7] x11-libs/glamor: drop autotools-utils

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-libs/glamor/glamor-0.6.0-r1.ebuild | 6 +++---
 x11-libs/glamor/glamor-0.6.0.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
index 453e142..389d98c 100644
--- a/x11-libs/glamor/glamor-0.6.0-r1.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0-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$
 
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
 XORG_MODULE_REBUILD=yes
 S=${WORKDIR}/${PN}-egl-${PV}
 
-inherit xorg-2 autotools-utils toolchain-funcs
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
@@ -50,5 +50,5 @@ src_prepare() {
 
 src_install() {
 	# workaround parallel install failure, bug #488124.
-	autotools-utils_src_install -j1
+	xorg-2_src_install -j1
 }
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild b/x11-libs/glamor/glamor-0.6.0.ebuild
index f7447da..f89200c 100644
--- a/x11-libs/glamor/glamor-0.6.0.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
 XORG_MODULE_REBUILD=yes
 S=${WORKDIR}/${PN}-egl-${PV}
 
-inherit xorg-2 autotools-utils toolchain-funcs
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
@@ -49,5 +49,5 @@ src_prepare() {
 
 src_install() {
 	# workaround parallel install failure, bug #488124.
-	autotools-utils_src_install -j1
+	xorg-2_src_install -j1
 }
-- 
2.8.1

[gentoo-dev] [PATCH 7/7] x11-libs/xpyb: set XORG_EAUTORECONF instead of AUTOTOOLS_AUTORECONF

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-libs/xpyb/xpyb-1.3.1-r2.ebuild | 4 ++--
 x11-libs/xpyb/xpyb-1.3.1-r3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
index c563aa3..50243a4 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
+XORG_EAUTORECONF=yes
 
 inherit flag-o-matic xorg-2 python-r1
 
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
index 0cb8e96..34c520d 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
+XORG_EAUTORECONF=yes
 
 inherit flag-o-matic xorg-2 python-r1
 
-- 
2.8.1

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Ian Stakenvicius]

Sent from an iPhone, sorry for the HTML...

> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
> 
> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
> xorg-2_src_compile() {
>    debug-print-function ${FUNCNAME} "$@"
> 
> +    local makeargs=( "$@" )
> +
>    if [[ ${XORG_MULTILIB} == yes ]]; then
> -        autotools-multilib_src_compile "$@"
> +        if ! declare -f multilib_src_compile >/dev/null; then
> +            multilib_src_compile() {
> +                emake "${makeargs[@]}"
> +            }
> +        fi
> +        multilib-minimal_src_compile
>    else
> -        autotools-utils_src_compile "$@"
> +        emake "${makeargs[@]}"
>    fi
> }

Does the src_compile code need to be as complex as this?  Why not just a 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '?  

...or even 'default' instead of emake...?

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Ian Stakenvicius]

> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
> 
> The xorg-2 eclass currently uses the deprecated autotools-utils and
> autotools-multilib eclasses, which are banned in EAPI 6.
> 
> This patchset attempts to remove any trace of autotools-utils from ebuilds
> using xorg-2.
> 
> Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
> eclass. If there is a strong feeling that this is too dangerous, I can alter
> my approach. I have build tested most packages using xorg-2, and only a few
> had issues.
> 

Although I commend you for these efforts, given that this deprecation is also linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take advantage of all the simplifications, and this will allow/enforce migration of all the ebuilds as well in turn?

It would be nice for instance to drop the epatch stuffs at the same time, if we could...

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
>
>
> Sent from an iPhone, sorry for the HTML...
>
>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>>
>> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
>> xorg-2_src_compile() {
>>    debug-print-function ${FUNCNAME} "$@"
>>
>> +    local makeargs=( "$@" )
>> +
>>    if [[ ${XORG_MULTILIB} == yes ]]; then
>> -        autotools-multilib_src_compile "$@"
>> +        if ! declare -f multilib_src_compile >/dev/null; then
>> +            multilib_src_compile() {
>> +                emake "${makeargs[@]}"
>> +            }
>> +        fi
>> +        multilib-minimal_src_compile
>>    else
>> -        autotools-utils_src_compile "$@"
>> +        emake "${makeargs[@]}"
>>    fi
>> }
>
> Does the src_compile code need to be as complex as this?  Why not just a 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '?
>
> ...or even 'default' instead of emake...?

multilib-mininmal_src_compile and default_src_comple do not provide
any method to pass arguments to emake. If I recall correctly, there is
at least one ebuild that needs to do so.

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Ian Stakenvicius]

> On Apr 17, 2016, at 10:45 AM, Mike Gilbert <floppym@gentoo.org> wrote:
> 
>> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
>> 
>> 
>> Sent from an iPhone, sorry for the HTML...
>> 
>>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>>> 
>>> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
>>> xorg-2_src_compile() {
>>>   debug-print-function ${FUNCNAME} "$@"
>>> 
>>> +    local makeargs=( "$@" )
>>> +
>>>   if [[ ${XORG_MULTILIB} == yes ]]; then
>>> -        autotools-multilib_src_compile "$@"
>>> +        if ! declare -f multilib_src_compile >/dev/null; then
>>> +            multilib_src_compile() {
>>> +                emake "${makeargs[@]}"
>>> +            }
>>> +        fi
>>> +        multilib-minimal_src_compile
>>>   else
>>> -        autotools-utils_src_compile "$@"
>>> +        emake "${makeargs[@]}"
>>>   fi
>>> }
>> 
>> Does the src_compile code need to be as complex as this?  Why not just a 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '?
>> 
>> ...or even 'default' instead of emake...?
> 
> multilib-mininmal_src_compile and default_src_comple do not provide
> any method to pass arguments to emake. If I recall correctly, there is
> at least one ebuild that needs to do so.
> 

That would do it then...  

mgorny how difficult do you think it would be to pass extra "$@" bits through to the default multilib_src_compile?  Or does that just call 'default' too...  (can't check right now)

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:37 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
>
>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>>
>> The xorg-2 eclass currently uses the deprecated autotools-utils and
>> autotools-multilib eclasses, which are banned in EAPI 6.
>>
>> This patchset attempts to remove any trace of autotools-utils from ebuilds
>> using xorg-2.
>>
>> Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
>> eclass. If there is a strong feeling that this is too dangerous, I can alter
>> my approach. I have build tested most packages using xorg-2, and only a few
>> had issues.
>>
>
> Although I commend you for these efforts, given that this deprecation is also linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take advantage of all the simplifications, and this will allow/enforce migration of all the ebuilds as well in turn?
>
> It would be nice for instance to drop the epatch stuffs at the same time, if we could...
>

If the x11 team wants to go that way, that's fine. It's just a lot
more work to update all the ebuilds, so I would need people to help
out.

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:50 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
>
>> On Apr 17, 2016, at 10:45 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>>
>>> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
>>>
>>>
>>> Sent from an iPhone, sorry for the HTML...
>>>
>>>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>>>>
>>>> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
>>>> xorg-2_src_compile() {
>>>>   debug-print-function ${FUNCNAME} "$@"
>>>>
>>>> +    local makeargs=( "$@" )
>>>> +
>>>>   if [[ ${XORG_MULTILIB} == yes ]]; then
>>>> -        autotools-multilib_src_compile "$@"
>>>> +        if ! declare -f multilib_src_compile >/dev/null; then
>>>> +            multilib_src_compile() {
>>>> +                emake "${makeargs[@]}"
>>>> +            }
>>>> +        fi
>>>> +        multilib-minimal_src_compile
>>>>   else
>>>> -        autotools-utils_src_compile "$@"
>>>> +        emake "${makeargs[@]}"
>>>>   fi
>>>> }
>>>
>>> Does the src_compile code need to be as complex as this?  Why not just a 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '?
>>>
>>> ...or even 'default' instead of emake...?
>>
>> multilib-mininmal_src_compile and default_src_comple do not provide
>> any method to pass arguments to emake. If I recall correctly, there is
>> at least one ebuild that needs to do so.
>>
>
> That would do it then...
>
> mgorny how difficult do you think it would be to pass extra "$@" bits through to the default multilib_src_compile?  Or does that just call 'default' too...  (can't check right now)
>

If multilib_src_compile is undefined, mutlilib-minimal_src_compile
calls default_src_compile.

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

On Sun, 17 Apr 2016 10:45:08 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius <axs@gentoo.org> wrote:
> >
> >
> > Sent from an iPhone, sorry for the HTML...
> >  
> >> On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
> >>
> >> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
> >> xorg-2_src_compile() {
> >>    debug-print-function ${FUNCNAME} "$@"
> >>
> >> +    local makeargs=( "$@" )
> >> +
> >>    if [[ ${XORG_MULTILIB} == yes ]]; then
> >> -        autotools-multilib_src_compile "$@"
> >> +        if ! declare -f multilib_src_compile >/dev/null; then
> >> +            multilib_src_compile() {
> >> +                emake "${makeargs[@]}"
> >> +            }
> >> +        fi
> >> +        multilib-minimal_src_compile
> >>    else
> >> -        autotools-utils_src_compile "$@"
> >> +        emake "${makeargs[@]}"
> >>    fi
> >> }  
> >
> > Does the src_compile code need to be as complex as this?  Why not just a 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '?
> >
> > ...or even 'default' instead of emake...?  
> 
> multilib-mininmal_src_compile and default_src_comple do not provide
> any method to pass arguments to emake. If I recall correctly, there is
> at least one ebuild that needs to do so.

I'd say the EAPI approach (employed by multilib-minimal as well) would
be to redefine multilib_src_compile() in that ebuild rather than
complexifying the generic case.

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

On Sun, 17 Apr 2016 10:37:35 -0400
Ian Stakenvicius <axs@gentoo.org> wrote:

> > On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
> > 
> > The xorg-2 eclass currently uses the deprecated autotools-utils and
> > autotools-multilib eclasses, which are banned in EAPI 6.
> > 
> > This patchset attempts to remove any trace of autotools-utils from ebuilds
> > using xorg-2.
> > 
> > Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
> > eclass. If there is a strong feeling that this is too dangerous, I can alter
> > my approach. I have build tested most packages using xorg-2, and only a few
> > had issues.
> >   
> 
> Although I commend you for these efforts, given that this deprecation is also linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take advantage of all the simplifications, and this will allow/enforce migration of all the ebuilds as well in turn?
> 
> It would be nice for instance to drop the epatch stuffs at the same time, if we could...

+1. This is really a good point to look again at what exactly needs to
be in the eclass, and clean everything up.

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

On Sun, Apr 17, 2016 at 12:24 PM, Michał Górny <mgorny@gentoo.org> wrote:
> On Sun, 17 Apr 2016 10:37:35 -0400
> Ian Stakenvicius <axs@gentoo.org> wrote:
>
>> > On Apr 17, 2016, at 10:13 AM, Mike Gilbert <floppym@gentoo.org> wrote:
>> >
>> > The xorg-2 eclass currently uses the deprecated autotools-utils and
>> > autotools-multilib eclasses, which are banned in EAPI 6.
>> >
>> > This patchset attempts to remove any trace of autotools-utils from ebuilds
>> > using xorg-2.
>> >
>> > Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
>> > eclass. If there is a strong feeling that this is too dangerous, I can alter
>> > my approach. I have build tested most packages using xorg-2, and only a few
>> > had issues.
>> >
>>
>> Although I commend you for these efforts, given that this deprecation is also linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take advantage of all the simplifications, and this will allow/enforce migration of all the ebuilds as well in turn?
>>
>> It would be nice for instance to drop the epatch stuffs at the same time, if we could...
>
> +1. This is really a good point to look again at what exactly needs to
> be in the eclass, and clean everything up.

Ok, I'll leave xorg-2 alone for the time being. Thanks for the feedback.