fix wrt multilib-strict and mark stable on amd64

(Portage version: 2.1.2_pre2-r3)

4 files changed, 44 insertions, 4 deletions

diff --git a/net-print/libinklevel/ChangeLog b/net-print/libinklevel/ChangeLog
index 891735b7b80d..cf5f0a8abb44 100644
--- a/net-print/libinklevel/ChangeLog
+++ b/net-print/libinklevel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2006/09/29 23:40:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.17 2006/10/04 17:32:27 blubb Exp $
+
+  04 Oct 2006; Simon Stelling <blubb@gentoo.org>
+  +files/libinklevel-0.6.5_rc1-libdir.patch, libinklevel-0.6.5_rc1.ebuild:
+  fix wrt multilib-strict and mark stable on amd64
 
   29 Sep 2006; <ticho@gentoo.org> libinklevel-0.6.5_rc1.ebuild:
   Stable on x86, bug #146396.
diff --git a/net-print/libinklevel/files/digest-libinklevel-0.6.3 b/net-print/libinklevel/files/digest-libinklevel-0.6.3
index 4e7e125c0540..7d12eeb28918 100644
--- a/net-print/libinklevel/files/digest-libinklevel-0.6.3
+++ b/net-print/libinklevel/files/digest-libinklevel-0.6.3
@@ -1 +1,3 @@
 MD5 0e19f9b5b8fe0cac6b6ec2236152a451 libinklevel-0.6.3.tar.gz 13974
+RMD160 cb45540547f335e605b8fcffa50223a857cba79e libinklevel-0.6.3.tar.gz 13974
+SHA256 da4e6b2b8d4f0d2698d6cda236b8d79cbf50bde2fd38d7a3076d6844423860b0 libinklevel-0.6.3.tar.gz 13974
diff --git a/net-print/libinklevel/files/libinklevel-0.6.5_rc1-libdir.patch b/net-print/libinklevel/files/libinklevel-0.6.5_rc1-libdir.patch
new file mode 100644
index 000000000000..55a9c561ee6d
--- /dev/null
+++ b/net-print/libinklevel/files/libinklevel-0.6.5_rc1-libdir.patch
@@ -0,0 +1,25 @@
+--- libinklevel/Makefile.orig	2006-10-04 19:18:54.000000000 +0200
++++ libinklevel/Makefile	2006-10-04 19:20:18.000000000 +0200
+@@ -1,4 +1,5 @@
+ DESTDIR = /usr/local/
++LIBDIR = $(DESTDIR)/lib
+ CC = gcc
+ CFLAGS = -Wall -O2 -fPIC -DPIC -I.
+ 
+@@ -7,12 +8,12 @@
+ 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 $(LIBDIR) 
+ 	install -m 755 -o root -g root libinklevel.so.2.0.6.5 \
+-	$(DESTDIR)/lib/libinklevel.so.2.0.6.5
+-	cd $(DESTDIR)/lib && rm -fr libinklevel.so && \
++	$(LIBDIR)/libinklevel.so.2.0.6.5
++	cd $(LIBDIR) && rm -fr libinklevel.so && \
+ 	ln -s libinklevel.so.2.0.6.5 libinklevel.so
+-	ldconfig $(DESTDIR)/lib
++	ldconfig $(LIBDIR)
+ 
+ clean:
+ 	rm -fr *.o *.so.2.0.6.5 *~
diff --git a/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild b/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild
index b3e46024c5f9..e11b7ac93d47 100644
--- a/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild
+++ b/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild,v 1.3 2006/09/29 23:40:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.6.5_rc1.ebuild,v 1.4 2006/10/04 17:32:27 blubb Exp $
+
+inherit multilib eutils
 
 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"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 IUSE=""
 
@@ -15,8 +17,15 @@ DEPEND="sys-libs/libieee1284"
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-libdir.patch || die "applying patch failed"
+}
+
 src_install () {
-	make DESTDIR=${D}/usr install || die "make install failed"
+	make DESTDIR=${D}/usr LIBDIR="\$(DESTDIR)/$(get_libdir)" install || die "make install failed"
 	dodoc README
 }