old

4 files changed, 18 insertions, 45 deletions

diff --git a/net-print/foomatic-db/files/perl-module.diff b/net-print/foomatic-db/files/perl-module.diff
deleted file mode 100644
index e0c895f42176..000000000000
--- a/net-print/foomatic-db/files/perl-module.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN Makefile.in.1 Makefile.in
---- Makefile.in.1	2002-07-19 16:18:47.000000000 -0500
-+++ Makefile.in	2002-10-17 13:58:09.000000000 -0500
-@@ -178,10 +178,10 @@
- install-bin: check-config lib/Makefile
- #	This is the only way to get the Perl-generated Makefile using
- #	$(DESTDIR) properly
--	( cd lib && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
--	)
-+#	( cd lib && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
-+#	)
- 	install -d $(DESTDIR)$(BINDIR)
- 	install -d $(DESTDIR)$(SBINDIR)
- 	install -d $(DESTDIR)$(ETCDIR)
-diff -Naur Makefile.in.1 Makefile.in
---- Makefile.in.1	2003-07-11 16:00:57.000000000 +0200
-+++ Makefile.in	2003-07-11 16:01:02.000000000 +0200
-@@ -40,7 +40,7 @@
- FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # foomatic-rip path for a "make inplace" installation
--LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
-+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # Locations for installing the components of this package
- BINDIR=$(bindir)
diff --git a/net-print/foomatic-db/foomatic-db-20031018.ebuild b/net-print/foomatic-db/foomatic-db-20031018.ebuild
index 7b5f7bb4bb87..26d0768d5843 100644
--- a/net-print/foomatic-db/foomatic-db-20031018.ebuild
+++ b/net-print/foomatic-db/foomatic-db-20031018.ebuild
@@ -1,11 +1,12 @@
 # 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-20031018.ebuild,v 1.5 2004/02/23 00:53:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20031018.ebuild,v 1.6 2004/03/29 01:22:43 vapier 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"
@@ -13,7 +14,7 @@ IUSE="cups ppds"
 
 DEPEND="dev-libs/libxml2
 	net-misc/wget
-	net-ftp/curl
+	net-misc/curl
 	net-print/foomatic-filters
 	net-print/foomatic-db-engine"
 
@@ -25,7 +26,7 @@ src_compile() {
 	econf || die
 	rm db/source/driver/stp.xml
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		rm -f `find . -name "*gimp-print*" `
 		rm -f `find . -name "*hpijs*" `
@@ -39,10 +40,10 @@ src_install() {
 	chmod 755 ${D}/usr/share/foomatic/db/source
 	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		./install -d ${D} -p /usr -z
-		if [ "`use cups`" ]; then
+		if use cups ; then
 			dodir /usr/share/cups/model
 			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
 		fi
diff --git a/net-print/foomatic-db/foomatic-db-20031231.ebuild b/net-print/foomatic-db/foomatic-db-20031231.ebuild
index e592835593c0..fd4ea1b641e2 100644
--- a/net-print/foomatic-db/foomatic-db-20031231.ebuild
+++ b/net-print/foomatic-db/foomatic-db-20031231.ebuild
@@ -1,11 +1,12 @@
 # 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.3 2004/03/02 13:28:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20031231.ebuild,v 1.4 2004/03/29 01:22:43 vapier 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"
@@ -13,7 +14,7 @@ IUSE="cups ppds"
 
 DEPEND="dev-libs/libxml2
 	net-misc/wget
-	net-ftp/curl
+	net-misc/curl
 	net-print/foomatic-filters
 	net-print/foomatic-db-engine"
 
@@ -25,7 +26,7 @@ src_compile() {
 	econf || die
 	rm db/source/driver/stp.xml
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		rm -f `find . -name "*gimp-print*" `
 		rm -f `find . -name "*hpijs*" `
@@ -39,10 +40,10 @@ src_install() {
 	chmod 755 ${D}/usr/share/foomatic/db/source
 	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		./install -d ${D} -p /usr -z
-		if [ "`use cups`" ]; then
+		if use cups ; then
 			dodir /usr/share/cups/model
 			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
 		fi
diff --git a/net-print/foomatic-db/foomatic-db-20040302.ebuild b/net-print/foomatic-db/foomatic-db-20040302.ebuild
index 87576533eb2c..6dd42c5ced17 100644
--- a/net-print/foomatic-db/foomatic-db-20040302.ebuild
+++ b/net-print/foomatic-db/foomatic-db-20040302.ebuild
@@ -1,11 +1,12 @@
 # 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.2 2004/03/14 00:59:57 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20040302.ebuild,v 1.3 2004/03/29 01:22:43 vapier 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"
@@ -13,7 +14,7 @@ IUSE="cups ppds"
 
 DEPEND="dev-libs/libxml2
 	net-misc/wget
-	net-ftp/curl
+	net-misc/curl
 	net-print/foomatic-filters
 	net-print/foomatic-db-engine"
 
@@ -25,7 +26,7 @@ src_compile() {
 	econf || die
 	rm db/source/driver/stp.xml
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		rm -f `find . -name "*gimp-print*" `
 		rm -f `find . -name "*hpijs*" `
@@ -39,10 +40,10 @@ src_install() {
 	chmod 755 ${D}/usr/share/foomatic/db/source
 	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
 
-	if [ "`use ppds`" ]; then
+	if use ppds ; then
 		cd ../foomatic-filters-ppds-${PV}
 		./install -d ${D} -p /usr -z
-		if [ "`use cups`" ]; then
+		if use cups ; then
 			dodir /usr/share/cups/model
 			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
 		fi