Use configure stage instead of setup to not abuse the binary packages that much.

24 files changed, 56 insertions, 73 deletions

diff --git a/x11-libs/glamor/glamor-9999.ebuild b/x11-libs/glamor/glamor-9999.ebuild
index 5e604513..de142a8b 100644
--- a/x11-libs/glamor/glamor-9999.ebuild
+++ b/x11-libs/glamor/glamor-9999.ebuild
@@ -26,11 +26,11 @@ RDEPEND=">=x11-base/xorg-server-1.10
 	>=x11-libs/pixman-0.21.8"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable gles glamor-gles2)
 	)
+	xorg-2_src_configure
 }
 
 src_prepare() {
diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild
index 7a68662f..0bffbf43 100644
--- a/x11-libs/libFS/libFS-9999.ebuild
+++ b/x11-libs/libFS/libFS-9999.ebuild
@@ -15,10 +15,9 @@ RDEPEND="x11-libs/xtrans
 	x11-proto/fontsproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index bfc074e6..ba327679 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -16,9 +16,7 @@ RDEPEND="x11-libs/xtrans
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc docs)
@@ -26,4 +24,5 @@ pkg_setup() {
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 5ef32f97..b2cd5648 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -20,9 +20,8 @@ RDEPEND=">=x11-libs/libICE-1.0.5
 	) )"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
+src_configure() {
 	local withuuid=$(use_with uuid libuuid)
-	xorg-2_pkg_setup
 
 	# do not use uuid even if available in libc (like on FreeBSD)
 	use uuid || export ac_cv_func_uuid_create=no
@@ -47,6 +46,7 @@ pkg_setup() {
 				;;
 		esac
 	fi
+
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc docs)
@@ -54,4 +54,5 @@ pkg_setup() {
 		${withuuid}
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 1c8cf485..84530c6d 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -28,17 +28,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 		$(use_enable doc specs)
 		$(use_enable ipv6)
 		--without-fop
 	)
-}
 
-src_configure() {
 	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
 	xorg-2_src_configure
 }
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 349a3767..5312b450 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -21,12 +21,11 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xextproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXaw3d/libXaw3d-9999.ebuild b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
index 2491cedf..301b5928 100644
--- a/x11-libs/libXaw3d/libXaw3d-9999.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
@@ -19,8 +19,4 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 	x11-proto/xextproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-}
+	x11-proto/xproto"
\ No newline at end of file
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index 36fe6d91..9822dee3 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -18,9 +18,9 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index 2f9ec408..9e4a7d5d 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -15,12 +15,11 @@ IUSE=""
 RDEPEND="x11-proto/xproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index aa4c0606..955c641f 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -16,10 +16,11 @@ RDEPEND=">=x11-libs/libX11-1.2
 	>=x11-proto/xextproto-7.1.99"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index cc5a812b..f6349f55 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -18,14 +18,14 @@ RDEPEND=">=x11-libs/libX11-1.4.99.1
 	>=x11-proto/xextproto-7.0.3"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		$(use_with doc asciidoc)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index 4c3d9a65..c226fd0e 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -18,13 +18,12 @@ RDEPEND="x11-libs/libXt
 	x11-proto/xextproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index a60dc53e..b241900e 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -17,8 +17,8 @@ RDEPEND="x11-libs/libX11
 	x11-proto/kbproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	tc-is-cross-compiler && export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 83b3a6cd..16cefaa7 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -32,7 +32,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.28-solaris.patch
 )
 
-pkg_setup() {
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		--enable-udev
 		$(use_enable video_cards_exynos exynos-experimental-api)
@@ -43,14 +51,5 @@ pkg_setup() {
 		$(use_enable video_cards_vmware vmwgfx-experimental-api)
 		$(use_enable libkms)
 	)
-
-	xorg-2_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index 03b57ca2..b859e26c 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -13,13 +13,12 @@ DEPEND="!<x11-base/xorg-server-1.5
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		"$(use_with zlib)"
 		"--with-pciids-path=${EPREFIX}/usr/share/misc"
 	)
+	xorg-2_src_configure
 }
 
 src_install() {
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 2f5e605e..1aad0e61 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -24,11 +24,11 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=x11-proto/xcb-proto-1.7"
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc build-docs)
 		$(use_enable selinux)
 		--enable-xinput
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index b7f75f1d..17b72bfa 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -11,9 +11,7 @@ DESCRIPTION="Low-level pixel manipulation routines"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt mmx neon sse2"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable mmx)
 		$(use_enable sse2)
@@ -22,4 +20,5 @@ pkg_setup() {
 		$(use_enable iwmmxt arm-iwmmxt)
 		--disable-gtk
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
index e7810912..13f294c2 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
@@ -24,10 +24,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.4 )"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)
 	)
-
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }
\ No newline at end of file
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
index 2976c437..444a3b05 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
@@ -24,10 +24,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.4 )"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)
 	)
-
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
index aab044a8..c2f67546 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
@@ -24,10 +24,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.4 )"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)
 	)
-
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
index 144c2e5d..29c8ead2 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
@@ -24,10 +24,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.4 )"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)
 	)
-
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index 48afb129..d2f70840 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -31,10 +31,9 @@ PDEPEND="
 	>=x11-libs/xcb-util-wm-${PV}
 "
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)
 	)
-
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xpyb/xpyb-9999.ebuild b/x11-libs/xpyb/xpyb-9999.ebuild
index 473edc79..3dee03d9 100644
--- a/x11-libs/xpyb/xpyb-9999.ebuild
+++ b/x11-libs/xpyb/xpyb-9999.ebuild
@@ -20,9 +20,9 @@ DEPEND="${RDEPEND}"
 
 DOCS=( NEWS README )
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable selinux xselinux)
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
index b4c796dd..7ccb7214 100644
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ b/x11-libs/xtrans/xtrans-9999.ebuild
@@ -17,10 +17,11 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }