fix wrt multilib-strict and mark stable on amd64

Package-Manager: portage-2.1.2_pre2-r3

5 files changed, 60 insertions, 26 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/Manifest b/net-print/libinklevel/Manifest
index 311b3f637a49..65628d7231bb 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,42 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libinklevel-0.6.3.tar.gz 13974
+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
+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
 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
 SHA256 423bd0aad743ecf787e26f5733fb7bec5510a180738e99b8632963a080b71d8b libinklevel-0.6.3.ebuild 583
-EBUILD libinklevel-0.6.5_rc1.ebuild 604 RMD160 46186a5564b035c204f75cc738172a1eff7b0446 SHA1 ab1987fac3b19bc6c083d320a03e707f264816a9 SHA256 091352d6935a93b11362256cdad8bc9001c4fda7fa6c8751bf618265d0ead406
-MD5 b5d1c8b0024f9539208deebaebe1dc1a libinklevel-0.6.5_rc1.ebuild 604
-RMD160 46186a5564b035c204f75cc738172a1eff7b0446 libinklevel-0.6.5_rc1.ebuild 604
-SHA256 091352d6935a93b11362256cdad8bc9001c4fda7fa6c8751bf618265d0ead406 libinklevel-0.6.5_rc1.ebuild 604
+EBUILD libinklevel-0.6.5_rc1.ebuild 775 RMD160 6308423e04c0d710007c7fd803b7901950b38d08 SHA1 9db4352159b2bea75965849c734295c606bc2f4a SHA256 c26bf38d4f687a64e20415cb6ce1090ac5540ea62bd7e5dbbf86890c4dc70c8e
+MD5 096f1212c0f44fd2b9b88990480cdf40 libinklevel-0.6.5_rc1.ebuild 775
+RMD160 6308423e04c0d710007c7fd803b7901950b38d08 libinklevel-0.6.5_rc1.ebuild 775
+SHA256 c26bf38d4f687a64e20415cb6ce1090ac5540ea62bd7e5dbbf86890c4dc70c8e libinklevel-0.6.5_rc1.ebuild 775
 EBUILD libinklevel-0.6.6_rc3.ebuild 609 RMD160 577332a94548da2a01f3c29ce0f424d055e6849e SHA1 0d5a54cbc2a74525e38c143507c198168e22cb1e SHA256 cea1844ec6faf87b65f071beab030717b6d23dd9440440e2c55966d1eb885f31
 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 2063 RMD160 8cb2f6e8f556dff193f47cb26eaac86db77208a1 SHA1 1a69bb9c31babfab4646c81025c997fca7b6766d SHA256 0ca4090a8c764936eadb55aa59264d04e53fd44064dfba1b584ebbcc2b53eafd
-MD5 76e9e59a04d046e7248eff6171fe922a ChangeLog 2063
-RMD160 8cb2f6e8f556dff193f47cb26eaac86db77208a1 ChangeLog 2063
-SHA256 0ca4090a8c764936eadb55aa59264d04e53fd44064dfba1b584ebbcc2b53eafd ChangeLog 2063
+MISC ChangeLog 2239 RMD160 08a1821ae6584e7602ecb87b68732edba6f4e663 SHA1 1e5e9f05d718f86d1d95e289190aa87ead019a8e SHA256 c3e22af7c8c2e5294d37f5303bc6a1878a9423983af34147711d74b9627ebc07
+MD5 171fed86d458e6871be08d24b1906a79 ChangeLog 2239
+RMD160 08a1821ae6584e7602ecb87b68732edba6f4e663 ChangeLog 2239
+SHA256 c3e22af7c8c2e5294d37f5303bc6a1878a9423983af34147711d74b9627ebc07 ChangeLog 2239
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 20f52131c54c7afab8cd4a10e3f9e761 files/digest-libinklevel-0.6.3 68
-RMD160 65ee8286327ea653e20d4975c35c47809d92d9c9 files/digest-libinklevel-0.6.3 68
-SHA256 a0ec6997e5c1442045c64a6cba3de71cafe14913d7c8738b50cf598c249f23f5 files/digest-libinklevel-0.6.3 68
+MD5 1d2cc2111bc71e5fce852cd9183b2d71 files/digest-libinklevel-0.6.3 250
+RMD160 60e48d449caba97170af351295b5679af9d38242 files/digest-libinklevel-0.6.3 250
+SHA256 f7a6d3c336c7f6e69b8b638a710cbcf3496931d9779bcbe8450c7f5874bc21d2 files/digest-libinklevel-0.6.3 250
 MD5 eac3dfdfe72a13744c015e753d2292d4 files/digest-libinklevel-0.6.5_rc1 259
 RMD160 5e14d1cce7ed19b2ce03d01d9b6cf4b3241bba95 files/digest-libinklevel-0.6.5_rc1 259
 SHA256 554123cc41f457525f12504e256ce6f8ed1114e7b64b647c0bb7b26068d1844c files/digest-libinklevel-0.6.5_rc1 259
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFHa7410xuJSrg3/sRAl/VAJ9nwLblWE2V16l6l4wu+uHSIri/2wCeL4Ox
-Y5eQUL1AzTXv3GgIRt+Dc8w=
-=vQ6p
------END PGP SIGNATURE-----
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
 }