diff options
| author |   Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2013-03-10 20:52:10 +0100 |
|---|---|---|
| committer | Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2013-03-10 20:52:10 +0100 |
| commit | d392a0423fbbf5c5b5a7b01b8e1f76eb89204929 (patch) | |
| tree | 58913abda986d2b9cf3ff278d721a928ada41cd5 | |
| parent | x11-libs/libSM: sync to gx86. (diff) | |
| download | x11-d392a0423fbbf5c5b5a7b01b8e1f76eb89204929.tar.gz x11-d392a0423fbbf5c5b5a7b01b8e1f76eb89204929.tar.bz2 x11-d392a0423fbbf5c5b5a7b01b8e1f76eb89204929.zip | |
Switch pkg_setup() calls back to src_configure().
| -rw-r--r-- | x11-libs/libSM/libSM-9999.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/libXaw3d/libXaw3d-9999.ebuild | 6 | ||||
| -rw-r--r-- | x11-libs/libxcb/libxcb-9999.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/xpyb/xpyb-9999.ebuild | 5 | ||||
| -rw-r--r-- | 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 7ccf9d39..b150976a 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 09d0c0df..7539b2fd 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 bb9356b8..944f1d5d 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 f14e35f5..9346a26f 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 b279fee8..85b4a9eb 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 } |