Ebuild cleanup. Remove elog messages and refer to the updated printing guide instead.

Package-Manager: portage-2.1.9.35/cvs/Linux i686

5 files changed, 40 insertions, 51 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 146e8ffe6062..aea0d042427d 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.180 2011/02/01 19:24:19 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.181 2011/02/14 19:53:22 billie Exp $
+
+  14 Feb 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.10.9-r1.ebuild,
+  hplip-3.11.1-r2.ebuild, metadata.xml:
+  Ebuild cleanup. Remove elog messages and refer to the updated printing guide
+  instead.
 
 *hplip-3.11.1-r2 (01 Feb 2011)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 964597c9c62b..60617e4ef8a4 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -10,7 +10,7 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
 DIST hplip-3.11.1.tar.gz 22167916 RMD160 0ac41ed3935a050f1bcd431418fa280b853e8caf SHA1 6b06567373cadc7dff48134c6b58f90a4d72582a SHA256 2f5d988ce53c084556425ae6c5e56a9b5cfa3ac0381059eed913b4523bd1c878
-EBUILD hplip-3.10.9-r1.ebuild 8036 RMD160 0a46cdfa916066f0baf951b27399148fae368677 SHA1 7b0d30b761872340adc3a1f76cbd89423fd45eae SHA256 af3f36d2f800adfb850e9d86b8e66ff3fd4c942c3d4e5598c9bae05316ea412e
-EBUILD hplip-3.11.1-r2.ebuild 8021 RMD160 9eeeb861a0ddf78482f2567b1174b7278ffcec52 SHA1 a5934dd2769c3b29a2344ae816ff1ceaf8f17478 SHA256 39aa52c31913a344e06ca669cdcaeeb5eafa91adcdbb8779387de86447ca1268
-MISC ChangeLog 31371 RMD160 db69faeae961d66301384be24cfffbf526da3fae SHA1 5ee3afb9fe53b55a421e1ee112e9ca89db7c2acd SHA256 5c5be008179374d90e8cc7dab2d111204f16e55348defaf53079c6bdb3d47da4
-MISC metadata.xml 1913 RMD160 595b2f423da3f8715119c41473f9a07cf805533d SHA1 dd63aa217fda9022029cdb44521f1fe3c61f4e71 SHA256 27810cc7dc8a61b067b7714e0d7d935b27b2cc4e09c33c6c72ed0e9025023489
+EBUILD hplip-3.10.9-r1.ebuild 7555 RMD160 6826be4038a3df41fd4e13b8c69310f904e67c31 SHA1 b5a49874fc16a601ebe4e1f367907f465a3fc7ca SHA256 55e00fcef73203f11faec74c15ce1dd7a42361833a98692e53e0d13633484449
+EBUILD hplip-3.11.1-r2.ebuild 7539 RMD160 29cbb5f041924557c0289d8f7ab8f54cc49d324d SHA1 ca7ecf9e3d5184d06fee4a6db9c042c84eb483ca SHA256 bb0d22614daccba5b89fdddc6dbc71faaac05bdb162b6a2b57ce9e98074548f0
+MISC ChangeLog 31578 RMD160 d29fef3a4daeea3fd8fab776acaecc2fcedaa4fe SHA1 3930aef3a30eed8111d0156ac21648d18a218160 SHA256 a37956f9902d7c523de56052d898276b20aa42de3315f9a87eb8daf7e8772b49
+MISC metadata.xml 1913 RMD160 1c4fd3bb30048481c0cb42c07fcc5c5c4bb0d0e7 SHA1 8579b881d5997f443891eef70bb677d8fe2e7815 SHA256 5fe1b44e4ddfdca2d3c5842aaecff76430255153d3d397629cca188f4a5a93a1
diff --git a/net-print/hplip/hplip-3.10.9-r1.ebuild b/net-print/hplip/hplip-3.10.9-r1.ebuild
index 4db78d18cd21..a5434478fc3c 100644
--- a/net-print/hplip/hplip-3.10.9-r1.ebuild
+++ b/net-print/hplip/hplip-3.10.9-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/hplip/hplip-3.10.9-r1.ebuild,v 1.4 2011/01/21 13:44:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.9-r1.ebuild,v 1.5 2011/02/14 19:53:23 billie Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ PYTHON_USE_WITH_OPT="!minimal"
 
 inherit fdo-mime linux-info python autotools
 
-DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
 
@@ -18,7 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 
-# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
 IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
 
 COMMON_DEPEND="
@@ -69,7 +70,7 @@ RDEPEND="${COMMON_DEPEND}
 	)"
 
 CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
 
 pkg_setup() {
 	if ! use minimal; then
@@ -117,7 +118,8 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
 	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
 
-	# Htmldocs are not installed under docdir/html so enable htmldir configure switch
+	# Htmldocs are not installed under docdir/html so enable htmldir configure
+	# switch
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
 	epatch "${FILESDIR}"/${PN}-3.9.10-htmldir.patch
 
@@ -142,10 +144,10 @@ src_prepare() {
 	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
 	# The hpcups driver does not use foomatic-rip
 	local i
-	for i in ppd/hpijs/*.ppd.gz
-	do
+	for i in ppd/hpijs/*.ppd.gz ; do
 		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
 		mv ${i}.temp ${i}
 	done
 
@@ -248,19 +250,9 @@ pkg_postinst() {
 	use !minimal && python_mod_optimize /usr/share/${PN}
 	fdo-mime_desktop_database_update
 
-	elog "You should run hp-setup as root if you are installing hplip for the first time,"
-	elog "and may also need to run it if you are upgrading from an earlier version."
-	elog
-	elog "If your device is connected using USB, users will need to be in the lp group to"
-	elog "access it."
-	elog
-	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
-	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
-	elog "If you prefer the SLP method you have to choose this when configuring the"
-	elog "device."
-	elog "Note: For cups-1.4.x SLP is the only supported method as mDNS (zeroconf) is not"
-	elog "available here."
-
+	elog "For more information on setting up your printer please take"
+	elog "a look at the hplip section of the gentoo printing guide:"
+	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
 }
 
 pkg_postrm() {
diff --git a/net-print/hplip/hplip-3.11.1-r2.ebuild b/net-print/hplip/hplip-3.11.1-r2.ebuild
index eaa6b1e6b1e5..fa7cc8710773 100644
--- a/net-print/hplip/hplip-3.11.1-r2.ebuild
+++ b/net-print/hplip/hplip-3.11.1-r2.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/hplip/hplip-3.11.1-r2.ebuild,v 1.1 2011/02/01 19:24:19 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.1-r2.ebuild,v 1.2 2011/02/14 19:53:23 billie Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ PYTHON_USE_WITH_OPT="!minimal"
 
 inherit fdo-mime linux-info python autotools
 
-DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
 
@@ -18,7 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
 IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
 
 COMMON_DEPEND="
@@ -69,7 +70,7 @@ RDEPEND="${COMMON_DEPEND}
 	)"
 
 CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
 
 pkg_setup() {
 	if ! use minimal; then
@@ -117,7 +118,8 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
 	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
 
-	# Htmldocs are not installed under docdir/html so enable htmldir configure switch
+	# Htmldocs are not installed under docdir/html so enable htmldir configure
+	# switch
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
 	epatch "${FILESDIR}"/${P}-htmldir.patch
 
@@ -142,10 +144,10 @@ src_prepare() {
 	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
 	# The hpcups driver does not use foomatic-rip
 	local i
-	for i in ppd/hpijs/*.ppd.gz
-	do
+	for i in ppd/hpijs/*.ppd.gz ; do
 		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
 		mv ${i}.temp ${i}
 	done
 
@@ -248,19 +250,9 @@ pkg_postinst() {
 	use !minimal && python_mod_optimize /usr/share/${PN}
 	fdo-mime_desktop_database_update
 
-	elog "You should run hp-setup as root if you are installing hplip for the first time,"
-	elog "and may also need to run it if you are upgrading from an earlier version."
-	elog
-	elog "If your device is connected using USB, users will need to be in the lp group to"
-	elog "access it."
-	elog
-	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
-	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
-	elog "If you prefer the SLP method you have to choose this when configuring the"
-	elog "device."
-	elog "Note: For cups-1.4.x SLP is the only supported method as mDNS (zeroconf) is not"
-	elog "available here."
-
+	elog "For more information on setting up your printer please take"
+	elog "a look at the hplip section of the gentoo printing guide:"
+	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
 }
 
 pkg_postrm() {
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index e7d0a95910c0..80e1712d5d49 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -3,16 +3,16 @@
 <pkgmetadata>
 	<herd>printing</herd>
 	<maintainer>
-		<email>calchan@gentoo.org</email>
-		<name>Denis Dupeyron</name>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
 	</maintainer>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 		<name>Diego Elio Pettenò</name>
 	</maintainer>
 	<maintainer>
-		<email>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
+		<email>calchan@gentoo.org</email>
+		<name>Denis Dupeyron</name>
 	</maintainer>
 	<use>
 		<flag name="doc">Build documentation</flag>