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

(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)

11 files changed, 19 insertions, 380 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/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 )"