summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-07-28 08:50:48 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-07-28 08:50:48 +0000
commitd0815b0019045bae40e3b36eabf17e7238937883 (patch)
tree96d54134861e8cca81018cdd9ca91bc4f2873ad2 /x11-base
parentSearch for a fortran compiler, since gcc doesn't compile one by default anymo... (diff)
downloadgentoo-2-d0815b0019045bae40e3b36eabf17e7238937883.tar.gz
gentoo-2-d0815b0019045bae40e3b36eabf17e7238937883.tar.bz2
gentoo-2-d0815b0019045bae40e3b36eabf17e7238937883.zip
Add more info on pam-X circular dep (#54378, #35468).
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild8
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild8
3 files changed, 15 insertions, 7 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2f7a0ce26e8b..935b7d521fa5 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# 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.83 2004/07/26 20:23:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.84 2004/07/28 08:50:48 spyderous Exp $
+
+ 28 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+ Add more info on pam-X circular dep (#54378, #35468).
26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
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 7b66762d54f9..a778cf4ac507 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.29 2004/07/26 20:23:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.30 2004/07/28 08:50:48 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,
@@ -182,11 +182,13 @@ pkg_setup() {
# See bug #35468, circular pam-X11 dep
if use pam && [ "`best_version x11-base/${PN}`" ]
then
- einfo "Previous X installation detected"
+ einfo "Previous ${PN} installation detected"
einfo "Enabling PAM features in ${PN}..."
else
- einfo "Previous X installation NOT detected"
+ einfo "Previous ${PN} installation NOT detected"
einfo "Disabling PAM features in ${PN}..."
+ einfo "You must remerge ${PN} to enable pam."
+ einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468."
fi
if use static || use dlloader
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index 5b3ac0345f06..4ba0bf0e6cc8 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.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-r2.ebuild,v 1.9 2004/07/26 20:23:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.10 2004/07/28 08:50:48 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,
@@ -157,11 +157,13 @@ pkg_setup() {
# See bug #35468, circular pam-X11 dep
if use pam && [ "`best_version x11-base/${PN}`" ]
then
- einfo "Previous X installation detected"
+ einfo "Previous ${PN} installation detected"
einfo "Enabling PAM features in ${PN}..."
else
- einfo "Previous X installation NOT detected"
+ einfo "Previous ${PN} installation NOT detected"
einfo "Disabling PAM features in ${PN}..."
+ einfo "You must remerge ${PN} to enable pam."
+ einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468."
fi
if use static || use dlloader