diff options
author | Joshua Baergen <joshuabaergen@gentoo.org> | 2005-12-09 07:19:33 +0000 |
---|---|---|
committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2005-12-09 07:19:33 +0000 |
commit | 4672c2ea5cd3f590f47fafe63858b22c2286c3c0 (patch) | |
tree | 91cea62907ad2af8713c898fb66b3782652efd44 /x11-libs | |
parent | Pull old versions. (diff) | |
download | historical-4672c2ea5cd3f590f47fafe63858b22c2286c3c0.tar.gz historical-4672c2ea5cd3f590f47fafe63858b22c2286c3c0.tar.bz2 historical-4672c2ea5cd3f590f47fafe63858b22c2286c3c0.zip |
(fd.o #5175) Make encodingsdir configurable.
Package-Manager: portage-2.0.53
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/libfontenc/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/libfontenc/Manifest | 5 | ||||
-rw-r--r-- | x11-libs/libfontenc/files/configurable-encodingsdir.patch | 33 | ||||
-rw-r--r-- | x11-libs/libfontenc/files/digest-libfontenc-0.99.3-r1 | 1 | ||||
-rw-r--r-- | x11-libs/libfontenc/libfontenc-0.99.3-r1.ebuild | 18 |
5 files changed, 63 insertions, 2 deletions
diff --git a/x11-libs/libfontenc/ChangeLog b/x11-libs/libfontenc/ChangeLog index 8add36d039d9..afb6d4c47054 100644 --- a/x11-libs/libfontenc/ChangeLog +++ b/x11-libs/libfontenc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/libfontenc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/ChangeLog,v 1.11 2005/12/09 06:06:18 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/ChangeLog,v 1.12 2005/12/09 07:19:33 joshuabaergen Exp $ + +*libfontenc-0.99.3-r1 (09 Dec 2005) + + 09 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/configurable-encodingsdir.patch, +libfontenc-0.99.3-r1.ebuild: + (fd.o #5175) Make encodingsdir configurable. 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -libfontenc-0.99.1.ebuild, -libfontenc-0.99.2.ebuild: diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest index 0b695457a228..8f5cdcbc3645 100644 --- a/x11-libs/libfontenc/Manifest +++ b/x11-libs/libfontenc/Manifest @@ -1,4 +1,7 @@ -MD5 4e9d8f25e25abb748d43cc2d31e7c107 ChangeLog 1504 +MD5 4f023263532d5c543c463897b80ebf6d ChangeLog 1722 +MD5 8dc2a2742d4743b42fc1a980feac114c files/configurable-encodingsdir.patch 953 MD5 a665d0c766ffc1fdcc07e24d90b824cc files/digest-libfontenc-0.99.3 70 +MD5 a665d0c766ffc1fdcc07e24d90b824cc files/digest-libfontenc-0.99.3-r1 70 +MD5 30c53140addf7e34ed39f4e4ab26ee07 libfontenc-0.99.3-r1.ebuild 583 MD5 3032eb182751883b01f03a6f244ae16e libfontenc-0.99.3.ebuild 458 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 diff --git a/x11-libs/libfontenc/files/configurable-encodingsdir.patch b/x11-libs/libfontenc/files/configurable-encodingsdir.patch new file mode 100644 index 000000000000..ae36abab7d22 --- /dev/null +++ b/x11-libs/libfontenc/files/configurable-encodingsdir.patch @@ -0,0 +1,33 @@ +--- configure.ac 2005/12/03 05:49:46 1.10 ++++ configure.ac 2005/12/09 06:07:14 1.11 +@@ -33,6 +33,15 @@ + AC_PROG_CC + AC_PROG_LIBTOOL + ++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) ++ + # zlib + + AC_CHECK_LIB(z, gzclose) +--- src/Makefile.am 2005/08/03 03:28:03 1.6 ++++ src/Makefile.am 2005/12/09 06:07:14 1.7 +@@ -5,8 +5,8 @@ + fontenc.c \ + fontencI.h + +-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 \ + -DFONTENC_NO_LIBFONT $(FONTENCDEFS) + + diff --git a/x11-libs/libfontenc/files/digest-libfontenc-0.99.3-r1 b/x11-libs/libfontenc/files/digest-libfontenc-0.99.3-r1 new file mode 100644 index 000000000000..5ba9b5cbefa5 --- /dev/null +++ b/x11-libs/libfontenc/files/digest-libfontenc-0.99.3-r1 @@ -0,0 +1 @@ +MD5 4ccb051962f067ec076dc12b0b43913d libfontenc-0.99.3.tar.bz2 157301 diff --git a/x11-libs/libfontenc/libfontenc-0.99.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-0.99.3-r1.ebuild new file mode 100644 index 000000000000..ea6c0fcadb2e --- /dev/null +++ b/x11-libs/libfontenc/libfontenc-0.99.3-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-0.99.3-r1.ebuild,v 1.1 2005/12/09 07:19:33 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org fontenc library" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86" +RDEPEND="" +DEPEND="${RDEPEND} + x11-proto/xproto" + +CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings" + +PATCHES="${FILESDIR}/configurable-encodingsdir.patch" |