Update the fast-pp patch to add linkage against lrt. This fixes bug #402177. Thanks to Juergen Rose and Martin Mokrejš for the patch.

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

3 files changed, 41 insertions, 12 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index a2a9e44aa89c..1f7a081ef1c5 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.210 2012/02/07 20:04:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.211 2012/02/08 19:29:59 billie Exp $
+
+  08 Feb 2012; Daniel Pielmeier <billie@gentoo.org>
+  files/hplip-3.11.12-fast-pp.patch:
+  Update the fast-pp patch to add linkage against lrt. This fixes bug #402177.
+  Thanks to Juergen Rose and Martin Mokrejš for the patch.
 
 *hplip-3.12.2 (07 Feb 2012)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 50f6ce66f4a3..69b51e8abb28 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,7 +7,7 @@ AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab
 AUX hplip-3.11.1-udev-attrs.patch 13946 RMD160 3634385078375936692251464ad9d31f76bc1c63 SHA1 abf1f2cfc709c9a46c18b4bff5f08420e50e2ae9 SHA256 a7ce9b86783c94f3c3c5e111364ef7874bbfda4af89137b1e7d158961d084d33
 AUX hplip-3.11.10-udev-attrs.patch 13895 RMD160 e350d51abbf93f20c1829bdeaf01d300b7030bc5 SHA1 e67a3053f12ac84ca496ddfe75d2864a3a257017 SHA256 83a7b126877f49fbfb28e5d9df26607e1f165a74a865030023c081c60e7256cd
 AUX hplip-3.11.12-black-stripes-pcl5c.patch 552 RMD160 8f6828824244e387418c2d467be63b2c9131e84a SHA1 4d6174bc075560b6ae49bc246a4ff8d55da21217 SHA256 5636e9d32d6bcc71ea358426d1723a0e57080ae5be0e65d597f1d1764eb5728e
-AUX hplip-3.11.12-fast-pp.patch 21769 RMD160 248881681613db17b16d374fab7b5a80ab3d9329 SHA1 a5ab26d304392133210f38e2da1b83af78c3513b SHA256 80b584e4ba0b075be9fbf44b853f39617def9e861922a6c2248a8e64de43677a
+AUX hplip-3.11.12-fast-pp.patch 22850 RMD160 048ccbc67a5baa669694d05db8bf3a9822050405 SHA1 5f48cc43ee69362a4817ac6684253c56bcbb55e6 SHA256 ee827c8c18591815d4994fa216778e9efeba1627c927015699c89e0b96ac3dee
 AUX hplip-3.11.12-udev-rules.patch 951 RMD160 29947b36f48b2bce89baf44c215ee044ea916711 SHA1 ef9d4b84520d3ddfdb4f300acc125f86fc47fe0f SHA256 9e461b7f6a264434317fcc83bb53c313f5f9c467bdec8c572b49684f6ddfcfa7
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
@@ -20,12 +20,12 @@ EBUILD hplip-3.11.10.ebuild 7527 RMD160 ac1c37d102321db5ecf6da112902023e89e0d1ef
 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
 EBUILD hplip-3.12.2.ebuild 7823 RMD160 3301e2f85b69a1ac4102a47a4298af6b77dab396 SHA1 4d327c0895fb7064912144296c59cdd38032ef0e SHA256 d927a6bcc29eacdf4ccbedd729b30806a371731119931e6d1d049acf47826814
-MISC ChangeLog 36400 RMD160 7841aef884b12d6ad10a3fece326fb2e2a8749e3 SHA1 39c64fedfa0d92fa5c232a9f0663ab20a6377d35 SHA256 563842bbe09a5b469d46490c039f4f5b4e9881eeaa3a6a1425479a0e6d6f8d47
+MISC ChangeLog 36629 RMD160 5f25239f438b33a67fc21b45115f9a83bddac176 SHA1 95b088defbd2e62d3e51e1fab8788d89d57765d5 SHA256 63220193ec78f6da89be338c77ac82fac5d85e20c250618d854dca0208fb95c0
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8xg9QACgkQlcuUeyFa0U3+EgCePglFfyYcnF7AZhSwFfVyb/PQ
-548Anj3t62v0YoftNk4l3iHVDLVZzsIp
-=7sSw
+iEYEAREIAAYFAk8yzUQACgkQlcuUeyFa0U1McgCdHXOI0ChnX1qyIVwA3cNXRCPt
+OS8AoOX0LylhD1D79jPIZMZCL7xKAvX6
+=XQxZ
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.11.12-fast-pp.patch b/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
index 478e5aab8eb3..7eaa9cd855b6 100644
--- a/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
+++ b/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
@@ -1,6 +1,6 @@
-diff -ur hplip-3.11.5/io/hpmud/pp.c hplip-3.11.5-fast-pp/io/hpmud/pp.c
---- hplip-3.11.5/io/hpmud/pp.c	2011-05-14 18:26:04.000000000 +0000
-+++ hplip-3.11.5-fast-pp/io/hpmud/pp.c	2011-07-13 22:06:57.000000000 +0000
+diff -Naur hplip-3.12.2-orig/io/hpmud/pp.c hplip-3.12.2/io/hpmud/pp.c
+--- hplip-3.12.2-orig/io/hpmud/pp.c	2012-02-01 12:53:52.000000000 +0100
++++ hplip-3.12.2/io/hpmud/pp.c	2012-02-08 20:04:14.559884716 +0100
 @@ -28,6 +28,8 @@
  
  #include "hpmud.h"
@@ -784,9 +784,9 @@ diff -ur hplip-3.11.5/io/hpmud/pp.c hplip-3.11.5-fast-pp/io/hpmud/pp.c
  
        m = IEEE1284_MODE_NIBBLE;
        ioctl(pd->mlc_fd, PPNEGOT, &m);
-diff -ur hplip-3.11.5/io/hpmud/pp.h hplip-3.11.5-fast-pp/io/hpmud/pp.h
---- hplip-3.11.5/io/hpmud/pp.h	2011-05-14 18:26:04.000000000 +0000
-+++ hplip-3.11.5-fast-pp/io/hpmud/pp.h	2011-07-13 21:08:15.000000000 +0000
+diff -Naur hplip-3.12.2-orig/io/hpmud/pp.h hplip-3.12.2/io/hpmud/pp.h
+--- hplip-3.12.2-orig/io/hpmud/pp.h	2012-02-01 12:53:52.000000000 +0100
++++ hplip-3.12.2/io/hpmud/pp.h	2012-02-08 20:04:14.559884716 +0100
 @@ -60,18 +60,11 @@
   *   0 - Strobe *
   * 
@@ -806,3 +806,27 @@ diff -ur hplip-3.11.5/io/hpmud/pp.h hplip-3.11.5-fast-pp/io/hpmud/pp.h
  
  struct _mud_device;
  struct _mud_channel;
+diff -Naur hplip-3.12.2-orig/Makefile.am hplip-3.12.2/Makefile.am
+--- hplip-3.12.2-orig/Makefile.am	2012-02-01 12:53:57.000000000 +0100
++++ hplip-3.12.2/Makefile.am	2012-02-08 20:04:14.576551703 +0100
+@@ -68,9 +68,9 @@
+ 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \

+ 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h

+ if NETWORK_BUILD

+-libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto

++libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt -l$(SNMPLIB) -lcrypto

+ else

+-libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread

++libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt

+ endif

+ libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"

+ 

+@@ -87,7 +87,7 @@
+ hp_mkuridir = $(bindir)

+ hp_mkuri_PROGRAMS = hp-mkuri

+ hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c

+-hp_mkuri_LDADD = -ldl libhpmud.la

++hp_mkuri_LDADD = -ldl -lrt libhpmud.la

+ hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"

+ 

+ # hpmud.rules