Get rid of some old ebuilds to make my life my sane and fix bug #80321 while I'm at it.

(Portage version: 2.0.51-r15)

17 files changed, 18 insertions, 231 deletions

diff --git a/media-libs/win32codecs/ChangeLog b/media-libs/win32codecs/ChangeLog
index 92d5f2a3ebed..594ca2bccad3 100644
--- a/media-libs/win32codecs/ChangeLog
+++ b/media-libs/win32codecs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/win32codecs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/ChangeLog,v 1.22 2005/02/07 17:07:26 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/ChangeLog,v 1.23 2005/02/07 19:00:15 chriswhite Exp $
+
+  08 Feb 2005; Chris White <chriswhite@gentoo.org>
+  -win32codecs-0.90.1-r1.ebuild, -win32codecs-0.90.1-r2.ebuild,
+  -win32codecs-20031001.ebuild, -win32codecs-20040427.ebuild,
+  -win32codecs-20040703.ebuild, -win32codecs-20040916-r1.ebuild,
+  -win32codecs-20040916.ebuild, win32codecs-20050115.ebuild:
+  get rid of some old ebuilds to make my life my sane and fix bug #80321 while
+  I'm at it.
 
   08 Feb 2005; Chris White <chriswhite@gentoo.org>
   win32codecs-20040916-r1.ebuild:
diff --git a/media-libs/win32codecs/Manifest b/media-libs/win32codecs/Manifest
index 2492df93cb0a..71a33f472df5 100644
--- a/media-libs/win32codecs/Manifest
+++ b/media-libs/win32codecs/Manifest
@@ -1,28 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e58f5427b9d1f41b61461390e49f1ed7 ChangeLog 3813
+MD5 f76231bcc5c5eb43a22b706a14810c5f ChangeLog 4209
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 d4ffe596b3c450cc74ca5790d6834030 win32codecs-0.90.1-r1.ebuild 732
-MD5 2b6fbcf8566812048a6e40e865196219 win32codecs-0.90.1-r2.ebuild 979
-MD5 c45c8270988871429efa40decfdea13d win32codecs-20031001.ebuild 773
-MD5 2938a8fcc4ffda8bc9bd28175a2b2d9b win32codecs-20040427.ebuild 773
-MD5 5fff8eea2665a0ae64834f593b5a7972 win32codecs-20040703.ebuild 905
-MD5 593b7f71ca7e82e830b6d179e56d1571 win32codecs-20040916-r1.ebuild 852
-MD5 a92bba5ff5b550d63ae330ed36465235 win32codecs-20040916.ebuild 809
-MD5 b6ae33d3227648ee237f3b57b4644146 win32codecs-20050115.ebuild 844
-MD5 76732e9260e5e2a7926ee46be894aa79 files/digest-win32codecs-0.90.1-r1 140
-MD5 a0766a5ca0b5ed037030e556bb0d6ff8 files/digest-win32codecs-0.90.1-r2 317
-MD5 43e971c7fc7e042e7d63ee36e2cd9f95 files/digest-win32codecs-20031001 290
-MD5 b8565217a038af6767ddb9112d59ab82 files/digest-win32codecs-20040427 290
-MD5 e8eb2fc9b4fc39755fe39f1f8e8771d9 files/digest-win32codecs-20040703 291
-MD5 03a0d60b85a63f2d544706e5e008cb05 files/digest-win32codecs-20040916 67
-MD5 03a0d60b85a63f2d544706e5e008cb05 files/digest-win32codecs-20040916-r1 67
+MD5 997b08f3e79a1d7fdb36677605cb36a4 win32codecs-20050115.ebuild 888
 MD5 3ef68960534c464efae0627c3b009e61 files/digest-win32codecs-20050115 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCB6BnFdQwWVoAgN4RAv+XAJ0fRGYStgUyuf9jJdd9MeVb9IjOBwCg1iFV
-8Vtjpa0VuajNn8JbvB9WUZk=
-=7mn/
------END PGP SIGNATURE-----
diff --git a/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r1 b/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r1
deleted file mode 100644
index 6637b44fbd4b..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ba90cc628ffb4cd646e79e76249a71c0 win32codecs-0.90.1.tar.bz2 6064543
-MD5 8915f44dcea2dd3387b354048f63d69b qt6dlls-0.90.1.tar.bz2 2628353
diff --git a/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r2 b/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r2
deleted file mode 100644
index bc1947c69e3b..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-0.90.1-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 ba90cc628ffb4cd646e79e76249a71c0 win32codecs.tar.bz2 6064543
-MD5 34b1214440b6ca09795562c1566d6b1d dmocodecs.tar.bz2 1058011
-MD5 cfb565a4e3ee0e44e5b485a4d4462879 rp9win32codecs.tar.bz2 388753
-MD5 8915f44dcea2dd3387b354048f63d69b qt6dlls.tar.bz2 2628353
-MD5 784b6c1ecf878a6d6963b66e5b76ac83 qtextras.tar.bz2 701356
diff --git a/media-libs/win32codecs/files/digest-win32codecs-20031001 b/media-libs/win32codecs/files/digest-win32codecs-20031001
deleted file mode 100644
index f389cf84703d..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-20031001
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b6044b95d9c9c36f24d52435f9ed7569 win32codecs-20031001.tar.bz2 6606025
-MD5 5634600ac24a337be2126229bcc1fe46 rp9win32codecs-20031001.tar.bz2 528088
-MD5 8915f44dcea2dd3387b354048f63d69b qt6dlls-20031001.tar.bz2 2628353
-MD5 784b6c1ecf878a6d6963b66e5b76ac83 qtextras-20031001.tar.bz2 701356
diff --git a/media-libs/win32codecs/files/digest-win32codecs-20040427 b/media-libs/win32codecs/files/digest-win32codecs-20040427
deleted file mode 100644
index d29c83cce31a..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-20040427
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 10e934a4a5609fa2e094acb0f6c1b976 win32codecs-20040427.tar.bz2 6803247
-MD5 5634600ac24a337be2126229bcc1fe46 rp9win32codecs-20040427.tar.bz2 528088
-MD5 8915f44dcea2dd3387b354048f63d69b qt6dlls-20040427.tar.bz2 2628353
-MD5 784b6c1ecf878a6d6963b66e5b76ac83 qtextras-20040427.tar.bz2 701356
diff --git a/media-libs/win32codecs/files/digest-win32codecs-20040703 b/media-libs/win32codecs/files/digest-win32codecs-20040703
deleted file mode 100644
index ac26056233be..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-20040703
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 90ba6a76ded2f9fd9f865024bd8de3d3 win32codecs-20040703.tar.bz2 7176589
-MD5 921976403ea42052e287159c4245fbb0 rp9codecs-win32-20040626.tar.bz2 528186
-MD5 c8cc10f2c9f109fa44fc4dddb91571c4 qt6dlls-20040626.tar.bz2 2628348
-MD5 c28b85f16e00470cfa65f2d6f2f3f01a qtextras-20040704.tar.bz2 721908
diff --git a/media-libs/win32codecs/files/digest-win32codecs-20040916 b/media-libs/win32codecs/files/digest-win32codecs-20040916
deleted file mode 100644
index 453dffe35ce9..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-20040916
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a03b4af330e7dfc3a22c32eb04be5f07 all-20040916.tar.bz2 11268600
diff --git a/media-libs/win32codecs/files/digest-win32codecs-20040916-r1 b/media-libs/win32codecs/files/digest-win32codecs-20040916-r1
deleted file mode 100644
index 453dffe35ce9..000000000000
--- a/media-libs/win32codecs/files/digest-win32codecs-20040916-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a03b4af330e7dfc3a22c32eb04be5f07 all-20040916.tar.bz2 11268600
diff --git a/media-libs/win32codecs/win32codecs-0.90.1-r1.ebuild b/media-libs/win32codecs/win32codecs-0.90.1-r1.ebuild
deleted file mode 100644
index 6390f4dfcfc2..000000000000
--- a/media-libs/win32codecs/win32codecs-0.90.1-r1.ebuild
+++ /dev/null
@@ -1,24 +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/win32codecs/win32codecs-0.90.1-r1.ebuild,v 1.7 2005/01/16 20:13:59 luckyduck Exp $
-
-# Update codec pack from:
-#
-#   http://www.mplayerhq.hu/MPlayer/releases/codecs/win32codecs.tar.bz2
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Win32 binary codecs for MPlayer and maybe avifile as well"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	quicktime? ( mirror://gentoo/qt6dlls-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="quicktime"
-
-src_install() {
-	insinto /usr/lib/win32
-	doins ${S}/*
-	use quicktime && doins ${WORKDIR}/qt6dlls/*
-}
diff --git a/media-libs/win32codecs/win32codecs-0.90.1-r2.ebuild b/media-libs/win32codecs/win32codecs-0.90.1-r2.ebuild
deleted file mode 100644
index 034581e2dee7..000000000000
--- a/media-libs/win32codecs/win32codecs-0.90.1-r2.ebuild
+++ /dev/null
@@ -1,22 +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/win32codecs/win32codecs-0.90.1-r2.ebuild,v 1.6 2005/01/16 20:13:59 luckyduck Exp $
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="http://www1.mplayerhq.hu/MPlayer/releases/codecs/${PN}.tar.bz2
-	http://www1.mplayerhq.hu/MPlayer/releases/codecs/dmocodecs.tar.bz2
-	http://www1.mplayerhq.hu/MPlayer/releases/codecs/rp9win32codecs.tar.bz2
-	quicktime? ( http://www1.mplayerhq.hu/MPlayer/releases/codecs/qt6dlls.tar.bz2
-		http://www1.mplayerhq.hu/MPlayer/releases/codecs/qtextras.tar.bz2 )"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha"
-IUSE="quicktime"
-
-src_install() {
-	insinto /usr/lib/win32
-	doins ${S}/* ${WORKDIR}/dmocodecs/* ${WORKDIR}/rp9win32codecs/*
-	use quicktime && doins ${WORKDIR}/qt6dlls/* ${WORKDIR}/qtextras/*
-}
diff --git a/media-libs/win32codecs/win32codecs-20031001.ebuild b/media-libs/win32codecs/win32codecs-20031001.ebuild
deleted file mode 100644
index 13e6db2f932f..000000000000
--- a/media-libs/win32codecs/win32codecs-20031001.ebuild
+++ /dev/null
@@ -1,21 +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/win32codecs/win32codecs-20031001.ebuild,v 1.4 2005/01/16 20:13:59 luckyduck Exp $
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/rp9win32codecs-${PV}.tar.bz2
-	quicktime? ( mirror://gentoo/qt6dlls-${PV}.tar.bz2
-		mirror://gentoo/qtextras-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-IUSE="quicktime"
-
-src_install() {
-	insinto /usr/lib/win32
-	doins ${S}/* ${WORKDIR}/rp9win32codecs/*
-	use quicktime && doins ${WORKDIR}/qt6dlls/* ${WORKDIR}/qtextras/*
-}
diff --git a/media-libs/win32codecs/win32codecs-20040427.ebuild b/media-libs/win32codecs/win32codecs-20040427.ebuild
deleted file mode 100644
index 20beee50a59b..000000000000
--- a/media-libs/win32codecs/win32codecs-20040427.ebuild
+++ /dev/null
@@ -1,21 +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/win32codecs/win32codecs-20040427.ebuild,v 1.3 2005/01/16 20:13:59 luckyduck Exp $
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/rp9win32codecs-${PV}.tar.bz2
-	quicktime? ( mirror://gentoo/qt6dlls-${PV}.tar.bz2
-		mirror://gentoo/qtextras-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-IUSE="quicktime"
-
-src_install() {
-	insinto /usr/lib/win32
-	doins ${S}/* ${WORKDIR}/rp9win32codecs/*
-	use quicktime && doins ${WORKDIR}/qt6dlls/* ${WORKDIR}/qtextras/*
-}
diff --git a/media-libs/win32codecs/win32codecs-20040703.ebuild b/media-libs/win32codecs/win32codecs-20040703.ebuild
deleted file mode 100644
index 9ffbb7073b42..000000000000
--- a/media-libs/win32codecs/win32codecs-20040703.ebuild
+++ /dev/null
@@ -1,25 +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/win32codecs/win32codecs-20040703.ebuild,v 1.2 2005/01/16 20:13:59 luckyduck Exp $
-
-RP_V="20040626"
-QT_V="20040626"
-QTE_V="20040704"
-CODECS="releases/codecs"
-
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="mirror://mplayer/${CODECS}/${P}.tar.bz2
-	mirror://mplayer/${CODECS}/rp9codecs-win32-${RP_V}.tar.bz2
-	quicktime? ( mirror://mplayer/${CODECS}/qt6dlls-${QT_V}.tar.bz2
-		mirror://mplayer/${CODECS}/qtextras-${QTE_V}.tar.bz2 )"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-IUSE="quicktime"
-
-src_install() {
-	insinto /usr/lib/win32
-	doins ${S}/* ${WORKDIR}/rp9codecs-win32-${RP_V}/*
-	use quicktime && doins ${WORKDIR}/qt6dlls-${QT_V}/* ${WORKDIR}/qtextras-${QTE_V}/*
-}
diff --git a/media-libs/win32codecs/win32codecs-20040916-r1.ebuild b/media-libs/win32codecs/win32codecs-20040916-r1.ebuild
deleted file mode 100644
index 9fb551e42510..000000000000
--- a/media-libs/win32codecs/win32codecs-20040916-r1.ebuild
+++ /dev/null
@@ -1,33 +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/win32codecs/win32codecs-20040916-r1.ebuild,v 1.5 2005/02/07 17:07:26 chriswhite Exp $
-
-
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-${PV}.tar.bz2"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha -amd64"
-IUSE="quicktime real"
-
-S=${WORKDIR}/all-${PV}
-
-src_install() {
-	cd ${S}
-
-	if use real
-	then
-		mkdir -p ${D}/usr/lib/real
-		mv *so.6.0 ${D}/usr/lib/real
-	fi
-
-	if use quicktime
-	then
-		mkdir -p ${D}/usr/lib/win32
-		mv *.qtx *.qts qtmlClient.dll  ${D}/usr/lib/win32
-	fi
-
-	mkdir -p ${D}/usr/lib/win32
-	mv *.dll *.ax *xa *.acm *.vwp *.drv *.DLL ${D}/usr/lib/win32
-}
diff --git a/media-libs/win32codecs/win32codecs-20040916.ebuild b/media-libs/win32codecs/win32codecs-20040916.ebuild
deleted file mode 100644
index 352f13730047..000000000000
--- a/media-libs/win32codecs/win32codecs-20040916.ebuild
+++ /dev/null
@@ -1,33 +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/win32codecs/win32codecs-20040916.ebuild,v 1.4 2005/01/16 20:13:59 luckyduck Exp $
-
-
-DESCRIPTION="Win32 binary codecs for video and audio playback support"
-SRC_URI="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-${PV}.tar.bz2"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-IUSE="quicktime real"
-
-S=${WORKDIR}/all-${PV}
-
-src_install() {
-	cd ${S}
-
-	if use real
-	then
-		mkdir -p ${D}/usr/lib/real
-		mv *so.6.0 ${D}/usr/lib/real
-	fi
-
-	if use quicktime
-	then
-		mkdir -p ${D}/usr/lib/win32
-		mv *.qtx *.qts qtmlClient.dll  ${D}/usr/lib/win32
-	fi
-
-	mkdir -p ${D}/usr/lib/win32
-	mv *.dll ${D}/usr/lib/win32
-}
diff --git a/media-libs/win32codecs/win32codecs-20050115.ebuild b/media-libs/win32codecs/win32codecs-20050115.ebuild
index d877c5593938..8ae0fb63c1e3 100644
--- a/media-libs/win32codecs/win32codecs-20050115.ebuild
+++ b/media-libs/win32codecs/win32codecs-20050115.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/win32codecs/win32codecs-20050115.ebuild,v 1.2 2005/01/30 17:51:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20050115.ebuild,v 1.3 2005/02/07 19:00:15 chriswhite Exp $
 
 
 DESCRIPTION="Win32 binary codecs for video and audio playback support"
@@ -16,18 +16,21 @@ S=${WORKDIR}/all-${PV}
 src_install() {
 	cd ${S}
 
+	mkdir -p ${D}/usr/lib/win32
+
 	if use real
 	then
 		mkdir -p ${D}/usr/lib/real
 		mv *so.6.0 ${D}/usr/lib/real
+
+		# fix bug #80321
+		ln -s ${D}/usr/lib/real/* ${D}/usr/lib/win32/
 	fi
 
 	if use quicktime
 	then
-		mkdir -p ${D}/usr/lib/win32
 		mv *.qtx *.qts qtmlClient.dll  ${D}/usr/lib/win32
 	fi
 
-	mkdir -p ${D}/usr/lib/win32
-	mv *.dll *.ax *.acm *.vwp *.drv *.DLL ${D}/usr/lib/win32
+	mv *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL ${D}/usr/lib/win32
 }