Added patch to get non-executable stack, from bug #90287. yasm still generate executable stack and that's bad, need a newer version. In the mean time removed userland_Darwin ebuild and changed with a $CHOST check.

(Portage version: 2.1_pre1)

4 files changed, 15 insertions, 16 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 348294fa250d..4aecaf2a3d0e 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.48 2005/09/18 00:31:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.49 2005/12/17 12:59:42 flameeyes Exp $
+
+  17 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xvid-1.1.0_beta2-r1.ebuild:
+  Added patch to get non-executable stack, from bug #90287. yasm still
+  generate executable stack and that's bad, need a newer version. In the mean
+  time removed userland_Darwin ebuild and changed with a $CHOST check.
 
   18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> xvid-1.0.3.ebuild:
   Add ~alpha keyword.
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 9576e0015122..67224365fd1a 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 85b5f9326201af5c75913ae646b468d6 ChangeLog 5921
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
@@ -13,7 +10,7 @@ MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
 MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
 MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
 MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2 73
-MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2-r1 73
+MD5 efdb459d255b1c1d8c6784303c1cd575 files/digest-xvid-1.1.0_beta2-r1 149
 MD5 666fc1f16bf35b48d500b495509b07b2 files/xvid-1.0-ia64.patch 264
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
 MD5 80a43f67032aa35894fcb976e575c252 files/xvid-1.1.0_beta2-altivec.patch 1070
@@ -25,12 +22,5 @@ MD5 d332fc92996c01572c8f514106f41c6d xvid-1.0.0_rc4.ebuild 1074
 MD5 12796f897e8656ae363eee47d96a4e59 xvid-1.0.1.ebuild 1291
 MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
 MD5 8982c73fa7f61ee253fa87381f233a46 xvid-1.0.3.ebuild 1170
-MD5 c177c149ed6a800d04ee7c088901b4a1 xvid-1.1.0_beta2-r1.ebuild 1635
+MD5 1f704edbcdf17b0f0ec7aafd923fd8ac xvid-1.1.0_beta2-r1.ebuild 1747
 MD5 5632dec80948ffc1039785157d1d6ed5 xvid-1.1.0_beta2.ebuild 1215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRJ0pgIKl8Uu19MoRAs9tAJ9YQ+Coo7dQPAxdiWZ3RPP8NGdzLwCeLGEX
-/EoOmAgipzQxpwjuxJRaIME=
-=T5J7
------END PGP SIGNATURE-----
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1 b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
index de40693aba77..50ef637893b9 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
@@ -1 +1,2 @@
+MD5 891c95e3e4660da30db9badfbd724f6b xvid-1.1.0-noexec-stack.patch.bz2 3443
 MD5 1556584438f5b9fcd4c5e4ca829da602 xvidcore-1.1.0-beta2.tar.bz2 594159
diff --git a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
index d8067c01a3cc..1d748de6c0cd 100644
--- a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
+++ b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
@@ -1,13 +1,14 @@
 # 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.1.0_beta2-r1.ebuild,v 1.7 2005/10/06 03:40:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.8 2005/12/17 12:59:42 flameeyes Exp $
 
 inherit eutils fixheadtails
 
 MY_P=${PN}core-${PV/_beta/-beta}
 DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-1.1.0-noexec-stack.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -28,6 +29,7 @@ src_unpack() {
 	cd "${WORKDIR}"/${MY_P}
 	epatch "${FILESDIR}"/${P}-altivec.patch
 	epatch "${FILESDIR}"/${P}-amd64-gcc4.patch
+	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
 
 	cd "${S}"
 	ht_fix_file bootstrap.sh
@@ -45,7 +47,7 @@ src_install() {
 	cd "${S}"/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*
 
-	if use userland_Darwin; then
+	if [[ ${CHOST} == *-darwin* ]]; then
 		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
 		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
 	else