QA, removed old, respecting LDFLAGS/CFLAGS/CC, 335595

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

7 files changed, 96 insertions, 69 deletions

diff --git a/app-text/pstotext/ChangeLog b/app-text/pstotext/ChangeLog
index 2d81a6a094d4..3073f1ffdfe5 100644
--- a/app-text/pstotext/ChangeLog
+++ b/app-text/pstotext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/pstotext
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/ChangeLog,v 1.33 2009/12/26 19:47:13 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/ChangeLog,v 1.34 2010/10/03 14:15:17 jlec Exp $
+
+*pstotext-1.9-r3 (03 Oct 2010)
+
+  03 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/1.9-flags.patch,
+  -pstotext-1.8g-r1.ebuild, -files/pstotext-1.8g-dsafer.patch,
+  pstotext-1.9-r2.ebuild, +pstotext-1.9-r3.ebuild:
+  QA, removed old, respecting LDFLAGS/CFLAGS/CC, 335595
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> pstotext-1.8g-r1.ebuild,
   pstotext-1.9-r2.ebuild:
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
index 974591712610..20d63a659a7c 100644
--- a/app-text/pstotext/Manifest
+++ b/app-text/pstotext/Manifest
@@ -1,8 +1,17 @@
-AUX pstotext-1.8g-dsafer.patch 668 RMD160 0b85092a5db456da9f231866594b32e9deff08e4 SHA1 6bda6c5d1769ed0551a369f5d7a94e066b9de1da SHA256 dfd36fbd81c7601351d233c22f005268307a0420b3ab2573c55bdc693c9d130a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.9-flags.patch 775 RMD160 7d06fc910a95cacf6f68af6eb22139fc51b2d45b SHA1 74ccc0e6754f40450332f246f5386fab07823653 SHA256 fff20b702f82c3b81d4a9c8c0d58047f02f2ca64c5371a509f713bfdf4395fe7
 AUX pstotext-1.9-quote-chars-fix.patch 3491 RMD160 d9049573eb4cb69954be9a0db51e2b30b80f4af0 SHA1 ca792c059eb48d8206abd22fb22c91f973f9af8b SHA256 86a031cba40e1d5ffc7cb17970a2af25c2816d274215f0aa7ade367ae8f41ce4
 DIST pstotext-1.9.tar.gz 37461 RMD160 16dc199d19df64280184d11ccbced7a32770ddad SHA1 d84732ba42301a8905f6b14f37d8b57ff8b42a3e SHA256 cfe0a251d0d43982a7d3bdf1d1670c854432739d00cb593c9beaca4b2cc36c27
-DIST pstotext.tar.Z 58743 RMD160 b8a49c5a0478b9ac8f7948ed75690327e8b98f48 SHA1 efd4b97fa21f0b683e351d8ec9dcd4ad171e294d SHA256 139ff4819bd067cb185c5d65d97b2ce62fb8109487a44e4b5450916179363652
-EBUILD pstotext-1.8g-r1.ebuild 787 RMD160 18111a03617a775c9fde0c779551b54e10e91d03 SHA1 140eb0581c103a41b5735a269bee0a023399f608 SHA256 279ee107f91ceafec621e457c575547e5a75fcab079794f627d717ecd5eabd84
-EBUILD pstotext-1.9-r2.ebuild 785 RMD160 15cfb0cf6553093649af6f9e7ee77124d2d815f7 SHA1 9017038946c08c21061c5796ba465ae4b53ace79 SHA256 eda0635d4f00e6c2472d67ed362b6860624b50a618336adce29e923c230be9d4
-MISC ChangeLog 4154 RMD160 aeda942c305e9b607428ac4670f1c9c7851dd086 SHA1 b8d9ae658aba2588cdb6792cfdf078a9c712e9d0 SHA256 08949dd3c0fd4b3068b8e6a0c4439541028959b51c156350deb42bbe2a80308e
+EBUILD pstotext-1.9-r2.ebuild 749 RMD160 c160b8b03fced18af77f6d3a679f124d2c015f62 SHA1 698590ac4fbec20f45be60807698b506ebc2e808 SHA256 3eb218531dd11b2c5809b23cbe5b0c81c7e58451d9cd1c011c85d131463a1736
+EBUILD pstotext-1.9-r3.ebuild 792 RMD160 b4186209ad5f8c1d5668871df7a92cd10f650a20 SHA1 f660d9187236e6a17c4fe649da4ce33b5beb844c SHA256 261cd7594665fa79ae7e57b44234e8b192d04bacacb459ee550f8949b8919cec
+MISC ChangeLog 4429 RMD160 64e6afae12902226dad09bdd142c1f20550f7839 SHA1 ff314f76f1436982e90614ce3a466fcdc9d3deac SHA256 929cf2cbb47c7385be13104166fc525698be07b0ff02143f092fbe924436a04f
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyoj/oACgkQgAnW8HDreRa2PgCgktXTPbMWVnOOJTCQZAfmRZhb
+QFoAoK5hbMfWc00/uXIvg04cH/aJxKCn
+=Oh3o
+-----END PGP SIGNATURE-----
diff --git a/app-text/pstotext/files/1.9-flags.patch b/app-text/pstotext/files/1.9-flags.patch
new file mode 100644
index 000000000000..6f3c9b68d82c
--- /dev/null
+++ b/app-text/pstotext/files/1.9-flags.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index 551e3b8..1d55ebe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@
+ # commenting out the includes of ptotdll.h in ptotdll.c and main.c.
+ # PMcJ 6 Sep 96
+ 
+-CC=gcc
++CC ?= gcc
+ #CC=cc -std
+ 
+ BUNDLE = ocr.h rot270.h rot90.h
+@@ -17,18 +17,18 @@ BUNDLE = ocr.h rot270.h rot90.h
+ all:	pstotext
+ 
+ main.o: main.c ptotdll.h bundle.h ocr.h rot270.h rot90.h
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ ptotdll.o: ptotdll.c ptotdll.h
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ pstotext: bundle.o main.o ptotdll.o
+-	$(CC) -o pstotext main.o bundle.o ptotdll.o -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o pstotext main.o bundle.o ptotdll.o -lm
+ 
+ .SUFFIXES: .ps
+ 
+ .c.o:
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ # "Bundle" an Ascii file.
+ .ps.h:
diff --git a/app-text/pstotext/files/pstotext-1.8g-dsafer.patch b/app-text/pstotext/files/pstotext-1.8g-dsafer.patch
deleted file mode 100644
index 06e67e897cba..000000000000
--- a/app-text/pstotext/files/pstotext-1.8g-dsafer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pstotext-1.9/main.c~	2005-06-02 15:42:33.754177096 +0200
-+++ pstotext-1.9/main.c	2005-06-02 15:45:20.412084016 +0200
-@@ -231,9 +231,9 @@
-   sprintf(
-     gs_cmdline,
- #ifdef VMS
--    "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" %s %s %s",
-+    "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" \"-dSAFER\" %s %s %s",
- #else
--    "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE %s %s %s",
-+    "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE -dSAFER %s %s %s",
- #endif
-     gs_cmd,
-     (debug ? "" : "-q"),
diff --git a/app-text/pstotext/pstotext-1.8g-r1.ebuild b/app-text/pstotext/pstotext-1.8g-r1.ebuild
deleted file mode 100644
index 684e8f60e761..000000000000
--- a/app-text/pstotext/pstotext-1.8g-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.8g-r1.ebuild,v 1.6 2009/12/26 19:47:13 pva Exp $
-
-inherit eutils
-
-DESCRIPTION="extract ASCII text from a PostScript or PDF file"
-HOMEPAGE="http://research.compaq.com/SRC/virtualpaper/pstotext.html"
-SRC_URI="http://research.compaq.com/SRC/virtualpaper/binaries/pstotext.tar.Z"
-
-LICENSE="PSTT"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/ncompress"
-
-RDEPEND="app-text/ghostscript-gpl"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${PN}-1.8g-dsafer.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	into /usr
-	dobin pstotext
-	doman pstotext.1
-}
diff --git a/app-text/pstotext/pstotext-1.9-r2.ebuild b/app-text/pstotext/pstotext-1.9-r2.ebuild
index 7b78723b660f..cb11dc6f1f5e 100644
--- a/app-text/pstotext/pstotext-1.9-r2.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.9-r2.ebuild,v 1.9 2009/12/26 19:47:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.9-r2.ebuild,v 1.10 2010/10/03 14:15:17 jlec Exp $
 
 inherit eutils
 
-DESCRIPTION="extract ASCII text from a PostScript or PDF file"
+DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
 HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
 SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
 
@@ -14,22 +14,16 @@ KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/ncompress"
-
 RDEPEND="app-text/ghostscript-gpl"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# fix bug #132662
-	epatch "${FILESDIR}"/${P}-quote-chars-fix.patch || die
-}
-
-src_compile() {
-	emake || die
+	epatch "${FILESDIR}"/${P}-quote-chars-fix.patch
 }
 
 src_install () {
-	into /usr
-	dobin pstotext
-	doman pstotext.1
+	dobin pstotext || die
+	doman pstotext.1 || die
 }
diff --git a/app-text/pstotext/pstotext-1.9-r3.ebuild b/app-text/pstotext/pstotext-1.9-r3.ebuild
new file mode 100644
index 000000000000..7df444deb9c6
--- /dev/null
+++ b/app-text/pstotext/pstotext-1.9-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.9-r3.ebuild,v 1.1 2010/10/03 14:15:17 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
+SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
+
+LICENSE="PSTT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/ncompress"
+RDEPEND="app-text/ghostscript-gpl"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-quote-chars-fix.patch \
+		"${FILESDIR}"/${PV}-flags.patch
+	tc-export CC
+}
+
+src_install () {
+	dobin pstotext || die
+	doman pstotext.1 || die
+}