summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-22 18:45:11 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-22 18:45:11 +0000
commita048761f10785fe7a8fb599686ee5ef0594305ff (patch)
tree558bf7bdc533a4307a506f3a00e0e8e6ab16c333 /net-print/cups
parentchange virtual/os-headers provider to a package.provided libsystem, so (diff)
downloadhistorical-a048761f10785fe7a8fb599686ee5ef0594305ff.tar.gz
historical-a048761f10785fe7a8fb599686ee5ef0594305ff.tar.bz2
historical-a048761f10785fe7a8fb599686ee5ef0594305ff.zip
better postinstall to be only shown for users who ignored it the first time
Package-Manager: portage-2.1.1_pre1-r1
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/Manifest8
-rw-r--r--net-print/cups/cups-1.2.1-r2.ebuild13
2 files changed, 12 insertions, 9 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 16961ffe9191..37494b41bb98 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -72,10 +72,10 @@ EBUILD cups-1.1.23-r7.ebuild 4654 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee78
MD5 28058673f2f754db6b5c8ea6ad9490ac cups-1.1.23-r7.ebuild 4654
RMD160 3b50b26d2519c60d5f86274dc1d998af69bee783 cups-1.1.23-r7.ebuild 4654
SHA256 71115c06cf8608d96b56fb3ba4cab0dd725648938a3e28e0a8af6c294585db39 cups-1.1.23-r7.ebuild 4654
-EBUILD cups-1.2.1-r2.ebuild 5088 RMD160 fb6f2899496b4ece8d86dc6dea816c7bf409faf6 SHA1 7f89f80680ba636148a4be8e3d557e4a0b1f01a2 SHA256 caf2b0cf336b478b017f0f634a122731bf99c682cbf130c6c04f93a4a1c54112
-MD5 83398007634c3a8c15688f4e19078e2f cups-1.2.1-r2.ebuild 5088
-RMD160 fb6f2899496b4ece8d86dc6dea816c7bf409faf6 cups-1.2.1-r2.ebuild 5088
-SHA256 caf2b0cf336b478b017f0f634a122731bf99c682cbf130c6c04f93a4a1c54112 cups-1.2.1-r2.ebuild 5088
+EBUILD cups-1.2.1-r2.ebuild 5119 RMD160 f3db201623ad26624e25280559f722a7cf0ef9c4 SHA1 34a920c733ff5e555a29e4098c08fd6d5a5c2585 SHA256 f0042420b042a7f30a43fecccd61364a9c7743cd6435b29b63db7d909d055915
+MD5 8a59c00a75bb476b1c458c383468a5bf cups-1.2.1-r2.ebuild 5119
+RMD160 f3db201623ad26624e25280559f722a7cf0ef9c4 cups-1.2.1-r2.ebuild 5119
+SHA256 f0042420b042a7f30a43fecccd61364a9c7743cd6435b29b63db7d909d055915 cups-1.2.1-r2.ebuild 5119
MISC ChangeLog 25589 RMD160 f959c8fa6f3060c52b887f38ad9c498d7c64f33b SHA1 5271cfe5bb20aaef13b74dc49d2adb8fad7961d8 SHA256 7e6036c2a79d3132d049d62f4d4d4778ca1387375f93ce7101f16f713b87d225
MD5 b3a46008f9d3c95842288cc2d8a595fe ChangeLog 25589
RMD160 f959c8fa6f3060c52b887f38ad9c498d7c64f33b ChangeLog 25589
diff --git a/net-print/cups/cups-1.2.1-r2.ebuild b/net-print/cups/cups-1.2.1-r2.ebuild
index 4fa300c26e20..6f32a7009b05 100644
--- a/net-print/cups/cups-1.2.1-r2.ebuild
+++ b/net-print/cups/cups-1.2.1-r2.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.1-r2.ebuild,v 1.2 2006/06/22 18:09:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r2.ebuild,v 1.3 2006/06/22 18:45:11 genstef Exp $
inherit eutils flag-o-matic multilib autotools
@@ -142,20 +142,23 @@ pkg_postinst() {
einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
einfo
einfo "You need to emerge ghostscript with the cups-USEflag turned on"
- ewarn
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"
ewarn "one and start from scratch:"
ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
ewarn
- ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild"
- ewarn "that installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
+ ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
+ fi
+ if [ -e ${ROOT}/usr/lib/cups ]; then
+ ewarn
+ ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
+ ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
ewarn
einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
einfo "symlinks installed by this package, it wont be needed on later merges."
ewarn "You should also run revdep-rebuild"
- einfo "Rebuilding kdelibs is also a good idea when you want to use it for cups"
# place symlinks to make the update smoothless
for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do