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

Package-Manager: portage-2.0.53

5 files changed, 102 insertions, 15 deletions

diff --git a/media-fonts/font-alias/ChangeLog b/media-fonts/font-alias/ChangeLog
index b96bdbb711d3..cefcf2b64f3d 100644
--- a/media-fonts/font-alias/ChangeLog
+++ b/media-fonts/font-alias/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-fonts/font-alias
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/ChangeLog,v 1.7 2005/10/20 00:35:00 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/ChangeLog,v 1.8 2005/12/08 20:23:03 spyderous Exp $
+
+*font-alias-0.99.0-r1 (08 Dec 2005)
+
+  08 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/configurable-aliasdir.patch, -font-alias-0.99.0.ebuild,
+  +font-alias-0.99.0-r1.ebuild:
+  (fd.o #5293) Make aliasdir configurable in the source instead of a hackish
+  sed in the ebuild.
 
   20 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
   font-alias-0.99.0.ebuild:
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 5b7613885fc3..a8cb33544061 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,4 +1,5 @@
-MD5 d6d3f975259a16f1faff28c2a575eb54 ChangeLog 953
-MD5 d6d1a647f1f8d2157bb01433ed1b8140 files/digest-font-alias-0.99.0 69
-MD5 0748b49171dd302eb8695569d9cdcb49 font-alias-0.99.0.ebuild 707
+MD5 3fc3fe112ce8de2c77c6f2f824207c4e ChangeLog 1244
+MD5 12bf3b9155570a326406d81e1abd4eee files/configurable-aliasdir.patch 2905
+MD5 d6d1a647f1f8d2157bb01433ed1b8140 files/digest-font-alias-0.99.0-r1 69
+MD5 9c9290e4f533ebc53832bb99f562ab9d font-alias-0.99.0-r1.ebuild 578
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/media-fonts/font-alias/files/configurable-aliasdir.patch b/media-fonts/font-alias/files/configurable-aliasdir.patch
new file mode 100644
index 000000000000..34dacc8ca5a6
--- /dev/null
+++ b/media-fonts/font-alias/files/configurable-aliasdir.patch
@@ -0,0 +1,86 @@
+? configurable-aliasdir.patch
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/font/alias/configure.ac,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 configure.ac
+--- configure.ac	29 Jul 2005 21:22:47 -0000	1.2
++++ configure.ac	8 Dec 2005 20:18:22 -0000
+@@ -28,6 +28,13 @@
+ 
+ AC_PROG_INSTALL
+ 
++DEFAULT_ALIASDIR=${libdir}/X11/fonts
++AC_ARG_WITH(aliasdir,
++	AS_HELP_STRING([--with-aliasdir=ALIASDIR], [Path to install font encodings]),
++	[ALIASDIR="$withval"],
++	[ALIASDIR="$DEFAULT_ALIASDIR"])
++AC_SUBST(ALIASDIR)
++
+ XORG_RELEASE_VERSION
+ 
+ AC_OUTPUT([Makefile
+Index: 100dpi/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/alias/100dpi/Makefile.am,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 Makefile.am
+--- 100dpi/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
++++ 100dpi/Makefile.am	8 Dec 2005 20:18:22 -0000
+@@ -19,7 +19,7 @@
+ #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-aliasdir = $(libdir)/X11/fonts/100dpi
++aliasdir = @ALIASDIR@/100dpi
+ alias_DATA = fonts.alias
+ 
+ EXTRA_DIST = $(alias_DATA)
+Index: 75dpi/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/alias/75dpi/Makefile.am,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 Makefile.am
+--- 75dpi/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
++++ 75dpi/Makefile.am	8 Dec 2005 20:18:22 -0000
+@@ -19,7 +19,7 @@
+ #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-aliasdir = $(libdir)/X11/fonts/75dpi
++aliasdir = @ALIASDIR@/75dpi
+ alias_DATA = fonts.alias
+ 
+ EXTRA_DIST = $(alias_DATA)
+Index: cyrillic/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/alias/cyrillic/Makefile.am,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 Makefile.am
+--- cyrillic/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
++++ cyrillic/Makefile.am	8 Dec 2005 20:18:22 -0000
+@@ -19,7 +19,7 @@
+ #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-aliasdir = $(libdir)/X11/fonts/cyrillic
++aliasdir = @ALIASDIR@/cyrillic
+ alias_DATA = fonts.alias
+ 
+ EXTRA_DIST = $(alias_DATA)
+Index: misc/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/font/alias/misc/Makefile.am,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 Makefile.am
+--- misc/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
++++ misc/Makefile.am	8 Dec 2005 20:18:22 -0000
+@@ -19,7 +19,7 @@
+ #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-aliasdir = $(libdir)/X11/fonts/misc
++aliasdir = @ALIASDIR@/misc
+ alias_DATA = fonts.alias
+ 
+ EXTRA_DIST = $(alias_DATA)
diff --git a/media-fonts/font-alias/files/digest-font-alias-0.99.0 b/media-fonts/font-alias/files/digest-font-alias-0.99.0-r1
index 4191151fca6f..4191151fca6f 100644
--- a/media-fonts/font-alias/files/digest-font-alias-0.99.0
+++ b/media-fonts/font-alias/files/digest-font-alias-0.99.0-r1
diff --git a/media-fonts/font-alias/font-alias-0.99.0.ebuild b/media-fonts/font-alias/font-alias-0.99.0-r1.ebuild
index 9b4bc9ab7348..38760ebc70dd 100644
--- a/media-fonts/font-alias/font-alias-0.99.0.ebuild
+++ b/media-fonts/font-alias/font-alias-0.99.0-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/font-alias/font-alias-0.99.0.ebuild,v 1.8 2005/10/20 00:35:00 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/font-alias-0.99.0-r1.ebuild,v 1.1 2005/12/08 20:23:03 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-aliasdir=/usr/share/fonts"
 
-	for dir in 100dpi 75dpi cyrillic misc; do
-		sed -i -e "s:^aliasdir =.*:aliasdir = \$(datadir)/fonts/${dir}:g" \
-			${S}/${dir}/Makefile.am
-	done
-
-	x-modular_reconf_source
-}
+PATCHES="${FILESDIR}/configurable-aliasdir.patch"