Version bumped, bug #236101.

(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 104 insertions, 44 deletions

diff --git a/media-fonts/unifont/ChangeLog b/media-fonts/unifont/ChangeLog
index bc76c5f9d9d2..a84a53a2734e 100644
--- a/media-fonts/unifont/ChangeLog
+++ b/media-fonts/unifont/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/unifont
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.30 2008/06/16 03:47:56 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.31 2008/12/31 15:12:28 matsuu Exp $
+
+*unifont-5.1.20080914 (31 Dec 2008)
+
+  31 Dec 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/unifont-5.1.20080914-gentoo.patch, -unifont-1.0-r3.ebuild,
+  +unifont-5.1.20080914.ebuild:
+  Version bumped, bug #236101. Removed old version.
 
   16 Jun 2008; Joseph Jezak <josejx@gentoo.org> unifont-1.0-r4.ebuild:
   Marked ppc stable.
diff --git a/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch b/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch
new file mode 100644
index 000000000000..80c90e0a65a4
--- /dev/null
+++ b/media-fonts/unifont/files/unifont-5.1.20080914-gentoo.patch
@@ -0,0 +1,63 @@
+diff -Naur unifont-5.1.20080914.orig/font/Makefile unifont-5.1.20080914/font/Makefile
+--- unifont-5.1.20080914.orig/font/Makefile	2008-09-08 11:22:52.000000000 +0900
++++ unifont-5.1.20080914/font/Makefile	2008-12-31 23:29:52.000000000 +0900
+@@ -29,8 +29,8 @@
+ #
+ PKGDEST = $(DESTDIR)/usr/share/unifont
+ FONTDEST = $(DESTDIR)/usr/share/fonts
+-PCFDEST = $(FONTDEST)/X11/misc
+-TTFDEST = $(FONTDEST)/truetype/unifont
++PCFDEST = $(FONTDEST)/unifont
++TTFDEST = $(FONTDEST)/unifont
+ #
+ # destination directory for compiled fonts
+ #
+diff -Naur unifont-5.1.20080914.orig/hoge.y unifont-5.1.20080914/hoge.y
+--- unifont-5.1.20080914.orig/hoge.y	1970-01-01 09:00:00.000000000 +0900
++++ unifont-5.1.20080914/hoge.y	2008-12-31 23:55:28.000000000 +0900
+@@ -0,0 +1,15 @@
++STARTFONT 2.1
++FONT -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1
++SIZE 16 75 75
++FONTBOUNDINGBOX 16 16 0 -2
++STARTPROPERTIES 7
++PIXEL_SIZE 16
++POINT_SIZE 160
++FONT_ASCENT 14
++FONT_DESCENT 2
++CHARSET_REGISTRY "iso10646"
++CHARSET_ENCODING "1"
++DEFAULT_CHAR 32
++ENDPROPERTIES
++CHARS 0
++ENDFONT
+diff -Naur unifont-5.1.20080914.orig/src/Makefile unifont-5.1.20080914/src/Makefile
+--- unifont-5.1.20080914.orig/src/Makefile	2008-09-08 04:01:56.000000000 +0900
++++ unifont-5.1.20080914/src/Makefile	2009-01-01 00:05:08.000000000 +0900
+@@ -1,5 +1,5 @@
+ 
+-CFLAGS = -g -O2 -Wall
++CFLAGS += -g -Wall
+ 
+ INSTALLBINDIR = ../bin
+ 
+@@ -26,8 +26,8 @@
+ 
+ all: $(CPROGS)
+ 	install -m0755 -d $(INSTALLBINDIR)
+-	install -s -m0755 $(CPROGS) $(INSTALLBINDIR)
+-	install    -m0755 $(PPROGS) $(INSTALLBINDIR)
++	install -m0755 $(CPROGS) $(INSTALLBINDIR)
++	install -m0755 $(PPROGS) $(INSTALLBINDIR)
+ 	rm -f $(CPROGS)
+ 
+ install:
+@@ -40,7 +40,7 @@
+ 	install -m0755 -d $(INSTALLDIR)
+ 	set -e ; \
+ 	   cd $(INSTALLBINDIR) ; \
+-	   install -s -m0755 $(CPROGS) $(INSTALLDIR)
++	   install -m0755 $(CPROGS) $(INSTALLDIR)
+ 	set -e ; \
+ 	   cd ../bin ; \
+ 	   install    -m0755 $(PPROGS) $(INSTALLDIR)
diff --git a/media-fonts/unifont/unifont-1.0-r3.ebuild b/media-fonts/unifont/unifont-1.0-r3.ebuild
deleted file mode 100644
index c75a488789c5..000000000000
--- a/media-fonts/unifont/unifont-1.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-1.0-r3.ebuild,v 1.12 2007/07/22 07:33:43 dirtyepic Exp $
-
-inherit eutils
-
-IUSE="X"
-
-DESCRIPTION="X11 GNU unicode font"
-HOMEPAGE="http://czyborra.com/"
-SRC_URI="mirror://debian/pool/main/u/unifont/${P/-/_}.orig.tar.gz
-	mirror://debian/pool/main/u/unifont/${P/-/_}-1.diff.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DEPEND="x11-apps/bdftopcf
-		x11-apps/mkfontdir"
-RDEPEND=""
-
-FONTPATH="/usr/share/fonts/${PN}"
-S="${WORKDIR}/${PN}-dvdeug-${PV}"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/${P/-/_}-1.diff"
-}
-
-src_compile() {
-	emake || die
-	emake -f Makefile.new || die
-}
-
-src_install() {
-	insinto ${FONTPATH}
-	doins unifont*.gz
-	use X && mkfontdir "${D}${FONTPATH}"
-}
diff --git a/media-fonts/unifont/unifont-5.1.20080914.ebuild b/media-fonts/unifont/unifont-5.1.20080914.ebuild
new file mode 100644
index 000000000000..9a3b2ab7ec8b
--- /dev/null
+++ b/media-fonts/unifont/unifont-5.1.20080914.ebuild
@@ -0,0 +1,33 @@
+# 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-5.1.20080914.ebuild,v 1.1 2008/12/31 15:12:28 matsuu Exp $
+
+inherit eutils font toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	font_xfont_config
+	font_xft_config
+	font_fontconfig
+
+	dodoc README unifont-intro.txt
+}