Remove print_installed(). Bug #211588.

Package-Manager: portage-2.1.4.4

4 files changed, 24 insertions, 56 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/Manifest b/x11-base/xorg-server/Manifest
index a605fa429c11..ab3d54d200fb 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -44,7 +47,14 @@ DIST xorg-server-1.4.0.90.tar.bz2 6315011 RMD160 181b3c682710265df3c6ed30e164be9
 EBUILD xorg-server-1.3.0.0-r2.ebuild 17322 RMD160 d54594444e07b2756c5802731f4311425da6b3c0 SHA1 337ed873f75cc3504810144a8bf0bf20bee38879 SHA256 4dbf0c4eadc24eecce16a4e3ab18c9440f1f8fa5d50e03dc1dcd5290f2d29c2a
 EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928dd2e11e015 SHA1 2552f8fc12bc8b446e65b912dbd86f7cf4019ec5 SHA256 fcf3d38047d812e887769b17ffe7c94035fc6376bc6b307b04190851bb3ed19c
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18038 RMD160 5fd3410af8913e2192e91173a2eb2d8d9bdbbc0a SHA1 2b1ceb9f002d14aad769e8cc8b368c0d8185e4bb SHA256 ba78561bee1a7fadd6d51eab46993bb7e620660b8496189c4b5d6e9e0c406f5f
-EBUILD xorg-server-1.4.0.90-r2.ebuild 19373 RMD160 32156d552ce1ef0728e8dec432faad78a07bc882 SHA1 a35f3d2d84618ddc300022672068a4de3f9be5b3 SHA256 807bcb8aa7411bf67b2b7eef2635c585e9740ed6bcee292613ad0395a7e5daab
-EBUILD xorg-server-1.4.0.90-r3.ebuild 19533 RMD160 50d127d94ef5312adc28f76115c3c6f3d2e94edc SHA1 f749fc9a13835237bf34b68d9357d4f886072459 SHA256 ed4ff127608f4d673b97f515b94490c3f4e087c2c47d14f120655aabcd974b95
-MISC ChangeLog 69020 RMD160 ce41cc05c821990f8fe816a5216af8fe90bf8871 SHA1 d3c0f65822ac31188babec9ef76e9770e2432927 SHA256 1e35dad7dcffb0549521be07516127712c82029581aa85d9db1c1ac957fda8a3
+EBUILD xorg-server-1.4.0.90-r2.ebuild 18783 RMD160 5216d267d2b9550ae42152b9d9d050665a50deef SHA1 9526cc4cee85678f300a3790a171ea526974385d SHA256 db1a62761e6a1c55398ce827084f50f3d85031a790df77f51d7b1d34a933c68e
+EBUILD xorg-server-1.4.0.90-r3.ebuild 18943 RMD160 c5d7995d302907352bb1a3c9c70a221b47de8f2a SHA1 3adb769fe2ddf0ae3620074892025d524e981d23 SHA256 bdbc758d60b786626dfba37d1c841dab67012acf8171a41271b5c065a893e334
+MISC ChangeLog 69175 RMD160 5bbc1b8e1704fe9d56b1ae55cb248581c67ea026 SHA1 525d4ffc42881a69971685c57c7a0dd6ce22231f SHA256 a97da9cef4a2584204b0c806283f6367899b0d53e867393ab0c378b8fc62d423
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1XJifxJ68Jl1NeERAnvoAJ4tSvOnXTJPJNma+dB3VrHYod77ZACfa+nM
+NMSpspRtVpPjCEt/IU7ySb8=
+=LWiG
+-----END PGP SIGNATURE-----
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