summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-04-12 05:30:24 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-04-12 05:30:24 +0000
commit3b282e742fd8de6e30ff7e7ded39c31aa4841168 (patch)
tree2debf5302cebe6d275ceb593a236993689344567 /x11-base/xfree
parentUpdated to the latest CVS snapshot (Manifest recommit) (Manifest recommit) (diff)
downloadgentoo-2-3b282e742fd8de6e30ff7e7ded39c31aa4841168.tar.gz
gentoo-2-3b282e742fd8de6e30ff7e7ded39c31aa4841168.tar.bz2
gentoo-2-3b282e742fd8de6e30ff7e7ded39c31aa4841168.zip
Move unpacking of NLS-related things earlier, so patches to them apply properly.
Diffstat (limited to 'x11-base/xfree')
-rw-r--r--x11-base/xfree/ChangeLog6
-rw-r--r--x11-base/xfree/xfree-4.3.0-r6.ebuild12
2 files changed, 12 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 3fdb6b31ab05..bd007d102743 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.316 2004/04/08 16:27:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.317 2004/04/12 05:30:24 spyderous Exp $
+
+ 12 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
+ Move unpacking of NLS-related things earlier, so patches to them apply
+ properly.
*xfree-4.3.0-r6 (08 Apr 2004)
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 9b424ce68b36..b3feea0ad3b3 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.19 2004/04/08 16:27:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.20 2004/04/12 05:30:24 spyderous Exp $
# TODO
# 14 Mar. 2004 <spyderous@gentoo.org>
@@ -221,6 +221,12 @@ src_unpack() {
# Remove bum encoding
rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc
+ cd ${S}
+ bzcat ${DISTDIR}/XFree86-compose.dir-0.1.bz2 > nls/compose.dir
+ bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
+ bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
+ bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
+
# Update the Savage Driver
# savage driver 1.1.27t is a .zip and contains a savage directory
# (that's why we have to be in drivers, not in savage subdir).
@@ -566,10 +572,6 @@ src_unpack() {
eend 0
cd ${S}
- bzcat ${DISTDIR}/XFree86-compose.dir-0.1.bz2 > nls/compose.dir
- bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
- bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
- bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
if use doc
then