Mir war der

7 files changed, 65 insertions, 80 deletions

diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog
index bc6fd9d2f786..83a7f49de827 100644
--- a/net-print/foomatic-db/ChangeLog
+++ b/net-print/foomatic-db/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for net-print/foomatic-db
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.9 2004/02/23 00:53:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.10 2004/03/02 13:28:04 lanius Exp $
 
   22 Feb 2004; Aron Griffis <agriffis@gentoo.org> foomatic-db-20031018.ebuild,
   foomatic-db-20031231.ebuild:
   add ia64 keywords
 
+  02 Mar 2004; Heinrich Wendel <lanius@gentoo.org>
+  foomatic-db-20030716.ebuild, foomatic-db-20031231.ebuild:
+  remove old version; mark 20031231 stable, add 20040302
+
 *foomatic-db-20031231 (31 Dec 2003)
 
   31 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index c47b9fdbb410..e35aa315f752 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,9 +1,9 @@
-MD5 e644800833244ddddcba92cf59e39626 foomatic-db-20030716.ebuild 1777
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 2fe20e7b62b89a97868832b504b412fb ChangeLog 1287
+MD5 d34f71ce10257951a68696112b878078 foomatic-db-20040302.ebuild 1426
 MD5 9f7f2a49ba7840d1b515e74be23e5460 foomatic-db-20031018.ebuild 1421
-MD5 393e30dcf77ed2312277163ecd00a274 foomatic-db-20031231.ebuild 1428
-MD5 6ae48bdfda2843beb859270c02d62c34 files/digest-foomatic-db-20030716 148
-MD5 a61100174a95d158d5ce23eedf1f2cea files/perl-module.diff 1050
+MD5 d1e00fbc6b9b67217062011f56da57d6 foomatic-db-20031231.ebuild 1421
+MD5 83d40fd7b290c685e36ebaf353b5d25a ChangeLog 1456
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 27591bd8cd134189e8a6f1e5c5e05ab2 files/digest-foomatic-db-20031018 156
 MD5 7ef09368fb06013054015fb773661324 files/digest-foomatic-db-20031231 155
+MD5 663216887676d82c4cb8a2483f26e3ea files/digest-foomatic-db-20040302 155
+MD5 a61100174a95d158d5ce23eedf1f2cea files/perl-module.diff 1050
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20030716 b/net-print/foomatic-db/files/digest-foomatic-db-20030716
deleted file mode 100644
index 90db390e91e3..000000000000
--- a/net-print/foomatic-db/files/digest-foomatic-db-20030716
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4aaa4f88b419427209c47e01e0da3ae4 foomatic-db-20030716.tar.gz 440089
-MD5 a3c0b0fc6662a7b9afab09cbe74bb292 foomatic-db-engine-3.0.0.tar.gz 271044
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20040302 b/net-print/foomatic-db/files/digest-foomatic-db-20040302
new file mode 100644
index 000000000000..8b4e6020c9f4
--- /dev/null
+++ b/net-print/foomatic-db/files/digest-foomatic-db-20040302
@@ -0,0 +1,2 @@
+MD5 dc69b37896b5d781fb48f39063ba50a7 foomatic-db-20040302.tar.gz 480247
+MD5 5cf278e14f72b57504884053058163fa foomatic-filters-ppds-20040302.tar.gz 2810832
diff --git a/net-print/foomatic-db/foomatic-db-20030716.ebuild b/net-print/foomatic-db/foomatic-db-20030716.ebuild
deleted file mode 100644
index 4a0326c839ad..000000000000
--- a/net-print/foomatic-db/foomatic-db-20030716.ebuild
+++ /dev/null
@@ -1,69 +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/foomatic-db/foomatic-db-20030716.ebuild,v 1.5 2003/09/07 00:18:10 msterret Exp $
-
-DESCRIPTION="Foomatic printer database"
-HOMEPAGE="http://www.linuxprinting.org/foomatic"
-SRC_URI="mirror://gentoo/foomatic-db-${PV}.tar.gz
-	http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-3.0.0.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE="cups ppds"
-
-S=${WORKDIR}/foomatic
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-ftp/curl
-	net-print/foomatic-filters
-	net-print/foomatic-db-engine"
-
-src_unpack() {
-	mkdir foomatic
-	cd foomatic
-	unpack foomatic-db-engine-3.0.0.tar.gz
-	unpack foomatic-db-${PV}.tar.gz
-}
-
-src_compile() {
-	cd foomatic-db-${PV}
-	econf
-	emake || die
-	rm db/source/driver/stp.xml
-	cd ..
-
-	if [ `use ppds` ]; then
-		cd foomatic-db-engine-3.0.0
-		epatch ${FILESDIR}/perl-module.diff
-		cp Makefile.in Makefile.in.orig
-		sed s:'cp\ \$\${foomatic_filters_root}/\*\.1':'cp\ \*\.1': \
-		  < Makefile.in.orig > Makefile.in
-		econf
-		make inplace
-		rm foomatic-rip
-		ln -s /usr/bin/foomatic-rip ./foomatic-rip
-		#./foomatic-cleanupdrivers
-		./foomatic-preferred-driver
-		make DESTDIR=${D} filters-ppds || die
-		cd ..
-	fi
-}
-
-src_install() {
-	cd foomatic-db-${PV}
-	make DESTDIR=${D} install || die "make install failed"
-
-	if [ `use ppds` ]; then
-		cd ../foomatic-db-engine-3.0.0
-		tar -xzf foomatic-filters-ppds-${PV}.tar.gz
-
-		dodir /usr/share/ppd
-		cp -R  foomatic-filters-ppds-${PV}/share/ppd/* ${D}/usr/share/ppd
-		gzip -rf ${D}/usr/share/ppd
-		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
index d126eaf5bdd4..e592835593c0 100644
--- a/net-print/foomatic-db/foomatic-db-20031231.ebuild
+++ b/net-print/foomatic-db/foomatic-db-20031231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2 2004/02/23 00:53:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20031231.ebuild,v 1.3 2004/03/02 13:28:04 lanius Exp $
 
 DESCRIPTION="Foomatic printer database"
 HOMEPAGE="http://www.linuxprinting.org/foomatic"
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="cups ppds"
 
 DEPEND="dev-libs/libxml2
diff --git a/net-print/foomatic-db/foomatic-db-20040302.ebuild b/net-print/foomatic-db/foomatic-db-20040302.ebuild
new file mode 100644
index 000000000000..789f45cd3228
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-20040302.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20040302.ebuild,v 1.1 2004/03/02 13:28:04 lanius 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-ftp/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
+}