remove old, more on-demand the postinst information thanks to ph <phajdan.jr@gmail.com> in bug 142057

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 43 insertions, 33 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e500fcf8dcc1..bb01e5a1d33c 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.192 2006/07/23 18:23:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.193 2006/08/17 23:59:44 genstef Exp $
+
+  17 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild,
+  cups-1.2.2.ebuild:
+  remove old, more on-demand the postinst information thanks to ph
+  <phajdan.jr@gmail.com> in bug 142057
 
 *cups-1.2.2 (23 Jul 2006)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 88ede7ca786d..d56347c2b2aa 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -67,32 +67,23 @@ MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
 RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a files/xpdf-pl3.patch 348
 SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b files/xpdf-pl3.patch 348
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-DIST cups-1.2.1-source.tar.bz2 3475342 RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 SHA1 308dec4039153e62d4206c30d6b1f25469ee868f SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45
 DIST cups-1.2.2-source.tar.bz2 3527322 RMD160 f0faa978ae50c5a0cf9bff43f72ab5ca2d530a3e SHA1 c392e216e1eaa0d5dee437056d70c3457a93e35c SHA256 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776
 EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac SHA1 3958abd83fa55d34622b647f111086d92351965c SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b
 MD5 b1e18a006a467d2c94dd37e0f469db56 cups-1.1.23-r1.ebuild 4132
 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac cups-1.1.23-r1.ebuild 4132
 SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b cups-1.1.23-r1.ebuild 4132
-EBUILD cups-1.1.23-r7.ebuild 4792 RMD160 011d4c05d8b76822d278c9d46059b990e2514ccc SHA1 51a2a660994f42d907cf2db05fc5c04c5c470e74 SHA256 5c80fab5157ccc7f0d1b91b514dd8ba2af9e83799a0328166cce5457454c1910
-MD5 0b8a97ef5957c7c66ae4cad82717b377 cups-1.1.23-r7.ebuild 4792
-RMD160 011d4c05d8b76822d278c9d46059b990e2514ccc cups-1.1.23-r7.ebuild 4792
-SHA256 5c80fab5157ccc7f0d1b91b514dd8ba2af9e83799a0328166cce5457454c1910 cups-1.1.23-r7.ebuild 4792
-EBUILD cups-1.1.23-r8.ebuild 4745 RMD160 c5af36c2514f4af027441ac73f2c7d8b8cfad546 SHA1 2fb819ae4dc640e236eed252c807ea7a7e567104 SHA256 61da6a1f71865e27d1b813dddcb601d1b52e88614becdf9374a7e7739d44bb49
-MD5 6bc89cefe5eafe8a5efeb199326918c4 cups-1.1.23-r8.ebuild 4745
-RMD160 c5af36c2514f4af027441ac73f2c7d8b8cfad546 cups-1.1.23-r8.ebuild 4745
-SHA256 61da6a1f71865e27d1b813dddcb601d1b52e88614becdf9374a7e7739d44bb49 cups-1.1.23-r8.ebuild 4745
-EBUILD cups-1.2.1-r2.ebuild 5490 RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74 SHA1 e8525a550999f208ce30e2cdb46318da85e109a9 SHA256 bd756abe2a45445a8af4a5a229ff70647217c1926a020557b497ca4600ffe0d2
-MD5 880b8c1c029d3f781f495e1572724463 cups-1.2.1-r2.ebuild 5490
-RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74 cups-1.2.1-r2.ebuild 5490
-SHA256 bd756abe2a45445a8af4a5a229ff70647217c1926a020557b497ca4600ffe0d2 cups-1.2.1-r2.ebuild 5490
-EBUILD cups-1.2.2.ebuild 5444 RMD160 5e511734f28b36f339099d8e8a6f4c42bb8cbd2b SHA1 89180a2e599e58e6b0c23be2c07825c7f2fe2ec8 SHA256 4114ad135d945b4bba0bd3bfc529043b6c10fabe7c2647ccfc323793e759bb9a
-MD5 48566f4f51d15edbb08a2e0b3a0e2346 cups-1.2.2.ebuild 5444
-RMD160 5e511734f28b36f339099d8e8a6f4c42bb8cbd2b cups-1.2.2.ebuild 5444
-SHA256 4114ad135d945b4bba0bd3bfc529043b6c10fabe7c2647ccfc323793e759bb9a cups-1.2.2.ebuild 5444
-MISC ChangeLog 26727 RMD160 dd20d3f6fb3947174d3621f6d41c6efeeb3953c2 SHA1 0d22973a7f80aacf2c4ee9d11ff01b03c00959a8 SHA256 62317d4c32a1ed35acb483d60c6a8738961a40e3da975a830aedba26f63d1e16
-MD5 5aec8f167d5d9535cd553d3639015ad1 ChangeLog 26727
-RMD160 dd20d3f6fb3947174d3621f6d41c6efeeb3953c2 ChangeLog 26727
-SHA256 62317d4c32a1ed35acb483d60c6a8738961a40e3da975a830aedba26f63d1e16 ChangeLog 26727
+EBUILD cups-1.1.23-r8.ebuild 4964 RMD160 05a4ac371f38e59caa52cdf017cf2940d78e2713 SHA1 71dcf8e8318fbf48f34c356cefaa345f5d48c14b SHA256 466a665ed60af9fd4c2bfd1d5d7413fe8055b8093e7d259d0a90c174ddcc76c5
+MD5 88c9537d567eabeea09032701020d95d cups-1.1.23-r8.ebuild 4964
+RMD160 05a4ac371f38e59caa52cdf017cf2940d78e2713 cups-1.1.23-r8.ebuild 4964
+SHA256 466a665ed60af9fd4c2bfd1d5d7413fe8055b8093e7d259d0a90c174ddcc76c5 cups-1.1.23-r8.ebuild 4964
+EBUILD cups-1.2.2.ebuild 5657 RMD160 7b9aadd19476bd6042a808fb21d7bc0b67f585fb SHA1 272fcae2f2c3a730e047f2dc1f33666862025a62 SHA256 e66318f2d705b69987d5ed5b9080e283e3123b30335b07d2f7021224631a884d
+MD5 af1e75b8c67c766c4b7352a0f5c31694 cups-1.2.2.ebuild 5657
+RMD160 7b9aadd19476bd6042a808fb21d7bc0b67f585fb cups-1.2.2.ebuild 5657
+SHA256 e66318f2d705b69987d5ed5b9080e283e3123b30335b07d2f7021224631a884d cups-1.2.2.ebuild 5657
+MISC ChangeLog 26931 RMD160 65052bd0aacb4e7b90edf52f7c4261ca5f750f72 SHA1 3d7aab41cf6c5690126c9545ec800201ef4c2a4d SHA256 5899e03d3aee2de3d6b2fb425430b6b67f38940743861c55b7abed28fc52d6cf
+MD5 f1ee16c18598b6303752b298fe9bb401 ChangeLog 26931
+RMD160 65052bd0aacb4e7b90edf52f7c4261ca5f750f72 ChangeLog 26931
+SHA256 5899e03d3aee2de3d6b2fb425430b6b67f38940743861c55b7abed28fc52d6cf ChangeLog 26931
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -100,15 +91,9 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r1 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r1 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r1 262
-MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r7 262
-RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r7 262
-SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r7 262
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
-MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r2 259
-RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r2 259
-SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r2 259
 MD5 6ca104f41098627aed8831c9c787c6f2 files/digest-cups-1.2.2 259
 RMD160 5816b73bced2a425eadfd3ee49d3022e42c4741f files/digest-cups-1.2.2 259
 SHA256 dacf58f7bf93d749bdd7330f57e43ab53d507c143f509920c9a5c4aa106a1c6b files/digest-cups-1.2.2 259
diff --git a/net-print/cups/cups-1.1.23-r8.ebuild b/net-print/cups/cups-1.1.23-r8.ebuild
index e88ddd97010f..cb5d0a337a64 100644
--- a/net-print/cups/cups-1.1.23-r8.ebuild
+++ b/net-print/cups/cups-1.1.23-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.2 2006/07/03 20:05:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.3 2006/08/17 23:59:44 genstef Exp $
 
 inherit eutils flag-o-matic pam autotools
 
@@ -167,5 +167,15 @@ pkg_postinst() {
 	einfo "For more information about installing a printer take a look at:"
 	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
 
-	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+	local good_gs=false
+	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
+		if built_with_use ${x} cups; then
+			good_gs=true
+			break
+		fi
+	done;
+	if ! ${good_gs}; then
+		ewarn
+		ewarn "You need to emerge ghostscript with the cups-USEflag turned on"
+	fi
 }
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
index 11d62f1e630f..db7ff1eb6559 100644
--- a/net-print/cups/cups-1.2.2.ebuild
+++ b/net-print/cups/cups-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.1 2006/07/23 18:23:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.2 2006/08/17 23:59:44 genstef Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -153,8 +153,18 @@ pkg_postinst() {
 	einfo
 	einfo "For more information about installing a printer take a look at:"
 	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-	einfo
-	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+
+	local good_gs=false
+	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
+		if built_with_use ${x} cups; then
+			good_gs=true
+			break
+		fi
+	done;
+	if ! ${good_gs}; then
+		ewarn
+		ewarn "You need to emerge ghostscript with the cups-USEflag turned on"
+	fi
 	if has_version =net-print/cups-1.1*; then
 		ewarn
 		ewarn "The configuration changed with cups-1.2, you may want to save the old"