[gentoo-commits] proj/x11:master commit in: x11-libs/xpyb/, x11-proto/xcb-proto/, x11-libs/libxcb/, x11-libs/libSM/, ...

[gentoo-commits] proj/x11:master commit in: x11-libs/xpyb/, x11-proto/xcb-proto/, x11-libs/libxcb/, x11-libs/libSM/, ...

[Chi-Thanh Christopher Nguyen]

commit:     d392a0423fbbf5c5b5a7b01b8e1f76eb89204929
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 19:52:10 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Mar 10 19:52:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d392a042

Switch pkg_setup() calls back to src_configure().

---
 x11-libs/libSM/libSM-9999.ebuild          |    4 ++--
 x11-libs/libXaw3d/libXaw3d-9999.ebuild    |    6 +++---
 x11-libs/libxcb/libxcb-9999.ebuild        |    5 ++++-
 x11-libs/xpyb/xpyb-9999.ebuild            |    5 ++++-
 x11-proto/xcb-proto/xcb-proto-9999.ebuild |    5 ++++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 7ccf9d3..b150976 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -25,9 +25,8 @@ RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
 	) )"
 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
@@ -59,4 +58,5 @@ pkg_setup() {
 		${withuuid}
 		--without-fop
 	)
+	xorg-2_src_configure
 }

diff --git a/x11-libs/libXaw3d/libXaw3d-9999.ebuild b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
index 09d0c0d..7539b2f 100644
--- a/x11-libs/libXaw3d/libXaw3d-9999.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="x11-libs/libX11
@@ -20,12 +20,12 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-pkg_setup() {
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
 		--enable-arrow-scrollbars
 		--enable-gray-stipples
 	)
 
-	xorg-2_pkg_setup
+	xorg-2_src_configure
 }

diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index bb9356b..944f1d5 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -31,10 +31,13 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	python-single-r1_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/xpyb/xpyb-9999.ebuild b/x11-libs/xpyb/xpyb-9999.ebuild
index f14e35f..9346a26 100644
--- a/x11-libs/xpyb/xpyb-9999.ebuild
+++ b/x11-libs/xpyb/xpyb-9999.ebuild
@@ -24,8 +24,11 @@ DOCS=( NEWS README )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	xorg-2_pkg_setup
+}
+
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable selinux xselinux)
 	)
+	xorg-2_src_configure
 }

diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index b279fee..85b4a9e 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -23,5 +23,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	xorg-2_pkg_setup
+}
+
+src_configure() {
+	xorg-2_src_configure
 }