Update to 20120731

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x560FDD64

3 files changed, 157 insertions, 16 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 3f5cbdb63a9f..b6113d08882a 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.150 2013/05/28 15:46:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.151 2013/07/19 18:39:00 nirbheek Exp $
+
+*fontforge-20120731 (19 Jul 2013)
+
+  19 Jul 2013; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +fontforge-20120731.ebuild:
+  Update to 20120731
 
   28 May 2013; Anthony G. Basile <blueness@gentoo.org>
   +files/fontforge-20110222-remove-useless-extern.patch,
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index becd3b0d9d3e..35c343dc1999 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -9,27 +9,29 @@ AUX fontforge-py27.diff 387 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb4
 DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 SHA512 a85daeb16b6650179f54ff9e35915c4c7bb5e2efca0455262a271063849484dbba08c4b493c4ca08552365205995cad5c3770ba7b3cadb2e5c386626dc46636c WHIRLPOOL 0c840cf7f4d7f432597f68620231da34cff2dac5af1ba3200b57b63566f3b81b151ddf7cbaa84665f4b7c629bb8f100c72b8bade8634687e5c11110ed91ed821
 DIST fontforge_full-20100501.tar.bz2 6666386 SHA256 ee4928b0df7480c31a422645854d9f3f4f6718dd423b6885bd33e87a8a6edd79
 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-20100429.tar.bz2 3115782 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
 DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
 EBUILD fontforge-20100501.ebuild 3499 SHA256 e28182deffee715039d7b1fd041d75744e3a25ca2b7819163b65f69a7a8abf29 SHA512 f4691b00c0046f3e66303c36020d8acf4439946f1bd91140635c47dd96996ba6b092c91768a0a6e3502ed36bc1f2f553a6b3b8e8cbe1b54f93b871c0e532ee32 WHIRLPOOL f3582d89e25ac5b85a5d94943fdadfcdb1866a68cb1653d14ba5313d04831b3365a4698d75a4c785934e5f625592717c67fb917767f8bc73c38e9c7542ec2556
 EBUILD fontforge-20110222-r1.ebuild 3808 SHA256 ea922443d760c9d052bb9b92ee3de9fe823f419fba42f0a94d31722ce1524c5e SHA512 f67d2ee6242319228262cf2d02e5ec7bb4d21168943317ff8133d19c277af2e01ad02232da8195a16282dacac13d677be14f01454b405b593a76479b117f487c WHIRLPOOL 875d3bedd5bf5b4da72002d645215fe581d60e02ad1faef51579bbbb19771b62b8633b9cde6d52af6591d5b50499c4b6cfaf65f5119265522859c9fa717d543e
 EBUILD fontforge-20110222.ebuild 3696 SHA256 da3b2a27843e9af54f68a1fc1dcabd65b22ac6c3db9209cb5a84f8dca2d30175 SHA512 3fa047e30992c5280182bce51fef00971d97ff4d8b0ec5749b33de800aa1fbb5e65adc21790af63bf2efef09cbc1feaa43320f145d232519d04b4a49e6476db1 WHIRLPOOL 4dbb2b4522a47f90c7a93122a2362653b7ba3c71ed39d7d8922cce8ce14d0a1cd7bbf4ba0e2ee09d95f29cf1ba8a08c4c8decd5d151cc951faf8bf1975187004
-MISC ChangeLog 22210 SHA256 1e572456ab793a47ba5d307d1198c506ac0c21c442ed3e10b9d3221b35003b2b SHA512 7977996be9d8e9a784962bfed3d4ab3b496173d0f84929f94b4254d15f9e0c55dde737a70bc0cebc7f02bfbf49f1ce8de35515595e73863bf2a56b21a99f3a87 WHIRLPOOL 04cd20d896b532d3855ff1b7c963f43e917bbd270f48757638e405015099b96ced4def5edceb2f1fd8bb5d1aad976e0d1a7468a92e2564d32c9462df2831d6dd
+EBUILD fontforge-20120731.ebuild 4077 SHA256 64a8f8d0d80bbf1cdd682c4babb1f8300b8c6e6a6354775cde849ba4847ed830 SHA512 23b2da901a82ca84683376fc0303408239a80af9e47f4a0bd1a8222f06bf09137c91e626dd8e26f309e90d607c1b507cbfff9e8310030b0ac292ab10b4d5189e WHIRLPOOL 5fe65c1b5c3140f44d7177b496733b5bfc79de369f9db2d24550710417d8615aa7a44110ea0eda58eff96e6e3c42185e5256b1ad2b1eca0754c4372d286a2b4f
+MISC ChangeLog 22351 SHA256 e298bd073ba5a559374f0cbf3e82b0dd0bea8df8cdf08911093f0a727ab8dc1d SHA512 db9992eea2c69ac5baf7de64632d9f022dde52116527963757d94de637a1d027e593b0a04cff94c0ee4c8a64ddb834edd647e4b587933c287e119d622dd8a558 WHIRLPOOL 20bd9293c9f8cb2fe394e7112bb411e91047f2fbcb40983b2bd3994e5b5c1b3dd0bd8b22d62e1fac42f877e2fad99e45aa67bf48061ff132cb61befd5abdfedd
 MISC metadata.xml 1457 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604 SHA512 b4c13b65e4a2b24971c7c5216f746d85db6ff0d2d7961a4fbda99d1a722114437f3629140364374abff2acec4d38e87e67d44e9c7373da12561336445e6168d6 WHIRLPOOL a7060604b91f4dd495dd76e7b5671339ddf8a89e2c5f9e0754e315f8278b70bdd0526b2046a38ff3c0fcfed1ccd700c95427fdb9f87bff04817d043d831c614e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRpNFeAAoJEJOE+m71LUu6OUUQAIaSDUKDmIw9EnvXbHs7hMlc
-9AHqrIz+CCkO2bpa2XxIrJX+tF7RSvg0TrVQoyNAm5T+o2H/lCvbwsUUUF91A3UF
-bqqL6PNvL0PAiRjb0yOosBW9pyj9AoSGw31q9/Ieau0D2a/xN+MANW5MYPec28DF
-g2OVDvi1+v7DfybxwJ7cCDc9AHOxHOhzuM25QyDvT9pW2/XlAD1FiGhwFcX8dIi1
-MeXMg0eqg6vEJNyYpoeA4fAFP+ZQ2QdvXN3Q7pGf0+NfJOGczTo5mzN0cYF4FJC7
-bA70isiYiLVZXgxyKhpuU/hIKIJiPhztSfBbMTvwHdzWLeZL7rdYHWTM2EkrgMX9
-CmfsOswNqUGeCbn+Mq3uA6+GL7i8eOvt50fFUZUmyhpyU8D4KkuA4jZ7VMbZVdfL
-htn3qfTyybZhPP/YlPYqR4xCqKzCg28iccijhpTkdqrBoKDfDidL+Ef7s0vjdr21
-5CQNMgDuW07JF1GtgiuTcQIBDFfI4zZgjgKfahfagtZJpKkHzdfngy/K6zIEgvzQ
-UThrGyuO92ejtd+gf9NByGX0MtOK2EONvoE71NEeyUSPCV/p7tLKE5oq+N1rPgp9
-W2a+hnQ/2jCwOa/C3Fsr3+rHV3Q3eIB+/mGmRYJkMhhlX4Wnhkji+ezrZe4+/luW
-t4El05z9zecKgZWd7KpH
-=iPYD
+iQIcBAEBCAAGBQJR6YfNAAoJEO/kOhxWD91khssQAI9XJfXV6TOkns6H074JrQ/y
+cKXIoETCpkI6SPUmAFycaiXJmPIzp/YBhQnF5ef4t2hjnX/u0QrLUH4uAsdbQ2Nq
+8TzFdroB0mv0jsm0tYdxJyjTLPXLwETqreqoddxFNEhjy2jNCtBvQ85MhXO0uuZK
+QCvybRaqvyBS+ZDVwXRY7xH4Wp8MolBO3G7TCtbw9C2QFhtOPbdQxQDxDuajEO8p
+5xBaAH5BLu6QWnz5OBZ5SLgZXJ1CFR3+16IwJAYNlwlk4QgsTebxvpgYyhGcHYQE
+abZGMUEEM3dkVhZOdnnoEw2Y/rpzjr5ZB7+CqqZyHSCzlozqlLRWf3cuHsshNWUg
+ofbmvmf5u0wq931q/W17Hfw2m8OfkronpR6NOkg06GO8QWLN5xPPpTUsLsQSYOdc
+E6ovzFYjVgs6ytnxjAgxV2sRTIPVkxiuJI5de85GHw5bNYYRMze6MDG/vJY8V26q
+sNEYeWeWkjn1IlxNhFuobltxQUQ4vTBtZELOC2dHPxW6MbCZsV3ND4Dgk/m6SRSO
+Nq/7eINCVB1m5erTmvcR1I3UhsOU0aQA8vGZtMrDSkU1R8QW/8YO40xsCxOv92Jl
+9wy4LJTBzi84GQ6agOahfzkkY5v5RSUqDq8jxofM4tEMzwoF1vJ+OEsOMABXZN8k
+3R1LjVZV0Y1g9pL/exHT
+=YYbd
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/fontforge-20120731.ebuild b/media-gfx/fontforge/fontforge-20120731.ebuild
new file mode 100644
index 000000000000..8ea05f905c3c
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20120731.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20120731.ebuild,v 1.1 2013/07/19 18:39:00 nirbheek 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="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 ~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 )
+	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
+}