workaround LANG issue

5 files changed, 19 insertions, 43 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index dc3e2fa62636..31d7fff30b7c 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.9 2003/02/12 09:24:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.10 2003/04/30 09:38:32 liquidx Exp $
 
-  05 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> openmotif-2.1.30-r1.ebuild, openmotif-2.2.2.ebuild,
-						openmotif-2.2.2-r1.ebuild :
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> openmotif-2.2.2-r1.ebuild:
+  workaround LANG problem in makefile. #15117
+
+  05 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> openmotif-2.1.30-r1.ebuild,
+  openmotif-2.2.2.ebuild, openmotif-2.2.2-r1.ebuild :
   Added PROVIDE.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
new file mode 100644
index 000000000000..b97f8db423f9
--- /dev/null
+++ b/x11-libs/openmotif/Manifest
@@ -0,0 +1,8 @@
+MD5 c1cda64aa0c4bf28aead1736f97b47c4 ChangeLog 1917
+MD5 3280c2d9db375a3f9c6646382213c1c5 openmotif-2.2.2-r1.ebuild 1040
+MD5 600686239e2f33c8da8abc19a4a1e710 openmotif-2.2.2.ebuild 897
+MD5 d9fb88b149d0eb40279440b75183c850 files/animate-demo.diff 498
+MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2 68
+MD5 009fd49058dd31057e2cbdc0c5cbb6a5 files/digest-openmotif-2.2.2-r1 136
+MD5 de211ad75fe5ccc5bfb4794dec54157f files/include-order.diff 597
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r1 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r1
deleted file mode 100644
index ead704e865e9..000000000000
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
deleted file mode 100644
index 041a63c9e301..000000000000
--- a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild,v 1.15 2003/02/13 17:00:04 vapier Exp $
-
-MY_P=${P}-4_MLI.src
-S=${WORKDIR}/motif
-DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
-HOMEPAGE="http://www.metrolink.com/openmotif/"
-LICENSE="MOTIF"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-PROVIDE="virtual/motif"
-DEPEND="virtual/glibc virtual/x11"
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/site.def ${S}/config/cf/
-}
-
-src_compile() { 
-													
-	mkdir -p imports/x11
-	cd imports/x11
-	ln -s /usr/X11R6/bin bin
-	ln -s /usr/X11R6/include include
-	ln -s /usr/X11R6/lib lib
-	cd ${S}
-	make World || die
-}
-
-src_install() {															 
-
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die
-
-}
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild
index 2f82b7ca5411..fd68bd3649ef 100644
--- a/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild,v 1.5 2003/02/13 17:00:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r1.ebuild,v 1.6 2003/04/30 09:38:32 liquidx Exp $
 
 S=${WORKDIR}/openMotif-2.2.2
 
@@ -24,8 +24,10 @@ src_unpack() {
 	patch -p1 < ${FILESDIR}/include-order.diff || die "patch failed"
 }
 
-src_compile() { 
-
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+	
 	./configure \
 		--prefix=/usr/X11R6 \
 		--sysconfdir=/etc/X11 \