[gentoo-commits] proj/hardened-dev:uclibc commit in: media-gfx/fontforge/, media-gfx/fontforge/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     8f16c724d4571fa1a476fe998f7566fc805a2a83
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 15:56:52 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 28 15:56:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8f16c724

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

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

---
 .../files/fontforge-20110222-libz.so-linkage.patch |  66 -----------
 .../files/fontforge-20110222-lxkbui.patch          |  13 ---
 .../fontforge-20110222-remove-useless-extern.patch |  11 --
 media-gfx/fontforge/fontforge-20110222-r99.ebuild  | 126 ---------------------
 media-gfx/fontforge/metadata.xml                   |  36 ------
 5 files changed, 252 deletions(-)

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 7e01e8a..0000000
--- 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 b344bc9..0000000
--- 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 f7e7152..0000000
--- 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 9c89e0c..0000000
--- 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 af748a8..0000000
--- 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>