Version bump. Fixes automagic dep on x11-libs/libxkbui, thank Rafał Mużyło for patch and Gef Lebster for report. Python relaed code is verified, fixes #313495 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 147 insertions, 16 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 3e39489060c7..c1bcf45dcd22 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.135 2011/01/19 19:45:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.136 2011/04/19 16:34:47 pva Exp $
+
+*fontforge-20110222 (19 Apr 2011)
+
+  19 Apr 2011; Peter Volkov <pva@gentoo.org> +fontforge-20110222.ebuild,
+  +files/fontforge-20110222-lxkbui.patch:
+  Version bump. Fixes automagic dep on x11-libs/libxkbui, thank Rafał Mużyło
+  for patch and Gef Lebster for report. Python relaed code is verified, fixes
+  #313495 by Arfrever Frehtes Taifersar Arahesis.
 
   19 Jan 2011; Dror Levin <spatz@gentoo.org> -fontforge-20090622.ebuild,
   -fontforge-20090923.ebuild, -files/fontforge-20090923-configure.patch,
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index eddea709262b..2a17844b1d8c 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX fontforge-20110222-lxkbui.patch 593 RMD160 1f6f743647c7b57f611d3265763727979068a5f0 SHA1 d4002942986ccbd01fabf8cec3c1906b05096435 SHA256 875c9c8d8b93b5c61e14b56b78ad13830fe35b7fb479f3cd89e11590f992d528
 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
 AUX fontforge-py27.diff 387 RMD160 633fbf1f53495d0bb87975f657e00f452d7cae9b SHA1 406b97dbd894a97f1f1a66376a1ab41c7a6081f2 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed
 DIST cidmaps-20090121.tgz 314314 RMD160 d194355e61813d31fe4813bdf10a62d66a9f6d04 SHA1 efbc7c9d3e95159f5600dc71f9cccb370e46bb94 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
 DIST fontforge_full-20100501.tar.bz2 6666386 RMD160 4dee2ecdbd32bf3854105f195984d9cabf198fd8 SHA1 483425116c6af6ad90e37f9ada0c28e34f251ec3 SHA256 ee4928b0df7480c31a422645854d9f3f4f6718dd423b6885bd33e87a8a6edd79
+DIST fontforge_full-20110222.tar.bz2 5126031 RMD160 7f276e9e3ef673b78355bb7be50f6b2587aee633 SHA1 8fada07647f102351bb1d7d1c4da487356e7142f SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e
 DIST fontforge_htdocs-20100429.tar.bz2 3115782 RMD160 f1dedf39898d12398ffe463c06ebcb5d88fb575b SHA1 eeda060ad5e83392d1a27f6c9c1eac2a9c780c09 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
+DIST fontforge_htdocs-20110221.tar.bz2 3129839 RMD160 ac92a01aafbb39ccbecff2953f3b6f49c3721f71 SHA1 e966fea60a2f7f022af71669f67e15e258948e0e SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
 EBUILD fontforge-20100501.ebuild 3534 RMD160 81a5b4889001b774990194fae81ea54fd6500fdd SHA1 29c4c4b5c08b75a66eb0c6244bd7abf0c491d057 SHA256 6283e38c9c221e5c3ccbe9cf03fb817172d05398acc45eb7b343d366ef3475d2
-MISC ChangeLog 19751 RMD160 266d7256f40e6b656acad39b14938aebaadc91f1 SHA1 8151cf13fcce3afb83ca4a92e9e4b77683bcc56b SHA256 05c22047d88ce62761262142ef9a2f1e15b43f68643023b9c5dbfe93c32a09df
+EBUILD fontforge-20110222.ebuild 3562 RMD160 6c0be96e6c4ffbeea671a2f6be35361267f3f297 SHA1 72e93ecb94e23264c0ef0ee57deb4dcd27e4e156 SHA256 9f0652ccb135ee1f103508ce138ee486646163809753091d36ccf134039f3c05
+MISC ChangeLog 20108 RMD160 0a8c52b055f88a266f283d8310837c4fdd20f829 SHA1 08dad3ce3bd945e244415147e80c54ba84226422 SHA256 201fd2bd78ae38f472fabb050c064d58719e2eb8ba33dd587b85b6ea756f82bc
 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJNNz93AAoJEAWF714uGAc6hvoH/0fRekuk+ZY+GIoD/yOCUTiI
-veyh7Bjc1Hv143abEafngIKRzH7x1VPipXcn8mk5ZKszGSq28EgKeJ99q1MAFlD7
-s1Y2lRNrjTT37L/xYDoxMBizJQ/HQ+hL1HpBFiEWTPUMICOKH2yKsq6ozUAkQEnz
-B8bSKnrr71gdibvQdhssmOPsv93kAfJBGBKHIw8bKNbppMVPfhLAGR7NFVsQKIcl
-5Fcp22wklS6gsyuacJMaGWuVPA6cM2ZsohNR+VksUS9n97OTT4S7J/AfdEog5SUZ
-5UGCrcv16NezuyRfChkFNkeOljehWQKkfiZNdLUozHAekB/jz926UebUCQqbLOU=
-=pYtr
------END PGP SIGNATURE-----
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..9ab07296a727
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
@@ -0,0 +1,13 @@
+=== modified file 'configure.in'
+--- configure.in	2011-04-10 05:27:00 +0000
++++ configure.in	2011-04-10 05:27:31 +0000
+@@ -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/fontforge-20110222.ebuild b/media-gfx/fontforge/fontforge-20110222.ebuild
new file mode 100644
index 000000000000..fbec13bb5105
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20110222.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.1 2011/04/19 16:34:47 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=3
+
+PYTHON_DEPEND="python? 2"
+inherit eutils fdo-mime python
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-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 )
+	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[X] )
+	x11-libs/libXi
+	x11-proto/inputproto
+	!media-gfx/pfaedit"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_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() {
+	if use doc; then
+		cd "${WORKDIR}"/html/
+		chmod -x *.html
+	fi
+	epatch "${FILESDIR}/${P}-lxkbui.patch"
+}
+
+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_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*
+
+	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
+}