Respect LDFLAGS (bug #337857 by Diego). Migrate to EAPI 3. Don't install

redundant html docs. Quote variables.

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

3 files changed, 69 insertions, 5 deletions

diff --git a/app-text/ttf2pt1/ChangeLog b/app-text/ttf2pt1/ChangeLog
index 4974c14dc3fe..ee48890bd5c7 100644
--- a/app-text/ttf2pt1/ChangeLog
+++ b/app-text/ttf2pt1/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for app-text/ttf2pt1
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.23 2010/09/19 04:54:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.24 2010/09/19 05:26:58 dirtyepic Exp $
 
-  19 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> -ttf2pt1-3.4.0.ebuild,
-  -files/ttf2pt1-3.4.0-Makefile-gentoo.diff,
-  -files/ttf2pt1-3.4.0-Makefile-multiline-sed.diff:
-  Remove old.
+*ttf2pt1-3.4.4-r1 (19 Sep 2010)
+
+  19 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> +ttf2pt1-3.4.4-r1.ebuild,
+  +files/ttf2pt1-3.4.4-LDFLAGS.patch:
+  Respect LDFLAGS (bug #337857 by Diego). Migrate to EAPI 3. Don't install
+  redundant html docs. Quote variables.
 
   10 Oct 2009; Raúl Porcel <armin76@gentoo.org> ttf2pt1-3.4.4.ebuild:
   sparc stable wrt #286600
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
new file mode 100644
index 000000000000..3d03e03e14ca
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 2616d46..cf72cba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -179,7 +179,7 @@ app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
+ 	sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src  >$@
+ 
+ t1asm: t1asm.c
+-	$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS)
++	$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LDFLAGS) $(LIBS)
+ 
+ ttf2pt1.o: ttf2pt1.c ttf.h pt1.h global.h version.h
+ 	$(CC) $(CFLAGS) -c ttf2pt1.c
+@@ -203,7 +203,7 @@ runt1asm.o: runt1asm.c global.h
+ 	$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
+ 
+ ttf2pt1:	ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
+-	$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
++	$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LDFLAGS) $(LIBS)
+ 
+ CHANGES: CHANGES.html
+ 	scripts/unhtml <CHANGES.html >CHANGES
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..cfb15b652766
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild,v 1.1 2010/09/19 05:26:58 dirtyepic Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="True Type Font to Postscript Type 1 Converter"
+HOMEPAGE="http://ttf2pt1.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
+
+LICENSE="ttf2pt1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/freetype-2.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
+	epatch "${FILESDIR}"/${P}-freetype.patch
+
+	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
+	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
+	sed -i -e "/^LIBS_FT=/ { s:-L/usr/lib:-L/usr/$(get_libdir): }" Makefile
+	sed -i -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" Makefile
+}
+
+src_install() {
+	emake INSTDIR="${D}"/usr install || die
+	dodir /usr/share/doc/${PF}
+	pushd "${D}"/usr/share/ttf2pt1 > /dev/null
+	rm -r app other
+	mv [A-Z]* ../doc/${PF}
+	popd > /dev/null
+}