media-gfx/fontforge: fixed in tree, bug #469954

Package-Manager: portage-2.1.11.62
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 0 insertions, 280 deletions

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
deleted file mode 100644
index 9f943987..00000000
--- a/media-gfx/fontforge/Manifest
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX fontforge-20110222-libz.so-linkage.patch 2959 SHA256 8358e7fa2fd43876cb24f3d1c58765aacc8560ddfd7d3577d65984e2c796128e SHA512 7f407489ed1554e45b7aef8f15626bc9141ad544f368a67b734b4c6602ac1eb2bd26485039312d856853a79e2ed4046caa14bd22db53948402b29270d8f0edc3 WHIRLPOOL 857339763873909c1746b3b1becc7cf136c1170b9edfe010200872eeab7ad1f9152424e4411ed74f7b017aa23cbabb035e039503288d95bdf019cbde7c40c97c
-AUX fontforge-20110222-lxkbui.patch 545 SHA256 192d3606dcf8f925a9cc5f79e7430979d0eb1a0f209a4447682f135f79d33828 SHA512 a60bd08aeb16ce515172814b1867fe4d7e876c960d8f044f9f90c8837230ea0e50ac50113145cdf23c6c04f7caad16dfdd1b20c96eda1e2266b9e0f0091fa970 WHIRLPOOL 3f50a26e9325bfda0391d2facffc6c553c3ec193f11a138e573b892426f9b068d20b0f0411bdb7d14395754a1f081f3474e71102255e8e2a93842afd9c33adea
-AUX fontforge-20110222-remove-useless-extern.patch 554 SHA256 45f169384d528766426272b16a9cca4cadbb63fbf5f37a1b084afbc187b21ac9 SHA512 5d665c61834ce2c1002743fa90658b138bf6fd768585821f729de5a1f3a4e30b29d88dbf3ae525640d5b5a62a77d41f87d6e6ebb0e4495130115913014be8a46 WHIRLPOOL 95592a878ced57d853e727ac1366823beb6e82b8f21975c302a3a2f30fcda7765f22ce37042e09fc33c62646b31a6eda58a7517d6362a076f5d00af5b3c7ecfc
-DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
-DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e SHA512 af74ca482d8892c30e650bd377df16d44a11738c930625bcf9878d97ba8faaf67f2965dcf3c32b722120273d99dcdd042405bb6afeee1286f0cf18f916e4f12a WHIRLPOOL f6446b8b6d5d49d9bb421bf39a4a192f4622916eb68013a3317c78585d1ae05837478c5d2fa1bb2ebad9caa3455cf0db6e132f6e7ad07d3ae9f58b1b4ab7fd52
-DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
-EBUILD fontforge-20110222-r99.ebuild 3693 SHA256 4a162a7b01adfadaa6246ad24e779bb312575b2eb5b0c7258d8afe7c717fdeb2 SHA512 d039610843d832d00767b0c5efadabfa8735babc3d559618717030609da0b128b798f4c1e5a312fe8402f798eb16bc6360e13a5f30128126047b9c549156ebac WHIRLPOOL d7a79fb8e933a3ddc0d753fbaf7f531a054fabd723c81d00713163b1a970b17682f78a6f41cb00ae2aaee9380f54283d6b30604ffdd26cb415e91a9aa8dcddee
-MISC metadata.xml 1457 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604 SHA512 b4c13b65e4a2b24971c7c5216f746d85db6ff0d2d7961a4fbda99d1a722114437f3629140364374abff2acec4d38e87e67d44e9c7373da12561336445e6168d6 WHIRLPOOL a7060604b91f4dd495dd76e7b5671339ddf8a89e2c5f9e0754e315f8278b70bdd0526b2046a38ff3c0fcfed1ccd700c95427fdb9f87bff04817d043d831c614e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRhp/pAAoJEJOE+m71LUu6hf4P/1UkwrpNOZtNivEpt9aJ0lGf
-cg4kKkQi4Tcs5FcrtXWoyw144W8rUheHx+mxHa2HO7uAA8meULyOtUAh6khbv5xr
-RIFhz54jHs1Pe8iv0RJlqAMBsezkeI3wpdD4gD2P4DID4u6z8zbCz1prfhAxamm7
-1EoluUmkU0UufkrTxkNGw8Ygi5n15V673B5gRGtbeoGiZWtDDGFxIVQ3B/jwHpwA
-SvVWQbP+NMe2rqbKSOMA5lbfWKkqwn3pCW8KwusHyjFQwmhBuLjEkja4ObIitl+s
-Chv5D8YhzquB5ZfosbvrxGHyitVGRYx0fKLO6k9VUhs1TEuiEplXoRXh9H6cd2qd
-7qfiyFZ2rYgW18IoQAvueNzpzUQEK9gK1SpgNjUttTs+dCaaBp0/A4VUiwKWzVyG
-Xw8LjBVD27OkF0AXKK9R+jFEeirtjoqn+N8yYw1/h7LGuOLwgbNruvLqOD56XAHk
-bm5eTg07SNigupX0aKMGKCFhRvTPVFtZbnm5FAhOqlwlKA2pF/Anph/cQ/k/ESH6
-Zv32f/VaQEsJAOQxLSPVwpVScBC+2UrkwyuIlm8+cMNCbcm/E7yzl99LfWqSdpIw
-mC2N6gqH/0bwiA1WfrEU+tMqRVVOxHyGifxRq5NS6pnfxInojaAadfzgWGRAEeD+
-OJK5wSETfIWqoBRxO66K
-=VWUN
------END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
deleted file mode 100644
index 7e01e8a3..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=367425
-
-diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c
---- fontforge-20110222~/fontforge/parsepdf.c	2011-02-15 05:37:39.000000000 +0200
-+++ fontforge-20110222/fontforge/parsepdf.c	2011-05-17 22:19:56.000000000 +0300
-@@ -759,7 +759,11 @@
-     if ( zlib!=NULL )
- return( true );
- 
--    if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
-+    if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL
-+#ifdef SO_1_EXT                                                                                                                                                                                                 
-+            && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
-+#endif 
-+            ) {
- 	LogError( "%s", dlerror());
- return( false );
-     }
-diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c
---- fontforge-20110222~/fontforge/svg.c	2011-02-18 23:33:27.000000000 +0200
-+++ fontforge-20110222/fontforge/svg.c	2011-05-17 22:19:56.000000000 +0300
-@@ -1153,7 +1153,11 @@
-     if ( xmltested )
- return( libxml!=NULL );
- 
--    dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
-+    dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
-+#ifdef SO_1_EXT                                                                                                                                                                                                 
-+        || dlopen("libz" SO_1_EXT,RTLD_LAZY)
-+#endif
-+        ;
- 
-     libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
- # ifdef SO_2_EXT
-diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c
---- fontforge-20110222~/fontforge/ufo.c	2011-02-17 02:20:37.000000000 +0200
-+++ fontforge-20110222/fontforge/ufo.c	2011-05-17 22:19:56.000000000 +0300
-@@ -929,7 +929,11 @@
-     if ( xmltested )
- return( libxml!=NULL );
- 
--    dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
-+    dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
-+#ifdef SO_1_EXT                                                                                                                                                                                                 
-+        || dlopen("libz" SO_1_EXT,RTLD_LAZY)
-+#endif
-+        ;
- 
-     libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
- # ifdef SO_2_EXT
-diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c
---- fontforge-20110222~/fontforge/woff.c	2011-02-15 05:37:40.000000000 +0200
-+++ fontforge-20110222/fontforge/woff.c	2011-05-17 22:19:56.000000000 +0300
-@@ -76,7 +76,11 @@
-     if ( zlib!=NULL )
- return( true );
- 
--    if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
-+    if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL 
-+#ifdef SO_1_EXT
-+            && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
-+#endif
-+            ) {
- 	LogError( "%s", dlerror());
- return( false );
-     }
diff --git a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
deleted file mode 100644
index b344bc9d..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'configure.in'
---- a/configure.in
-+++ b/configure.in
-@@ -36,7 +36,7 @@
-  dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
- 
-  AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 ) 
-- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) 
-+ AC_CHECK_LIB(X11, XkbQueryExtension, ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
- fi
- 
- gww_define_caps_for_alt="dontknow"
-
diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
deleted file mode 100644
index f7e7152f..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c
---- fontforge-20110222.orig/gutils/gimagereadrgb.c	2013-05-05 18:03:18.884623199 +0000
-+++ fontforge-20110222/gutils/gimagereadrgb.c	2013-05-05 18:03:35.452624126 +0000
-@@ -86,7 +86,6 @@
- 
- static void find_scanline(FILE *fp,struct sgiheader *header,int cur,
- 	unsigned long *starttab,unsigned char **ptrtab) {
--    extern int fgetc(FILE *);
-     int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort;
-     int ch,i,cnt,val;
-     unsigned char *pt;
diff --git a/media-gfx/fontforge/fontforge-20110222-r99.ebuild b/media-gfx/fontforge/fontforge-20110222-r99.ebuild
deleted file mode 100644
index 9c89e0cf..00000000
--- a/media-gfx/fontforge/fontforge-20110222-r99.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
-
-# Some notes for maintainers this package:
-# 1. README-unix: freetype headers are required to make use of truetype debugger
-# in fontforge.
-# 2. --enable-{double,longdouble} these just make ff use more storage space. In
-# normal fonts neither is useful. Leave off.
-# 3. FontForge autodetects libraries but does not link with them. They are
-# dynamically loaded at run time if fontforge found them at build time.
-# --with-regular-link disables this behaviour. No reason to make it optional for
-# users. http://fontforge.sourceforge.net/faq.html#libraries. To see what
-# libraries fontforge thinks with use $ fontforge --library-status
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-inherit eutils fdo-mime python autotools
-
-HTDOCSV="20110221"
-CIDMAPV="20090121"
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${HTDOCSV}.tar.bz2 )
-	cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
-
-RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
-	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.2.4 )
-	tiff? ( >=media-libs/tiff-3.5.7-r1 )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	cairo? ( >=x11-libs/cairo-1.6.4[X] )
-	pango? ( >=x11-libs/pango-1.20.3 )
-	x11-libs/libXi
-	x11-proto/inputproto
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${PN}_full-${PV}.tar.bz2
-	use cjk && unpack cidmaps-${CIDMAPV}.tgz
-	if use doc; then
-		mkdir html
-		cd html
-		unpack fontforge_htdocs-${HTDOCSV}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-lxkbui.patch"
-	epatch "${FILESDIR}/${P}-libz.so-linkage.patch"
-	epatch "${FILESDIR}/${P}-remove-useless-extern.patch"
-	if use doc; then
-		chmod -x "${WORKDIR}"/html/*.html || die
-	fi
-	eautoconf
-}
-
-src_configure() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--disable-static \
-		$(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
-		$(use_enable type3) \
-		$(use_with python) \
-		$(use_enable python pyextension) \
-		$(use_enable pasteafter) \
-		$(use_with X x) \
-		$(use_enable cjk gb12345) \
-		$(use_enable tilepath) \
-		$(use_enable debug debug-raw-points) \
-		$(use_with pango) \
-		$(use_with cairo)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README* || die
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use cjk; then #129518
-		insinto /usr/share/fontforge
-		doins "${WORKDIR}"/*.cidmap || die
-	fi
-
-	doicon Packaging/fontforge.png || die
-	domenu Packaging/fontforge.desktop || die
-	insinto /usr/share/mime/application
-	doins Packaging/fontforge.xml || die
-
-	if use doc; then
-		insinto /usr/share/doc/${PN}
-		cd "${WORKDIR}/html/"
-		doins -r * || die
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
deleted file mode 100644
index af748a8f..00000000
--- a/media-gfx/fontforge/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>fonts</herd>
-<longdescription>
-	FontForge -- An outline font editor that lets you create your own
-	postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
-	(bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one
-	format to another. FontForge has support for many macintosh font formats. 
-</longdescription>
-<use>
-
-	<flag name="truetype-debugger">Enable truetype debugger in
-	fontforge</flag>
-
-	<flag name='type3'>Build in support for type3/svg fonts containing
-	multilayered drawing with strokes, fills, images, etc. Type3 fonts are only
-	supported by postscript printers (not by most windowing displays). They are
-	capable of more exotic images than normal fonts but require much more effort
-	to support.</flag>
-
-	<flag name="pango">Enable pango font rendering</flag>
-
-	<flag name='pasteafter'>Controls whether fontforge has a paste after command
-	(Useful for making words?). This is kind of fun, but it isn't useful for
-	normal fonts.</flag>
-
-	<flag name='cjk'>Controls whether fontforge understands the gb12345 encoding
-	and installs cidmap package to edit CID-keyed fonts</flag>
-	
-	<flag name='tilepath'>Controls whether fontforge has a tile path command (a
-	variant of expand stroke) This is useful for very decorative fonts, most
-	people won't want it.</flag>
-
-</use>
-</pkgmetadata>