Also fix pkgconfig file, so other packages can discover mapdir.

Package-Manager: portage-2.0.53

5 files changed, 31 insertions, 9 deletions

diff --git a/media-fonts/font-util/ChangeLog b/media-fonts/font-util/ChangeLog
index 9dd1e5db7dd6..b04926f266fa 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.13 2005/12/08 20:00:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/ChangeLog,v 1.14 2005/12/08 22:58:37 spyderous Exp $
+
+*font-util-0.99.2-r2 (08 Dec 2005)
+
+  08 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  files/configurable-mapdir.patch, -font-util-0.99.2-r1.ebuild,
+  +font-util-0.99.2-r2.ebuild:
+  Also fix pkgconfig file, so other packages can discover mapdir.
 
   08 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -font-util-0.99.2.ebuild:
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 75d1797c40c6..6ac6af2175ab 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,5 @@
-MD5 ad72d58664cc9e1bfcd47b82dee22a16 ChangeLog 1824
-MD5 8a2f1ec6f7beb02b4d7f6904efb77856 files/configurable-mapdir.patch 1266
-MD5 c967eee6bbb5023d1e0b0d9c4fa09f7b files/digest-font-util-0.99.2-r1 68
-MD5 606a7cbe9b20e4c01f6e384ac0545173 font-util-0.99.2-r1.ebuild 555
+MD5 91c7a1f48a46b28f496a06764ac4a9e3 ChangeLog 2077
+MD5 c7700adb73e1ad917948fb7eb2ae7c14 files/configurable-mapdir.patch 1693
+MD5 c967eee6bbb5023d1e0b0d9c4fa09f7b files/digest-font-util-0.99.2-r2 68
+MD5 57a4f10546efbd92dee8c64a0c0a788f font-util-0.99.2-r2.ebuild 555
 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
index 18e39b64509a..c7ecb06d7921 100644
--- a/media-fonts/font-util/files/configurable-mapdir.patch
+++ b/media-fonts/font-util/files/configurable-mapdir.patch
@@ -3,14 +3,13 @@ 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
++++ Makefile.am	8 Dec 2005 22:54:49 -0000
 @@ -31,7 +31,7 @@
  aclocaldir = $(datadir)/aclocal
  aclocal_DATA = fontutil.m4
@@ -26,7 +25,7 @@ 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
++++ configure.ac	8 Dec 2005 22:54:49 -0000
 @@ -31,8 +31,12 @@
  AC_PROG_CC
  AC_PROG_INSTALL
@@ -42,3 +41,19 @@ diff -u -b -B -r1.7 configure.ac
  
  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-r1 b/media-fonts/font-util/files/digest-font-util-0.99.2-r2
index cf7446fdc2bb..cf7446fdc2bb 100644
--- 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-r2
diff --git a/media-fonts/font-util/font-util-0.99.2-r1.ebuild b/media-fonts/font-util/font-util-0.99.2-r2.ebuild
index f85e46d634c1..07cd98c41948 100644
--- a/media-fonts/font-util/font-util-0.99.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-0.99.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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 $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"