Version bump and fixed the multilib issues.

Package-Manager: portage-2.1.2_rc4-r5

5 files changed, 98 insertions, 6 deletions

diff --git a/net-print/libinklevel/ChangeLog b/net-print/libinklevel/ChangeLog
index cf5f0a8abb44..759cdb341cf0 100644
--- a/net-print/libinklevel/ChangeLog
+++ b/net-print/libinklevel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/libinklevel
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.17 2006/10/04 17:32:27 blubb Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.18 2007/01/06 19:04:38 cryos Exp $
+
+*libinklevel-0.6.6_rc5 (06 Jan 2007)
+
+  06 Jan 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/libinklevel-0.6.6_rc5-libdir.patch, +libinklevel-0.6.6_rc5.ebuild:
+  Version bump and fixed the multilib issues.
 
   04 Oct 2006; Simon Stelling <blubb@gentoo.org>
   +files/libinklevel-0.6.5_rc1-libdir.patch, libinklevel-0.6.5_rc1.ebuild:
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 65628d7231bb..d31aee32c9d5 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libinklevel-0.6.5_rc1-libdir.patch 783 RMD160 75940a39ba11f00641331d844530a10272732258 SHA1 ec1ec2656416a0c7e053da7e4cded02ff2f72c93 SHA256 f826725750418fb2e83f762a0370580d49e55340a0bbb852269ef283ffcab00e
 MD5 df3eda01ef89b56f9c31c794384225ae files/libinklevel-0.6.5_rc1-libdir.patch 783
 RMD160 75940a39ba11f00641331d844530a10272732258 files/libinklevel-0.6.5_rc1-libdir.patch 783
 SHA256 f826725750418fb2e83f762a0370580d49e55340a0bbb852269ef283ffcab00e files/libinklevel-0.6.5_rc1-libdir.patch 783
+AUX libinklevel-0.6.6_rc5-libdir.patch 1072 RMD160 95d5c03065424a2e8ff2c20f81e635d56d2fbad8 SHA1 7f3f56c6810f8f9eddf0c17af49e0462a9deb8e3 SHA256 a2fa85f35a667a67dee5088bb0dd698ff16983fdf63a41fda331e4c74e1ca848
+MD5 2de805fc9c27ef9f8ccc7aa3f82eb920 files/libinklevel-0.6.6_rc5-libdir.patch 1072
+RMD160 95d5c03065424a2e8ff2c20f81e635d56d2fbad8 files/libinklevel-0.6.6_rc5-libdir.patch 1072
+SHA256 a2fa85f35a667a67dee5088bb0dd698ff16983fdf63a41fda331e4c74e1ca848 files/libinklevel-0.6.6_rc5-libdir.patch 1072
 DIST libinklevel-0.6.3.tar.gz 13974 RMD160 cb45540547f335e605b8fcffa50223a857cba79e SHA1 e445fefe1f9f8c7615268f01fd09ed58ef04e685 SHA256 da4e6b2b8d4f0d2698d6cda236b8d79cbf50bde2fd38d7a3076d6844423860b0
 DIST libinklevel-0.6.5rc1.tar.gz 13266 RMD160 2de1b2fab1cb7318434d24c5db95b12167bd6751 SHA1 786bcabd3753e514fa39c4c29da69ab0470a73bc SHA256 c964a67437b01eb1c72b1c32a42fa2d0b689a4fc9f19ef288c92ceb7d64fd73e
 DIST libinklevel-0.6.6rc3.tar.gz 16888 RMD160 a2d90d0f0beff01e93bcd68ff20f56145baab547 SHA1 7e3710481c7c304eb3f3304bbf0ab51b36acbdba SHA256 d7d7cd61571fe605d8346b872e6ee4a1f021a74091a23beac3543b5b3313fdac
+DIST libinklevel-0.6.6rc5.tar.gz 29495 RMD160 4d60eb127f6275096209b62c02ada23ff3894b8c SHA1 b217019476e8c66f701a6cb95578193b83fccbde SHA256 28a17a391febbdd63cb5a43c75acb73030c4cfae349b36539076778880b9e720
 EBUILD libinklevel-0.6.3.ebuild 583 RMD160 5a7d05754e14020839a5cd0410c12fe0619d0f36 SHA1 0dce022ab33918751bc089bb161d2215b53ff8bc SHA256 423bd0aad743ecf787e26f5733fb7bec5510a180738e99b8632963a080b71d8b
 MD5 dee3dc9e6a9c39595d4e92861afdf0af libinklevel-0.6.3.ebuild 583
 RMD160 5a7d05754e14020839a5cd0410c12fe0619d0f36 libinklevel-0.6.3.ebuild 583
@@ -17,10 +25,14 @@ EBUILD libinklevel-0.6.6_rc3.ebuild 609 RMD160 577332a94548da2a01f3c29ce0f424d05
 MD5 264960c665f3217841c3adb822fd28a2 libinklevel-0.6.6_rc3.ebuild 609
 RMD160 577332a94548da2a01f3c29ce0f424d055e6849e libinklevel-0.6.6_rc3.ebuild 609
 SHA256 cea1844ec6faf87b65f071beab030717b6d23dd9440440e2c55966d1eb885f31 libinklevel-0.6.6_rc3.ebuild 609
-MISC ChangeLog 2239 RMD160 08a1821ae6584e7602ecb87b68732edba6f4e663 SHA1 1e5e9f05d718f86d1d95e289190aa87ead019a8e SHA256 c3e22af7c8c2e5294d37f5303bc6a1878a9423983af34147711d74b9627ebc07
-MD5 171fed86d458e6871be08d24b1906a79 ChangeLog 2239
-RMD160 08a1821ae6584e7602ecb87b68732edba6f4e663 ChangeLog 2239
-SHA256 c3e22af7c8c2e5294d37f5303bc6a1878a9423983af34147711d74b9627ebc07 ChangeLog 2239
+EBUILD libinklevel-0.6.6_rc5.ebuild 735 RMD160 1b7b5d190f6f5e98505863e97ead0db957fbb5c4 SHA1 aa2c57b54d8216a84306c511c935c39a65a8d420 SHA256 395d8979ffa1385e4a66966e89be0eac711cc258edcf350697cc34bc67cbba51
+MD5 9154b8a580be886eef7b4120a9f0fc56 libinklevel-0.6.6_rc5.ebuild 735
+RMD160 1b7b5d190f6f5e98505863e97ead0db957fbb5c4 libinklevel-0.6.6_rc5.ebuild 735
+SHA256 395d8979ffa1385e4a66966e89be0eac711cc258edcf350697cc34bc67cbba51 libinklevel-0.6.6_rc5.ebuild 735
+MISC ChangeLog 2452 RMD160 9f268de2009683a59e372ec6f3375d45b71f86f2 SHA1 2f69180f9f8121768bb686cc34a81e8a4fc4df7d SHA256 41adf4a054fcce3881f678d8acd3297e2203fc7b2d0d5f62b069caf4c01c0461
+MD5 26dbd7c4ac92dfe9144d1770786a78b0 ChangeLog 2452
+RMD160 9f268de2009683a59e372ec6f3375d45b71f86f2 ChangeLog 2452
+SHA256 41adf4a054fcce3881f678d8acd3297e2203fc7b2d0d5f62b069caf4c01c0461 ChangeLog 2452
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -34,3 +46,13 @@ SHA256 554123cc41f457525f12504e256ce6f8ed1114e7b64b647c0bb7b26068d1844c files/di
 MD5 2cf122f4bf182b9bb7fc260c35bdd317 files/digest-libinklevel-0.6.6_rc3 259
 RMD160 9576bfd19ed0a7621ddbd517073f2ee5f796fda7 files/digest-libinklevel-0.6.6_rc3 259
 SHA256 aad9387c76ac3cb84095d142aba30eb3c78acb8f38d48e0ed5f7ed40afff5160 files/digest-libinklevel-0.6.6_rc3 259
+MD5 643259381a9816104d3c9c5b895a52eb files/digest-libinklevel-0.6.6_rc5 259
+RMD160 9a3e9da47e9ff81fca4dedb4a91ede46ea082b47 files/digest-libinklevel-0.6.6_rc5 259
+SHA256 ffdb121cb58fbdb9bb9ffbd49c60b311f85af605e78741e2469928dd0c7fdde9 files/digest-libinklevel-0.6.6_rc5 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFn/LUntT9W3vfTuoRAlAeAKCumcrKAxGL/XGAkn9qXpC0a6hyzQCZATzW
+1QvbsOHGZfi2WfMImRdxCM0=
+=IKe9
+-----END PGP SIGNATURE-----
diff --git a/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5 b/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5
new file mode 100644
index 000000000000..c3377bc1e8fa
--- /dev/null
+++ b/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5
@@ -0,0 +1,3 @@
+MD5 e1ac2a8f24a1b553e884c1edf1bf5271 libinklevel-0.6.6rc5.tar.gz 29495
+RMD160 4d60eb127f6275096209b62c02ada23ff3894b8c libinklevel-0.6.6rc5.tar.gz 29495
+SHA256 28a17a391febbdd63cb5a43c75acb73030c4cfae349b36539076778880b9e720 libinklevel-0.6.6rc5.tar.gz 29495
diff --git a/net-print/libinklevel/files/libinklevel-0.6.6_rc5-libdir.patch b/net-print/libinklevel/files/libinklevel-0.6.6_rc5-libdir.patch
new file mode 100644
index 000000000000..c4608b2c5219
--- /dev/null
+++ b/net-print/libinklevel/files/libinklevel-0.6.6_rc5-libdir.patch
@@ -0,0 +1,30 @@
+# Marcus D. Hanwell <cryos@gentoo.org> 6 January 2007.
+# Help libinklevel to be more multilib friendly.
+--- Makefile.orig	2007-01-06 13:40:39.000000000 +0000
++++ Makefile	2007-01-06 13:42:44.000000000 +0000
+@@ -1,4 +1,5 @@
+ DESTDIR = /usr/local/
++LIBDIR = lib
+ CFLAGS = -Wall -O2 -fPIC -DPIC -I.
+ 
+ all: libinklevel.so.3.0.6.6
+@@ -6,14 +7,14 @@
+ install: all
+ 	mkdir -p $(DESTDIR)/include
+ 	install -m 644 -o root -g root inklevel.h $(DESTDIR)/include/inklevel.h
+-	mkdir -p $(DESTDIR)/lib
++	mkdir -p $(DESTDIR)/${LIBDIR}
+ 	install -m 755 -o root -g root libinklevel.so.3.0.6.6 \
+-	$(DESTDIR)/lib/libinklevel.so.3.0.6.6
+-	cd $(DESTDIR)/lib && rm -fr libinklevel.so && \
++	$(DESTDIR)/${LIBDIR}/libinklevel.so.3.0.6.6
++	cd $(DESTDIR)/${LIBDIR} && rm -fr libinklevel.so && \
+ 	ln -s libinklevel.so.3.0.6.6 libinklevel.so
+-	cd $(DESTDIR)/lib && rm -fr libinklevel.so.3 && \
++	cd $(DESTDIR)/${LIBDIR} && rm -fr libinklevel.so.3 && \
+ 	ln -s libinklevel.so.3.0.6.6 libinklevel.so.3
+-	ldconfig $(DESTDIR)/lib
++	ldconfig $(DESTDIR)/${LIBDIR}
+ 
+ clean:
+ 	rm -fr *.o *.so.3.0.6.6 *~
diff --git a/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild b/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild
new file mode 100644
index 000000000000..3ecfae77c6c9
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild,v 1.1 2007/01/06 19:04:38 cryos Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${P/_}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="sys-libs/libieee1284"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-libdir.patch
+}
+
+src_install () {
+	emake DESTDIR=${D}/usr LIBDIR=$(get_libdir) install || \
+		die "emake install failed"
+	dodoc README
+}
+