Clean out the cruft, fix bug 239700. Thanks to Evil Compile Person <bugs@dev.gentooexperimental.org>

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64

12 files changed, 23 insertions, 398 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 157d488901a1..2f30a47beb96 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,15 @@
 # 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.84 2008/09/29 14:16:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.85 2008/10/04 21:42:19 loki_val Exp $
+
+  04 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  fontforge-20071210.ebuild, -fontforge-20080109.ebuild,
+  -fontforge-20080203.ebuild, -fontforge-20080302.ebuild,
+  -fontforge-20080309.ebuild, -fontforge-20080429.ebuild,
+  -fontforge-20080607.ebuild, -fontforge-20080720.ebuild,
+  fontforge-20080824.ebuild, fontforge-20080927.ebuild:
+  Clean out the cruft, fix bug 239700. Thanks to Evil Compile Person
+  <bugs@dev.gentooexperimental.org>
 
 *fontforge-20080927 (29 Sep 2008)
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 9d2376ff008c..1d6b79ac7ffe 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -3,26 +3,12 @@ AUX fontforge-20071210-parallel-build.patch 678 RMD160 aa05d9514a07ee339648ed1ab
 AUX fontforge-20080302-bad-apple.patch 848 RMD160 d9fe065be781506231c2f478c5af7ffcf9d0ea8e SHA1 a1d18d5eac0fb37a4d89d12381eb32279e4a82f8 SHA256 e19f9132e5640b89dd16f975bcb415a5f4b891f9d24ee94d9643253434dfb007
 DIST cidmaps-20041222.tgz 313755 RMD160 c25b1a4f0d8ed0634402d2ce2b36ba47e0c2ef1b SHA1 d111db1f6d9a05cf6cb1387c2fb2eeb21ba0279a SHA256 e0c16072d4c0fea3614073306ba243aa974a00130c5201651892950d855641f3
 DIST fontforge_full-20071210.tar.bz2 4160548 RMD160 9d0bb33f030d28f792c8222e01886733c45f0193 SHA1 45050f40b7525afb4628239a013cb9dd04c45f42 SHA256 c38e6ea0b0e0bdc70262781995c953071431225a17452551e732ca5480cfe6ba
-DIST fontforge_full-20080109.tar.bz2 4548471 RMD160 ad2a07358896de92719bd0416362a3eac5e44cd0 SHA1 e3b21ff8aa18e108eac958e62a01dc3b41a0e99e SHA256 5d800f3241c93d95f1e2f0c99ef05b973df80680352166d224a22cff8e60f29a
-DIST fontforge_full-20080203.tar.bz2 4673160 RMD160 d1aadecf888297cfd6d9179f5a957a70aed59f9b SHA1 c8e0aac5a83bdf784948118a4eda8e38a2bde2b6 SHA256 e29fb18184adbff4cad0cc136f48976d2f18f03601850e14511a95a11d207141
-DIST fontforge_full-20080302.tar.bz2 4742742 RMD160 4871b938aecf953c30898e44cdc9ac1f7cd9512e SHA1 614f31176d3ce4fed9e3a5061e6956c57b124cf3 SHA256 8e3ec0264b027698e173cc233d93491f25dd1144383099f7cbc5318068f333f8
-DIST fontforge_full-20080309.tar.bz2 4797893 RMD160 c007790d77923118f12867f662cf74143921573c SHA1 934e2bee827badb36d17614f3f12ce3d538b6f7b SHA256 fa824d4c9babadff6c764ced71789ab2490046017fdd6eb1b720760dd719dd65
 DIST fontforge_full-20080330.tar.bz2 4774776 RMD160 d3dd8f88b942333827f516038376dc7fa4083654 SHA1 0207392300bda80b15fb50e79fc1f09d1e92a0e4 SHA256 8edfc14d2c56d71b14ed9398ab7a5f66903393b2e8b73b48d1e81c22fb19c55a
-DIST fontforge_full-20080429.tar.bz2 4797332 RMD160 22d718512ee468d31e9991b4dbd23074beb0e19f SHA1 165c137216fcadca557a5264fc2822f558b0c75a SHA256 2b47a104c3c68644528f98ef4399b7c825f4c9c4fba3242d388f6c375b5ca2fe
-DIST fontforge_full-20080607.tar.bz2 4844736 RMD160 0f9f1653d69acd3a24409df169ef2bf70f515816 SHA1 5c72921bb43556ec0b6c174f07f9406065363feb SHA256 0198cd511d84b56ce286c9498585316a54dd571937d65c54932e527464b95d92
-DIST fontforge_full-20080720.tar.bz2 5039266 RMD160 9f2c8a0afaa2be55a7f69db2272c886aaf5a6bfd SHA1 e964955d5257b5c88887823293d069ce372bf0fa SHA256 d0c1ff91540e01f8f33e571e925e0ae53e087efcb06e5b5edf62ece708d719bb
 DIST fontforge_full-20080824.tar.bz2 5069320 RMD160 723741ec3bba3006801f33744052b341a6e0f4cd SHA1 eb355ca33e767720c7c07fee44be09ededc9415a SHA256 9ca40f36abd95869fdaab84c269b6698ccd8752b82eba3b32e1877986dcda7ca
 DIST fontforge_full-20080927.tar.bz2 5072410 RMD160 8f8fb0026b967602184bfefd83d5234fc684f340 SHA1 bf80dd035d0ff26da1f5cc4aa55dcd9b6ff9e748 SHA256 122da7c4d291b2f0a77bd1c642622a38409c2cb9128b7140bd7d43f37337eb41
-EBUILD fontforge-20071210.ebuild 1702 RMD160 f8b8b21e9b92150b557a540a4a160c1c4d6d90ab SHA1 1bd829aec2b6096bc0c4a23491292b47e1ad6e0e SHA256 226779dccdaedc77157409c9400b861873353dd9bcb1aaf3e33f56339823a446
-EBUILD fontforge-20080109.ebuild 1575 RMD160 3058aa60c1826f74846765ecb51a5e624ec6a43f SHA1 4c70aadd96689ee8b65ea7679aba3735d40054d4 SHA256 44e90a0914f310f3f3d635ada4590591c68c36cc94e2a1e8d68db4bcd5cd7ce0
-EBUILD fontforge-20080203.ebuild 1575 RMD160 0bb3f87c7647e3417236e223799a0eeace915314 SHA1 2f9c1d00abe68b04cd98226f5d2506776869144b SHA256 8e221e756ce87f8d82a7a4d7179b7be7e7cfd056df7ad42c60fbb86c6e6f066f
-EBUILD fontforge-20080302.ebuild 1646 RMD160 febed526b3d0441cdf8396b35731ddb1700354eb SHA1 bbfe83227986a331b48ef8334eee680d55ce538b SHA256 10a241dd89c7dd9168e93443eb262ec13d17c25a5d7489b587790ef7d59e9131
-EBUILD fontforge-20080309.ebuild 1591 RMD160 2f7d6b77eadb4160a739d16625dde39c1ac2ee1e SHA1 3411badd001c11372416bf2efa5494004869a656 SHA256 8c9f9a8527c81efddb06473873cfa850feff218fc52a47a717d59aea66a18139
+EBUILD fontforge-20071210.ebuild 1740 RMD160 01eaf92b33ba39d746f319287a7653ade653ff07 SHA1 f93b0d8ec49b22eba6bc1331257bf95b34182863 SHA256 daa3747add3e5b62c00fa96a8baf0bfb431f1bc4957800988fe8c424376939ec
 EBUILD fontforge-20080330.ebuild 1591 RMD160 76869268071dd4a5bd4f94b6a3fcadc76a563a71 SHA1 f687f7b108ebb6620ce1a657f64e1124556d5043 SHA256 2e4cee8989ef1c0296f591b29c00cebe9b67160727d2d26bb15ee9f9a5c8ad4f
-EBUILD fontforge-20080429.ebuild 1591 RMD160 eeb107e0e5e14aebf8a716dfa351ec0e579d1fe8 SHA1 2fa5c51a8df6b06460f55ee2d4ef220db93f4610 SHA256 a013b670031a8b23306c0c22205c8a97ec07ab007fa472e7a1335b8216e487d7
-EBUILD fontforge-20080607.ebuild 1591 RMD160 64c337aa1e8667470ff51c7bdc27dd242934db6e SHA1 e093e5c69904e83be68212054a04f827652a2855 SHA256 d81c5def055cef17030f0d7e5c45ac4ba9c4c7c91a937691b14f2c276bdec5ce
-EBUILD fontforge-20080720.ebuild 1588 RMD160 699aa70ffdcae8f80bb81f66863855fedf75c99e SHA1 c2517e2d1c69a8b11ab3a4ab9f10ff2e6ee6ae8f SHA256 6e521b95e8fee40b802b160b28f6c62017dd5742a83cb8b19497c79831cb19b4
-EBUILD fontforge-20080824.ebuild 1591 RMD160 28fdb36a7f1e6e1825980a34905da9f2234f2aa8 SHA1 577d8b1b6f94c657724793bd8e8b145079a70dd7 SHA256 f8d0e8239eded13d44d40d7217d21cf78dbb2e228d8d7a1d16619db8f1c2a31c
-EBUILD fontforge-20080927.ebuild 1663 RMD160 78c6cf7c4b6f8f7af4fa70d510877557754d31d6 SHA1 dd719b6a827eb0c519f776d285d4e6a0048bf029 SHA256 e010ac762fbf75de967ff733b55037b94a392edf29b924f3636b6f5971d9ca6a
-MISC ChangeLog 12394 RMD160 44a3d97d5605ca28c6313226a652206159e559f5 SHA1 af84adfe2a78dbea03471a66370d1e462e4f6e76 SHA256 c15fb902d49adfacae2051c3ca7557b64e1cac444a55484fdb29feb5dafe3388
+EBUILD fontforge-20080824.ebuild 1631 RMD160 51102b85142212fe0a695fecb3e6cead90b16b3e SHA1 cfbbe17e9f03f9ce4b4d1ef0a71a9eaba9cc07da SHA256 cd317488a727a3bf597f09dd25ffe8fbc73cb751b417565f5efbd3282f5d19a5
+EBUILD fontforge-20080927.ebuild 1706 RMD160 24633a77b3375be2f534dfffd7c0af0a21b6570e SHA1 fc6fd9fb9c6232e15e88460254fa9da2a79f64cd SHA256 b0662dded917a8971349f610a703d7f54c431bbd2fd959a6335393676fc1ce9d
+MISC ChangeLog 12845 RMD160 813d3e7669ee8327e5c090d0e037cc34db23c786 SHA1 bfa8a0250249450725131369ec6d5a0f8069e862 SHA256 ec08c6347faa58bcf3159ddba5f8ac4299740ba8fff6b9cfafb2d6cf78996573
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
diff --git a/media-gfx/fontforge/fontforge-20071210.ebuild b/media-gfx/fontforge/fontforge-20071210.ebuild
index b4b69f74eebb..0cb8ccbae3a9 100644
--- a/media-gfx/fontforge/fontforge-20071210.ebuild
+++ b/media-gfx/fontforge/fontforge-20071210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.11 2008/02/11 13:47:43 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20071210.ebuild,v 1.12 2008/10/04 21:42:19 loki_val Exp $
 
 inherit eutils
 
@@ -22,6 +22,8 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
 	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 )"
diff --git a/media-gfx/fontforge/fontforge-20080109.ebuild b/media-gfx/fontforge/fontforge-20080109.ebuild
deleted file mode 100644
index 8917d174318b..000000000000
--- a/media-gfx/fontforge/fontforge-20080109.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080109.ebuild,v 1.3 2008/02/05 21:37:31 vapier Exp $
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080203.ebuild b/media-gfx/fontforge/fontforge-20080203.ebuild
deleted file mode 100644
index 3d34193b16fc..000000000000
--- a/media-gfx/fontforge/fontforge-20080203.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080203.ebuild,v 1.2 2008/02/05 21:37:31 vapier Exp $
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080302.ebuild b/media-gfx/fontforge/fontforge-20080302.ebuild
deleted file mode 100644
index 1ab220b3b30c..000000000000
--- a/media-gfx/fontforge/fontforge-20080302.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080302.ebuild,v 1.2 2008/03/13 01:09:50 dirtyepic Exp $
-
-inherit eutils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-
-	epatch "${FILESDIR}"/${P}-bad-apple.patch	#212715
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080309.ebuild b/media-gfx/fontforge/fontforge-20080309.ebuild
deleted file mode 100644
index 7748800ab0c2..000000000000
--- a/media-gfx/fontforge/fontforge-20080309.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080309.ebuild,v 1.1 2008/03/13 23:35:42 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080429.ebuild b/media-gfx/fontforge/fontforge-20080429.ebuild
deleted file mode 100644
index 81280d2098de..000000000000
--- a/media-gfx/fontforge/fontforge-20080429.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080429.ebuild,v 1.1 2008/05/06 04:19:37 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080607.ebuild b/media-gfx/fontforge/fontforge-20080607.ebuild
deleted file mode 100644
index f5ccd873a82f..000000000000
--- a/media-gfx/fontforge/fontforge-20080607.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080607.ebuild,v 1.1 2008/06/09 01:16:03 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080720.ebuild b/media-gfx/fontforge/fontforge-20080720.ebuild
deleted file mode 100644
index 9d7437be4c76..000000000000
--- a/media-gfx/fontforge/fontforge-20080720.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080720.ebuild,v 1.1 2008/08/12 08:59:29 pva Exp $
-
-inherit eutils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
-	mirror://gentoo/cidmaps-20041222.tgz"	# http://fontforge.sf.net/cidmaps.tgz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg nls png python tiff truetype 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 )
-	svg? ( >=dev-libs/libxml2-2.6.7 )
-	unicode? ( >=media-libs/libuninameslist-030713 )
-	!media-gfx/pfaedit"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455
-}
-
-src_compile() {
-	# no real way of disabling gettext/nls ...
-	use nls || export ac_cv_header_libintl_h=no
-	econf \
-		--with-multilayer \
-		--without-freetype-src \
-		$(use_with python) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
-
-	# install cidmaps needed for editing fonts with lots of characters #129518
-	insinto /usr/share/fontforge
-	doins "${WORKDIR}"/*.cidmap
-}
diff --git a/media-gfx/fontforge/fontforge-20080824.ebuild b/media-gfx/fontforge/fontforge-20080824.ebuild
index 8fea951a5571..ed359576f850 100644
--- a/media-gfx/fontforge/fontforge-20080824.ebuild
+++ b/media-gfx/fontforge/fontforge-20080824.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080824.ebuild,v 1.1 2008/08/25 13:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080824.ebuild,v 1.2 2008/10/04 21:42:19 loki_val Exp $
 
 inherit eutils
 
@@ -22,6 +22,8 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
 	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 )"
diff --git a/media-gfx/fontforge/fontforge-20080927.ebuild b/media-gfx/fontforge/fontforge-20080927.ebuild
index d7157ab582cb..5a4f2d8bc2cb 100644
--- a/media-gfx/fontforge/fontforge-20080927.ebuild
+++ b/media-gfx/fontforge/fontforge-20080927.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080927.ebuild,v 1.1 2008/09/29 14:16:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080927.ebuild,v 1.2 2008/10/04 21:42:19 loki_val Exp $
 
 inherit eutils
 
@@ -22,6 +22,8 @@ RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
 	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 )"