Version bump. Remove old.

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

3 files changed, 23 insertions, 16 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 0f165ab1ee95..a2a9e44aa89c 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.209 2012/02/05 01:29:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.210 2012/02/07 20:04:31 billie Exp $
+
+*hplip-3.12.2 (07 Feb 2012)
+
+  07 Feb 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.12-r1.ebuild,
+  +hplip-3.12.2.ebuild:
+  Version bump. Remove old.
 
   05 Feb 2012; Mike Gilbert <floppym@gentoo.org> hplip-3.11.10.ebuild,
   hplip-3.11.5.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0379fbd4ab84..50f6ce66f4a3 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -15,16 +15,17 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95
 DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
 DIST hplip-3.11.12.tar.gz 21530771 RMD160 e192446613e13d55bedfd331afd9b08d51071da0 SHA1 4990a7e416b5c75a9cf31604d20e5a0ff2f2f2dd SHA256 dcf05d1261f091a1dba1316a1f4e9034147fecbb1fff3e68179a599eb5ee4a9d
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
+DIST hplip-3.12.2.tar.gz 20579749 RMD160 99893258300446bab8ae6d4198cc2f0b62197fbe SHA1 bdf3e37a344f5b57b62425f755c4293d6d4ae875 SHA256 6eaa0cc6f255cc3ebeddb73dee208e6bdc22ba467e3b1da943844ae266d3c314
 EBUILD hplip-3.11.10.ebuild 7527 RMD160 ac1c37d102321db5ecf6da112902023e89e0d1ef SHA1 29485a677f4cbad83a36aaf65f5fc6a791f477e6 SHA256 4aab63ac5bfa7c8220f63e89af051c70b8a14b2bac4ec8bca9a4a66f418f4b28
-EBUILD hplip-3.11.12-r1.ebuild 7807 RMD160 dc4c18093e46245b0106496f53c374f5202786c7 SHA1 4fd92331b647c5474e3079bfe168c5419c914538 SHA256 b3ec5873619be3221299c437102ba83718cc74fac701c5e837b5a591b59a5c79
 EBUILD hplip-3.11.12-r2.ebuild 7942 RMD160 79686dccbbeb52d91c4b2cdb322a59d4e3f385e1 SHA1 48a5c77cf231574971d3e9633fb26a128e28fd09 SHA256 7943a001486424a6ac12ddddaf4a1b8a9965614a3e3c940041bbed44e258bffe
 EBUILD hplip-3.11.5.ebuild 7524 RMD160 9796167bb42c741ec7334c92efac174d2b1e3ab0 SHA1 f64c398442fe0ee399ea290afe67d1dec9726265 SHA256 f649c426149b98b1458d4b146718427905c46d3cf4bcf5fe57eb62acbb81dc44
-MISC ChangeLog 36241 RMD160 7562444e4ff3ffb7f55c9f9ff4e3fb7a357a954c SHA1 8032cb27285d28f509e3b3c04169ed9daeb52087 SHA256 917b44bbd3a122fde7d8a23eafab1054b93d5dfe3386c1d49aba5999139c1cbe
+EBUILD hplip-3.12.2.ebuild 7823 RMD160 3301e2f85b69a1ac4102a47a4298af6b77dab396 SHA1 4d327c0895fb7064912144296c59cdd38032ef0e SHA256 d927a6bcc29eacdf4ccbedd729b30806a371731119931e6d1d049acf47826814
+MISC ChangeLog 36400 RMD160 7841aef884b12d6ad10a3fece326fb2e2a8749e3 SHA1 39c64fedfa0d92fa5c232a9f0663ab20a6377d35 SHA256 563842bbe09a5b469d46490c039f4f5b4e9881eeaa3a6a1425479a0e6d6f8d47
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8t22cACgkQC77qH+pIQ6T0XwD+Lm42LTFZ2VsD5s58HVsVd5L6
-AsbXQ1HfitiHUJLMN/oBAMeBoyZmliI6jfFrEamtkooriUBvmUPAhDaCh/FXB32b
-=lKyJ
+iEYEAREIAAYFAk8xg9QACgkQlcuUeyFa0U3+EgCePglFfyYcnF7AZhSwFfVyb/PQ
+548Anj3t62v0YoftNk4l3iHVDLVZzsIp
+=7sSw
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.11.12-r1.ebuild b/net-print/hplip/hplip-3.12.2.ebuild
index f7844c5e545b..5b421e097282 100644
--- a/net-print/hplip/hplip-3.11.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.12-r1.ebuild,v 1.1 2012/01/12 19:19:01 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2.ebuild,v 1.1 2012/02/07 20:04:31 billie Exp $
 
 EAPI=4
 
@@ -122,13 +122,9 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
 	epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
 
-	# Increase systray check timeout for slower machines
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
-	epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
-
 	# Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
 	# Upstream bug: None
-	epatch "${FILESDIR}"/${P}-udev-rules.patch
+	epatch "${FILESDIR}"/${PN}-3.11.12-udev-rules.patch
 
 	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
 	# http://secunia.com/advisories/42956/
@@ -137,7 +133,11 @@ src_prepare() {
 
 	# Fix black stripes on pcl5c printouts
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
-	epatch "${FILESDIR}"/${P}-black-stripes-pcl5c.patch
+	epatch "${FILESDIR}"/${PN}-3.11.12-black-stripes-pcl5c.patch
+
+	# Fix parallel port cpu usage
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
+	epatch "${FILESDIR}"/${PN}-3.11.12-fast-pp.patch
 
 	# Force recognition of Gentoo distro by hp-check
 	sed -i \
@@ -247,11 +247,11 @@ src_install() {
 	# Gentoo Bug: #201023
 	rm -f "${D}"/etc/sane.d/dll.conf || die
 
-	rm -f "${D}"/usr/share/doc/${P}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir "${D}"/usr/share/doc/${P}/ >/dev/null
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
 
 	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal  || die
+	rm -rf "${D}"/usr/share/hal || die
 
 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die
 }