fix building with ia64 and mark hppa/ia64 stable

Package-Manager: portage-2.0.51.20

4 files changed, 41 insertions, 23 deletions

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 27dd625315b1..c5c88c033536 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,19 +1,20 @@
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 c951ce0d729ba204c7657bd7008d1ee6 xvid-0.9.2-r1.ebuild 1146
-MD5 d5a53a350f3b3242b9226edd519487cd xvid-1.0.2.ebuild 1175
+MD5 8cdfafe064dcc9bba92e795410f55d50 ChangeLog 4776
 MD5 8e01e1865534a13a85e07a39895a556e xvid-0.9.1.ebuild 1036
-MD5 d332fc92996c01572c8f514106f41c6d xvid-1.0.0_rc4.ebuild 1074
+MD5 c951ce0d729ba204c7657bd7008d1ee6 xvid-0.9.2-r1.ebuild 1146
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 12796f897e8656ae363eee47d96a4e59 xvid-1.0.1.ebuild 1291
-MD5 f1e72afc76f28009416e13ccdfc3bc90 xvid-1.0.3.ebuild 1086
-MD5 8cdfafe064dcc9bba92e795410f55d50 ChangeLog 4776
+MD5 d332fc92996c01572c8f514106f41c6d xvid-1.0.0_rc4.ebuild 1074
+MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
+MD5 f184c3cf02cd241edbeacdab5b92a9e4 xvid-1.0.3.ebuild 1153
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.3-DESTDIR.patch 1450
-MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
-MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
 MD5 e83498fda540ee61cdb0ce3fe79585c8 files/digest-xvid-0.9.1 67
+MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
+MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
 MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
-MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
+MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.3-DESTDIR.patch 1450
 MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
+MD5 666fc1f16bf35b48d500b495509b07b2 files/xvid-1.0-ia64.patch 264
diff --git a/media-libs/xvid/files/xvid-1.0-ia64.patch b/media-libs/xvid/files/xvid-1.0-ia64.patch
new file mode 100644
index 000000000000..58a19dfb9e74
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.0-ia64.patch
@@ -0,0 +1,14 @@
+Fix compile on ia64
+
+--- src/quant/quant.h
++++ src/quant/quant.h
+@@ -91,7 +91,8 @@
+ #endif
+ 
+ #ifdef ARCH_IS_IA64
+-quanth263_intraFunc dequant_intra_ia64;
++quant_intraFunc dequant_intra_ia64;
++quant_intraFunc dequant_h263_intra_ia64;
+ #endif
+ 
+ #ifdef ARCH_IS_PPC
diff --git a/media-libs/xvid/xvid-1.0.2.ebuild b/media-libs/xvid/xvid-1.0.2.ebuild
index e9f7df021ca9..4fc4af555ea0 100644
--- a/media-libs/xvid/xvid-1.0.2.ebuild
+++ b/media-libs/xvid/xvid-1.0.2.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-libs/xvid/xvid-1.0.2.ebuild,v 1.14 2005/04/19 20:11:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.15 2005/04/24 09:09:45 vapier Exp $
 
 inherit eutils
 
@@ -11,11 +11,11 @@ SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~ia64 ppc64 ~mips arm"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc"
 
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/build/generic"
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-DESTDIR.patch
 	cd ${S}/../..
+	epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
 	epatch ${FILESDIR}/${PN}-1.0.1-64bit-clean.patch
 }
 
diff --git a/media-libs/xvid/xvid-1.0.3.ebuild b/media-libs/xvid/xvid-1.0.3.ebuild
index 809178756479..b516aaac6b25 100644
--- a/media-libs/xvid/xvid-1.0.3.ebuild
+++ b/media-libs/xvid/xvid-1.0.3.ebuild
@@ -1,32 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.4 2005/04/19 20:11:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.5 2005/04/24 09:09:45 vapier Exp $
 
 inherit eutils
 
 MY_P=${PN}core-${PV/_rc/-rc}
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
 SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc64 ~ppc"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/build/generic"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-DESTDIR.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-DESTDIR.patch
+	cd "${S}"/../..
+	epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 
 	cd ${S}/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*