(fd.o #5175) Make encodingsdir configurable.

Package-Manager: portage-2.0.53

5 files changed, 72 insertions, 2 deletions

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 1fd72d0ee161..0a1c101acde3 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.16 2005/12/09 05:46:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.17 2005/12/09 07:39:19 joshuabaergen Exp $
+
+*libXfont-0.99.3-r2 (09 Dec 2005)
+
+  09 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/configurable-encodingsdir.patch, +libXfont-0.99.3-r2.ebuild:
+  (fd.o #5175) Make encodingsdir configurable.
 
   09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -files/fontpath_unscaled.patch, -libXfont-0.99.1.ebuild,
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index e3a6ff8c2440..3073e08cab6f 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,4 +1,7 @@
-MD5 86b166c45bd07f5d99ffe1fe3eb2dd8d ChangeLog 2773
+MD5 740f70c61c1355db02c67f8262c3e12b ChangeLog 2987
+MD5 3fe51e69f72dff3ac44e272d44166671 files/configurable-encodingsdir.patch 1189
 MD5 2412e009d3985b7728e170a33164f6b5 files/digest-libXfont-0.99.3-r1 68
+MD5 2412e009d3985b7728e170a33164f6b5 files/digest-libXfont-0.99.3-r2 68
 MD5 bd7a9230850f829ea7c9d2d4c1624112 libXfont-0.99.3-r1.ebuild 642
+MD5 833f2b33b128f574252dac7470d3a54c libXfont-0.99.3-r2.ebuild 748
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-libs/libXfont/files/configurable-encodingsdir.patch b/x11-libs/libXfont/files/configurable-encodingsdir.patch
new file mode 100644
index 000000000000..bf4fded127dd
--- /dev/null
+++ b/x11-libs/libXfont/files/configurable-encodingsdir.patch
@@ -0,0 +1,35 @@
+--- configure.ac	2005/12/03 05:49:43	1.20
++++ configure.ac	2005/12/09 06:55:26	1.21
+@@ -1,5 +1,5 @@
+ dnl 
+-dnl  $Id: configurable-encodingsdir.patch,v 1.1 2005/12/09 07:39:19 joshuabaergen Exp $
++dnl  $Id: configurable-encodingsdir.patch,v 1.1 2005/12/09 07:39:19 joshuabaergen Exp $
+ dnl 
+ dnl  Copyright © 2003 Keith Packard
+ dnl 
+@@ -50,6 +50,15 @@
+ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
+ AC_CHECK_FUNCS([poll])
+ 
++m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
++
++DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
++AC_ARG_WITH(encodingsdir,
++	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]),
++	[ENCODINGSDIR="$withval"],
++	[ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
++AC_SUBST(ENCODINGSDIR)
++
+ #
+ # select libraries to include
+ #
+--- src/fontfile/Makefile.am	2005/07/03 16:10:05	1.3
++++ src/fontfile/Makefile.am	2005/12/09 06:55:27	1.4
+@@ -1,5 +1,5 @@
+-FONTDIR=${libdir}/X11/fonts
+-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\"
++FONTENCDIR=@ENCODINGSDIR@
++FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
+ 
+ INCLUDES =			\
+ 	-I${top_srcdir}/include \
diff --git a/x11-libs/libXfont/files/digest-libXfont-0.99.3-r2 b/x11-libs/libXfont/files/digest-libXfont-0.99.3-r2
new file mode 100644
index 000000000000..1b31cb989a46
--- /dev/null
+++ b/x11-libs/libXfont/files/digest-libXfont-0.99.3-r2
@@ -0,0 +1 @@
+MD5 08ed359995921a1092c3bdcd6da8853a libXfont-0.99.3.tar.bz2 540069
diff --git a/x11-libs/libXfont/libXfont-0.99.3-r2.ebuild b/x11-libs/libXfont/libXfont-0.99.3-r2.ebuild
new file mode 100644
index 000000000000..39964659965c
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-0.99.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-0.99.3-r2.ebuild,v 1.1 2005/12/09 07:39:19 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xfont library"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6"
+RDEPEND="x11-libs/xtrans
+	x11-libs/libfontenc
+	x11-proto/xproto
+	x11-proto/fontsproto
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	x11-proto/fontcacheproto"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)
+	--enable-type1
+	--with-encodingsdir=/usr/share/fonts/encodings"
+
+PATCHES="${FILESDIR}/configurable-encodingsdir.patch"