Remove print_installed(). Bug #211588.

(Portage version: 2.1.4.4)

3 files changed, 11 insertions, 53 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1c9dfe0e4730..cb9fc4504f05 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.318 2008/02/11 06:04:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.319 2008/03/10 17:39:30 zlin Exp $
+
+  10 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  xorg-server-1.4.0.90-r2.ebuild, xorg-server-1.4.0.90-r3.ebuild:
+  Remove print_installed(). Bug #211588.
 
   11 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
   xorg-server-1.3.0.0-r5.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild
index 7436b0b74a1e..b9fac1370db0 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.90-r2.ebuild,v 1.1 2008/01/18 21:31:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild,v 1.2 2008/03/10 17:39:30 zlin Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -427,11 +427,9 @@ pkg_postinst() {
 	ewarn "or earlier, because the ABI changed. If you cannot start X because"
 	ewarn "of module version mismatch errors, this is your problem."
 
-	ewarn "Here's a list of installed X drivers to emerge:"
-	print_installed x11-drivers/
-
 	echo
-	ewarn "You can generate a similar list at any point using this command:"
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
 	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
 
 	ebeep 5
@@ -550,27 +548,6 @@ 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 -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
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
index 3ec53f60b8ce..207390c34c6c 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.90-r3.ebuild,v 1.1 2008/02/01 21:47:19 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.2 2008/03/10 17:39:30 zlin Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -429,11 +429,9 @@ pkg_postinst() {
 	ewarn "or earlier, because the ABI changed. If you cannot start X because"
 	ewarn "of module version mismatch errors, this is your problem."
 
-	ewarn "Here's a list of installed X drivers to emerge:"
-	print_installed x11-drivers/
-
 	echo
-	ewarn "You can generate a similar list at any point using this command:"
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
 	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
 
 	ebeep 5
@@ -552,27 +550,6 @@ 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 -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