summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-03-20 20:23:18 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-03-20 20:23:18 +0000
commitd59120548382a78b77d9534bad0dc1ae92c78a37 (patch)
treef3df5ea2ddd3aadb6a74c7a2879e3df4fab7ddca /x11-base
parentversion bump (diff)
downloadhistorical-d59120548382a78b77d9534bad0dc1ae92c78a37.tar.gz
historical-d59120548382a78b77d9534bad0dc1ae92c78a37.tar.bz2
historical-d59120548382a78b77d9534bad0dc1ae92c78a37.zip
Get rid of no-pam hack in favor of pam USE.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/Manifest4
-rw-r--r--x11-base/xfree/xfree-4.3.0-r6.ebuild8
3 files changed, 10 insertions, 7 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 74e90d80c099..48b1427c765f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.304 2004/03/19 10:59:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.305 2004/03/20 20:23:18 spyderous Exp $
+
+ 20 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
+ Get rid of no-pam hack in favor of pam USE.
19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
Update TODO.
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 03736b783333..f2aff5bb9141 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,6 +1,6 @@
MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 3fdb0636e6ed41a7ba0afd4f509e2d63 ChangeLog 67790
-MD5 95d1c306c056d34fd98569e53c498c40 xfree-4.3.0-r6.ebuild 37112
+MD5 c653baa3e5318b53ab88adf274610f66 ChangeLog 67915
+MD5 76c700fb3449e5940d05748f79f3954c xfree-4.3.0-r6.ebuild 37099
MD5 bce61a7ef514c412d85fc79778532e09 xfree-4.2.1-r4.ebuild 23997
MD5 cff37d5e3a2cb5ceb5b75e5c6c4c1a5e xfree-4.3.0-r5.ebuild 35217
MD5 f11c15a3e191849140c023592cebca9f xfree-4.3.99.902-r2.ebuild 31359
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 6db1f6daf244..03916ad5111d 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.10 2004/03/19 10:59:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.11 2004/03/20 20:23:18 spyderous Exp $
# TODO
# 14 Mar. 2004 <spyderous@gentoo.org>
@@ -27,7 +27,7 @@ inherit eutils flag-o-matic gcc xfree
RESTRICT="nostrip"
# IUSE="sse mmx 3dnow" were disabled in favor of autodetection
-IUSE="3dfx truetype nls cjk doc ipv6 debug static sdk gatos no-pam pie"
+IUSE="3dfx truetype nls cjk doc ipv6 debug static sdk gatos pam pie"
IUSE_INPUT_DEVICES="synaptics wacom"
PATCH_VER="2.1.26.15"
@@ -167,7 +167,7 @@ pkg_setup() {
strip-flags
# See bug #35468, circular pam-xfree dep
- if [ ! "`use no-pam`" -a "`has_version x11-base/xfree`" ]
+ if [ "`use pam`" -a "`has_version x11-base/xfree`" ]
then
einfo "Previous XFree86 installation detected"
einfo "Enabling PAM features in XFree86..."
@@ -437,7 +437,7 @@ src_unpack() {
# Remove circular dep between pam and xfree, bug #35468
# If no-pam isn't in USE and we have xfree, then we can enable PAM
- if [ ! "`use no-pam`" -a "`has_version x11-base/xfree`" ]
+ if [ "`use pam`" -a "`has_version x11-base/xfree`" ]
then
# If you want to have optional pam support, do it properly ...
echo "#define HasPam YES" >> config/cf/host.def