Fix install when using foomaticdb.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 28 insertions, 16 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 0d0763f91dd7..b6fb3c898c9e 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.36 2008/12/01 15:41:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.37 2008/12/02 13:03:27 scarabeus Exp $
+
+  02 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  files/foo2zjs-20081129-Makefile.patch:
+  Fix install when using foomaticdb.
 
 *foo2zjs-20081129 (29 Nov 2008)
 
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 81e3da48e7af..55778a871dd1 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,4 +1,4 @@
-AUX foo2zjs-20081129-Makefile.patch 4463 RMD160 9454eb4f49d4b47ab339b6579931d68d8be117ae SHA1 2d8a0fa66a7e28294836dc1a1a6d7fe2fc8a8083 SHA256 8813779d5381ba310f823659dfa69bc15a689c8a95d862ad1b48d935cf3cca77
+AUX foo2zjs-20081129-Makefile.patch 4709 RMD160 670d88781bd13e6a63be3983c46ef25dd28db6b5 SHA1 197601abfed199f38b1c3588b0d37f2e0f9daf5e SHA256 d093d2cc2501fa7d84397e12b0085c18747134934540236f072919767edc3b56
 AUX foo2zjs-20081129-udevfwld.patch 7851 RMD160 c4ffc179e248ac759e7d94d4bebabe518c5b02af SHA1 40684cd6daf35d7cfb4fb8780994964dc01ad246 SHA256 f10883053501866e0925ad7953801caaa8bedc10644449aa39c0331f30a10d5c
 AUX foo2zjs-Makefile-20080225.diff 5724 RMD160 4348836658ad0f339b77ba2aff5ac003a28020a6 SHA1 173fbfd9446a9698d651077528216f16a9a30054 SHA256 052e9a385ebd460d9ca5614f02d3167a2314b71759ade19e52b295849c81b129
 AUX foo2zjs-udevfwld-20080225.diff 7408 RMD160 32780df42edb60c4449ee7a397809a24dddec4a9 SHA1 572b11a275adf70e0155a1480547094633cba9fa SHA256 c7fa47847cb5250796ae8cb363da89a80a2ee7b6fe895b22e8fc8259488c6f4f
@@ -24,5 +24,5 @@ DIST sihpP1006.tar.gz 153532 RMD160 aa7167b49b24d6fe2f09c6805a2caf45193321a2 SHA
 DIST sihpP1505.tar.gz 166072 RMD160 3968a33dd8263f73ebad07173bb62d8d186f5511 SHA1 ed2bbeaacb41bb8599bbdb0acd0758596e3ce090 SHA256 f631bce116447af89b1740c3b9732666348579a9dcd96d6f31121d5586332f35
 EBUILD foo2zjs-20080225.ebuild 4075 RMD160 c442bce04085919eb0f47fa2206c37e1bb73e3cf SHA1 8bcf0e7d5ad359ffb4090e746ae866953f21d503 SHA256 217406a4f37b9020167b89d6d2bc1ed65fe4b3ebce6efb76e17220a4cdc47cd1
 EBUILD foo2zjs-20081129.ebuild 4474 RMD160 a6a828615e73a86b1d0555a0d60e19e64f5c4e36 SHA1 d1d103a9722ae7d806fd7dee00e3dc3fa4bbf78f SHA256 387f628623f9357b4f1853241ad526ca9156a95f31696d7b6093917c5c6d398c
-MISC ChangeLog 8598 RMD160 b24bfc45707d0c8067d987f26a23e40ad9093bad SHA1 9d1449f7c4fbf95db2fc87dbc63b4e60e636e19a SHA256 88c000f9e4fa462a78de5c98a58aa3e501bb342754da6f54a8a886e289d458b8
+MISC ChangeLog 8729 RMD160 63de772a9727e5b818497cbe0cef4928f01b3fd2 SHA1 95526496369609a4567184f0838d8bf6af1909a6 SHA256 915068219790dc519e4bb24c2afd77c151da927c3543b93f45fcfde11f4e6ccf
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
diff --git a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
index e625b06ca30e..8391dad872c3 100644
--- a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
+++ b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
@@ -1,6 +1,6 @@
-diff -urN foo2zjs/icc2ps/Makefile foo2zjs.new/icc2ps/Makefile
---- foo2zjs/icc2ps/Makefile	2007-11-27 22:13:53.000000000 +0100
-+++ foo2zjs.new/icc2ps/Makefile	2008-11-29 19:13:43.000000000 +0100
+diff -urN foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
+--- foo2zjs.orig/icc2ps/Makefile	2007-11-27 22:13:53.000000000 +0100
++++ foo2zjs/icc2ps/Makefile	2008-12-02 13:51:12.000000000 +0100
 @@ -1,11 +1,11 @@
  UNAME := $(shell uname)
 -PREFIX=	/usr
@@ -15,9 +15,9 @@ diff -urN foo2zjs/icc2ps/Makefile foo2zjs.new/icc2ps/Makefile
  INSTALL=install
  ifeq ($(UNAME),SunOS)
      INSTALL=/usr/ucb/install
-diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
---- foo2zjs/Makefile	2008-09-23 15:56:20.000000000 +0200
-+++ foo2zjs.new/Makefile	2008-11-29 19:12:42.000000000 +0100
+diff -urN foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2008-09-23 15:56:20.000000000 +0200
++++ foo2zjs/Makefile	2008-12-02 14:00:42.000000000 +0100
 @@ -251,7 +251,7 @@
  endif
  
@@ -45,7 +45,15 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -583,6 +584,7 @@
+@@ -570,6 +571,7 @@
+ 	#
+ 	# Remove obsolete foomatic database files from previous versions
+ 	#
++	mkdir -p $(FOODB)/opt/
+ 	rm -f $(FOODB)/opt/foo2zjs-Media.xml
+ 	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
+ 	rm -f $(FOODB)/opt/foo2zjs-Source.xml
+@@ -583,6 +585,7 @@
  	# Install current database files
  	#
  	@if [ -d $(FOODB) ]; then \
@@ -53,7 +61,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  	    for dir in driver printer opt; do \
  		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  		$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -601,10 +603,10 @@
+@@ -601,10 +604,10 @@
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
@@ -68,7 +76,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  	    foomatic-combo-xml -O >overview.xml; \
  	fi
  
-@@ -736,13 +738,6 @@
+@@ -736,13 +739,6 @@
  	    done; \
  	    ppdmgr -u; \
  	elif [ -d $(PPD) ]; then \
@@ -82,7 +90,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
              [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
  	    cd PPD; \
  	    for ppd in *.ppd; do \
-@@ -789,10 +784,8 @@
+@@ -789,10 +785,8 @@
  	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
  	
  
@@ -95,7 +103,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  
  install-hotplug-test:
  	#
-@@ -810,9 +803,6 @@
+@@ -810,9 +804,6 @@
  	#
  
  install-hotplug-prog:
@@ -105,7 +113,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  	[ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/
  	$(INSTALL) -c -m 755 hplj1000 $(USBDIR)/
  	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
-@@ -823,15 +813,12 @@
+@@ -823,15 +814,12 @@
  	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
  	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
  	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
@@ -127,7 +135,7 @@ diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
  
  cups:	FRC
  	if [ -x /etc/init.d/cups ]; then \
-@@ -1223,7 +1210,6 @@
+@@ -1223,7 +1211,6 @@
  	$(INSTALL) -c -m 644 README $(DOCDIR)
  	$(INSTALL) -c -m 644 ChangeLog $(DOCDIR)