3 files changed, 12 insertions, 42 deletions
diff --git a/media-fonts/unifont/ChangeLog b/media-fonts/unifont/ChangeLog
index f7b0587eb7c9..2b6578007b64 100644
--- a/media-fonts/unifont/ChangeLog
+++ b/media-fonts/unifont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/unifont
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.36 2011/12/18 15:49:37 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.37 2012/01/08 04:30:18 dirtyepic Exp $
+
+  08 Jan 2012; Ryan Hill <dirtyepic@gentoo.org> -unifont-1.0-r4.ebuild,
+  unifont-5.1.20080914.ebuild:
+  Stabilize on ppc/ppc64 (bug #393767). Fix LICENCE (bug #395179). Remove old.
 
   18 Dec 2011; Raúl Porcel <armin76@gentoo.org> unifont-5.1.20080914.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #393767
diff --git a/media-fonts/unifont/unifont-1.0-r4.ebuild b/media-fonts/unifont/unifont-1.0-r4.ebuild
deleted file mode 100644
index 8adf6036031a..000000000000
--- a/media-fonts/unifont/unifont-1.0-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-1.0-r4.ebuild,v 1.6 2008/06/16 03:47:56 josejx Exp $
-
-inherit font
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://czyborra.com/"
-SRC_URI="mirror://debian/pool/main/u/unifont/${P/-/_}.orig.tar.gz
-	mirror://debian/pool/main/u/unifont/${P/-/_}-4.diff.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DEPEND="x11-apps/bdftopcf"
-
-S="${WORKDIR}/${PN}-dvdeug-${PV}"
-FONT_S="${S}"
-FONT_SUFFIX="pcf.gz"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/${P/-/_}-4.diff"
-}
-
-src_compile() {
-	emake || die
-	emake -f Makefile.new || die
-	gzip -9 unifont.pcf || die
-}
diff --git a/media-fonts/unifont/unifont-5.1.20080914.ebuild b/media-fonts/unifont/unifont-5.1.20080914.ebuild
index 1b46a8b6a15f..c914b650aea4 100644
--- a/media-fonts/unifont/unifont-5.1.20080914.ebuild
+++ b/media-fonts/unifont/unifont-5.1.20080914.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-5.1.20080914.ebuild,v 1.6 2011/12/18 15:49:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-5.1.20080914.ebuild,v 1.7 2012/01/08 04:30:18 dirtyepic Exp $
 
 inherit eutils font toolchain-funcs
 
@@ -8,12 +8,13 @@ DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
 HOMEPAGE="http://unifoundry.com/"
 SRC_URI="http://unifoundry.com/pub/debian/${P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="czyborra GPL-2 GPL-3 GPL-2-with-font-exception public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/perl"
+DEPEND=""
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}