Remove old versions of xvid, leave only latest stable and ~arch. Solves the collision problem of bug #41157.

(Portage version: 2.1_pre1)

15 files changed, 11 insertions, 329 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 4aecaf2a3d0e..29c6a2b37a9d 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2005/12/17 12:59:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.50 2005/12/18 17:58:50 flameeyes Exp $
+
+  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/1.0.0_rc4-DESTDIR.patch, -files/1.0.1-DESTDIR.patch,
+  -files/1.0.3-DESTDIR.patch, -xvid-0.9.1.ebuild, -xvid-0.9.2-r1.ebuild,
+  -xvid-1.0.0_rc4.ebuild, -xvid-1.0.1.ebuild, xvid-1.0.3.ebuild,
+  -xvid-1.1.0_beta2.ebuild:
+  Remove old versions of xvid, leave only latest stable and ~arch. Solves the
+  collision problem of bug #41157.
 
   17 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   xvid-1.1.0_beta2-r1.ebuild:
diff --git a/media-libs/xvid/files/1.0.0_rc4-DESTDIR.patch b/media-libs/xvid/files/1.0.0_rc4-DESTDIR.patch
deleted file mode 100644
index 68d7249da598..000000000000
--- a/media-libs/xvid/files/1.0.0_rc4-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/1.0.1-DESTDIR.patch b/media-libs/xvid/files/1.0.1-DESTDIR.patch
deleted file mode 100644
index 68d7249da598..000000000000
--- a/media-libs/xvid/files/1.0.1-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/1.0.3-DESTDIR.patch b/media-libs/xvid/files/1.0.3-DESTDIR.patch
deleted file mode 100644
index 68d7249da598..000000000000
--- a/media-libs/xvid/files/1.0.3-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/digest-xvid-0.9.1 b/media-libs/xvid/files/digest-xvid-0.9.1
deleted file mode 100644
index 83afc7ed94af..000000000000
--- a/media-libs/xvid/files/digest-xvid-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f958ae81562b3f5dbb7ac0e0ff3489 xvidcore-0.9.1.tar.bz2 468683
diff --git a/media-libs/xvid/files/digest-xvid-0.9.2-r1 b/media-libs/xvid/files/digest-xvid-0.9.2-r1
deleted file mode 100644
index ac2e4246b644..000000000000
--- a/media-libs/xvid/files/digest-xvid-0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 965b2b9ae12ad8f17cee29899c920deb xvidcore-0.9.2.tar.bz2 497291
diff --git a/media-libs/xvid/files/digest-xvid-1.0.0_rc4 b/media-libs/xvid/files/digest-xvid-1.0.0_rc4
deleted file mode 100644
index e2445446f1c7..000000000000
--- a/media-libs/xvid/files/digest-xvid-1.0.0_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 112910affa656dca7cf16d9e0a6e1b78 xvidcore-1.0.0-rc4.tar.bz2 536183
diff --git a/media-libs/xvid/files/digest-xvid-1.0.1 b/media-libs/xvid/files/digest-xvid-1.0.1
deleted file mode 100644
index 408204959fd4..000000000000
--- a/media-libs/xvid/files/digest-xvid-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef8993d620e403e992cc660dbe6e3581 xvidcore-1.0.1.tar.bz2 538011
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0_beta2 b/media-libs/xvid/files/digest-xvid-1.1.0_beta2
deleted file mode 100644
index de40693aba77..000000000000
--- a/media-libs/xvid/files/digest-xvid-1.1.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1556584438f5b9fcd4c5e4ca829da602 xvidcore-1.1.0-beta2.tar.bz2 594159
diff --git a/media-libs/xvid/xvid-0.9.1.ebuild b/media-libs/xvid/xvid-0.9.1.ebuild
deleted file mode 100644
index ccd93862dc3d..000000000000
--- a/media-libs/xvid/xvid-0.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-0.9.1.ebuild,v 1.14 2005/01/09 07:04:18 luckyduck Exp $
-
-DESCRIPTION="high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://www.xvid.org/"
-SRC_URI="http://files.xvid.org/downloads/${PN}core-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.30 )"
-
-S="${WORKDIR}/${PN}core-${PV}/build/generic"
-
-src_install() {
-	dodir /usr/{include,lib}
-	einstall || die
-
-	cd ${S}/../../
-
-	dodoc authors.txt changelog.txt LICENSE README.txt todo.txt
-
-	if use doc
-	then
-		dodoc CodingStyle doc/README doc/xvid-decoding.txt doc/xvid-encoder.txt
-
-		dodoc doc/xvid-api-ref.pdf
-		dohtml -r doc/xvid-api-ref
-
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		# Empty for this release ...
-		#insinto /usr/share/doc/${PF}/examples/ex1
-		#doins examples/ex1/*
-	fi
-}
diff --git a/media-libs/xvid/xvid-0.9.2-r1.ebuild b/media-libs/xvid/xvid-0.9.2-r1.ebuild
deleted file mode 100644
index 6f2dff61097f..000000000000
--- a/media-libs/xvid/xvid-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-0.9.2-r1.ebuild,v 1.10 2005/01/09 07:04:18 luckyduck Exp $
-
-inherit eutils
-
-MY_P=${PN}core-${PV}
-DESCRIPTION="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="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
-
-S="${WORKDIR}/${MY_P}/build/generic"
-
-src_install() {
-	dodir /usr/{include,lib}
-	einstall || die
-
-	cd ${S}/../../
-
-	dodoc authors.txt changelog.txt LICENSE README.txt todo.txt
-	dosym /usr/$(get_libdir)/libxvidcore.so.2.1 /usr/$(get_libdir)/libxvidcore.so
-
-	if use doc
-	then
-		dodoc CodingStyle doc/README doc/xvid-decoding.txt doc/xvid-encoder.txt
-
-		dodoc doc/xvid-api-ref.pdf
-		dohtml -r doc/xvid-api-ref
-
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		# Empty for this release ...
-		#insinto /usr/share/doc/${PF}/examples/ex1
-		#doins examples/ex1/*
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.0.0_rc4.ebuild b/media-libs/xvid/xvid-1.0.0_rc4.ebuild
deleted file mode 100644
index cb2cd4afbf2c..000000000000
--- a/media-libs/xvid/xvid-1.0.0_rc4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.0_rc4.ebuild,v 1.5 2005/01/09 07:04:18 luckyduck Exp $
-
-inherit eutils
-
-MY_P=${PN}core-${PV/_rc/-rc}
-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 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
-
-S="${WORKDIR}/${MY_P}/build/generic"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-DESTDIR.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-
-	cd ${S}/../../
-	dodoc AUTHORS ChangeLog README TODO doc/*
-
-	local mylib="$(basename $(ls ${D}/usr/lib/libxvidcore.so*))"
-	dosym ${mylib} /usr/lib/libxvidcore.so
-	dosym ${mylib} /usr/lib/${mylib/.0}
-
-	if use doc ; then
-		dodoc CodingStyle doc/README
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.0.1.ebuild b/media-libs/xvid/xvid-1.0.1.ebuild
deleted file mode 100644
index 600e9823aca2..000000000000
--- a/media-libs/xvid/xvid-1.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.1.ebuild,v 1.9 2005/01/09 07:04:18 luckyduck Exp $
-
-inherit eutils
-
-MY_P=${PN}core-${PV}
-DESCRIPTION="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 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64 ppc64 ~mips"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
-
-S="${WORKDIR}/${MY_P}/build/generic"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-DESTDIR.patch
-
-	# Appliying 64bit patch unconditionally.
-	# Simple patch that works arch independent.
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/06/22
-	cd ${S}/../..
-	epatch ${FILESDIR}/${P}-64bit-clean.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-
-	cd ${S}/../../
-	dodoc AUTHORS ChangeLog README TODO doc/*
-
-	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
-	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
-	dosym ${mylib} /usr/$(get_libdir)/${mylib/.0}
-
-	if use doc ; then
-		dodoc CodingStyle doc/README
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.0.3.ebuild b/media-libs/xvid/xvid-1.0.3.ebuild
index 884ff421a823..4b1d67018d1b 100644
--- a/media-libs/xvid/xvid-1.0.3.ebuild
+++ b/media-libs/xvid/xvid-1.0.3.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.3.ebuild,v 1.10 2005/10/06 03:40:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.11 2005/12/18 17:58:50 flameeyes Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/build/generic
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-DESTDIR.patch
+	epatch "${FILESDIR}/1.0.2-DESTDIR.patch"
 	cd "${S}"/../..
 	epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
 }
diff --git a/media-libs/xvid/xvid-1.1.0_beta2.ebuild b/media-libs/xvid/xvid-1.1.0_beta2.ebuild
deleted file mode 100644
index e877c472c30f..000000000000
--- a/media-libs/xvid/xvid-1.1.0_beta2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.ebuild,v 1.3 2005/10/06 03:40:58 vapier Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )
-		amd64? ( >=dev-lang/yasm-0.4.0 )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/build/generic"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-#	epatch "${FILESDIR}"/${PV}-DESTDIR.patch
-	cd "${S}"/../..
-#	epatch "${FILESDIR}"/${PN}-1.0-ia64.patch
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	cd ${S}/../../
-	dodoc AUTHORS ChangeLog README TODO doc/*
-
-	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
-	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
-	dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
-
-	if use doc ; then
-		dodoc CodingStyle doc/README
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}