Remove textrel patch, see bug 135326

Package-Manager: portage-2.1.1-r1

5 files changed, 90 insertions, 19 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 366efa77d6db..6c163beb3085 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.73 2006/10/02 08:19:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.74 2006/10/27 17:45:41 beandog Exp $
+
+*xvid-1.1.0-r3 (27 Oct 2006)
+
+  27 Oct 2006; Steve Dibb <beandog@gentoo.org> +xvid-1.1.0-r3.ebuild:
+  Remove textrel patch, see bug 135326
 
 *xvid-1.1.0-r2 (02 Oct 2006)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 29b23dcc013d..65d8dbb0356c 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.2-DESTDIR.patch 1450 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 SHA1 71d1e00c431a8dd1840cfc067504a51beec6bdef SHA256 5aa2571d3e5053d15a9efa21a71ff8a851df6afb7dee73bb1075696346159e83
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 files/1.0.2-DESTDIR.patch 1450
@@ -27,7 +24,7 @@ RMD160 316da7461c58ddabec7d2907431fbb9675cea322 files/xvid-1.1.0_beta2-altivec.p
 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d files/xvid-1.1.0_beta2-altivec.patch 1070
 DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac403397fa566f2d1 SHA1 41eba0bcda09741773dace31a4321005f6e35445 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e
 DIST xvid-1.1.0-textrel-2.patch.bz2 24494 RMD160 5ba4a367fa6ece1de693100112fe2d328c0ae3bb SHA1 0f23b4e4333030ee5c370483a475b749aff7018a SHA256 32ea754d71ac82461cd3fdc9a0f5eacbf8e0d0b3441e9e602baa2cacb9861440
-DIST xvidcore-1.0.2.tar.bz2 541407
+DIST xvidcore-1.0.2.tar.bz2 541407 RMD160 373cd9da39ffe250e8a536a2f7e2f7724c0794c9 SHA1 843c6d9d20a6525331726d5357f5032fcd62b4de SHA256 0fe361f203ff37dfab556a82e1004237a7de513b5333fe3cacdf1cdcaaf57546
 DIST xvidcore-1.0.3.tar.bz2 541841 RMD160 96e4d46f617ebb802c2a6cacbf64502356a70741 SHA1 4b7de410e55c318cb68a829bb7e3619cbf40a1cf SHA256 dbe805e16caaf9e3a781619d03feb9b032603b21f626beda80f98383ac1dfd94
 DIST xvidcore-1.1.0.tar.bz2 612101 RMD160 582927437970cf81534b9ed4f02173201e10f47b SHA1 f3ffc21529ab7941e423df7365de22c391d2eaeb SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c
 EBUILD xvid-1.0.2.ebuild 1212 RMD160 8187ba91b17eee9f376fc0f3dbf8c39f04aa5f61 SHA1 ccedbbecfc4c5fb4b438c5e46412e35d6646a40a SHA256 f8c1f0366c0afd9db2ea5eaf6f9fc2044f9e6ec4d2096ff31f4bb21278f7fb35
@@ -46,21 +43,25 @@ EBUILD xvid-1.1.0-r2.ebuild 1745 RMD160 9814485b410000e18a8cc19accca7a46e853ce3c
 MD5 5971fb3e5ff171405df85e58c8ef9104 xvid-1.1.0-r2.ebuild 1745
 RMD160 9814485b410000e18a8cc19accca7a46e853ce3c xvid-1.1.0-r2.ebuild 1745
 SHA256 fdedeafe1254e04bb39a33f5f9dd53ce4e17330efe3cf229656366f4338edbc6 xvid-1.1.0-r2.ebuild 1745
+EBUILD xvid-1.1.0-r3.ebuild 1656 RMD160 f7a3c44a707f03ae90d246cf48ef6b4324a8e76f SHA1 adbcd1587daf61117fe9a24b2bc5e898c6192a7b SHA256 f87cdc7252200ba77f8db52f1244954bcabe45bf76954e235c9a08f1e1e855e0
+MD5 38d5e50b42d0bf82559f6cd4f9b451e7 xvid-1.1.0-r3.ebuild 1656
+RMD160 f7a3c44a707f03ae90d246cf48ef6b4324a8e76f xvid-1.1.0-r3.ebuild 1656
+SHA256 f87cdc7252200ba77f8db52f1244954bcabe45bf76954e235c9a08f1e1e855e0 xvid-1.1.0-r3.ebuild 1656
 EBUILD xvid-1.1.0.ebuild 1601 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f SHA1 f1d134f7749815d2664be87c235ea703890191b2 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2
 MD5 01be81ecfee18e03edf81918793be35e xvid-1.1.0.ebuild 1601
 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f xvid-1.1.0.ebuild 1601
 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2 xvid-1.1.0.ebuild 1601
-MISC ChangeLog 9501 RMD160 a0ebd641b7025bab40a9376e4733938b5f7c659c SHA1 a25ea0472117cb047e38fee484ff4b7f418bb46a SHA256 9273b3aefe7a7433d127ced0a0f42772cbc2935b98e4ae6936e1965506588ccf
-MD5 a29b0e182acd00f94838d0d1366a8934 ChangeLog 9501
-RMD160 a0ebd641b7025bab40a9376e4733938b5f7c659c ChangeLog 9501
-SHA256 9273b3aefe7a7433d127ced0a0f42772cbc2935b98e4ae6936e1965506588ccf ChangeLog 9501
+MISC ChangeLog 9639 RMD160 9ab18fac6c0183209d52c77447b1895afff8089c SHA1 642252f8b4c76723f585bc68b9b7f8fa9ccec855 SHA256 75b7fe700be76880ee0d3e5894632d6abcd9a845f8017c55801d78b45dafe7d6
+MD5 0637fef9f8bf68a0409964a5d6588a2c ChangeLog 9639
+RMD160 9ab18fac6c0183209d52c77447b1895afff8089c ChangeLog 9639
+SHA256 75b7fe700be76880ee0d3e5894632d6abcd9a845f8017c55801d78b45dafe7d6 ChangeLog 9639
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
-MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
-RMD160 02b7e85dadb9b930ef9355f446459e980ab1e77e files/digest-xvid-1.0.2 67
-SHA256 01e095f596d57fede70641b32ded31db0f3b2fc8e4234a7744b48c1621abbc04 files/digest-xvid-1.0.2 67
+MD5 1a7b16c3a7a0c5ac694eb8fb93ed7ad6 files/digest-xvid-1.0.2 247
+RMD160 aa238bbeee1f45f48892ee2382b5ce99e19fd385 files/digest-xvid-1.0.2 247
+SHA256 9d885047f4a6b75fcddaf5c4ac057aa089372881924e94f541d4eef3ab6ec758 files/digest-xvid-1.0.2 247
 MD5 27f907d4a58c48ee189f3e1193e3582f files/digest-xvid-1.0.3 247
 RMD160 24b6a9b365df8c564d856f55c6343cf777d51db3 files/digest-xvid-1.0.3 247
 SHA256 b1c26d6ed3d08abd46e2810e420c57f893aad516ebec4171f0695e031707fac3 files/digest-xvid-1.0.3 247
@@ -73,10 +74,6 @@ SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/di
 MD5 72d5ac6407edb7c072a50ad5fa8fe610 files/digest-xvid-1.1.0-r2 789
 RMD160 06f53882da57b698c9bcc2bc3550dbee170d58a0 files/digest-xvid-1.1.0-r2 789
 SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/digest-xvid-1.1.0-r2 789
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFIMuxAiZjviIA2XgRAkxnAKCdiDsH7JBcmL0L0FYXoS756kPmJQCgrBrg
-kkFxZzapuVwhIBKHcYjQNlo=
-=OfMp
------END PGP SIGNATURE-----
+MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0-r3 521
+RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0-r3 521
+SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0-r3 521
diff --git a/media-libs/xvid/files/digest-xvid-1.0.2 b/media-libs/xvid/files/digest-xvid-1.0.2
index 1f377aba5710..8fb2392f3eb9 100644
--- a/media-libs/xvid/files/digest-xvid-1.0.2
+++ b/media-libs/xvid/files/digest-xvid-1.0.2
@@ -1 +1,3 @@
 MD5 e8ffc32146991fcff286ccdcd6a16a49 xvidcore-1.0.2.tar.bz2 541407
+RMD160 373cd9da39ffe250e8a536a2f7e2f7724c0794c9 xvidcore-1.0.2.tar.bz2 541407
+SHA256 0fe361f203ff37dfab556a82e1004237a7de513b5333fe3cacdf1cdcaaf57546 xvidcore-1.0.2.tar.bz2 541407
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r3 b/media-libs/xvid/files/digest-xvid-1.1.0-r3
new file mode 100644
index 000000000000..31b550c2ac6e
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r3
@@ -0,0 +1,6 @@
+MD5 891c95e3e4660da30db9badfbd724f6b xvid-1.1.0-noexec-stack.patch.bz2 3443
+RMD160 3da4597854b67975e424614ac403397fa566f2d1 xvid-1.1.0-noexec-stack.patch.bz2 3443
+SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e xvid-1.1.0-noexec-stack.patch.bz2 3443
+MD5 359eebc5fb496a2bf7b15010059e7897 xvidcore-1.1.0.tar.bz2 612101
+RMD160 582927437970cf81534b9ed4f02173201e10f47b xvidcore-1.1.0.tar.bz2 612101
+SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c xvidcore-1.1.0.tar.bz2 612101
diff --git a/media-libs/xvid/xvid-1.1.0-r3.ebuild b/media-libs/xvid/xvid-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..8537078c5279
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/10/27 17:45:41 beandog Exp $
+
+inherit eutils fixheadtails autotools
+
+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
+	mirror://gentoo/${PN}-1.1.0-noexec-stack.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc altivec"
+
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )
+	amd64? ( dev-lang/yasm )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}/build/generic
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}"/${MY_P}
+	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
+	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
+	epatch "${FILESDIR}/${P}-3dnow-2.patch"
+
+	cd ${S}
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable altivec) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	cd "${S}"/../../
+	dodoc AUTHORS ChangeLog README TODO doc/*
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
+	else
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+		dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
+	fi
+
+	if use doc ; then
+		dodoc CodingStyle doc/README
+		docinto examples
+		dodoc examples/*
+	fi
+}