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

Package-Manager: portage-2.0.53

5 files changed, 66 insertions, 15 deletions

diff --git a/media-fonts/encodings/ChangeLog b/media-fonts/encodings/ChangeLog
index 28df92e80e0c..1d1cf924fbc2 100644
--- a/media-fonts/encodings/ChangeLog
+++ b/media-fonts/encodings/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-fonts/encodings
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/ChangeLog,v 1.9 2005/12/07 21:32:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/ChangeLog,v 1.10 2005/12/08 20:11:56 spyderous Exp $
+
+*encodings-0.99.1-r1 (08 Dec 2005)
+
+  08 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/configurable-encodingsdir.patch, -encodings-0.99.1.ebuild,
+  +encodings-0.99.1-r1.ebuild:
+  (fd.o #5292) Make encodingsdir configurable in the source instead of a
+  hackish sed in the ebuild.
 
   07 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -encodings-0.99.0.ebuild:
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 6d5cf43965fe..05afb3e6e4dd 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,4 +1,5 @@
-MD5 2f52d675eca72b8adb4598c03f45cefd ChangeLog 1188
-MD5 b6f8528f5f2078389d8e6429f562c369 encodings-0.99.1.ebuild 776
-MD5 ce225de469ea8408f700ea9a9d3f09f7 files/digest-encodings-0.99.1 69
+MD5 8c9bb077f3794216ff5840eb71972e73 ChangeLog 1482
+MD5 b21b8ce74fd1b77491e63e2a125fb1da encodings-0.99.1-r1.ebuild 594
+MD5 0ccf647d8bf04eacac43c631b10b1c23 files/configurable-encodingsdir.patch 1624
+MD5 ce225de469ea8408f700ea9a9d3f09f7 files/digest-encodings-0.99.1-r1 69
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/media-fonts/encodings/encodings-0.99.1.ebuild b/media-fonts/encodings/encodings-0.99.1-r1.ebuild
index 3f2914991a46..1405c106d820 100644
--- a/media-fonts/encodings/encodings-0.99.1.ebuild
+++ b/media-fonts/encodings/encodings-0.99.1-r1.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/encodings/encodings-0.99.1.ebuild,v 1.1 2005/11/11 20:03:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/encodings-0.99.1-r1.ebuild,v 1.1 2005/12/08 20:11:56 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -13,14 +13,6 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-apps/mkfontscale"
 
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
+CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings"
 
-	sed -i -e "s:^encodingsdir =.*:encodingsdir = \$(datadir)/fonts/encodings:g" \
-		${S}/Makefile.am
-	sed -i -e "s:^encodingsdir =.*:encodingsdir = \$(datadir)/fonts/encodings/large:g" \
-		${S}/large/Makefile.am
-
-	x-modular_reconf_source
-}
+PATCHES="${FILESDIR}/configurable-encodingsdir.patch"
diff --git a/media-fonts/encodings/files/configurable-encodingsdir.patch b/media-fonts/encodings/files/configurable-encodingsdir.patch
new file mode 100644
index 000000000000..25df71168129
--- /dev/null
+++ b/media-fonts/encodings/files/configurable-encodingsdir.patch
@@ -0,0 +1,50 @@
+? configurable-encodingsdir.patch
+Index: Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/encodings/Makefile.am,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 Makefile.am
+--- Makefile.am	6 Oct 2005 23:16:10 -0000	1.2
++++ Makefile.am	8 Dec 2005 20:05:50 -0000
+@@ -1,6 +1,6 @@
+ SUBDIRS = large
+ 
+-encodingsdir = $(libdir)/X11/fonts/encodings
++encodingsdir = @ENCODINGSDIR@
+ 
+ ENCODING_FILES =		\
+ 	adobe-dingbats.enc	\
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/font/encodings/configure.ac,v
+retrieving revision 1.3
+diff -u -b -B -r1.3 configure.ac
+--- configure.ac	19 Oct 2005 02:48:07 -0000	1.3
++++ configure.ac	8 Dec 2005 20:05:50 -0000
+@@ -18,6 +18,13 @@
+    AC_MSG_ERROR([gzip is needed to compress font encodings])
+ fi
+ 
++DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
++AC_ARG_WITH(encodingsdir,
++	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
++	[ENCODINGSDIR="$withval"],
++	[ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
++AC_SUBST(ENCODINGSDIR)
++
+ XORG_RELEASE_VERSION
+ 
+ AC_OUTPUT([Makefile large/Makefile])
+Index: large/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/encodings/large/Makefile.am,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 Makefile.am
+--- large/Makefile.am	6 Oct 2005 23:16:10 -0000	1.2
++++ large/Makefile.am	8 Dec 2005 20:05:50 -0000
+@@ -1,4 +1,4 @@
+-encodingsdir = $(libdir)/X11/fonts/encodings/large
++encodingsdir = @ENCODINGSDIR@/large
+ 
+ ENCODING_FILES =		\
+ 	big5.eten-0.enc		\
diff --git a/media-fonts/encodings/files/digest-encodings-0.99.1 b/media-fonts/encodings/files/digest-encodings-0.99.1-r1
index 413ec95420c7..413ec95420c7 100644
--- a/media-fonts/encodings/files/digest-encodings-0.99.1
+++ b/media-fonts/encodings/files/digest-encodings-0.99.1-r1