Bumping gcc fix into stable. Removing old ebuilds.

11 files changed, 52 insertions, 150 deletions

diff --git a/media-video/smpeg-xmms/ChangeLog b/media-video/smpeg-xmms/ChangeLog
index 09ff5dd65a2d..c6894f27a704 100644
--- a/media-video/smpeg-xmms/ChangeLog
+++ b/media-video/smpeg-xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/smpeg-xmms
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/ChangeLog,v 1.6 2003/09/20 10:22:25 jje Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/ChangeLog,v 1.7 2004/02/27 04:02:42 eradicator Exp $
+
+  26 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  smpeg-xmms-0.3.4-r1.ebuild, smpeg-xmms-0.3.4-r2.ebuild,
+  smpeg-xmms-0.3.5-r1.ebuild, smpeg-xmms-0.3.5.ebuild, files/gcc.patch,
+  files/smpeg-xmms-0.3.5-gcc.patch:
+  Bumping gcc fix into stable.  Removing old ebuilds.
 
   20 Sep 2003; jje <jje@gentoo.org> files/gcc.patch:
   Updated gcc patch. Missed one literal.
diff --git a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r1 b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r1
deleted file mode 100644
index 73e5846971b3..000000000000
--- a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d42622e606ac66346b376bc225f90dec smpeg-xmms-0.3.4.tar.gz 135172
diff --git a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r2 b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r2
deleted file mode 100644
index 73e5846971b3..000000000000
--- a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d42622e606ac66346b376bc225f90dec smpeg-xmms-0.3.4.tar.gz 135172
diff --git a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.5 b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.5
deleted file mode 100644
index b8ce5f08e223..000000000000
--- a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07e49327e0d9e7f24781f29a12de94cf smpeg-xmms-0.3.5.tar.gz 141182
diff --git a/media-video/smpeg-xmms/files/gcc.patch b/media-video/smpeg-xmms/files/gcc.patch
deleted file mode 100644
index be86ab0728db..000000000000
--- a/media-video/smpeg-xmms/files/gcc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-*** configure.orig	Sat Sep 20 05:09:58 2003
---- configure	Sat Sep 20 05:10:12 2003
-***************
-*** 2701,2716 ****
-      }
-    else
-      {
-!       printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the 
-! minimum version\n", $smpeg_major_version, $smpeg_minor_version, 
-! $smpeg_micro_version);
-!       printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is 
-! correct, then it is\n", major, minor, micro);
-        printf("*** best to upgrade to the required version.\n");
-!       printf("*** If smpeg-config was wrong, set the environment variable 
-! SMPEG_CONFIG\n");
-!       printf("*** to point to the correct copy of smpeg-config, and remove 
-! the file\n");
-        printf("*** config.cache before re-running configure\n");
-        return 1;
-      }
---- 2701,2711 ----
-      }
-    else
-      {
-!       printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
-!       printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", major, minor, micro);
-        printf("*** best to upgrade to the required version.\n");
-!       printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n");
-!       printf("*** to point to the correct copy of smpeg-config, and remove the file\n");
-        printf("*** config.cache before re-running configure\n");
-        return 1;
-      }
-
diff --git a/media-video/smpeg-xmms/files/smpeg-xmms-0.3.5-gcc.patch b/media-video/smpeg-xmms/files/smpeg-xmms-0.3.5-gcc.patch
new file mode 100644
index 000000000000..e293bfbb343a
--- /dev/null
+++ b/media-video/smpeg-xmms/files/smpeg-xmms-0.3.5-gcc.patch
@@ -0,0 +1,34 @@
+--- configure.orig	2004-02-26 19:54:31.000000000 -0800
++++ configure	2004-02-26 19:55:25.000000000 -0800
+@@ -2701,22 +2701,22 @@
+     }
+   else
+     {
+-      printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the 
+-minimum version\n", $smpeg_major_version, $smpeg_minor_version, 
+-$smpeg_micro_version);
+-      printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is 
+-correct, then it is\n", major, minor, micro);
++      printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
++      printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", major, minor, micro);
+       printf("*** best to upgrade to the required version.\n");
+-      printf("*** If smpeg-config was wrong, set the environment variable 
+-SMPEG_CONFIG\n");
+-      printf("*** to point to the correct copy of smpeg-config, and remove 
+-the file\n");
++      printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n");
++      printf("*** to point to the correct copy of smpeg-config, and remove the file\n");
+       printf("*** config.cache before re-running configure\n");
+       return 1;
+     }
+ }
+ 
+ 
++
++
++
++
++
+ EOF
+ if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
diff --git a/media-video/smpeg-xmms/metadata.xml b/media-video/smpeg-xmms/metadata.xml
new file mode 100644
index 000000000000..2cb214e88904
--- /dev/null
+++ b/media-video/smpeg-xmms/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<herd>video</herd>
+</pkgmetadata>
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
deleted file mode 100644
index 78873186d8d3..000000000000
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild,v 1.8 2003/09/07 00:08:13 msterret Exp $
-
-IUSE="sdl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A MPEG Plugin for XMMS"
-SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/plugins_input.html"
-
-DEPEND=">=media-sound/xmms-1.2.3
-	>=media-libs/smpeg-0.4.4-r1
-	sdl? ( >=media-libs/libsdl-1.2.2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	cd ${S}
-	local myconf
-	use sdl || myconf="${myconf} --disable-sdltest"
-
-	econf ${myconf} || die
-	make || die
-
-}
-
-src_install () {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING README TODO ChangeLog
-}
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r2.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r2.ebuild
deleted file mode 100644
index 1a9ea94b9ccf..000000000000
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r2.ebuild,v 1.6 2003/09/07 00:08:13 msterret Exp $
-
-IUSE="sdl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A MPEG Plugin for XMMS"
-SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/plugins_input.html"
-
-DEPEND=">=media-sound/xmms-1.2.3
-	>=media-libs/smpeg-0.4.4-r3
-	sdl? ( >=media-libs/libsdl-1.2.2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	cd ${S}
-	local myconf
-	use sdl || myconf="${myconf} --disable-sdltest"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install () {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING README TODO ChangeLog
-}
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild
index 2843369c6b94..605e790293e2 100644
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild
+++ b/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild,v 1.1 2003/09/20 08:15:22 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.5-r1.ebuild,v 1.2 2004/02/27 04:02:42 eradicator Exp $
 
 IUSE="sdl"
 
@@ -15,13 +15,13 @@ DEPEND=">=media-sound/xmms-1.2.4
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/gcc.patch
+	epatch ${FILESDIR}/${P}-gcc.patch
 }
 
 src_compile() {
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.5.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.5.ebuild
deleted file mode 100644
index 62d43067f389..000000000000
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.5.ebuild,v 1.5 2003/09/07 00:08:13 msterret Exp $
-
-IUSE="sdl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A MPEG Plugin for XMMS"
-SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/plugins_input.html"
-
-DEPEND=">=media-sound/xmms-1.2.4
-	>=media-libs/smpeg-0.4.4-r3
-	sdl? ( >=media-libs/libsdl-1.2.2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	cd ${S}
-	local myconf
-	use sdl || myconf="${myconf} --disable-sdltest"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install () {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING README TODO ChangeLog
-}