Fix support for converting freetype (otf) fonts. (bug #112680)

Version bump, rewrote ebuild.
Added to font herd.
Package-Manager: portage-2.1.3_rc8

8 files changed, 176 insertions, 69 deletions

diff --git a/app-text/ttf2pt1/ChangeLog b/app-text/ttf2pt1/ChangeLog
index e40d21da489c..602cdbd2a822 100644
--- a/app-text/ttf2pt1/ChangeLog
+++ b/app-text/ttf2pt1/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/ttf2pt1
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.17 2007/06/20 14:00:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.18 2007/07/16 02:30:10 dirtyepic Exp $
+
+*ttf2pt1-3.4.4 (16 Jul 2007)
+
+  16 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  -files/ttf2pt1-3.3.3-Makefile-gentoo.diff,
+  +files/ttf2pt1-3.4.4-Makefile.patch, +files/ttf2pt1-3.4.4-freetype.patch,
+  metadata.xml, +ttf2pt1-3.4.4.ebuild:
+  Fix support for converting freetype (otf) fonts.  (bug #112680)
+  Version bump, rewrote ebuild.
+  Added to font herd.
 
   20 Jun 2007; Christoph Mende <angelos@gentoo.org> ttf2pt1-3.4.0.ebuild:
   Added ~amd64 wrt bug 182251
diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
index e53f85d7736c..84fc44b57c30 100644
--- a/app-text/ttf2pt1/Manifest
+++ b/app-text/ttf2pt1/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ttf2pt1-3.3.3-Makefile-gentoo.diff 1203 RMD160 5621b3e61c25e7f1eb72e1d4c69d904d0e1b93c9 SHA1 d6f22e9344b74bcd721ecd373d40d4f121acebef SHA256 da28583d8208985f66c5043cdff0f2a07b5ea6c513ce098deca64a31a85f20db
-MD5 0199933f9e9763b60bfd6120daaead19 files/ttf2pt1-3.3.3-Makefile-gentoo.diff 1203
-RMD160 5621b3e61c25e7f1eb72e1d4c69d904d0e1b93c9 files/ttf2pt1-3.3.3-Makefile-gentoo.diff 1203
-SHA256 da28583d8208985f66c5043cdff0f2a07b5ea6c513ce098deca64a31a85f20db files/ttf2pt1-3.3.3-Makefile-gentoo.diff 1203
 AUX ttf2pt1-3.4.0-Makefile-gentoo.diff 1347 RMD160 4ab09ec152f3bf3eeced442a527e60d17efb24f0 SHA1 3eb8f7682b23a34f15c8b00a6b83ceb0b38c144b SHA256 a93f99bd7cea48f1f6467c5b93989f5c099fd02ff48730339fbe21af707dfb9e
 MD5 d8a381f600cd8b500edd31175e462ada files/ttf2pt1-3.4.0-Makefile-gentoo.diff 1347
 RMD160 4ab09ec152f3bf3eeced442a527e60d17efb24f0 files/ttf2pt1-3.4.0-Makefile-gentoo.diff 1347
@@ -17,26 +10,35 @@ AUX ttf2pt1-3.4.0-man-pages.diff 1441 RMD160 f155ab414656f1d7835da6fd71e851f8d3a
 MD5 ac57bac3e9f5fff0a1b04cce8afa3787 files/ttf2pt1-3.4.0-man-pages.diff 1441
 RMD160 f155ab414656f1d7835da6fd71e851f8d3a5a5e9 files/ttf2pt1-3.4.0-man-pages.diff 1441
 SHA256 9ee30134825bcddde474f9df69e8ef410825396482fb84e2554755ef36614093 files/ttf2pt1-3.4.0-man-pages.diff 1441
+AUX ttf2pt1-3.4.4-Makefile.patch 2911 RMD160 6f3409f8e9b7cdd23415d68107b5fff186ce56d8 SHA1 0124b0ed8ef0bf86da8a8fa54d3c9ed5ccf9955d SHA256 cb7a90cb39e7091c05e1dd1a870aa3fa438588abb6e8cc878528966b169607a6
+MD5 579c2238f5c7bd2a73d59d3e733d2c4d files/ttf2pt1-3.4.4-Makefile.patch 2911
+RMD160 6f3409f8e9b7cdd23415d68107b5fff186ce56d8 files/ttf2pt1-3.4.4-Makefile.patch 2911
+SHA256 cb7a90cb39e7091c05e1dd1a870aa3fa438588abb6e8cc878528966b169607a6 files/ttf2pt1-3.4.4-Makefile.patch 2911
+AUX ttf2pt1-3.4.4-freetype.patch 378 RMD160 da45079fc5d09246be159618d4d547df40cb85cf SHA1 4112bce0017b288a42843d30cfc271032de6a820 SHA256 cd235a861eae7e1fe3e2c69da71086a78e195dd634df403fba3d4207d81d97a2
+MD5 71b235432caef033133a92e3cdb81f19 files/ttf2pt1-3.4.4-freetype.patch 378
+RMD160 da45079fc5d09246be159618d4d547df40cb85cf files/ttf2pt1-3.4.4-freetype.patch 378
+SHA256 cd235a861eae7e1fe3e2c69da71086a78e195dd634df403fba3d4207d81d97a2 files/ttf2pt1-3.4.4-freetype.patch 378
 DIST ttf2pt1-3.4.0.tgz 204811 RMD160 42426b09ca964a5628ff3b7c2db7bf1c2ce43c48 SHA1 1e11478ab5f6dae26ea743dc1149603d652746bb SHA256 f05184ce4f3c7c6e0931ddf25a0c792aaaa27a1ca890036703cb6566dc482eae
+DIST ttf2pt1-3.4.4.tgz 230547 RMD160 f88d7a26b30fa02055fd12ce1450220bd52d8df2 SHA1 936771b11a740c16a8e0adb737b54b22cca18cb2 SHA256 ae926288be910073883b5c8a3b8fc168fde52b91199fdf13e92d72328945e1d0
 EBUILD ttf2pt1-3.4.0.ebuild 955 RMD160 97c57ef423140f66b4382d1044c87e2dd7e049c8 SHA1 3e447b6eff19c9b85c64556cc67f2478dccb379c SHA256 2e57f6d4454ae8453aab8e947ad1acde70c658b49c9ddcd66da0fac185a9974b
 MD5 7a6b8a4e614afb79baa990f7f49d0ad7 ttf2pt1-3.4.0.ebuild 955
 RMD160 97c57ef423140f66b4382d1044c87e2dd7e049c8 ttf2pt1-3.4.0.ebuild 955
 SHA256 2e57f6d4454ae8453aab8e947ad1acde70c658b49c9ddcd66da0fac185a9974b ttf2pt1-3.4.0.ebuild 955
-MISC ChangeLog 2331 RMD160 d9eccb0f2037d435845e176dcafa9d00a71db05f SHA1 68e21425fa3494c55f2cb7d3feb13871fd38ce22 SHA256 d86895e27971e006ba07acd21c4c4eb2d2ebb357f2db7c86a257a18385126edb
-MD5 f24df829100dd88a7c7d70fbefc5d61d ChangeLog 2331
-RMD160 d9eccb0f2037d435845e176dcafa9d00a71db05f ChangeLog 2331
-SHA256 d86895e27971e006ba07acd21c4c4eb2d2ebb357f2db7c86a257a18385126edb ChangeLog 2331
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
-MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
-RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
-SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata.xml 233
+EBUILD ttf2pt1-3.4.4.ebuild 1186 RMD160 7a4a8c7c950540a3a22166b0e12df0de567cfb07 SHA1 a0883aff93564e0e978bb1c4ca4c26e18ec3ea09 SHA256 89f5d0c346945bedb40c538fc25d11edd2469d0ecd43ede5c454e41a0069864c
+MD5 48066d6ab85bb8fd2c1b968343ca7616 ttf2pt1-3.4.4.ebuild 1186
+RMD160 7a4a8c7c950540a3a22166b0e12df0de567cfb07 ttf2pt1-3.4.4.ebuild 1186
+SHA256 89f5d0c346945bedb40c538fc25d11edd2469d0ecd43ede5c454e41a0069864c ttf2pt1-3.4.4.ebuild 1186
+MISC ChangeLog 2692 RMD160 b275a3396d7661104231cab0e51d729c3337a3c8 SHA1 4f58dc400f5082942f9b1cf026ca74d7d7fac2ed SHA256 22861f1adf6597e714e8675ce1b829abccdceb2957ed8e283543eca50c063e62
+MD5 7a19a4724ccbb7fc7648e71da1bc2d24 ChangeLog 2692
+RMD160 b275a3396d7661104231cab0e51d729c3337a3c8 ChangeLog 2692
+SHA256 22861f1adf6597e714e8675ce1b829abccdceb2957ed8e283543eca50c063e62 ChangeLog 2692
+MISC metadata.xml 159 RMD160 e9d6dae6266cd59331aaa78481fd5a67fc2ed725 SHA1 152e7ea08489d788f3f1c4c59be552a5f94b2d02 SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890
+MD5 13b29d06e2f61f5dfba17f43d065cb1a metadata.xml 159
+RMD160 e9d6dae6266cd59331aaa78481fd5a67fc2ed725 metadata.xml 159
+SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890 metadata.xml 159
 MD5 5ff0e333bbd3a9cbb78e33266f5c118b files/digest-ttf2pt1-3.4.0 232
 RMD160 b89c36dbc0a65924e16e28d75be6f9957aa3a1db files/digest-ttf2pt1-3.4.0 232
 SHA256 a4bf74bf275bdb00cc3fd1548d4b49afe9a837041da91306f4af79c983e65d2d files/digest-ttf2pt1-3.4.0 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGeTLxKhnDs22gwa8RAs5TAJsFq4Zu+1p4hhnVPHt1jf1y/FtwkQCfbKuj
-p1+cxkcRB7VpoEbv6l9b7ZQ=
-=ihfq
------END PGP SIGNATURE-----
+MD5 626cb5702d461735ae4a9cdaac8172e5 files/digest-ttf2pt1-3.4.4 232
+RMD160 4bd5c9f4a381040e44e459e48312f72488714f83 files/digest-ttf2pt1-3.4.4 232
+SHA256 6ef1081418bcc44e5dbebb1d148bb74f4d3b5814845438893a69597121902877 files/digest-ttf2pt1-3.4.4 232
diff --git a/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.4 b/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.4
new file mode 100644
index 000000000000..dfeae742a65e
--- /dev/null
+++ b/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.4
@@ -0,0 +1,3 @@
+MD5 cb143c07cc83167875ca09ea720d4932 ttf2pt1-3.4.4.tgz 230547
+RMD160 f88d7a26b30fa02055fd12ce1450220bd52d8df2 ttf2pt1-3.4.4.tgz 230547
+SHA256 ae926288be910073883b5c8a3b8fc168fde52b91199fdf13e92d72328945e1d0 ttf2pt1-3.4.4.tgz 230547
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.3.3-Makefile-gentoo.diff b/app-text/ttf2pt1/files/ttf2pt1-3.3.3-Makefile-gentoo.diff
deleted file mode 100644
index 8588da518506..000000000000
--- a/app-text/ttf2pt1/files/ttf2pt1-3.3.3-Makefile-gentoo.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- ttf2pt1-3.3.3/Makefile.orig	Tue Mar 20 08:28:51 2001
-+++ ttf2pt1-3.3.3/Makefile	Tue Mar 20 08:33:03 2001
-@@ -60,18 +60,18 @@
- # (if the include and lib directory do not match your installation,
- # modify them), also uncomment LIBS_FT
- #
--#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include
-+CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2
- 
- # 
- # The FreeType-2 library flags (disabled by default)
- 
--LIBS_FT=
-+#LIBS_FT=
- 
- # To enable use of the FreeType-2 library
- # (if the include and lib directory do not match your installation,
- # modify them), also uncomment LIBS_FT
- #
--#LIBS_FT= -L/usr/local/lib -lfreetype
-+LIBS_FT= -L/usr/lib -lfreetype
- 
- #
- # Preference of front-ends if multiple parsers match a file
-@@ -93,14 +93,14 @@
- # Installation-related stuff
- # 
- # The base dir for installation and subdirs in it
--INSTDIR = /usr/local
-+INSTDIR = /usr
- # for binaries
- BINDIR = $(INSTDIR)/bin
- # for binaries of little general interest
--LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
-+LIBXDIR = $(INSTDIR)/lib/ttf2pt1
- # for scripts, maps/encodings etc.
- SHAREDIR = $(INSTDIR)/share/ttf2pt1
--MANDIR = $(INSTDIR)/man
-+MANDIR = $(INSTDIR)/share/man
- 
- # owner and group of installed files
- OWNER = root
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
new file mode 100644
index 000000000000..6c760f43dd21
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
@@ -0,0 +1,82 @@
+diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
+--- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
++++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+@@ -9,7 +9,7 @@
+ #
+ # Use GNU C even if it's not the default compiler
+ #
+-#CC=gcc
++CC=gcc
+ #
+ # Use the standard ANSI C compiler on HP-UX even if it's not default
+ #
+@@ -60,18 +60,18 @@
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment LIBS_FT
+ #
+-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
++CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
+ 
+ # 
+ # The FreeType-2 library flags (disabled by default)
+ 
+-LIBS_FT=
++#LIBS_FT=
+ 
+ # To enable use of the FreeType-2 library
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment CFLAGS_FT
+ #
+-#LIBS_FT= -L/usr/local/lib -lfreetype
++LIBS_FT= -L/usr/lib -lfreetype
+ 
+ #
+ # The flags for C compiler for the Autotrace library (disabled by default). 
+@@ -120,18 +120,18 @@
+ # Installation-related stuff
+ # 
+ # The base dir for installation and subdirs in it
+-INSTDIR = /usr/local
++INSTDIR = /usr
+ # for binaries
+ BINDIR = $(INSTDIR)/bin
+ # for binaries of little general interest
+ LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
+ # for scripts, maps/encodings etc.
+ SHAREDIR = $(INSTDIR)/share/ttf2pt1
+-MANDIR = $(INSTDIR)/man
++MANDIR = $(INSTDIR)/share/man
+ 
+ # owner and group of installed files
+ OWNER = root
+-GROUP = bin
++GROUP = root
+ 
+ # After you have configured the Makefile, comment out the following
+ # definition:
+@@ -244,17 +244,19 @@
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+ 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+-	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+-		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+-		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
++	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
++		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
++		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
++		<scripts/convert >cvt.tmp
+ 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+ 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+ 	rm cvt.tmp
+ 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+ 	for i in $(MANS1); do { \
+-		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+-			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
++		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
++			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
++			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
++			<$$i >$(MANDIR)/man1/$$i \
+ 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
+ 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
+ 		&& chmod 0644 $(MANDIR)/man1/$$i \
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
new file mode 100644
index 000000000000..8257742ebe59
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
@@ -0,0 +1,11 @@
+diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
+--- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
++++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <freetype/ftglyph.h>
+ #include <freetype/ftsnames.h>
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
index 73420b6cf0f0..64cc0b687d48 100644
--- a/app-text/ttf2pt1/metadata.xml
+++ b/app-text/ttf2pt1/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<herd>fonts</herd>
 </pkgmetadata>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4.ebuild
new file mode 100644
index 000000000000..00b515d228d5
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/07/16 02:30:10 dirtyepic Exp $
+
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-Makefile.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_compile() {
+	emake all || die
+}
+
+src_install() {
+	emake INSTDIR=${D}/usr install || die
+	dodir /usr/share/doc/${PF}/html
+	cd ${D}/usr/share/ttf2pt1
+	rm -r app other
+	mv *.html ../doc/${PF}/html
+	mv [A-Z]* ../doc/${PF}
+	prepalldocs
+}