Respect environment flags wrt #248171.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 110 insertions, 54 deletions

diff --git a/net-print/pnm2ppa/ChangeLog b/net-print/pnm2ppa/ChangeLog
index f2f8f96e5688..9e44c8cd0087 100644
--- a/net-print/pnm2ppa/ChangeLog
+++ b/net-print/pnm2ppa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/pnm2ppa
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.16 2008/11/17 22:03:50 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.17 2009/07/18 18:24:17 ssuominen Exp $
+
+  18 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> pnm2ppa-1.12.ebuild,
+  files/pnm2ppa-1.12-gentoo.diff:
+  Respect environment flags wrt #248171.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/pnm2ppa-1.11.2-gentoo.diff:
diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff
index b64fdd962279..0e35168b7003 100644
--- a/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff
+++ b/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff
@@ -1,26 +1,6 @@
-diff -ur pnm2ppa-1.12/Makefile pnm2ppa-1.12.new/Makefile
---- Makefile	2002-11-15 18:29:29.000000000 -0500
-+++ Makefile	2002-12-11 17:39:27.000000000 -0500
-@@ -5,13 +5,13 @@
- # paths to locations where the pnm2ppa binary, the configuration file,
- # and the man page should be installed.   On some systems (like Solaris)
- # the install command requires the syntax BINDIR="-f /usr/local/bin".
--BINDIR="/usr/local/bin"
-+BINDIR="/usr/bin"
- CONFDIR="/etc"
--MANDIR="/usr/local/man/man1"
-+MANDIR="/usr/share/man/man1"
- 
- #compiler and linker options:
- CC=gcc
--CFLAGS=-Wall -pedantic -O2  
-+CFLAGS=-Wall -pedantic -O3
- LDFLAGS=-lm
- 
- INSTALL=install
-diff -ur pnm2ppa-1.12/lpd/ascii.if pnm2ppa-1.12.new/lpd/ascii.if
---- lpd/ascii.if	2000-10-28 10:58:07.000000000 -0400
-+++ lpd/ascii.if	2002-12-11 17:39:55.000000000 -0500
+diff -ur pnm2ppa-1.12.orig/lpd/ascii.if pnm2ppa-1.12/lpd/ascii.if
+--- pnm2ppa-1.12.orig/lpd/ascii.if	2000-10-28 17:58:07.000000000 +0300
++++ pnm2ppa-1.12/lpd/ascii.if	2009-07-18 21:12:42.000000000 +0300
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # for printing black and white text (ascii) files.
@@ -29,9 +9,9 @@ diff -ur pnm2ppa-1.12/lpd/ascii.if pnm2ppa-1.12.new/lpd/ascii.if
  #FILTER="/usr/local/bin/bweco.if"
  #------enscript command line--------------------------
  enscript -2rj -p- | $FILTER
-diff -ur pnm2ppa-1.12/lpd/bw.if pnm2ppa-1.12.new/lpd/bw.if
---- lpd/bw.if	2000-10-28 10:58:07.000000000 -0400
-+++ lpd/bw.if	2002-12-11 17:40:14.000000000 -0500
+diff -ur pnm2ppa-1.12.orig/lpd/bweco.if pnm2ppa-1.12/lpd/bweco.if
+--- pnm2ppa-1.12.orig/lpd/bweco.if	2000-10-28 17:58:07.000000000 +0300
++++ pnm2ppa-1.12/lpd/bweco.if	2009-07-18 21:12:42.000000000 +0300
 @@ -6,7 +6,7 @@
  #PAPER=a4
  #PAPER=a3
@@ -40,10 +20,10 @@ diff -ur pnm2ppa-1.12/lpd/bw.if pnm2ppa-1.12.new/lpd/bw.if
 +PNM2PPA="/usr/bin/pnm2ppa"
  #------------------dont change below this line----------------------
  gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
- $PNM2PPA --bw $PPAOPTS -i - -o -
-diff -ur pnm2ppa-1.12/lpd/bweco.if pnm2ppa-1.12.new/lpd/bweco.if
---- lpd/bweco.if	2000-10-28 10:58:07.000000000 -0400
-+++ lpd/bweco.if	2002-12-11 17:40:23.000000000 -0500
+ $PNM2PPA --bw --eco $PPAOPTS -i - -o -
+diff -ur pnm2ppa-1.12.orig/lpd/bw.if pnm2ppa-1.12/lpd/bw.if
+--- pnm2ppa-1.12.orig/lpd/bw.if	2000-10-28 17:58:07.000000000 +0300
++++ pnm2ppa-1.12/lpd/bw.if	2009-07-18 21:12:42.000000000 +0300
 @@ -6,7 +6,7 @@
  #PAPER=a4
  #PAPER=a3
@@ -52,34 +32,34 @@ diff -ur pnm2ppa-1.12/lpd/bweco.if pnm2ppa-1.12.new/lpd/bweco.if
 +PNM2PPA="/usr/bin/pnm2ppa"
  #------------------dont change below this line----------------------
  gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
- $PNM2PPA --bw --eco $PPAOPTS -i - -o -
-diff -ur pnm2ppa-1.12/lpd/color.if pnm2ppa-1.12.new/lpd/color.if
---- lpd/color.if	2000-10-28 10:58:07.000000000 -0400
-+++ lpd/color.if	2002-12-11 17:40:31.000000000 -0500
+ $PNM2PPA --bw $PPAOPTS -i - -o -
+diff -ur pnm2ppa-1.12.orig/lpd/coloreco.if pnm2ppa-1.12/lpd/coloreco.if
+--- pnm2ppa-1.12.orig/lpd/coloreco.if	2000-10-28 17:58:07.000000000 +0300
++++ pnm2ppa-1.12/lpd/coloreco.if	2009-07-18 21:12:42.000000000 +0300
 @@ -6,7 +6,7 @@
  #PAPER=a4
  #PAPER=a3
- #PPAOPTS="-p"
+ #PPAOPTS="--fd"
 -PNM2PPA="/usr/local/bin/pnm2ppa"
 +PNM2PPA="/usr/bin/pnm2ppa"
  #------------------dont change below this line----------------------
  gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
- $PNM2PPA $PPAOPTS -i - -o -
-diff -ur pnm2ppa-1.12/lpd/coloreco.if pnm2ppa-1.12.new/lpd/coloreco.if
---- lpd/coloreco.if	2000-10-28 10:58:07.000000000 -0400
-+++ lpd/coloreco.if	2002-12-11 17:40:45.000000000 -0500
+ $PNM2PPA --eco $PPAOPTS -i - -o -
+diff -ur pnm2ppa-1.12.orig/lpd/color.if pnm2ppa-1.12/lpd/color.if
+--- pnm2ppa-1.12.orig/lpd/color.if	2000-10-28 17:58:07.000000000 +0300
++++ pnm2ppa-1.12/lpd/color.if	2009-07-18 21:12:42.000000000 +0300
 @@ -6,7 +6,7 @@
  #PAPER=a4
  #PAPER=a3
- #PPAOPTS="--fd"
+ #PPAOPTS="-p"
 -PNM2PPA="/usr/local/bin/pnm2ppa"
 +PNM2PPA="/usr/bin/pnm2ppa"
  #------------------dont change below this line----------------------
  gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
- $PNM2PPA --eco $PPAOPTS -i - -o -
-diff -ur pnm2ppa-1.12/lpd/printcap pnm2ppa-1.12.new/lpd/printcap
---- lpd/printcap	2000-10-27 14:12:23.000000000 -0400
-+++ lpd/printcap	2002-12-11 17:41:35.000000000 -0500
+ $PNM2PPA $PPAOPTS -i - -o -
+diff -ur pnm2ppa-1.12.orig/lpd/printcap pnm2ppa-1.12/lpd/printcap
+--- pnm2ppa-1.12.orig/lpd/printcap	2000-10-27 21:12:23.000000000 +0300
++++ pnm2ppa-1.12/lpd/printcap	2009-07-18 21:12:42.000000000 +0300
 @@ -6,7 +6,7 @@
          :sd=/var/spool/lpd/coloreco:\
          :lf=/var/spool/lpd/coloreco/log:\
@@ -125,3 +105,76 @@ diff -ur pnm2ppa-1.12/lpd/printcap pnm2ppa-1.12.new/lpd/printcap
          :la:mx#0:\
          :sh:sf:
  
+diff -ur pnm2ppa-1.12.orig/Makefile pnm2ppa-1.12/Makefile
+--- pnm2ppa-1.12.orig/Makefile	2002-11-16 01:29:29.000000000 +0200
++++ pnm2ppa-1.12/Makefile	2009-07-18 21:22:20.000000000 +0300
+@@ -5,14 +5,14 @@
+ # paths to locations where the pnm2ppa binary, the configuration file,
+ # and the man page should be installed.   On some systems (like Solaris)
+ # the install command requires the syntax BINDIR="-f /usr/local/bin".
+-BINDIR="/usr/local/bin"
++BINDIR="/usr/bin"
+ CONFDIR="/etc"
+-MANDIR="/usr/local/man/man1"
++MANDIR="/usr/share/man/man1"
+ 
+ #compiler and linker options:
+-CC=gcc
+-CFLAGS=-Wall -pedantic -O2  
+-LDFLAGS=-lm
++CC?=gcc
++CFLAGS+=-Wall -pedantic
++LIBS=-lm
+ 
+ INSTALL=install
+ # Install under Linux and other versions with the -b (backup) option
+@@ -81,10 +81,10 @@
+ default: all
+ 
+ profile:
+-	make "CFLAGS=-Wall -pedantic -O2 -g -pg -DNDEBUG"
++	make "CFLAGS=-Wall -pedantic -g -pg -DNDEBUG"
+ 
+ debug:
+-	make "CFLAGS=-Wall -pedantic -g -O2 -DDEBUG=1 -DLANG_EN" "LDFLAGS=-lm -lefence" "OBJS=$(DOBJS)"
++	make "CFLAGS=-Wall -pedantic -g -DDEBUG=1 -DLANG_EN" "LIBS=-lm" "OBJS=$(DOBJS)"
+ 
+ # the following have been left in for those with good memories
+ 
+@@ -125,10 +125,10 @@
+ 	rm -f $(CONFDIR)/pnm2ppa.conf
+ 
+ pnm2ppa: $(OBJS) 
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LIBS) -o pnm2ppa
+ 
+ calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o 
++	$(CC) $(LDFLAGS) $(CFLAGS) calibrate_ppa.o pnmtools.o gamma.o $(LIBS) -o calibrate_ppa
+ 
+ calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h
+ 	$(CC) $(CFLAGS) -c calibrate_ppa.c
+diff -ur pnm2ppa-1.12.orig/ppa_protocol/Makefile pnm2ppa-1.12/ppa_protocol/Makefile
+--- pnm2ppa-1.12.orig/ppa_protocol/Makefile	2000-10-21 05:17:46.000000000 +0300
++++ pnm2ppa-1.12/ppa_protocol/Makefile	2009-07-18 21:18:27.000000000 +0300
+@@ -2,9 +2,9 @@
+ # Makefile for parse_vlink
+ #
+ 
+-CC=gcc
++CC?=gcc
+ 
+-CFLAGS=-Wall -pedantic -O2 -g 
++CFLAGS+=-Wall -pedantic
+ 
+ default: all
+ 
+diff -ur pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c pnm2ppa-1.12/ppa_protocol/parse_vlink.c
+--- pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c	2000-10-21 05:17:46.000000000 +0300
++++ pnm2ppa-1.12/ppa_protocol/parse_vlink.c	2009-07-18 21:19:30.000000000 +0300
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ 
+ void parse_scp (FILE *fptr, int length, unsigned long *pos)
+ {
diff --git a/net-print/pnm2ppa/pnm2ppa-1.12.ebuild b/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
index 1d6bb88ab6ab..39ce933dd94a 100644
--- a/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
+++ b/net-print/pnm2ppa/pnm2ppa-1.12.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.12.ebuild,v 1.14 2009/07/18 18:10:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.12.ebuild,v 1.15 2009/07/18 18:24:17 ssuominen Exp $
 
+EAPI=2
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
@@ -17,20 +18,18 @@ RDEPEND="app-text/enscript
 	dev-util/dialog"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_compile() {
-	append-flags -DNDEBUG
+	tc-export CC
+	append-flags -DNDEBUG -DLANG_EN
 
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DLANG_EN" \
-		|| die "emake failed"
+	emake || die "emake failed"
 
 	cd ppa_protocol
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install () {