proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

13 files changed, 940 insertions, 0 deletions

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
new file mode 100644
index 000000000000..faa8253b5865
--- /dev/null
+++ b/media-gfx/fontforge/Manifest
@@ -0,0 +1,8 @@
+DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 SHA512 a85daeb16b6650179f54ff9e35915c4c7bb5e2efca0455262a271063849484dbba08c4b493c4ca08552365205995cad5c3770ba7b3cadb2e5c386626dc46636c WHIRLPOOL 0c840cf7f4d7f432597f68620231da34cff2dac5af1ba3200b57b63566f3b81b151ddf7cbaa84665f4b7c629bb8f100c72b8bade8634687e5c11110ed91ed821
+DIST fontforge-20150430.tar.gz 24531572 SHA256 430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37 SHA512 e530a7e7cec569f9e9419ccf2805ac5bd41e05565b4c24fa6f6a8c6c3684d1d76868a9a19abba3ba92aa66bcca333949d37c8890f72a29c0072c8a3e912269e4 WHIRLPOOL b02912ed66149818da7e406300116465dae6f1c40032549ca820a9cfc7b33e862eeeb9cb1f366628423701e8e39e0a8ced3000a02ff2562f2c27eb5b70c805da
+DIST fontforge-20150612.tar.gz 125037727 SHA256 0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8 WHIRLPOOL 6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
+DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e SHA512 af74ca482d8892c30e650bd377df16d44a11738c930625bcf9878d97ba8faaf67f2965dcf3c32b722120273d99dcdd042405bb6afeee1286f0cf18f916e4f12a WHIRLPOOL f6446b8b6d5d49d9bb421bf39a4a192f4622916eb68013a3317c78585d1ae05837478c5d2fa1bb2ebad9caa3455cf0db6e132f6e7ad07d3ae9f58b1b4ab7fd52
+DIST fontforge_full-20120731.tar.bz2 5725667 SHA256 e5cb9e9e64a99d1dfc549950741eb9b44c3162a4c62f71053905c1f2d024295f SHA512 34dca27983d64c9ae570e2c8f438b1ea373d22f5aeb23808d4b77e458950b568b460a2b011edfc3154f9e8dd06595d6f64296f8f63f46c404c3ff7ed6d9816d1 WHIRLPOOL e502dc79b1d46e5cce9372b593bef06083a853eeb2af47a909d093956cc867432e7b4600c799f73c7d08474d7e76fb18bed1b080440f3a21d27b703ac831bc15
+DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
+DIST gnulib-b287b621969d5a3f56058ff01e554839814da4e1.tar.gz 5974028 SHA256 09e111c8388a7cdcea6c0f08bf8bf5e871f04ac5fa7496494a278b2d009b4dcd SHA512 80e235c1c3b5c9c5fa6d1f0e88f51be458b8396760928b535dbe3ea80ad779e7ba315d03f33a6debb8ec375d0c4d1a17bdf03d82b1fa0450fa1d064c9d9317e4 WHIRLPOOL 71e2fdb311d4183f4b177ea2670be25d069801a3289dcf168e7f4cb258c35d709cb380669ea343dc20ae35fc71492b14ea6594ef238cb43b7dd8c0c34b5de58c
+DIST uthash-ac47d4928e61c5abc6e977d91310d31ed74690e4.tar.gz 233813 SHA256 6331989d413069a4027b6292646b41d99cad70cefd9e9852f6f6e1bf531ccef4 SHA512 b0831be7be7d1ff11d9ca9248b121590e4b8ac3c808fcf461c5b192bdf3ae45c42b962d5cc02abc2491de6379d53855d487d798b9e0539007832bfd220ff76f2 WHIRLPOOL 7c0e55ba753210f396d736655e5043badaa222eb7e00fcb71b083c59da22f0a54f944c1231622a1378341e22a8583bd624bd5e99a1ca82099f610b373bbc166f
diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
new file mode 100644
index 000000000000..7e01e8a3a76f
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
@@ -0,0 +1,66 @@
+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
new file mode 100644
index 000000000000..b344bc9dc838
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
@@ -0,0 +1,13 @@
+=== 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
new file mode 100644
index 000000000000..f7e7152f2eaf
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
@@ -0,0 +1,11 @@
+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/files/fontforge-desktop.patch b/media-gfx/fontforge/files/fontforge-desktop.patch
new file mode 100644
index 000000000000..ba8ac1078152
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-desktop.patch
@@ -0,0 +1,16 @@
+diff --git a/Packaging/fontforge.desktop b/Packaging/fontforge.desktop
+index a66b28b..18e049c 100644
+--- a/Packaging/fontforge.desktop
++++ b/Packaging/fontforge.desktop
+@@ -8,9 +8,8 @@ Comment[ru]=Редактор шрифтов
+ Comment[fr]=Un constructeur des polices
+ Comment[zh_TW]=FontForge 描邊字型編輯器
+ Exec=fontforge
+-Icon=fontforge.png
++Icon=fontforge
+ Terminal=false
+ Type=Application
+-Categories=Application;Graphics;
+-Encoding=UTF-8
++Categories=Graphics;
+ MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-otf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex;
diff --git a/media-gfx/fontforge/files/fontforge-py27.diff b/media-gfx/fontforge/files/fontforge-py27.diff
new file mode 100644
index 000000000000..24f98e13cb30
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-py27.diff
@@ -0,0 +1,11 @@
+--- fontforge/ffpython.h	2010/02/04 17:42:36	1.8
++++ fontforge/ffpython.h	2010/09/12 08:30:00	1.9
+@@ -62,7 +62,7 @@
+ #define PyMODINIT_FUNC void
+ #endif
+ 
+-#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5)
++#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 7)
+ #define PyBytesObject PyStringObject
+ #define PyBytes_Type PyString_Type
+ 
diff --git a/media-gfx/fontforge/fontforge-20110222-r1.ebuild b/media-gfx/fontforge/fontforge-20110222-r1.ebuild
new file mode 100644
index 000000000000..3c4dbfdb3e2e
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20110222-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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:0 )
+	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/fontforge-20120731-r1.ebuild b/media-gfx/fontforge/fontforge-20120731-r1.ebuild
new file mode 100644
index 000000000000..1d66f4acbcfe
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20120731-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime python-single-r1 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.org/cidmaps.tgz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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:0 )
+	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 )
+	python? ( ${PYTHON_DEPS} )
+	x11-libs/libXi
+	x11-libs/libX11
+	x11-proto/inputproto
+	!media-gfx/pfaedit"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+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() {
+	# Version is #define-d as a string, even though the field is an int
+	sed  -i -e '/LibFF_VersionDate/s/"//g' fontforge/libffstamp.h || die
+
+	epatch "${FILESDIR}/${PN}-20110222-lxkbui.patch"
+	epatch "${FILESDIR}/${PN}-20110222-libz.so-linkage.patch"
+	epatch "${FILESDIR}/${PN}-20110222-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
+
+	for i in 16x16 22x22 24x24 32x32 48x48 scalable; do
+		doicon -s "$i" "Packaging/icons/${i}/apps/"* || die
+	done
+
+	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/fontforge-20120731.ebuild b/media-gfx/fontforge/fontforge-20120731.ebuild
new file mode 100644
index 000000000000..74833b1b5e2c
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20120731.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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="4"
+
+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.org/cidmaps.tgz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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:0 )
+	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-libs/libX11
+	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() {
+	# Version is #define-d as a string, even though the field is an int
+	sed  -i -e '/LibFF_VersionDate/s/"//g' fontforge/libffstamp.h || die
+
+	epatch "${FILESDIR}/${PN}-20110222-lxkbui.patch"
+	epatch "${FILESDIR}/${PN}-20110222-libz.so-linkage.patch"
+	epatch "${FILESDIR}/${PN}-20110222-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
+
+	for i in 16x16 22x22 24x24 32x32 48x48 scalable; do
+		doicon -s "$i" "Packaging/icons/${i}/apps/"* || die
+	done
+
+	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/fontforge-20150430.ebuild b/media-gfx/fontforge/fontforge-20150430.ebuild
new file mode 100644
index 000000000000..766b56944c83
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20150430.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils fdo-mime python-single-r1
+
+GNULIB="b287b621969d5a3f56058ff01e554839814da4e1"
+UTHASH="ac47d4928e61c5abc6e977d91310d31ed74690e4"
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~floppym/dist/gnulib-${GNULIB}.tar.gz
+	https://github.com/troydhanson/uthash/archive/${UTHASH}.tar.gz -> uthash-${UTHASH}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		x11-libs/libxkbui:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-proto/inputproto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+gnulib_import() {
+	(
+		func_add_hook() { :; }
+		source bootstrap.conf
+		set -- "${WORKDIR}/gnulib/gnulib-tool" --libtool --import ${gnulib_modules}
+		echo "$@"
+		"$@"
+	)
+}
+
+src_prepare() {
+	mv "${WORKDIR}/uthash-${UTHASH}" "${S}/uthash" || die
+	gnulib_import || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
+
+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/fontforge-20150612-r1.ebuild b/media-gfx/fontforge/fontforge-20150612-r1.ebuild
new file mode 100644
index 000000000000..baad001cd48e
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20150612-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils fdo-mime python-single-r1
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		x11-libs/libxkbui:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-proto/inputproto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+gnulib_import() {
+	(
+		func_add_hook() { :; }
+		source bootstrap.conf
+		set -- "${S}/gnulib/gnulib-tool" --libtool --import ${gnulib_modules}
+		echo "$@"
+		"$@"
+	)
+}
+
+src_prepare() {
+	# Tarball comes with broken absolute symlinks
+	# https://github.com/fontforge/fontforge/issues/2439
+	find . -lname "/*" -delete || die
+	gnulib_import || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+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/fontforge-20150612.ebuild b/media-gfx/fontforge/fontforge-20150612.ebuild
new file mode 100644
index 000000000000..9e81c813b371
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20150612.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils fdo-mime python-single-r1
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		x11-libs/libxkbui:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-proto/inputproto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+gnulib_import() {
+	(
+		func_add_hook() { :; }
+		source bootstrap.conf
+		set -- "${S}/gnulib/gnulib-tool" --libtool --import ${gnulib_modules}
+		echo "$@"
+		"$@"
+	)
+}
+
+src_prepare() {
+	# Tarball comes with broken absolute symlinks
+	# https://github.com/fontforge/fontforge/issues/2439
+	find . -lname "/*" -delete || die
+	gnulib_import || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
+
+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
new file mode 100644
index 000000000000..ce7955827b64
--- /dev/null
+++ b/media-gfx/fontforge/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<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>
+	<upstream>
+		<remote-id type="github">troydhanson/uthash</remote-id>
+	</upstream>
+</pkgmetadata>