Simplify code to get rid of global calls to tr and fix building with modular X.

(Portage version: 2.1_pre4-r1)

4 files changed, 61 insertions, 64 deletions

diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index bb91ee462937..9527e687a3d1 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/xanim
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.24 2005/12/12 04:58:19 spyderous Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.25 2006/02/25 07:33:30 vapier Exp $
+
+  25 Feb 2006; Mike Frysinger <vapier@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Simplify code to get rid of global calls to tr and fix building with modular X.
 
   12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xanim-2.80.1-r4.ebuild:
diff --git a/media-video/xanim/Manifest b/media-video/xanim/Manifest
index dab6f43f675b..50beec5b5c8f 100644
--- a/media-video/xanim/Manifest
+++ b/media-video/xanim/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac8dba2a2705ba9fb6f80adca187ba25 ChangeLog 3339
 RMD160 2b5fba9a53c35a66835b26fba9bd54b8c3f789b2 ChangeLog 3339
 SHA256 ca0de8d1589b32003f45f107c08b16d5194664e4da66e7e2f89b9a2373204ad3 ChangeLog 3339
-MD5 a04e6bf35b1c142eb7bbccfdc6c5280b files/digest-xanim-2.80.1-r4 878
-RMD160 dfb87bd73a6a04431c6d3ff472b0aa33d00a0f43 files/digest-xanim-2.80.1-r4 878
-SHA256 9f65a1399ebdc298b68b0851d2bf4dac9c854d396b7300e0d272ed90224541b8 files/digest-xanim-2.80.1-r4 878
+MD5 c9544fa5501dc0c576e78b52b18d5636 files/digest-xanim-2.80.1-r4 1046
+RMD160 7e5226dd38251f46c3be66022a8bbfe503880810 files/digest-xanim-2.80.1-r4 1046
+SHA256 cad507a1ece5b79fd7044098ef44de9c563da25843d1452e4abbce777a9f8d91 files/digest-xanim-2.80.1-r4 1046
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
-MD5 481b43dcaed903e28a2deb6fa544bd4d xanim-2.80.1-r4.ebuild 3266
-RMD160 1026e562fe2049c2338328dead593fba3122b5b9 xanim-2.80.1-r4.ebuild 3266
-SHA256 9961fa65095668e0317211de537fed952c3ba4b80ecaa386c7c07f2eb323553b xanim-2.80.1-r4.ebuild 3266
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEAARG2+ySkm8kpY0RAu3tAKDB8rDBVMY9z79EBUoEpS+Iz59bYACaA+N2
-09jCwZaeyOpuFWrN6HvrdZQ=
-=XijS
------END PGP SIGNATURE-----
+MD5 81eafc93af1cb8c5e537e406cf6c4aaa xanim-2.80.1-r4.ebuild 3254
+RMD160 ef9b3add1968febd7056f17e0706f137e157af9c xanim-2.80.1-r4.ebuild 3254
+SHA256 02b7ea431b310e404915ac84f98861c099af05411cb6cc18fb3d6eada7e70b65 xanim-2.80.1-r4.ebuild 3254
diff --git a/media-video/xanim/files/digest-xanim-2.80.1-r4 b/media-video/xanim/files/digest-xanim-2.80.1-r4
index 58d90144ebd8..c186ca59f41a 100644
--- a/media-video/xanim/files/digest-xanim-2.80.1-r4
+++ b/media-video/xanim/files/digest-xanim-2.80.1-r4
@@ -1,13 +1,15 @@
-MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
-MD5 a61c6cfdf34d395de2d7b747bfedebed xa1.0_cyuv_sparcELF.o.Z 1277
-MD5 2648138325bfacdfc2c35b5954422c3b xa2.0_cvid_sparcELF.o.Z 4730
-MD5 0f7db79cc5d8605e70c79e2c633e5a99 xa2.0_iv32_sparcELF.o.Z 48813
 MD5 9339c6d7e920233e5f63267f626a03d8 xa1.0_cyuv_linuxAlpha.o.gz 2053
-MD5 f158c55fcd39f2b2665cd65d5e2457df xa2.0_cvid_linuxAlpha.o.gz 5096
-MD5 c589ff8ef37efc557797068da3d30fc7 xa2.0_iv32_linuxAlpha.o.gz 33172
+MD5 a158a6eff799cf6769625ea90889cf71 xa1.0_cyuv_linuxELFg21.o.gz 1141
 MD5 45b318b6598b29c3477e14976b14bab6 xa1.0_cyuv_linuxPPC.o.Z 1513
+MD5 a61c6cfdf34d395de2d7b747bfedebed xa1.0_cyuv_sparcELF.o.Z 1277
+MD5 f158c55fcd39f2b2665cd65d5e2457df xa2.0_cvid_linuxAlpha.o.gz 5096
+MD5 e72191744dbf09ad7c522904cb95ecfd xa2.0_cvid_linuxELFg21.o.gz 3689
 MD5 066b6934377ae2bd1225a924c430240c xa2.0_cvid_linuxPPC.o.Z 5192
+MD5 2648138325bfacdfc2c35b5954422c3b xa2.0_cvid_sparcELF.o.Z 4730
+MD5 c589ff8ef37efc557797068da3d30fc7 xa2.0_iv32_linuxAlpha.o.gz 33172
 MD5 043341640efe45455f7d5c997b0fb55e xa2.0_iv32_linuxPPC.o.Z 56163
-MD5 a158a6eff799cf6769625ea90889cf71 xa1.0_cyuv_linuxELFg21.o.gz 1141
-MD5 e72191744dbf09ad7c522904cb95ecfd xa2.0_cvid_linuxELFg21.o.gz 3689
+MD5 0f7db79cc5d8605e70c79e2c633e5a99 xa2.0_iv32_sparcELF.o.Z 48813
 MD5 f10efd80c7ea22d1c7ea4962b6c09cdf xa2.1_iv32_linuxELFg21.o.gz 29291
+MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
+RMD160 d6cf77cb288d17866c569cb6cb571f87115ae6c0 xanim2801.tar.gz 441250
+SHA256 72031927a70ab782e2b0a69daaef7894b0ec1c2c6c2d65d495aff5f50bbed0a9 xanim2801.tar.gz 441250
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 2d68479cda78..fde8a14b9f22 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.31 2006/02/25 07:15:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.32 2006/02/25 07:33:30 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://xanim.polter.net/"
 
 LICENSE="XAnim"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="|| ( ( x11-libs/libXext
@@ -25,65 +25,67 @@ DEPEND="${RDEPEND}
 MY_P=${PN}${PV//.}
 S=${WORKDIR}/${MY_P}
 
-_XA_CYUV_ALPHA=xa1.0_cyuv_linuxAlpha.o
-_XA_CVID_ALPHA=xa2.0_cvid_linuxAlpha.o
-_XA_IV32_ALPHA=xa2.0_iv32_linuxAlpha.o
-_XA_ALPHA_EXT=.gz
+_XA_CYUV_alpha=xa1.0_cyuv_linuxAlpha.o
+_XA_CVID_alpha=xa2.0_cvid_linuxAlpha.o
+_XA_IV32_alpha=xa2.0_iv32_linuxAlpha.o
+_XA_EXT_alpha=.gz
 
-_XA_CYUV_PPC=xa1.0_cyuv_linuxPPC.o
-_XA_CVID_PPC=xa2.0_cvid_linuxPPC.o
-_XA_IV32_PPC=xa2.0_iv32_linuxPPC.o
-_XA_PPC_EXT=.Z
+_XA_CYUV_ppc=xa1.0_cyuv_linuxPPC.o
+_XA_CVID_ppc=xa2.0_cvid_linuxPPC.o
+_XA_IV32_ppc=xa2.0_iv32_linuxPPC.o
+_XA_EXT_ppc=.Z
 
-_XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
-_XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
-_XA_IV32_SPARC=xa2.0_iv32_sparcELF.o
-_XA_SPARC_EXT=.Z
+_XA_CYUV_sparc=xa1.0_cyuv_sparcELF.o
+_XA_CVID_sparc=xa2.0_cvid_sparcELF.o
+_XA_IV32_sparc=xa2.0_iv32_sparcELF.o
+_XA_EXT_sparc=.Z
 
-_XA_CYUV_X86=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_X86=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_X86=xa2.1_iv32_linuxELFg21.o
-_XA_X86_EXT=.gz
+_XA_CYUV_x86=xa1.0_cyuv_linuxELFg21.o
+_XA_CVID_x86=xa2.0_cvid_linuxELFg21.o
+_XA_IV32_x86=xa2.1_iv32_linuxELFg21.o
+_XA_EXT_x86=.gz
 
 # This might leave _XA_EXT empty and that's fine, just indicates no
 # particular support for a given arch
-eval _XA_EXT=\$_XA_`echo $ARCH | tr a-z A-Z`_EXT
-eval _XA_CVID=\$_XA_CVID_`echo $ARCH | tr a-z A-Z`
-eval _XA_CYUV=\$_XA_CYUV_`echo $ARCH | tr a-z A-Z`
-eval _XA_IV32=\$_XA_IV32_`echo $ARCH | tr a-z A-Z`
+eval _XA_EXT=\${_XA_${ARCH}}
+eval _XA_CVID=\${_XA_CVID_${ARCH}}
+eval _XA_CYUV=\${_XA_CYUV_${ARCH}}
+eval _XA_IV32=\${_XA_IV32_${ARCH}}
 
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 	sparc? (
-		mirror://gentoo/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
-		mirror://gentoo/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
-		mirror://gentoo/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
+		mirror://gentoo/${_XA_CVID_sparc}${_XA_EXT_sparc}
+		mirror://gentoo/${_XA_CYUV_sparc}${_XA_EXT_sparc}
+		mirror://gentoo/${_XA_IV32_sparc}${_XA_EXT_sparc}
 	)
 	alpha? (
-		mirror://gentoo/${_XA_CVID_ALPHA}${_XA_ALPHA_EXT}
-		mirror://gentoo/${_XA_CYUV_ALPHA}${_XA_ALPHA_EXT}
-		mirror://gentoo/${_XA_IV32_ALPHA}${_XA_ALPHA_EXT}
+		mirror://gentoo/${_XA_CVID_alpha}${_XA_EXT_alpha}
+		mirror://gentoo/${_XA_CYUV_alpha}${_XA_EXT_alpha}
+		mirror://gentoo/${_XA_IV32_alpha}${_XA_EXT_alpha}
 	)
 	ppc? (
-		mirror://gentoo/${_XA_CVID_PPC}${_XA_PPC_EXT}
-		mirror://gentoo/${_XA_CYUV_PPC}${_XA_PPC_EXT}
-		mirror://gentoo/${_XA_IV32_PPC}${_XA_PPC_EXT}
+		mirror://gentoo/${_XA_CVID_ppc}${_XA_EXT_ppc}
+		mirror://gentoo/${_XA_CYUV_ppc}${_XA_EXT_ppc}
+		mirror://gentoo/${_XA_IV32_ppc}${_XA_EXT_ppc}
 	)
 	x86? (
-		mirror://gentoo/${_XA_CVID_X86}${_XA_X86_EXT}
-		mirror://gentoo/${_XA_CYUV_X86}${_XA_X86_EXT}
-		mirror://gentoo/${_XA_IV32_X86}${_XA_X86_EXT}
+		mirror://gentoo/${_XA_CVID_x86}${_XA_EXT_x86}
+		mirror://gentoo/${_XA_CYUV_x86}${_XA_EXT_x86}
+		mirror://gentoo/${_XA_IV32_x86}${_XA_EXT_x86}
 	)"
 
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	if [[ -n ${_XA_EXT} ]]; then
-		mkdir ${S}/mods || die
-		cd ${S}/mods || die
+		mkdir "${S}"/mods || die
+		cd "${S}"/mods || die
 		unpack ${_XA_CVID}${_XA_EXT}
 		unpack ${_XA_CYUV}${_XA_EXT}
 		unpack ${_XA_IV32}${_XA_EXT}
 	fi
+	cd "${S}"
+	sed -i 's:/usr/X11R6:/usr:g' Makefile*
 }
 
 src_compile() {
@@ -99,7 +101,7 @@ src_compile() {
 			XA_IV32_LIB="mods/${_XA_CVID}" \
 			XA_CYUV_LIB="mods/${_XA_CYUV}" \
 			XA_CVID_LIB="mods/${_XA_IV32}" } \
-	|| die
+		|| die
 }
 
 src_install() {