New USE flags: tilepath, pasteafter, type3 they are not useful for most users (based on feedback from upstream, thank you George Williams); truetype-debugger (makes possible build ff with truetype debugger), doc (install offline documentation), debug (useful for developers of ff) and cjk (make ff understand gb12345 encoding and install cidmaps). Updated cidmaps, fixes bug #236829, thank Yu Yuwei for report. Fix .desktop file, bug 249463, thank Ulrich Müller for report. Install mime file and update fdo databases for desktop and mime.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 176 insertions, 14 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 484c9fa5f0b0..c9507c56ccbc 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-gfx/fontforge
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.96 2008/12/25 17:44:10 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.97 2009/01/21 16:24:36 pva Exp $
+
+*fontforge-20081224-r1 (21 Jan 2009)
+
+  21 Jan 2009; Peter Volkov <pva@gentoo.org> +files/fontforge-desktop.patch,
+  metadata.xml, +fontforge-20081224-r1.ebuild:
+  New USE flags: tilepath, pasteafter, type3 they are not useful for most
+  users (based on feedback from upstream, thank you George Williams);
+  truetype-debugger (makes possible build ff with truetype debugger), doc
+  (install offline documentation), debug (useful for developers of ff) and
+  cjk (make ff understand gb12345 encoding and install cidmaps). Updated
+  cidmaps, fixes bug #236829, thank Yu Yuwei for report. Fix .desktop file,
+  bug 249463, thank Ulrich Müller for report. Install mime file and update
+  fdo databases for desktop and mime.
 
 *fontforge-20081224 (25 Dec 2008)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 714b85960aec..b2af989fcd9b 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,10 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontforge-20071210-noX-nopython-build.patch 534 RMD160 68f18c475e8d65468c762503aaa81ae0997c7b54 SHA1 94ff964627c2c7c7ccea95adbedc3a3ead7bf00e SHA256 4ddf57a2e29de54b8e4189abf315e12767aad6fe83f8397136430a42503a44aa
 AUX fontforge-20071210-parallel-build.patch 678 RMD160 aa05d9514a07ee339648ed1abd0ab4257e07f64f SHA1 9f55e4df6bbc0101f411be6dc364cbd525abc656 SHA256 0ecfd51f3c2f8b1677f484f0f67d350b59798026f92d678043a403f72a235af8
 AUX fontforge-20080302-bad-apple.patch 848 RMD160 d9fe065be781506231c2f478c5af7ffcf9d0ea8e SHA1 a1d18d5eac0fb37a4d89d12381eb32279e4a82f8 SHA256 e19f9132e5640b89dd16f975bcb415a5f4b891f9d24ee94d9643253434dfb007
+AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
 DIST cidmaps-20041222.tgz 313755 RMD160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b SHA1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a SHA256 e0c16072d4c0fea3614073306ba243aa974a00130c5201651892950d855641f3
+DIST cidmaps-20090121.tgz 314314 RMD160 d194355e61813d31fe4813bdf10a62d66a9f6d04 SHA1 efbc7c9d3e95159f5600dc71f9cccb370e46bb94 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
 DIST fontforge_full-20071210.tar.bz2 4160548 RMD160 9d0bb33f030d28f792c8222e01886733c45f0193 SHA1 45050f40b7525afb4628239a013cb9dd04c45f42 SHA256 c38e6ea0b0e0bdc70262781995c953071431225a17452551e732ca5480cfe6ba
 DIST fontforge_full-20080330.tar.bz2 4774776 RMD160 d3dd8f88b942333827f516038376dc7fa4083654 SHA1 0207392300bda80b15fb50e79fc1f09d1e92a0e4 SHA256 8edfc14d2c56d71b14ed9398ab7a5f66903393b2e8b73b48d1e81c22fb19c55a
 DIST fontforge_full-20080824.tar.bz2 5069320 RMD160 723741ec3bba3006801f33744052b341a6e0f4cd SHA1 eb355ca33e767720c7c07fee44be09ededc9415a SHA256 9ca40f36abd95869fdaab84c269b6698ccd8752b82eba3b32e1877986dcda7ca
@@ -13,6 +12,7 @@ DIST fontforge_full-20081115.tar.bz2 5257075 RMD160 f0f9174555b6547edb8c81f10872
 DIST fontforge_full-20081117.tar.bz2 5137474 RMD160 2165d7ccba2c2d33d83acacbfaae8691556abace SHA1 b1020d85ed5c4ad16bc9517463d4efd6f1ec64b1 SHA256 7a71702cf70b6f5e4f0d720056f788cf0a407f1b324df4fc82305c916e5c1bd7
 DIST fontforge_full-20081215.tar.bz2 5188193 RMD160 bf1c2048521d95c0552e3eadcebe36daa0914fdb SHA1 96b03ce3277ee2d219c119d54ec45023c590079c SHA256 c2fe2b3e80dca95650f5ec80266ea49215cd1a1edff36922e0712f84af1e7eed
 DIST fontforge_full-20081224.tar.bz2 5236663 RMD160 c62db87e24e709734dff1b45c97c9b43b27c2e15 SHA1 be6863a96cadaae419a14fb055b7e6b5cb20af9e SHA256 1748614a0d36a1ea44cef276ad2e04e884cd0e6e0f6965a71ed0c055e6ad06fc
+DIST fontforge_htdocs-20081224.tar.bz2 2548702 RMD160 91e78a3ce4a8ab2e75db44fca4959e3600cab1d7 SHA1 7eff7f15cdcd2365647d981bdece9ee98d039cf2 SHA256 abd78c7ef02ee9f86adc3d323d604c73a47531c76979cc5ef9e94d67fda9b3b1
 EBUILD fontforge-20071210.ebuild 1740 RMD160 01eaf92b33ba39d746f319287a7653ade653ff07 SHA1 f93b0d8ec49b22eba6bc1331257bf95b34182863 SHA256 daa3747add3e5b62c00fa96a8baf0bfb431f1bc4957800988fe8c424376939ec
 EBUILD fontforge-20080330.ebuild 1591 RMD160 76869268071dd4a5bd4f94b6a3fcadc76a563a71 SHA1 f687f7b108ebb6620ce1a657f64e1124556d5043 SHA256 2e4cee8989ef1c0296f591b29c00cebe9b67160727d2d26bb15ee9f9a5c8ad4f
 EBUILD fontforge-20080824.ebuild 1631 RMD160 51102b85142212fe0a695fecb3e6cead90b16b3e SHA1 cfbbe17e9f03f9ce4b4d1ef0a71a9eaba9cc07da SHA256 cd317488a727a3bf597f09dd25ffe8fbc73cb751b417565f5efbd3282f5d19a5
@@ -20,13 +20,7 @@ EBUILD fontforge-20080927.ebuild 1693 RMD160 1344891890510c90131bf7d5446fdab5985
 EBUILD fontforge-20081115.ebuild 1704 RMD160 d86591cd3c553e8a27cdbdbf53c81c270b38faaa SHA1 3786d616c8714492e1dfa73e7e59f7d2447b507f SHA256 8563486fbdde4077ee63abfecdb807e2660597622bbd1fd81d1e48bf4fefc38a
 EBUILD fontforge-20081117.ebuild 1719 RMD160 3dd559c59c08eb311a66c5c0f838a6c1e00a2533 SHA1 67848ee047c1dd6f1bff1de1ec557452021a424c SHA256 251806235b823e0c01ab8a18138ce03fa31471334b9f04f8b06a3f118c4d4c0e
 EBUILD fontforge-20081215.ebuild 1719 RMD160 0e131f31c1b4dfb860bf90c57d94daba15e46cb2 SHA1 28df3f6df779405c01142b86b2c343c9bd481f11 SHA256 a3504acd8a5d8a6ee92b3374145f7f8c9e5e526bc98d7914c6012dd9718521d4
+EBUILD fontforge-20081224-r1.ebuild 3314 RMD160 c19618ea0b6507ae9fc8e4f633e58c636cac0475 SHA1 b1fd7af26a54a29260ee99d7fa41e31431bab42d SHA256 a36a0cbcebdf2d844043e113921bc66b50f849deebcb2454618bd4a8da546efe
 EBUILD fontforge-20081224.ebuild 1719 RMD160 73cd4c872307a1300d04e5c3fa59806963ca3ca5 SHA1 47159f1c46e43d44be25254bbbbf1d1c6e044c3a SHA256 4da4bce53d5b7e120ce5ae56fb57c9db4b3e801b92703379b55152734b99643d
-MISC ChangeLog 14166 RMD160 684954c7757fc735af014ac78a1899e831bff25f SHA1 7c81ec5822d49a69dc915f435a234e9a50f7e9a2 SHA256 ddf9955b4e15b45501fb32409eb7786607a0171067f2f06c6125b0d7e21f91c4
-MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklTxnMACgkQn/5bYzqsSmHXbgCdHZkqTxiCNPWntNT5CqryCT6X
-FAoAn2s9HFzXvYOrE6nUW/9nNHpra7Uo
-=5UDz
------END PGP SIGNATURE-----
+MISC ChangeLog 14882 RMD160 4a3dc64aa109970b592dec70ea5e57a103c55079 SHA1 b64c42ccf175b88a94a2df64ce5a2399cadee5b6 SHA256 c2e0bc34b869bd599f643ac248b51c5ef6e8e1aeadc509a5b7e417eed357ca9f
+MISC metadata.xml 1408 RMD160 53db86874de33a4d699db7a8366e1e1bd4aae3f1 SHA1 a27d054ff5477089b255a9c3438d488ffd675e89 SHA256 82d69a4888355cf91df8f8822a297edf674ca66e1876bb9c2c2ffee6dec7a681
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/fontforge-20081224-r1.ebuild b/media-gfx/fontforge/fontforge-20081224-r1.ebuild
new file mode 100644
index 000000000000..7538b9dd4d3e
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20081224-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20081224-r1.ebuild,v 1.1 2009/01/21 16:24:36 pva 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="2"
+inherit eutils fdo-mime
+
+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-${PV}.tar.bz2 )
+	cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )"	# http://fontforge.sf.net/cidmaps.tgz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cjk doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger type3 svg unicode +X"
+
+RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	png? ( >=media-libs/libpng-1.2.4 )
+	python? ( dev-lang/python )
+	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 )
+	x11-libs/libXi
+	x11-proto/inputproto
+	!media-gfx/pfaedit"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+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-${PV}.tar.bz2
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}/fontforge-desktop.patch"
+}
+
+src_prepare() {
+	if use doc; then
+		cd "${WORKDIR}/html/"
+		chmod -x *.html
+	fi
+}
+
+src_configure() {
+	# no real way of disabling gettext/nls ...
+	use nls || export ac_cv_header_libintl_h=no
+	econf \
+		$(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
+		$(use_enable type3) \
+		$(use_with python) \
+		$(use_with python pyextension) \
+		$(use_enable pasteafter) \
+		$(use_with X x) \
+		$(use_enable cjk gb12345) \
+		$(use_enable tilepath) \
+		$(use_enable debug debug-raw-points)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS README*
+
+	if use cjk; then #129518
+		insinto /usr/share/fontforge
+		doins "${WORKDIR}"/*.cidmap
+	fi
+
+	doicon Packaging/fontforge.png
+	insinto /usr/share/applications
+	doins Packaging/fontforge.desktop
+	insinto /usr/share/mime/application
+	doins Packaging/fontforge.xml
+
+	if use doc; then
+		insinto /usr/share/doc/${PN}
+		cd "${WORKDIR}/html/"
+		doins -r *
+	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
index 696065edd338..2f9f78d24a4f 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -2,4 +2,33 @@
 <!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 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='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>