version bump

(Portage version: 2.1.2.4)

8 files changed, 43 insertions, 62 deletions

diff --git a/net-print/libinklevel/ChangeLog b/net-print/libinklevel/ChangeLog
index 759cdb341cf0..2f8410c38640 100644
--- a/net-print/libinklevel/ChangeLog
+++ b/net-print/libinklevel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/libinklevel
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.19 2007/05/01 11:33:16 genstef Exp $
+
+*libinklevel-0.7.1 (01 May 2007)
+
+  01 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/libinklevel-0.6.6_rc5-libdir.patch,
+  +files/libinklevel-0.7.1-libdir.patch, -libinklevel-0.6.6_rc3.ebuild,
+  -libinklevel-0.6.6_rc5.ebuild, +libinklevel-0.7.1.ebuild:
+  version bump
 
 *libinklevel-0.6.6_rc5 (06 Jan 2007)
 
diff --git a/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc3 b/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc3
deleted file mode 100644
index 459370d456e8..000000000000
--- a/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc1e0c7e88e32443e1e38d5b4f243d0a libinklevel-0.6.6rc3.tar.gz 16888
-RMD160 a2d90d0f0beff01e93bcd68ff20f56145baab547 libinklevel-0.6.6rc3.tar.gz 16888
-SHA256 d7d7cd61571fe605d8346b872e6ee4a1f021a74091a23beac3543b5b3313fdac libinklevel-0.6.6rc3.tar.gz 16888
diff --git a/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5 b/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5
deleted file mode 100644
index c3377bc1e8fa..000000000000
--- a/net-print/libinklevel/files/digest-libinklevel-0.6.6_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-libinklevel-0.7.1 b/net-print/libinklevel/files/digest-libinklevel-0.7.1
new file mode 100644
index 000000000000..709612f01f71
--- /dev/null
+++ b/net-print/libinklevel/files/digest-libinklevel-0.7.1
@@ -0,0 +1,3 @@
+MD5 4e2e4a48a7ea83f6df0ee13510e7104e libinklevel-0.7.1.tar.gz 30576
+RMD160 a7ec63856fc3b6804c21cc99d4beac1b41c81bdd libinklevel-0.7.1.tar.gz 30576
+SHA256 2c613e6554043dff4537dccca105ad14de7780bd4352233cacc19c823f4c4148 libinklevel-0.7.1.tar.gz 30576
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
deleted file mode 100644
index c4608b2c5219..000000000000
--- a/net-print/libinklevel/files/libinklevel-0.6.6_rc5-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/files/libinklevel-0.7.1-libdir.patch b/net-print/libinklevel/files/libinklevel-0.7.1-libdir.patch
new file mode 100644
index 000000000000..3b18c5e23cb8
--- /dev/null
+++ b/net-print/libinklevel/files/libinklevel-0.7.1-libdir.patch
@@ -0,0 +1,29 @@
+diff -u libinklevel-0.7.1.orig/Makefile libinklevel-0.7.1/Makefile
+--- libinklevel-0.7.1.orig/Makefile	2007-05-01 13:23:54.000000000 +0200
++++ libinklevel-0.7.1/Makefile	2007-05-01 13:25:37.000000000 +0200
+@@ -1,4 +1,5 @@
+ DESTDIR = /usr/local/
++LIBDIR = lib
+ CFLAGS = -Wall -O2 -fPIC -DPIC -I.
+ 
+ all: libinklevel.so.4.0.7.1
+@@ -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.4.0.7.1 \
+-	$(DESTDIR)/lib/libinklevel.so.4.0.7.1
+-	cd $(DESTDIR)/lib && rm -fr libinklevel.so && \
++	$(DESTDIR)/${LIBDIR}/libinklevel.so.4.0.7.1
++	cd $(DESTDIR)/${LIBDIR} && rm -fr libinklevel.so && \
+ 	ln -s libinklevel.so.4.0.7.1 libinklevel.so
+-	cd $(DESTDIR)/lib && rm -fr libinklevel.so.4 && \
++	cd $(DESTDIR)/${LIBDIR} && rm -fr libinklevel.so.4 && \
+ 	ln -s libinklevel.so.4.0.7.1 libinklevel.so.4
+-	/sbin/ldconfig $(DESTDIR)/lib
++	/sbin/ldconfig $(DESTDIR)/${LIBDIR}
+ 
+ clean:
+ 	rm -fr *.o *.so.4.0.7.1 *~
diff --git a/net-print/libinklevel/libinklevel-0.6.6_rc3.ebuild b/net-print/libinklevel/libinklevel-0.6.6_rc3.ebuild
deleted file mode 100644
index c2ea8d3da704..000000000000
--- a/net-print/libinklevel/libinklevel-0.6.6_rc3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.6_rc3.ebuild,v 1.1 2006/09/16 14:51:23 genstef Exp $
-
-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_install () {
-	emake DESTDIR=${D}/usr install || die "emake install failed"
-	dodoc README
-}
-
diff --git a/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild b/net-print/libinklevel/libinklevel-0.7.1.ebuild
index 3ecfae77c6c9..d68a94e74e81 100644
--- a/net-print/libinklevel/libinklevel-0.6.6_rc5.ebuild
+++ b/net-print/libinklevel/libinklevel-0.7.1.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/libinklevel/libinklevel-0.6.6_rc5.ebuild,v 1.1 2007/01/06 19:04:38 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.7.1.ebuild,v 1.1 2007/05/01 11:33:16 genstef Exp $
 
 inherit eutils multilib
 
@@ -14,8 +14,7 @@ LICENSE="GPL-2"
 IUSE=""
 
 DEPEND="sys-libs/libieee1284"
-
-S=${WORKDIR}/${PN}
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}