Add gcc-3.4 patch and clean up old ebuilds.

8 files changed, 26 insertions, 68 deletions

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index bd700d4530c9..54ac38f188cb 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdauthor
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.9 2004/05/16 14:59:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.10 2004/05/18 18:53:22 vapier Exp $
+
+  18 May 2004; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  +files/0.6.10-gcc34.patch, dvdauthor-0.6.10.ebuild, -dvdauthor-0.6.8.ebuild,
+  -dvdauthor-0.6.9.ebuild:
+  Add gcc-3.4 patch and clean up old ebuilds.
 
 *dvdauthor-0.6.10 (16 May 2004)
 
diff --git a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
index f4777152c9de..575b9aacfa60 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.1 2004/05/16 14:59:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.2 2004/05/18 18:53:22 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
 HOMEPAGE="http://sourceforge.net/projects/dvdauthor/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE="png zlib"
 
 DEPEND="media-libs/libdvdread
 	>=media-gfx/imagemagick-5.5.7.14
 	>=dev-libs/libxml2-2.5.0"
 
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 }
 
 src_install() {
-	einstall || die "installation failed"
+	make install DESTDIR=${D} || die "installation failed"
 	dodoc README HISTORY TODO
 }
diff --git a/media-video/dvdauthor/dvdauthor-0.6.8.ebuild b/media-video/dvdauthor/dvdauthor-0.6.8.ebuild
deleted file mode 100644
index 2c3bd7c48436..000000000000
--- a/media-video/dvdauthor/dvdauthor-0.6.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.8.ebuild,v 1.3 2004/01/22 22:14:51 avenj Exp $
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://sourceforge.net/projects/dvdauthor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~amd64"
-IUSE="png zlib"
-
-DEPEND="media-libs/libdvdread
-	>=media-gfx/imagemagick-5.5.7.14
-	>=dev-libs/libxml2-2.5.0"
-
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-	dodoc README HISTORY TODO
-}
diff --git a/media-video/dvdauthor/dvdauthor-0.6.9.ebuild b/media-video/dvdauthor/dvdauthor-0.6.9.ebuild
deleted file mode 100644
index 51e41b98cf7f..000000000000
--- a/media-video/dvdauthor/dvdauthor-0.6.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.9.ebuild,v 1.2 2004/05/02 17:32:17 dholm Exp $
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://sourceforge.net/projects/dvdauthor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="png zlib"
-
-DEPEND="media-libs/libdvdread
-	>=media-gfx/imagemagick-5.5.7.14
-	>=dev-libs/libxml2-2.5.0"
-
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-	dodoc README HISTORY TODO
-}
diff --git a/media-video/dvdauthor/files/0.6.10-gcc34.patch b/media-video/dvdauthor/files/0.6.10-gcc34.patch
new file mode 100644
index 000000000000..360289e03b62
--- /dev/null
+++ b/media-video/dvdauthor/files/0.6.10-gcc34.patch
@@ -0,0 +1,10 @@
+--- src/dvdvob.c.orig	2004-05-18 14:47:22.102601912 -0400
++++ src/dvdvob.c	2004-05-18 14:47:33.434879144 -0400
+@@ -1149,6 +1149,7 @@
+                         fprintf(stderr,"\n");
+                         ach->audpts[ach->numaudpts-1].pts[1]=pts0;
+                     noshow:
++;
+                     }
+                     ach->audpts[ach->numaudpts].pts[0]=pts0;
+                     ach->audpts[ach->numaudpts].pts[1]=pts1;
diff --git a/media-video/dvdauthor/files/digest-dvdauthor-0.6.8 b/media-video/dvdauthor/files/digest-dvdauthor-0.6.8
deleted file mode 100644
index 569e7ef80315..000000000000
--- a/media-video/dvdauthor/files/digest-dvdauthor-0.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4e591f28e5f7d10623104fba2d08ef3 dvdauthor-0.6.8.tar.gz 203052
diff --git a/media-video/dvdauthor/files/digest-dvdauthor-0.6.9 b/media-video/dvdauthor/files/digest-dvdauthor-0.6.9
deleted file mode 100644
index d91fd0049cb1..000000000000
--- a/media-video/dvdauthor/files/digest-dvdauthor-0.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f01c7d62faf67a14695022349e2bb78d dvdauthor-0.6.9.tar.gz 235974
diff --git a/media-video/dvdauthor/metadata.xml b/media-video/dvdauthor/metadata.xml
index 1cadc2e4ec21..d9df1878d8e2 100644
--- a/media-video/dvdauthor/metadata.xml
+++ b/media-video/dvdauthor/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
 </pkgmetadata>