Do a cleanup of the arch support in this ebuild so that ia64 can build. These changes obviate files/Makefile and files/Makefile.amd64 and might even allow hppa and mips to build without changes to the ebuild. I don't think I broke anything!

3 files changed, 85 insertions, 105 deletions

diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index 2d976dd5c49d..1705dee42db3 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/xanim
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.14 2003/11/29 23:13:22 brad_mssw Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.15 2004/03/02 23:44:35 agriffis Exp $
+
+  02 Mar 2004; <agriffis@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Do a cleanup of the arch support in this ebuild so that ia64 can build. These
+  changes obviate files/Makefile and files/Makefile.amd64 and might even allow
+  hppa and mips to build without changes to the ebuild. I don't think I broke
+  anything
 
   29 Nov 2003; Brad House <brad_mssw@gentoo.org> xanim-2.80.1-r4.ebuild:
   mark stable on amd64
diff --git a/media-video/xanim/Manifest b/media-video/xanim/Manifest
index d9f1f2cacc8b..9a23c6e7b623 100644
--- a/media-video/xanim/Manifest
+++ b/media-video/xanim/Manifest
@@ -1,5 +1,5 @@
-MD5 d02661707d9edda2a8d69afbd7881e67 ChangeLog 2080
-MD5 e36489eea082d0daf2603e3853706255 xanim-2.80.1-r4.ebuild 3495
+MD5 b0e62abb64e310c934efe4321ef61c57 ChangeLog 2389
+MD5 57660ecda1aee9ee30872aec28b53187 xanim-2.80.1-r4.ebuild 3135
 MD5 6a40e5518b2aaa2929a2572c5d7ca79e files/Makefile 23423
-MD5 a04e6bf35b1c142eb7bbccfdc6c5280b files/digest-xanim-2.80.1-r4 878
 MD5 cd8f40081245fb40b09b20eae7f5fd73 files/Makefile.amd64 23429
+MD5 a04e6bf35b1c142eb7bbccfdc6c5280b files/digest-xanim-2.80.1-r4 878
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 98d735f4a711..ea9db091222b 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,137 +1,111 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.20 2004/02/22 22:34:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.21 2004/03/02 23:44:35 agriffis Exp $
 
 inherit flag-o-matic
 
+DESCRIPTION="program for playing a wide variety of animation, audio and video formats"
+HOMEPAGE="http://smurfland.cit.buffalo.edu/xanim/home.html"
 SLOT="0"
 LICENSE="XAnim"
-KEYWORDS="x86 ppc sparc alpha -mips -hppa amd64 -ia64"
+KEYWORDS="x86 ppc sparc alpha -mips -hppa amd64 ia64"
 
-_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
+RDEPEND="virtual/x11
+	>=sys-libs/zlib-1.1.3"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5"
+
+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_I386=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_I386=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_I386=xa2.1_iv32_linuxELFg21.o
-_XA_I386_EXT=.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
 
-case $ARCH in
-	sparc)
-			_XA_CYUV=$_XA_CYUV_SPARC
-			_XA_CVID=$_XA_CVID_SPARC
-			_XA_IV32=$_XA_IV32_SPARC
-			_XA_EXT=$_XA_SPARC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	alpha)
-			_XA_CYUV=$_XA_CYUV_ALPHA
-			_XA_CVID=$_XA_CVID_ALPHA
-			_XA_IV32=$_XA_IV32_ALPHA
-			_XA_EXT=$_XA_ALPHA_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-	ppc)
-			_XA_CYUV=$_XA_CYUV_PPC
-			_XA_CVID=$_XA_CVID_PPC
-			_XA_IV32=$_XA_IV32_PPC
-			_XA_EXT=$_XA_PPC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	amd64)
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-	*)
-			_XA_CYUV=$_XA_CYUV_I386
-			_XA_CVID=$_XA_CVID_I386
-			_XA_IV32=$_XA_IV32_I386
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-esac
+_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
 
-MY_P=${PN}${PV//.}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="XAnim"
-HOMEPAGE="http://smurfland.cit.buffalo.edu/xanim/home.html"
-XANIM_SRC="mirror://gentoo/"
-SRC_URI="${XANIM_SRC}/${MY_P}.tar.gz
-	sparc? ${XANIM_SRC}/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
-	sparc? ${XANIM_SRC}/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
-	sparc? ${XANIM_SRC}/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
-	alpha? ${XANIM_SRC}/${_XA_CYUV_ALPHA}${_XA_ALPHA_EXT}
-	alpha? ${XANIM_SRC}/${_XA_CVID_ALPHA}${_XA_ALPHA_EXT}
-	alpha? ${XANIM_SRC}/${_XA_IV32_ALPHA}${_XA_ALPHA_EXT}
-	ppc? ${XANIM_SRC}/${_XA_CYUV_PPC}${_XA_PPC_EXT}
-	ppc? ${XANIM_SRC}/${_XA_CVID_PPC}${_XA_PPC_EXT}
-	ppc? ${XANIM_SRC}/${_XA_IV32_PPC}${_XA_PPC_EXT}
-	x86? ${XANIM_SRC}/${_XA_CYUV_I386}${_XA_I386_EXT}
-	x86? ${XANIM_SRC}/${_XA_CVID_I386}${_XA_I386_EXT}
-	x86? ${XANIM_SRC}/${_XA_IV32_I386}${_XA_I386_EXT}"
-
-DEPEND="virtual/x11
-	>=sys-libs/zlib-1.1.3
-	>=sys-apps/sed-4.0.5
-	ppc? ( app-arch/ncompress )
-	sparc? ( app-arch/ncompress )"
+_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
+
+# 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`
+
+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}
+	)
+	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}
+	)
+	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}
+	)
+	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}
+	)"
 
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	if [ "$ARCH" != "amd64" ]
-	then
-		mkdir ${S}/mods
-		cd ${S}/mods
-		cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
-		$_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
-		cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
-		$_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
-		cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
-		$_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
+	if [[ -n ${_XA_EXT} ]]; then
+		mkdir ${S}/mods || die
+		cd ${S}/mods || die
+		unpack ${_XA_CVID}${_XA_EXT}
+		unpack ${_XA_CYUV}${_XA_EXT}
+		unpack ${_XA_IV32}${_XA_EXT}
 	fi
+}
 
+src_compile() {
 	# -O higher than -O2 breaks for GCC3.1
-	filter-flags -finline-functions
 	filter-flags "-O?" "-O2"
-	#CFLAGS=${CFLAGS//-O[0-9]/-O2}
-	if [ "$ARCH" = "amd64" ]
-	then
-		sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile.amd64 > ${S}/Makefile
-	else
-		sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-	fi
-
-}
+	filter-flags -finline-functions
 
-src_compile() {
-	if [ "$ARCH" = "amd64" ]
-	then
-		make || die
-	else
-		make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-			XA_CYUV_LIB=mods/${_XA_IV32} || die
-	fi
+	# Set XA_DLL_PATH even though we statically link the mods, I guess
+	# this provides extensibility
+	make CC="${CC}" OPTIMIZE="${CFLAGS}" \
+		XA_DLL_DEF="-DXA_DLL -DXA_PRINT" XA_DLL_PATH=/usr/lib/xanim/mods \
+		${_XA_EXT:+ \
+			XA_IV32_LIB="mods/${_XA_CVID}" \
+			XA_CYUV_LIB="mods/${_XA_CYUV}" \
+			XA_CVID_LIB="mods/${_XA_IV32}" }
 }
 
 src_install () {
 	into /usr
 	dobin xanim
 	newman docs/xanim.man xanim.1
-	insinto /usr/lib/xanim/mods
-	doins mods/*
 	dodoc README
 	dodoc docs/README.* docs/*.readme docs/*.doc
+
+	# I don't know why we're installing these modules when they're
+	# statically linked, but whatever...
+	insinto /usr/lib/xanim/mods
+	doins mods/${_XA_CVID}
+	doins mods/${_XA_CYUV}
+	doins mods/${_XA_IV32}
 }