summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-10-19 14:25:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-10-19 14:25:35 +0000
commit7baf5d810e53bd817a76b9eac716eb80166c2523 (patch)
tree639d51774d48c5768c03515bc0bdd4f039dc53ee
parentVersion bumped. Fixed QA issue. (diff)
downloadgentoo-2-7baf5d810e53bd817a76b9eac716eb80166c2523.tar.gz
gentoo-2-7baf5d810e53bd817a76b9eac716eb80166c2523.tar.bz2
gentoo-2-7baf5d810e53bd817a76b9eac716eb80166c2523.zip
Remove old and unused versions
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)
-rw-r--r--media-libs/xvid/ChangeLog8
-rw-r--r--media-libs/xvid/files/1.0.2-DESTDIR.patch33
-rw-r--r--media-libs/xvid/files/xvid-1.0-ia64.patch14
-rw-r--r--media-libs/xvid/files/xvid-1.1.0-3dnow.patch13
-rw-r--r--media-libs/xvid/xvid-1.1.0-r1.ebuild63
-rw-r--r--media-libs/xvid/xvid-1.1.0-r3.ebuild62
-rw-r--r--media-libs/xvid/xvid-1.1.3-r2.ebuild73
7 files changed, 7 insertions, 259 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 230d9447de8a..85861e464c39 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/xvid
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.98 2008/03/01 18:58:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.99 2008/10/19 14:25:35 aballier Exp $
+
+ 19 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+ -files/xvid-1.0-ia64.patch, -files/xvid-1.1.0-3dnow.patch,
+ -files/1.0.2-DESTDIR.patch, -xvid-1.1.0-r1.ebuild, -xvid-1.1.0-r3.ebuild,
+ -xvid-1.1.3-r2.ebuild:
+ Remove old and unused versions
*xvid-1.1.3-r3 (01 Mar 2008)
diff --git a/media-libs/xvid/files/1.0.2-DESTDIR.patch b/media-libs/xvid/files/1.0.2-DESTDIR.patch
deleted file mode 100644
index 68d7249da598..000000000000
--- a/media-libs/xvid/files/1.0.2-DESTDIR.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- build/generic/Makefile.orig 2004-04-26 18:36:04.708813608 -0400
-+++ build/generic/Makefile 2004-04-26 18:37:39.278436840 -0400
-@@ -135,15 +135,15 @@
-
- install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
- @echo " D: $(libdir)"
-- @$(INSTALL) -d $(libdir)
-+ @$(INSTALL) -d $(DESTDIR)$(libdir)
- @echo " I: $(libdir)/$(SHARED_LIB)"
-- @$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
-+ @$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo " I: $(libdir)/$(STATIC_LIB)"
-- @$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
-+ @$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
- @echo " D: $(includedir)"
-- @$(INSTALL) -d $(includedir)
-+ @$(INSTALL) -d $(DESTDIR)$(includedir)
- @echo " I: $(includedir)/xvid.h"
-- @$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(includedir)/xvid.h
-+ @$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
-
- #-----------------------------------------------------------------------------
- # Platorm specific file -- dumb rules for people executing make before
---- build/generic/platform.inc.in.orig 2004-04-26 18:36:51.928635104 -0400
-+++ build/generic/platform.inc.in 2004-04-26 18:37:02.919964168 -0400
-@@ -55,6 +55,7 @@
- # ============================================================================
-
- INSTALL=@INSTALL@
-+DESTDIR=
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
diff --git a/media-libs/xvid/files/xvid-1.0-ia64.patch b/media-libs/xvid/files/xvid-1.0-ia64.patch
deleted file mode 100644
index 58a19dfb9e74..000000000000
--- a/media-libs/xvid/files/xvid-1.0-ia64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/files/xvid-1.1.0-3dnow.patch b/media-libs/xvid/files/xvid-1.1.0-3dnow.patch
deleted file mode 100644
index 94af4d7756e5..000000000000
--- a/media-libs/xvid/files/xvid-1.1.0-3dnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xvidcore-1.1.0/src/xvid.c
-===================================================================
---- xvidcore-1.1.0.orig/src/xvid.c
-+++ xvidcore-1.1.0/src/xvid.c
-@@ -636,7 +636,7 @@ int xvid_gbl_init(xvid_gbl_init_t * init
- * features there really are. */
- if (cpu_flags & XVID_CPU_ASM) {
- /* SIMD state flusher */
-- emms = emms_3dn;
-+ emms = emms_mmx;
-
- /* DCT operators */
- fdct = fdct_skal_x86_64;
diff --git a/media-libs/xvid/xvid-1.1.0-r1.ebuild b/media-libs/xvid/xvid-1.1.0-r1.ebuild
deleted file mode 100644
index 8b8154fa52da..000000000000
--- a/media-libs/xvid/xvid-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.15 2007/11/27 18:53:20 zzam 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
- mirror://gentoo/${P}-textrel-2.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc 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.patch"
- epatch "${DISTDIR}/${P}-textrel-2.patch.bz2"
-
- 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
-}
diff --git a/media-libs/xvid/xvid-1.1.0-r3.ebuild b/media-libs/xvid/xvid-1.1.0-r3.ebuild
deleted file mode 100644
index 94ec5d19e944..000000000000
--- a/media-libs/xvid/xvid-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 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.11 2007/11/27 18:53:20 zzam Exp $
-
-WANT_AUTOMAKE="latest"
-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.2-noexec-stack.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc 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.2-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
-}
diff --git a/media-libs/xvid/xvid-1.1.3-r2.ebuild b/media-libs/xvid/xvid-1.1.3-r2.ebuild
deleted file mode 100644
index 34ced5194981..000000000000
--- a/media-libs/xvid/xvid-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3-r2.ebuild,v 1.1 2007/12/17 09:17:02 aballier Exp $
-
-inherit eutils fixheadtails autotools
-
-MY_P=${PN}core-${PV}
-
-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.2-noexec-stack.patch.bz2
- mirror://gentoo/${P}-textrel-2.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples altivec"
-
-# once yasm-0.6.0+ comes out, we can switch this to
-# dev-lang/nasm >=dev-lang/yasm-0.6.0
-# and then drop the quotes from section in the noexec-stack.patch
-
-# yasm < 0.6.2 has a bug when computing pic adresses.
-# See http://www.tortall.net/projects/yasm/ticket/114
-# the build system prefers yasm if it finds it
-# thus if we intend to have || (yasm nasm) for building
-# we need to make it block yasm < 0.6.2 on x86
-# otherwise it will compile wrong code
-NASM=">=dev-lang/yasm-0.6.2"
-DEPEND="x86? ( ${NASM} )
- amd64? ( ${NASM} )"
-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.2-noexec-stack.patch
- epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
- epatch "${FILESDIR}"/${P}-ia64-build.patch
- epatch "${WORKDIR}/${P}-textrel-2.patch"
- cd "${S}"
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable altivec)
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
-
- dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
-
- 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 examples; then
- dodoc "${S}"/../../CodingStyle
- insinto /usr/share/${PN}
- doins -r "${S}"/../../examples
- fi
-}