(fd.o #5175) Make mapdir configurable in the source instead of a hackish sed in the ebuild.

Package-Manager: portage-2.0.53

5 files changed, 74 insertions, 2 deletions

diff --git a/media-fonts/font-util/ChangeLog b/media-fonts/font-util/ChangeLog
index c0ce8a07fbdb..58b55a49befb 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.11 2005/12/07 21:51:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/ChangeLog,v 1.12 2005/12/08 19:59:19 spyderous Exp $
+
+*font-util-0.99.2-r1 (08 Dec 2005)
+
+  08 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/configurable-mapdir.patch, +font-util-0.99.2-r1.ebuild:
+  (fd.o #5175) Make mapdir configurable in the source instead of a hackish sed
+  in the ebuild.
 
   07 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -font-util-0.99.0.ebuild, -font-util-0.99.1.ebuild:
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 3faec114225e..ec8e7962f733 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,4 +1,7 @@
-MD5 6a0bca2f29ca823e8fa0b5045aa776c7 ChangeLog 1467
+MD5 f239c91349ea18dbddf358cb3348b15b ChangeLog 1720
+MD5 8a2f1ec6f7beb02b4d7f6904efb77856 files/configurable-mapdir.patch 1266
 MD5 c967eee6bbb5023d1e0b0d9c4fa09f7b files/digest-font-util-0.99.2 68
+MD5 c967eee6bbb5023d1e0b0d9c4fa09f7b files/digest-font-util-0.99.2-r1 68
+MD5 606a7cbe9b20e4c01f6e384ac0545173 font-util-0.99.2-r1.ebuild 555
 MD5 43bb573edec24c36b4e73bad45c4de21 font-util-0.99.2.ebuild 785
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/media-fonts/font-util/files/configurable-mapdir.patch b/media-fonts/font-util/files/configurable-mapdir.patch
new file mode 100644
index 000000000000..18e39b64509a
--- /dev/null
+++ b/media-fonts/font-util/files/configurable-mapdir.patch
@@ -0,0 +1,44 @@
+Independently created by me, but exactly the same as
+https://bugs.freedesktop.org/show_bug.cgi?id=5175#c4
+
+Donnie Berkholz <spyderous@gentoo.org>
+
+? configurable-mapdir.patch
+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 19:48:34 -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 19:48:34 -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
diff --git a/media-fonts/font-util/files/digest-font-util-0.99.2-r1 b/media-fonts/font-util/files/digest-font-util-0.99.2-r1
new file mode 100644
index 000000000000..cf7446fdc2bb
--- /dev/null
+++ b/media-fonts/font-util/files/digest-font-util-0.99.2-r1
@@ -0,0 +1 @@
+MD5 035da3fb58569c21fafc855d0dd3b906 font-util-0.99.2.tar.bz2 93663
diff --git a/media-fonts/font-util/font-util-0.99.2-r1.ebuild b/media-fonts/font-util/font-util-0.99.2-r1.ebuild
new file mode 100644
index 000000000000..f85e46d634c1
--- /dev/null
+++ b/media-fonts/font-util/font-util-0.99.2-r1.ebuild
@@ -0,0 +1,17 @@
+# 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-r1.ebuild,v 1.1 2005/12/08 19:59:19 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="BigReqs prototype headers"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-mapdir=/usr/share/fonts/util"
+
+PATCHES="${FILESDIR}/configurable-mapdir.patch"