Fixed DEPENDs, removed old ebuild, and fixed USE=-dvd for bug #43988.

6 files changed, 27 insertions, 51 deletions

diff --git a/media-sound/ogmtools/ChangeLog b/media-sound/ogmtools/ChangeLog
index 5f3727e76ef2..8719f18281f4 100644
--- a/media-sound/ogmtools/ChangeLog
+++ b/media-sound/ogmtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ogmtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.10 2004/03/04 22:25:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.11 2004/03/21 08:25:46 eradicator Exp $
+
+  21 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ogmtools-1.0.2.ebuild, ogmtools-1.0.3.ebuild, ogmtools-1.2.ebuild:
+  Fixed DEPENDs, removed old ebuild, and fixed USE=-dvd for bug #43988.
 
   04 Mar 2004; David Holm <dholm@gentoo.org> ogmtools-1.2.ebuild:
   Added to ~ppc.
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index fafe21ce039c..9a9323618db3 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,8 +1,6 @@
-MD5 01bc2067fc1deadcd53b526b536f1496 ChangeLog 1580
-MD5 4cb93c1252dae4d31a2708d73a508163 ogmtools-1.2.ebuild 907
-MD5 45cc233695a1cee28a70c8f82d59989a ogmtools-1.0.2.ebuild 941
-MD5 4206c76eff1722ad6355a2616ff325e6 ogmtools-1.0.3.ebuild 941
+MD5 e7deb08f36008278556348447c640342 ogmtools-1.0.3.ebuild 975
+MD5 234916699b4fde90a704496c51cf1e74 ChangeLog 1784
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
-MD5 c3a7abc79d029de1b34438b3dfe1567a files/digest-ogmtools-1.2 65
-MD5 4db5c622d177d8362fe1f84ca40a2742 files/digest-ogmtools-1.0.2 67
+MD5 c6a7c125515c0b0040de887b97766de3 ogmtools-1.2.ebuild 976
 MD5 aaa586bd89eed67eb73263e37636427f files/digest-ogmtools-1.0.3 67
+MD5 c3a7abc79d029de1b34438b3dfe1567a files/digest-ogmtools-1.2 65
diff --git a/media-sound/ogmtools/files/digest-ogmtools-1.0.2 b/media-sound/ogmtools/files/digest-ogmtools-1.0.2
deleted file mode 100644
index d7a1f6a1eb31..000000000000
--- a/media-sound/ogmtools/files/digest-ogmtools-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f388b2f649d3cc2b2cc8912b8b938044 ogmtools-1.0.2.tar.bz2 188734
diff --git a/media-sound/ogmtools/ogmtools-1.0.2.ebuild b/media-sound/ogmtools/ogmtools-1.0.2.ebuild
deleted file mode 100644
index 2a43c6c93fd6..000000000000
--- a/media-sound/ogmtools/ogmtools-1.0.2.ebuild
+++ /dev/null
@@ -1,30 +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-sound/ogmtools/ogmtools-1.0.2.ebuild,v 1.4 2004/02/23 13:03:32 eradicator Exp $
-
-IUSE="dvd"
-
-DESCRIPTION="These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams."
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
-SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
-
-DEPEND="dvd? ( media-libs/libdvdread )
-		>=sys-devel/automake-1.6.0
-		media-sound/vorbis-tools"
-
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat dvdxchap
-	into /usr/share
-	dodoc INSTALL TODO README COPYING ChangeLog
-	doman dvdxchap.1  ogmcat.1  ogmdemux.1  ogminfo.1  ogmmerge.1  ogmsplit.1
-}
diff --git a/media-sound/ogmtools/ogmtools-1.0.3.ebuild b/media-sound/ogmtools/ogmtools-1.0.3.ebuild
index b8e418d6e5b5..fd8c299f6610 100644
--- a/media-sound/ogmtools/ogmtools-1.0.3.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.0.3.ebuild,v 1.3 2004/02/23 13:03:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.0.3.ebuild,v 1.4 2004/03/21 08:25:46 eradicator Exp $
 
 IUSE="dvd"
 
@@ -11,20 +11,21 @@ KEYWORDS="x86"
 HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
 SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
 
-DEPEND="dvd? ( media-libs/libdvdread )
-		>=sys-devel/automake-1.6.0
-		media-sound/vorbis-tools"
+RDEPEND="dvd? ( media-libs/libdvdread )
+	 media-sound/vorbis-tools"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.6.0"
 
 
 src_compile() {
-	econf || die "econf failed"
+	econf `use_with dvd dvdread` || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	into /usr
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat dvdxchap
-	into /usr/share
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
+	use dvd && dobin dvdxchap
 	dodoc INSTALL TODO README COPYING ChangeLog
 	doman dvdxchap.1  ogmcat.1  ogmdemux.1  ogminfo.1  ogmmerge.1  ogmsplit.1
 }
diff --git a/media-sound/ogmtools/ogmtools-1.2.ebuild b/media-sound/ogmtools/ogmtools-1.2.ebuild
index 8a20130dc88e..0aa1276d4c57 100644
--- a/media-sound/ogmtools/ogmtools-1.2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.2.ebuild,v 1.5 2004/03/04 22:25:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.2.ebuild,v 1.6 2004/03/21 08:25:46 eradicator Exp $
 
 DESCRIPTION="These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams"
 HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
@@ -11,17 +11,21 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 IUSE="dvd"
 
-DEPEND="dvd? ( media-libs/libdvdread )
-	>=sys-devel/automake-1.6.0
+RDEPEND="dvd? ( media-libs/libdvdread )
 	media-sound/vorbis-tools"
 
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.6.0"
+
+
 src_compile() {
-	econf || die "econf failed"
+	econf `use_with dvd dvdread` || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat dvdxchap || die
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die
+	use dvd && dobin dvdxchap
 	dodoc INSTALL TODO README ChangeLog
 	doman dvdxchap.1 ogmcat.1 ogmdemux.1 ogminfo.1 ogmmerge.1 ogmsplit.1
 }