Added Joerg Plate's patch from bug 176857 to make it compile using libinklevel's new API. Thanks, Joerg! Minor whitespace fixes.

Package-Manager: portage-2.1.3_rc4

5 files changed, 63 insertions, 23 deletions

diff --git a/net-print/kink/ChangeLog b/net-print/kink/ChangeLog
index 9f911ec5b232..b4d00a86912c 100644
--- a/net-print/kink/ChangeLog
+++ b/net-print/kink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/kink
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/kink/ChangeLog,v 1.6 2007/01/06 19:50:57 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/kink/ChangeLog,v 1.7 2007/06/22 05:54:33 philantrop Exp $
+
+  22 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kink-0.2.1-api-update.patch, metadata.xml, kink-0.2.1-r1.ebuild:
+  Added Joerg Plate's patch from bug 176857 to make it compile using
+  libinklevel's new API. Thanks, Joerg! Minor whitespace fixes.
 
 *kink-0.2.1-r1 (06 Jan 2007)
 
diff --git a/net-print/kink/Manifest b/net-print/kink/Manifest
index dd4558cc65ab..4fcb3c58f587 100644
--- a/net-print/kink/Manifest
+++ b/net-print/kink/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kink-0.2.1-api-update.patch 821 RMD160 28016b8d94f55f78a67b942eaa973ebfbcfd0792 SHA1 446208ac42ff6abcb036e12572bafe2645afbdb3 SHA256 f84e11c83a194293461bf4882b17f2f0656f2c628acaae9c16f392637019116a
+MD5 2a61def1d49c5c90a1e4995a5df13c38 files/kink-0.2.1-api-update.patch 821
+RMD160 28016b8d94f55f78a67b942eaa973ebfbcfd0792 files/kink-0.2.1-api-update.patch 821
+SHA256 f84e11c83a194293461bf4882b17f2f0656f2c628acaae9c16f392637019116a files/kink-0.2.1-api-update.patch 821
 AUX kink-0.2.1-compilefix.diff 652 RMD160 bb9a2e0f30c8242b2619dab4ed83cc26adfbd6fb SHA1 5221d4fa85d191293b7367079fc9a5837b20f037 SHA256 397fe054c7cd2a2538ec4a17e8962219ecaefce3f4773b3a3628352fe544da49
 MD5 e42a0101174b97b644ed99bda4e4cceb files/kink-0.2.1-compilefix.diff 652
 RMD160 bb9a2e0f30c8242b2619dab4ed83cc26adfbd6fb files/kink-0.2.1-compilefix.diff 652
@@ -10,22 +14,22 @@ MD5 07762acb33e304850f1a55d45a893132 files/kink-0.2.1-libinklevel-0.6.6.patch 89
 RMD160 b885f8beaeab742879fa9fd3203aaa8ac1c2e5dc files/kink-0.2.1-libinklevel-0.6.6.patch 8984
 SHA256 c4eb718f2dab2ac38a1b44f2d337261179db5c4ae369c36a2a41fb40867161b1 files/kink-0.2.1-libinklevel-0.6.6.patch 8984
 DIST kink-0.2.1.tar.bz2 419012 RMD160 ed61efc29fd68a91b876553d31c775dea9483e38 SHA1 2314a3039588bb04a5f7f1273acb82a8eaf5996d SHA256 2c0eb6dade582b85a8938eb928d868d8ed81eaa55f16c2b469b0bf0cff9ad7bc
-EBUILD kink-0.2.1-r1.ebuild 595 RMD160 f70bf8701bbc8113869be287f20abf2f539e3940 SHA1 db9d61ca086f7a4a8accfffe2abfb218faa0ed35 SHA256 5a353dd6146a0e298bc12b87f47f8ec50fbbd7c55d78b03a3dc249af0b70d837
-MD5 b3b8b65d1ba7a27be4b27a58e8e45f60 kink-0.2.1-r1.ebuild 595
-RMD160 f70bf8701bbc8113869be287f20abf2f539e3940 kink-0.2.1-r1.ebuild 595
-SHA256 5a353dd6146a0e298bc12b87f47f8ec50fbbd7c55d78b03a3dc249af0b70d837 kink-0.2.1-r1.ebuild 595
+EBUILD kink-0.2.1-r1.ebuild 626 RMD160 430dac68a713374940aa7671f4af31040356f7bc SHA1 b76a8d17bc36f41a7a83f93ee7f4d0998d5ab3e3 SHA256 381eb567df340ffc3197df7248ff24322b2b189d5698ba48f498a17214521f0d
+MD5 01694ababaaff10f53cb6b3bc0bad08f kink-0.2.1-r1.ebuild 626
+RMD160 430dac68a713374940aa7671f4af31040356f7bc kink-0.2.1-r1.ebuild 626
+SHA256 381eb567df340ffc3197df7248ff24322b2b189d5698ba48f498a17214521f0d kink-0.2.1-r1.ebuild 626
 EBUILD kink-0.2.1.ebuild 576 RMD160 930facea23fc3d3dc7cdbc705987d8c7fbb0895c SHA1 8ef282a5f8c01ad8dbfc3485cfb7ff013f91ea42 SHA256 aea3621bd33f99623c96c4ce863e79762aa1f10976a904caa27cc82e8fcb47db
 MD5 c6aee0f49448cc92d8708b2cc08b1a20 kink-0.2.1.ebuild 576
 RMD160 930facea23fc3d3dc7cdbc705987d8c7fbb0895c kink-0.2.1.ebuild 576
 SHA256 aea3621bd33f99623c96c4ce863e79762aa1f10976a904caa27cc82e8fcb47db kink-0.2.1.ebuild 576
-MISC ChangeLog 960 RMD160 3faacbe62cce58b2b8a156b7b5b12a510a144ef5 SHA1 1f4e62f3fde0da4b22dcf5180ed63427ceea40e4 SHA256 848583fd747310b40360c7d73d44495bb90b6f45029c154665eb3d72a5f89f0d
-MD5 103b1287fbb50d3a14a6cce5fc6edb69 ChangeLog 960
-RMD160 3faacbe62cce58b2b8a156b7b5b12a510a144ef5 ChangeLog 960
-SHA256 848583fd747310b40360c7d73d44495bb90b6f45029c154665eb3d72a5f89f0d ChangeLog 960
-MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
+MISC ChangeLog 1228 RMD160 d8cee61d081c6d9ff8bcf68401f2c9ee63d382f8 SHA1 3cfe332bc55aa771c5f0661e494261e56a08b189 SHA256 68a71576fd1c0f3dfe9afca04f42605ac8a682afc316f43f3bd6a7ba4e759e65
+MD5 868687ed2ab3231316241dd1f69f4993 ChangeLog 1228
+RMD160 d8cee61d081c6d9ff8bcf68401f2c9ee63d382f8 ChangeLog 1228
+SHA256 68a71576fd1c0f3dfe9afca04f42605ac8a682afc316f43f3bd6a7ba4e759e65 ChangeLog 1228
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
 MD5 4f8b7d14555356953769bc7da0d96602 files/digest-kink-0.2.1 235
 RMD160 b4aa8537d80c40576bdc5a0f1d03b4f689d9543a files/digest-kink-0.2.1 235
 SHA256 21bf8f115f2e4b51e31a157dc893d50257ccc5ff24bb50cf5cb2885b64f021a4 files/digest-kink-0.2.1 235
@@ -33,9 +37,9 @@ MD5 4f8b7d14555356953769bc7da0d96602 files/digest-kink-0.2.1-r1 235
 RMD160 b4aa8537d80c40576bdc5a0f1d03b4f689d9543a files/digest-kink-0.2.1-r1 235
 SHA256 21bf8f115f2e4b51e31a157dc893d50257ccc5ff24bb50cf5cb2885b64f021a4 files/digest-kink-0.2.1-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFn/2sntT9W3vfTuoRAtGiAJ9Y/TGoYz5/wNE0enn0QIH3C1E+TQCgiAKu
-UczP5qKK4kSd1ir9UhtxAIc=
-=8Zz0
+iD8DBQFGe2QhCkvF58q80IkRAr1AAJ4oyupRYavhgFlJEdCi5T8ADqPgiwCfQ6Qh
+SpMIJ80XyyQHugsdNTT9bg8=
+=gaBy
 -----END PGP SIGNATURE-----
diff --git a/net-print/kink/files/kink-0.2.1-api-update.patch b/net-print/kink/files/kink-0.2.1-api-update.patch
new file mode 100644
index 000000000000..135a3dfbff15
--- /dev/null
+++ b/net-print/kink/files/kink-0.2.1-api-update.patch
@@ -0,0 +1,29 @@
+--- kink/kink.cpp-	2007-06-22 01:51:13.000000000 +0200
++++ kink/kink.cpp	2007-06-22 01:52:08.000000000 +0200
+@@ -76,7 +76,7 @@
+ 	// Detect printers on parallel ports (if any)
+   for(int i=0; i<PARPORT_LAST_PORT; i++)
+ 	{
+-	  callback = get_ink_level(PARPORT,i,&level);
++	  callback = get_ink_level(PARPORT,"",i,&level);
+ 		switch(callback)
+ 		{
+ 		  case OK:
+@@ -91,7 +91,7 @@
+ 	// Detect printers on USB ports (if any)
+   for(int i=0; i<USB_LAST_PORT; i++)
+ 	{
+-	  callback = get_ink_level(USB,i,&level);
++	  callback = get_ink_level(USB,"",i,&level);
+ 		switch(callback)
+ 		{
+ 		  case OK:
+@@ -202,7 +202,7 @@
+ 	grpError->hide();
+ 	grpLevels->show();
+ 
+-	callback=get_ink_level(last_type,last_port,&level);
++	callback=get_ink_level(last_type,"",last_port,&level);
+ 	if (callback == OK)
+ 	{
+ 		QProgressBar* ptrBar = 0;
diff --git a/net-print/kink/kink-0.2.1-r1.ebuild b/net-print/kink/kink-0.2.1-r1.ebuild
index 9dacd6311ad5..658136e492f6 100644
--- a/net-print/kink/kink-0.2.1-r1.ebuild
+++ b/net-print/kink/kink-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1-r1.ebuild,v 1.1 2007/01/06 19:10:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/kink/kink-0.2.1-r1.ebuild,v 1.2 2007/06/22 05:54:33 philantrop Exp $
 
 inherit kde eutils
 
@@ -10,11 +10,13 @@ SRC_URI="mirror://sourceforge/kink/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=net-print/libinklevel-0.6.6_rc5"
+DEPEND=">=net-print/libinklevel-0.7.1"
+
 need-kde 3.1
-PATCHES="${FILESDIR}/kink-0.2.1-compilefix.diff
-	${FILESDIR}/kink-0.2.1-libinklevel-0.6.6.patch"
 
+PATCHES="${FILESDIR}/kink-0.2.1-compilefix.diff
+	${FILESDIR}/${P}-libinklevel-0.6.6.patch
+	${FILESDIR}/${P}-api-update.patch"
diff --git a/net-print/kink/metadata.xml b/net-print/kink/metadata.xml
index 3399d0876645..8d1e86a9cefb 100644
--- a/net-print/kink/metadata.xml
+++ b/net-print/kink/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd> 
+<herd>kde</herd>
 </pkgmetadata>