mark x86, remove old version

10 files changed, 22 insertions, 60 deletions

diff --git a/net-print/ink/ChangeLog b/net-print/ink/ChangeLog
index c9a1d3d4e02e..3ef5678b1781 100644
--- a/net-print/ink/ChangeLog
+++ b/net-print/ink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/ink
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ChangeLog,v 1.3 2003/12/03 20:00:43 lanius Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ChangeLog,v 1.4 2004/01/15 18:12:41 lanius Exp $
+
+  15 Jan 2004; Heinrich Wendel <lanius@gentoo.org> ink-0.2.ebuild,
+  ink-0.3.ebuild:
+  mark x86, remove old version
 
 *ink-0.3 (03 Dec 2003)
 
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
index e927d0104a08..146443c722e1 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1,6 +1,4 @@
-MD5 fdc66f5a06247c27c57e66f3d0523006 ink-0.3.ebuild 586
-MD5 20b13cf551882aa5e2089d6f5fdd5972 ChangeLog 545
+MD5 a8c2830616121f2f9c444e62548a36d2 ink-0.3.ebuild 585
+MD5 48fcaa1504a27b295f2198aa1420a7b9 ChangeLog 662
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 8bc313a44fa84a71b9602adce13e7102 ink-0.2.ebuild 585
-MD5 faf31d90d68403b76d3ae1d11543ef9c files/digest-ink-0.2 57
 MD5 867a416b30b4398c8ed9b80ee081bd6e files/digest-ink-0.3 57
diff --git a/net-print/ink/files/digest-ink-0.2 b/net-print/ink/files/digest-ink-0.2
deleted file mode 100644
index 0dbad21ea663..000000000000
--- a/net-print/ink/files/digest-ink-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eabd95c49a3c1d7f69359009b57c7dcf ink-0.2.tar.gz 8018
diff --git a/net-print/ink/ink-0.2.ebuild b/net-print/ink/ink-0.2.ebuild
deleted file mode 100644
index e0e31fe0da84..000000000000
--- a/net-print/ink/ink-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ink-0.2.ebuild,v 1.2 2003/10/31 13:37:46 lanius Exp $
-
-DESCRIPTION="A command line utility to display the ink level of your printer"
-SRC_URI="http://home.arcor.de/markusheinz/${P}.tar.gz"
-HOMEPAGE="http://home.arcor.de/markusheinz/ink.html"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-DEPEND=">=net-print/libinklevel-0.5"
-
-S=${WORKDIR}/${PN}
-
-src_install () {
-	make DESTDIR=${D}/usr install || die
-	dodoc COPYING README
-}
diff --git a/net-print/ink/ink-0.3.ebuild b/net-print/ink/ink-0.3.ebuild
index 00a8d61ba765..130e543c67e2 100644
--- a/net-print/ink/ink-0.3.ebuild
+++ b/net-print/ink/ink-0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ink-0.3.ebuild,v 1.1 2003/12/03 20:00:43 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ink-0.3.ebuild,v 1.2 2004/01/15 18:12:41 lanius Exp $
 
 DESCRIPTION="A command line utility to display the ink level of your printer"
 SRC_URI="http://home.arcor.de/markusheinz/${P}.tar.gz"
 HOMEPAGE="http://home.arcor.de/markusheinz/ink.html"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 
 DEPEND=">=net-print/libinklevel-0.6"
diff --git a/net-print/libinklevel/ChangeLog b/net-print/libinklevel/ChangeLog
index 5d212fdbc3d6..5e6b8b10834b 100644
--- a/net-print/libinklevel/ChangeLog
+++ b/net-print/libinklevel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/libinklevel
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.3 2003/12/03 19:58:06 lanius Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/ChangeLog,v 1.4 2004/01/15 18:12:35 lanius Exp $
+
+  15 Jan 2004; Heinrich Wendel <lanius@gentoo.org> libinklevel-0.5.ebuild,
+  libinklevel-0.6.ebuild:
+  mark x86, remove old version
 
   03 Dec 2003; Heinrich Wendel <lanius@gentoo.org> libinklevel-0.6.ebuild:
   bump
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 023c31b14e11..58fdc978285f 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,6 +1,4 @@
-MD5 6932a09829e9ff1c1105b4ad956840ae libinklevel-0.5.ebuild 585
-MD5 341de046d307848d7827ff28efa94f43 libinklevel-0.6.ebuild 586
-MD5 d67f054631da320cc9d3ecadab883e6c ChangeLog 598
+MD5 618c9688c802b90e84f81bf776438c02 libinklevel-0.6.ebuild 585
+MD5 92307e632e715fefd005a6acbaea1853 ChangeLog 731
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 1a96d24d5a0cab65202d8dd0d6d593ae files/digest-libinklevel-0.5 66
 MD5 14b00b07ab353e03bcec44b09c572674 files/digest-libinklevel-0.6 66
diff --git a/net-print/libinklevel/files/digest-libinklevel-0.5 b/net-print/libinklevel/files/digest-libinklevel-0.5
deleted file mode 100644
index d8c52f71a48e..000000000000
--- a/net-print/libinklevel/files/digest-libinklevel-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c4555859bb17a6a478f88be7b45efd2 libinklevel-0.5.tar.gz 11577
diff --git a/net-print/libinklevel/libinklevel-0.5.ebuild b/net-print/libinklevel/libinklevel-0.5.ebuild
deleted file mode 100644
index 6eaf312d816c..000000000000
--- a/net-print/libinklevel/libinklevel-0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.5.ebuild,v 1.3 2003/10/31 13:37:06 lanius Exp $
-
-DESCRIPTION="A library to get the ink level of your printer"
-SRC_URI="http://home.arcor.de/markusheinz/${P}.tar.gz"
-HOMEPAGE="http://home.arcor.de/markusheinz/libinklevel.html"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-DEPEND="sys-libs/libieee1284"
-
-S=${WORKDIR}/${PN}
-
-src_install () {
-	make DESTDIR=${D}/usr install || die
-	dodoc COPYING README
-}
diff --git a/net-print/libinklevel/libinklevel-0.6.ebuild b/net-print/libinklevel/libinklevel-0.6.ebuild
index 767e1e7ae5e1..3ab5f8a089cd 100644
--- a/net-print/libinklevel/libinklevel-0.6.ebuild
+++ b/net-print/libinklevel/libinklevel-0.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.6.ebuild,v 1.1 2003/12/03 19:58:06 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libinklevel/libinklevel-0.6.ebuild,v 1.2 2004/01/15 18:12:35 lanius Exp $
 
 DESCRIPTION="A library to get the ink level of your printer"
 SRC_URI="http://home.arcor.de/markusheinz/${P}.tar.gz"
 HOMEPAGE="http://home.arcor.de/markusheinz/libinklevel.html"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 
 DEPEND="sys-libs/libieee1284"