8 files changed, 8 insertions, 162 deletions
diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog
index c8ef3039df91..21ce0fca843f 100644
--- a/net-print/foomatic-db/ChangeLog
+++ b/net-print/foomatic-db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/foomatic-db
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.25 2005/04/09 12:50:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.26 2005/06/06 22:31:57 lanius Exp $
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  -foomatic-db-20031018.ebuild, -foomatic-db-20031231.ebuild,
+  -foomatic-db-20040916.ebuild, foomatic-db-20041220.ebuild:
+  cleanups, mark 20041220 stable on all arches, this are only ppd and xml files
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org>
   foomatic-db-20040302.ebuild, foomatic-db-20040916.ebuild,
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20031018 b/net-print/foomatic-db/files/digest-foomatic-db-20031018
deleted file mode 100644
index fcf259c46281..000000000000
--- a/net-print/foomatic-db/files/digest-foomatic-db-20031018
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5294eb13bd31fc96fe1d19697285379b foomatic-db-20031018.tar.gz 460875
-MD5 cc18de5184c375a13c691922fe7a525d foomatic-filters-ppds-20031018.tar.gz 16583420
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20031231 b/net-print/foomatic-db/files/digest-foomatic-db-20031231
deleted file mode 100644
index 2d8a7c94c626..000000000000
--- a/net-print/foomatic-db/files/digest-foomatic-db-20031231
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 64fc6b5de759be6f8b16c52fed54e3a2 foomatic-db-20031231.tar.gz 472630
-MD5 4153b99f942e90a1b631819f1687b200 foomatic-filters-ppds-20031231.tar.gz 2730822
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20040916 b/net-print/foomatic-db/files/digest-foomatic-db-20040916
deleted file mode 100644
index 451e1d02e776..000000000000
--- a/net-print/foomatic-db/files/digest-foomatic-db-20040916
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cee58a75e831d82aa513dad8f453605d foomatic-db-20040916.tar.gz 493508
-MD5 7924877eec4019c7f8c05061c7140ec3 foomatic-filters-ppds-20040916.tar.gz 2760850
diff --git a/net-print/foomatic-db/foomatic-db-20031018.ebuild b/net-print/foomatic-db/foomatic-db-20031018.ebuild
deleted file mode 100644
index 0541e2642d94..000000000000
--- a/net-print/foomatic-db/foomatic-db-20031018.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20031018.ebuild,v 1.7 2004/06/25 00:38:32 agriffis Exp $
-
-DESCRIPTION="Foomatic printer database"
-HOMEPAGE="http://www.linuxprinting.org/foomatic"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz
-	ppds? ( http://www.linuxprinting.org/download/foomatic/foomatic-filters-ppds-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="cups ppds"
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-misc/curl
-	net-print/foomatic-filters
-	net-print/foomatic-db-engine"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf || die
-	rm db/source/driver/stp.xml
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		rm -f `find . -name "*gimp-print*" `
-		rm -f `find . -name "*hpijs*" `
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	chmod -R 644 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/source
-	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		./install -d ${D} -p /usr -z
-		if use cups ; then
-			dodir /usr/share/cups/model
-			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-		fi
-	fi
-}
diff --git a/net-print/foomatic-db/foomatic-db-20031231.ebuild b/net-print/foomatic-db/foomatic-db-20031231.ebuild
deleted file mode 100644
index c9c83061deff..000000000000
--- a/net-print/foomatic-db/foomatic-db-20031231.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20031231.ebuild,v 1.6 2004/07/17 17:33:35 tgall Exp $
-
-DESCRIPTION="Foomatic printer database"
-HOMEPAGE="http://www.linuxprinting.org/foomatic"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz
-	ppds? ( http://www.linuxprinting.org/download/foomatic/foomatic-filters-ppds-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ppc64"
-IUSE="cups ppds"
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-misc/curl
-	net-print/foomatic-filters
-	net-print/foomatic-db-engine"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf || die
-	rm db/source/driver/stp.xml
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		rm -f `find . -name "*gimp-print*" `
-		rm -f `find . -name "*hpijs*" `
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	chmod -R 644 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/source
-	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		./install -d ${D} -p /usr -z
-		if use cups ; then
-			dodir /usr/share/cups/model
-			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-		fi
-	fi
-}
diff --git a/net-print/foomatic-db/foomatic-db-20040916.ebuild b/net-print/foomatic-db/foomatic-db-20040916.ebuild
deleted file mode 100644
index 5f49fd350619..000000000000
--- a/net-print/foomatic-db/foomatic-db-20040916.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20040916.ebuild,v 1.2 2005/04/09 12:50:07 corsair Exp $
-
-DESCRIPTION="Foomatic printer database"
-HOMEPAGE="http://www.linuxprinting.org/foomatic"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz
-	ppds? ( http://www.linuxprinting.org/download/foomatic/foomatic-filters-ppds-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE="cups ppds"
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-misc/curl
-	net-print/foomatic-filters
-	net-print/foomatic-db-engine"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf || die
-	rm db/source/driver/stp.xml
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		rm -f `find . -name "*gimp-print*" `
-		rm -f `find . -name "*hpijs*" `
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	chmod -R 644 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/source
-	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		./install -d ${D} -p /usr -z
-		if use cups ; then
-			dodir /usr/share/cups/model
-			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-		fi
-	fi
-}
diff --git a/net-print/foomatic-db/foomatic-db-20041220.ebuild b/net-print/foomatic-db/foomatic-db-20041220.ebuild
index e1d2beb4d82a..465acc1a3ebe 100644
--- a/net-print/foomatic-db/foomatic-db-20041220.ebuild
+++ b/net-print/foomatic-db/foomatic-db-20041220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20041220.ebuild,v 1.2 2005/04/09 12:50:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20041220.ebuild,v 1.3 2005/06/06 22:31:57 lanius Exp $
 
 DESCRIPTION="Foomatic printer database"
 HOMEPAGE="http://www.linuxprinting.org/foomatic"
@@ -9,7 +9,7 @@ SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips ppc64"
 IUSE="cups ppds"
 
 DEPEND="dev-libs/libxml2