summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-10-14 11:12:41 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-10-14 11:12:41 +0000
commit3907a26c785164065fe780048edcaea483059d5c (patch)
tree27acfba9dba6dd4233e290c0263c3d51923206cc /x11-base
parentdrop xorg 6 checks for built with use, dont try to be clever with /usr/includ... (diff)
downloadgentoo-2-3907a26c785164065fe780048edcaea483059d5c.tar.gz
gentoo-2-3907a26c785164065fe780048edcaea483059d5c.tar.bz2
gentoo-2-3907a26c785164065fe780048edcaea483059d5c.zip
(#194503) Try adding some output to print the actual drivers that need to be rebuilt. Use qlist from portage-utils, equery from gentoolkit, epm, and fall back to internal portage best_version if all else fails.
(Portage version: 2.1.3.12)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog8
-rw-r--r--x11-base/xorg-server/xorg-server-1.4-r2.ebuild26
2 files changed, 32 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 08cb1963dda8..c7ad21acbe09 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.289 2007/10/13 20:52:35 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.290 2007/10/14 11:12:41 dberkholz Exp $
+
+ 14 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ xorg-server-1.4-r2.ebuild:
+ (#194503) Try adding some output to print the actual drivers that need to be
+ rebuilt. Use qlist from portage-utils, equery from gentoolkit, epm, and fall
+ back to internal portage best_version if all else fails.
*xorg-server-1.3.0.0-r2 (13 Oct 2007)
diff --git a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
index f2bd1f79160e..6f9dbe525211 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.3 2007/10/01 14:32:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.4 2007/10/14 11:12:41 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -405,6 +405,9 @@ pkg_postinst() {
ewarn "You must rebuild all drivers if upgrading from xorg-server 1.3"
ewarn "or earlier, because the ABI changed. If you cannot start X because"
ewarn "of module version mismatch errors, this is your problem."
+
+ print_installed x11-drivers/
+
ebeep 5
epause 10
}
@@ -529,6 +532,27 @@ switch_opengl_implem() {
eselect opengl set ${OLD_IMPLEM}
}
+print_installed() {
+ local command line token=$1
+
+ if $(type -P qlist >/dev/null 2>&1); then
+ command="qlist -I -v -C ${token}"
+ elif $(type -P equery >/dev/null 2>&1); then
+ command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'"
+ elif $(type -P epm >/dev/null 2>&1); then
+ command="epm -qaG | grep ${token}"
+ else
+ local dir
+ command="true"
+ for dir in "${PORTDIR}"/${token}*; do
+ command="${command} ; best_version ${dir#${PORTDIR}/}"
+ done
+ fi
+ while read line; do
+ ewarn "${line}"
+ done < <(eval ${command})
+}
+
xprint_src_install() {
# RH-style init script, we provide a wrapper
exeinto /usr/$(get_libdir)/misc