summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-07-16 06:11:44 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-07-16 06:11:44 +0000
commit0250b2071b7d0d4a119fa4c9c763ff1f187e36ee (patch)
tree568d13a980bbacf09c00ca1f2823d97d340df7ec /x11-base
parentBuild dlloader things for ppc64 and relink them properly (#56248). (diff)
downloadhistorical-0250b2071b7d0d4a119fa4c9c763ff1f187e36ee.tar.gz
historical-0250b2071b7d0d4a119fa4c9c763ff1f187e36ee.tar.bz2
historical-0250b2071b7d0d4a119fa4c9c763ff1f187e36ee.zip
USE flag pie renamed to dlloader. Remove USE flag hardened, because it did nothing.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild10
3 files changed, 13 insertions, 8 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3ec60cc1c9dc..c19b6f0fd389 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.73 2004/07/16 05:53:17 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.74 2004/07/16 06:11:44 spyderous Exp $
+
+ 16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.7.0-r1.ebuild:
+ USE flag pie renamed to dlloader. Remove USE flag hardened, because it did
+ nothing.
16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 1512b72ae1cc..0097bac24a62 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 7c8bb0c90e0228dc81a21367fec411f3 xorg-x11-6.7.0-r1.ebuild 41494
-MD5 ab55885c82e4e185bad39bb8eb01174a ChangeLog 16617
+MD5 1bc3777f02c7f090eea88fa14c9db6fd xorg-x11-6.7.0-r1.ebuild 41516
+MD5 a9bda361d0f50b3b68a74b58e0a173e3 ChangeLog 16789
MD5 c557d93f0e90a66a8b781b5ad898a3c9 files/digest-xorg-x11-6.7.0-r1 906
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index 9479220144ed..a40252e03c51 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.25 2004/07/16 05:53:17 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.26 2004/07/16 06:11:44 spyderous Exp $
# Libraries which are now supplied in shared form that were not in the past
# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -32,7 +32,7 @@ inherit eutils flag-o-matic gcc xfree
RESTRICT="nostrip"
# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow cjk debug doc hardened ipv6 mmx nls pam pie sdk sse static"
+IUSE="3dfx 3dnow cjk debug dlloader doc ipv6 mmx nls pam sdk sse static"
# IUSE_INPUT_DEVICES="synaptics wacom"
FILES_VER="0.2"
@@ -202,13 +202,13 @@ pkg_setup() {
einfo "Disabling PAM features in ${PN}..."
fi
- if use static
+ if use static || use dlloader
then
# A static build disallows building the SDK.
# See config/xf86.rules.
if use sdk
then
- die "The static and pie USE flags are currently incompatible with the sdk USE flag."
+ die "The static and dlloader USE flags are currently incompatible with the sdk USE flag."
fi
fi
}
@@ -300,7 +300,7 @@ host_def_setup() {
then
echo "#define DoLoadableServer NO" >>config/cf/host.def
else
- if use pie ; then
+ if use dlloader ; then
einfo "Setting DoLoadableServer/MakeDllModules to YES for etdyn building"
echo "#define DoLoadableServer YES" >> config/cf/host.def
echo "#define MakeDllModules YES" >> config/cf/host.def