diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-08-10 22:07:21 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-08-10 22:07:21 +0000 |
| commit | 23a7eadf9dd6ec3ae61ce2cbf01f917b2b0fc74b (patch) | |
| tree | 093b7f37866355501876aa5b7d3a0f9a8e017d87 /x11-base | |
| parent | Added -fPIC patch for bug #101542. (diff) | |
| download | gentoo-2-23a7eadf9dd6ec3ae61ce2cbf01f917b2b0fc74b.tar.gz gentoo-2-23a7eadf9dd6ec3ae61ce2cbf01f917b2b0fc74b.tar.bz2 gentoo-2-23a7eadf9dd6ec3ae61ce2cbf01f917b2b0fc74b.zip | |
Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild | 46 |
2 files changed, 29 insertions, 23 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 7c601e8c9de6..2baf5a18d41a 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.8 2005/08/10 21:37:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.9 2005/08/10 22:07:21 spyderous Exp $ + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r1.ebuild: + Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS. *xorg-server-0.99.1-r1 (10 Aug 2005) diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild index 7c52db51595c..6d1e455314ea 100644 --- a/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild,v 1.1 2005/08/10 21:37:59 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild,v 1.2 2005/08/10 22:07:21 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -61,28 +61,30 @@ DEPEND="${RDEPEND} dri? ( x11-proto/xf86driproto x11-libs/libdrm )" -if use glx; then - confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}" -fi +pkg_setup() { + if use glx; then + confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}" + fi -# localstatedir is used for the log location; we need to override the default -# from ebuild.sh -# sysconfdir is used for the xorg.conf location; same applies -CONFIGURE_OPTIONS=" - $(use_enable xinerama) - $(use_enable ipv6) - $(use_enable !minimal dmx) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable glx) - $(use_enable dri) - --enable-xorg - --enable-composite - --enable-xtrap - --enable-xevie - --sysconfdir=/etc/X11 - --localstatedir=/var - ${confopts}" + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + CONFIGURE_OPTIONS=" + $(use_enable xinerama) + $(use_enable ipv6) + $(use_enable !minimal dmx) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable glx) + $(use_enable dri) + --enable-xorg + --enable-composite + --enable-xtrap + --enable-xevie + --sysconfdir=/etc/X11 + --localstatedir=/var + ${confopts}" +} src_install() { x-modular_src_install |