Try to reorder the warnings for the usb useflag to be more self-explanatory.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 22 insertions, 21 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d5d654e340c3..a3d0ae43fe50 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.411 2011/05/01 15:15:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.412 2011/05/03 10:16:08 scarabeus Exp $
+
+  03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.6-r1.ebuild:
+  Try to reorder the warnings for the usb useflag to be more self-explanatory.
 
   01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.6-r1.ebuild:
   use linux-info rather than linux-mod eclass. Per bug #365491.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 6bb7ae4b7a55..c1ae138dc6d1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -23,13 +23,13 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
-EBUILD cups-1.4.6-r1.ebuild 8130 RMD160 760d7243ec28c3f62d0ebadb7c4e06907383243b SHA1 0aab1417d248b0a5c2983a1ff853e38ac0c5cfda SHA256 c1ff2ae7e336033033c39804700a6579993e9923f32eb2a65ba15218df24ab11
-MISC ChangeLog 61666 RMD160 a7dda54c32cc19c319996b56980387ec8ee0264d SHA1 e3cf4b892e3db1e145b895992c71273879b5d61f SHA256 a74a139e083bb909638be625c6b0f084268e7dd49e99d8bdae89ea687049e58b
+EBUILD cups-1.4.6-r1.ebuild 8034 RMD160 03b5e4a9fdef8fa0f4a02dd917a32e071573227b SHA1 6309515ce1e09e44afff7612172526b4d27b876c SHA256 fc18793ec26c253fd3d8f5596323b896b4589e62ad61c03d428e52e62b5947db
+MISC ChangeLog 61823 RMD160 a8459265ab362cab2ddfc47ec17ab7fa5d850164 SHA1 9d755207dc330946a0cdbcc03cb78bfcce8629fe SHA256 6d8387265366577a037a91520f96c80a4c936d6b5206e05fcca304f821f08959
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk29eMUACgkQHB6c3gNBRYdoHwCgp8sH9n4nfNLvQUm17wOvjHDZ
-jm0AoKUm3PIHZsh3j8HMkhuai7ZpzPbG
-=Ioun
+iEYEARECAAYFAk2/1ewACgkQHB6c3gNBRYeBAACgzq6Y+3z3kuzlHzo9h2vPp2dS
+RfoAn2S7hR0DW367ljjmHk6qx62ZUJ6J
+=15Zq
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.6-r1.ebuild b/net-print/cups/cups-1.4.6-r1.ebuild
index ec4ed461d27f..912d1c18d760 100644
--- a/net-print/cups/cups-1.4.6-r1.ebuild
+++ b/net-print/cups/cups-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.4 2011/05/01 15:15:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.5 2011/05/03 10:16:08 scarabeus Exp $
 
 EAPI=3
 
@@ -81,6 +81,17 @@ pkg_setup() {
 		python_pkg_setup
 	fi
 
+	if use usb; then
+		elog "You are going to use new libusb backed to access your usb printer."
+		elog "This interface has quite few known issues and does not report all"
+		elog "issues and just refuses to print."
+		elog "Please consider disabling usb useflag if you are having issues."
+		elog
+		elog "Please note that if you disable the usb useflag your device will be"
+		elog "still working using kernel usblp interface instead of libusb."
+		echo
+	fi
+
 	linux-info_pkg_setup
 	if  ! linux_config_exists; then
 		ewarn "Can't check the linux kernel configuration."
@@ -89,9 +100,7 @@ pkg_setup() {
 		# recheck that we don't have usblp to collide with libusb
 		if use usb; then
 			if linux_chkconfig_present USB_PRINTER; then
-				eerror "Your usb printers will be managed via libusb."
-				eerror "Note that this interface still has issues so alternatively"
-				eerror "you should just disable usb useflag on ${P}."
+				eerror "Your usb printers will be managed via libusb which collides with kernel module."
 				eerror "${P} requires the USB_PRINTER support disabled."
 				eerror "Please disable it:"
 				eerror "    CONFIG_USB_PRINTER=n"
@@ -273,15 +282,4 @@ pkg_postinst() {
 	elog "For information about installing a printer and general cups setup"
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
-
-	if use usb; then
-		elog
-		elog "You are going to use new libusb backed to access your usb printer."
-		elog "This interface has quite few known issues and does not report all"
-		elog "issues and just refuses to print."
-		elog "Please consider disabling usb useflag if you are having issues."
-		elog
-		elog "Please note that if you disable the usb useflag your device will be"
-		elog "still working using kernel usblp interface instead of libusb."
-	fi
 }