Version bump and fixed the multilib issues.

(Portage version: 2.1.2_rc4-r5)

4 files changed, 72 insertions, 2 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/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
+}
+