5 files changed, 11 insertions, 65 deletions
diff --git a/media-fonts/font-util/ChangeLog b/media-fonts/font-util/ChangeLog
index b04926f266fa..0a3911df4548 100644
--- a/media-fonts/font-util/ChangeLog
+++ b/media-fonts/font-util/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/font-util
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/ChangeLog,v 1.14 2005/12/08 22:58:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/ChangeLog,v 1.15 2005/12/18 19:59:19 spyderous Exp $
+
+*font-util-1.0.0 (18 Dec 2005)
+
+  18 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/configurable-mapdir.patch, -font-util-0.99.2-r2.ebuild,
+  +font-util-1.0.0.ebuild:
+  Bump for 7.0RC4.
 
 *font-util-0.99.2-r2 (08 Dec 2005)
 
diff --git a/media-fonts/font-util/files/configurable-mapdir.patch b/media-fonts/font-util/files/configurable-mapdir.patch
deleted file mode 100644
index c7ecb06d7921..000000000000
--- a/media-fonts/font-util/files/configurable-mapdir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Independently created by me, but exactly the same as
-https://bugs.freedesktop.org/show_bug.cgi?id=5175#c4
-
-Donnie Berkholz <spyderous@gentoo.org>
-
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/util/Makefile.am,v
-retrieving revision 1.9
-diff -u -b -B -r1.9 Makefile.am
---- Makefile.am	6 Dec 2005 22:48:41 -0000	1.9
-+++ Makefile.am	8 Dec 2005 22:54:49 -0000
-@@ -31,7 +31,7 @@
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = fontutil.m4
- 
--mapfilesdir = @mapdir@
-+mapfilesdir = @MAPDIR@
- mapfiles_DATA = \
- 	map-ISO8859-1 \
- 	map-ISO8859-2 \
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/font/util/configure.ac,v
-retrieving revision 1.7
-diff -u -b -B -r1.7 configure.ac
---- configure.ac	3 Dec 2005 05:49:41 -0000	1.7
-+++ configure.ac	8 Dec 2005 22:54:49 -0000
-@@ -31,8 +31,12 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- 
--mapdir="$libdir/X11/fonts/util"
--AC_SUBST(mapdir)
-+DEFAULT_MAPDIR=${libdir}/X11/fonts/util
-+AC_ARG_WITH(mapdir,
-+	AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
-+	[MAPDIR="$withval"],
-+	[MAPDIR="$DEFAULT_MAPDIR"])
-+AC_SUBST(MAPDIR)
- 
- XORG_MANPAGE_SECTIONS
- XORG_RELEASE_VERSION
-Index: fontutil.pc.in
-===================================================================
-RCS file: /cvs/xorg/font/util/fontutil.pc.in,v
-retrieving revision 1.1
-diff -u -b -B -r1.1 fontutil.pc.in
---- fontutil.pc.in	22 Jul 2005 04:13:44 -0000	1.1
-+++ fontutil.pc.in	8 Dec 2005 22:54:49 -0000
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--mapdir=@mapdir@
-+mapdir=@MAPDIR@
-  
- Name: FontUtil
- Description: Font utilities dirs
diff --git a/media-fonts/font-util/files/digest-font-util-0.99.2-r2 b/media-fonts/font-util/files/digest-font-util-0.99.2-r2
deleted file mode 100644
index cf7446fdc2bb..000000000000
--- a/media-fonts/font-util/files/digest-font-util-0.99.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 035da3fb58569c21fafc855d0dd3b906 font-util-0.99.2.tar.bz2 93663
diff --git a/media-fonts/font-util/files/digest-font-util-1.0.0 b/media-fonts/font-util/files/digest-font-util-1.0.0
new file mode 100644
index 000000000000..b37365c772f7
--- /dev/null
+++ b/media-fonts/font-util/files/digest-font-util-1.0.0
@@ -0,0 +1 @@
+MD5 51bd70c613eade783e16383c02c68c91 font-util-1.0.0.tar.bz2 94759
diff --git a/media-fonts/font-util/font-util-0.99.2-r2.ebuild b/media-fonts/font-util/font-util-1.0.0.ebuild
index 07cd98c41948..9cf1b8c1e670 100644
--- a/media-fonts/font-util/font-util-0.99.2-r2.ebuild
+++ b/media-fonts/font-util/font-util-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-0.99.2-r2.ebuild,v 1.1 2005/12/08 22:58:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.0.0.ebuild,v 1.1 2005/12/18 19:59:19 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
+#SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -13,5 +13,3 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--with-mapdir=/usr/share/fonts/util"
-
-PATCHES="${FILESDIR}/configurable-mapdir.patch"