ttf2pt1 working version upload

app-text/htmldoc/Manifest

@@ -1,4 +1,3 @@
-AUX htmldoc-desktop.patch 273 SHA256 e1173421304816e74585135eb3b4806fc6046d7ee773cabf44cff613fdb92710 SHA512 20b4e044b5f414ddc66dc7cf8a757c33c262a5afb71b5d8036bceafb3e0eacbe0f8ae6deda11e04a550cc7c038063f8aa7beec820012e50705749a6aae9c7ede WHIRLPOOL be1835eb82e77a8d887c76cfbbace6a317c87b9a9b8b29646d59b6eccbfeea01c48edb1a1edc18298788d1e0e4d29f0374b1350f4bf34b46611b1a0525f9b4fd
 DIST htmldoc-1.9.1-source.tar.gz 4429305 SHA256 cbee52b9e6f5485086db1b86d7ed0609925fef325a88cf96a6d11a5859117094 SHA512 078630c73c0e2101fbe7ee633ddd54ffe2ea133280320825a5e88143076a1a55e86b7a3657f305506eab1ae1a2289ca61ae43833b4de57362df5ec1dd604e03a WHIRLPOOL 8dcd4ed8d1ab1b1b5cc10dca5a63f008002f2b476e59c79f44ff7257003b11b038efe0b5279c7eff8b97aab17f0aedc82bb0e412f58b26183953e835a03c5cbc
-EBUILD htmldoc-1.9.1.ebuild 1293 SHA256 0fda99d14ca54fe3c01d1598d56083469b8686e43059163bf6d58aca1afb359e SHA512 9d14b22b2a13a7851e7e064f3c816c1107f10f432edc670d287f57ae011b8022e819833264ebfbdd3f79d256efebacd78d9b0ed6f9416b6fad5c00dbb745d88a WHIRLPOOL bb68993f3aab68e322c02646d2d86cb7d4f78731362ea45658532148d3c8e939644981aebbfa97409f147953e455e98fd4c55a1ee2bfe45986eb35c5533d88c1
+EBUILD htmldoc-1.9.1.ebuild 1432 SHA256 5656dce11ab939bf46938f116058ab6808aec2bfa22f889355b9d99c63635065 SHA512 31b0979b51489176bcd2f501f16e5ac22912d12355090ac90cf1b5f316d3a1cb865436df0c2855d9c928fd5c7c430a389985124b1600b67418d6837d082f8301 WHIRLPOOL 494eb8a89797454cfbb155830ff200ca8b60555590c90c24907ccba7932f1176d9e22c57af98d20a797caa3dd4743bbe763ca49932dcec83bc740962b8fcb1d1
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968

app-text/htmldoc/files/htmldoc-desktop.patch

@@ -1,8 +0,0 @@
---- desktop/htmldoc.desktop	2017-10-30 01:09:50.000000000 +0300
-+++ desktop/htmldoc.desktop	2017-12-22 05:28:05.000000000 +0300
-@@ -7,4 +7,4 @@
- Exec=htmldoc %F
- Icon=htmldoc
- Terminal=false
--Categories=Application;Office;X-Red-Hat-Base;
-+Categories=Office;X-Red-Hat-Base;

app-text/htmldoc/htmldoc-1.9.1.ebuild

@@ -11,6 +11,7 @@ IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+RESTRICT="strip"	# Not sure
 
 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
@@ -22,8 +23,8 @@ S="${WORKDIR}"
 src_prepare() {
 	default
 	
-    cd "${S}"
+	# Patch .desktop file to remove Appllication declaration, that is incorrect.
-    epatch "${FILESDIR}/htmldoc-desktop.patch"
+	sed -i -e 's/Application;//' desktop/htmldoc.desktop || die 'failed to patch .desktop file'
 
 	# make sure not to use the libs htmldoc ships with
 	rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'

app-text/ttf2pt1/Manifest

@@ -0,0 +1,7 @@
+AUX ttf2pt1-3.4.0-man-pages.diff 1441 SHA256 9ee30134825bcddde474f9df69e8ef410825396482fb84e2554755ef36614093 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f WHIRLPOOL 852ab007ce7ea96c505f6007b10fa76de26d2810b406a6451ab078a1c85e0ff3dc8dd71476d07cd5e44a298800ae0b69b32f35a21527271ed267da574e9e7e89
+AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 SHA256 57d3d96231fa0a00b64c2c4e10a9d9e46c7eafbb457dfcf3d6b4dbcdd0116f81 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf WHIRLPOOL d9d0d939dd1795286cf432dc4b1d5b38008116f188dcd54949df543bcdba35bb95075c7af717847595408308a8a4f88dafca753ad8e7a3cac92ccee9e08b5961
+AUX ttf2pt1-3.4.4-Makefile.patch 2911 SHA256 cb7a90cb39e7091c05e1dd1a870aa3fa438588abb6e8cc878528966b169607a6 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb WHIRLPOOL 76b91d1dade0d3dde6feba414cef148131fda0121d64856df7f7754f3afc3602a806f63655da8e5e586d24c31ca87a1584e70a3170c123b90a3e2ca51fb901f9
+AUX ttf2pt1-3.4.4-freetype.patch 378 SHA256 cd235a861eae7e1fe3e2c69da71086a78e195dd634df403fba3d4207d81d97a2 SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669 WHIRLPOOL be118be0736eae2a2750a72529f932f1997d3d7456da7866d561e77dbed3c3e5384dfb8b07f96e88e356ca58ea720c7976c888497df2537dfe6e43600eed708c
+DIST ttf2pt1-3.4.4.tgz 230547 SHA256 ae926288be910073883b5c8a3b8fc168fde52b91199fdf13e92d72328945e1d0 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014 WHIRLPOOL 10d4f372e52bbba9f405a3e811f7404a47f25259655f0ce85e4e06381c4a69cbce79833f5d15d900d4bd09cb740b4a74ce1506e56c1f58a67b2f3cf90da7884a
+EBUILD ttf2pt1-3.4.4-r2.ebuild 1062 SHA256 8a06a09621fe50cf638be34aaa6762af1cc883bb464ac332c53c4998ae49d5b3 SHA512 cbea33d093b56b6ea6660e2a7b86e777190c55b4d25e11458f71aabb8ee8e3b83aa3bbb222efd2a179908e4a27dd1a1e3d7711677e5b6e57919c945298ffeb9f WHIRLPOOL 4a043c51a2a98765f5ecef4bb7fde02feedc9656523019478be69ec996ed8841dffa4f2f951a65d04854c97e7c65687a10d891b819b29d1101dab23b4a6a1f61
+MISC metadata.xml 315 SHA256 357a6a81aa43ea0aa977ecac4892b8d6cdf6114a6a9bbe2e22df43afa6d92c45 SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3 WHIRLPOOL 5db4b6f071c7b4eec001448347889a8cc295f437982e11d4a3cbf0c14f82505172a33f62a8ae294ef4e0ed1a7eb8f19bae3ca6989f2481475f7bb064aa33f9ab

app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff

@@ -0,0 +1,39 @@
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1.1	2001-11-25 00:58:11.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1.1	2006-08-15 19:15:37.129672839 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_convert.1	2006-08-15 19:16:14.369517359 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1	2006-08-15 19:16:30.770568473 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0

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

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 \

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>

app-text/ttf2pt1/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ttf2pt1</remote-id>
+	</upstream>
+</pkgmetadata>

app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.5.1:2"
+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
+	dodir /usr/share/doc/${PF}
+	pushd "${D}"/usr/share/ttf2pt1 > /dev/null
+	rm -r app other
+	mv [A-Z]* ../doc/${PF}
+	popd > /dev/null
+}