removed 0.3.11 ebuild, removed sox USE flag, changed RDEPEND

Package-Manager: portage-2.0.53

6 files changed, 24 insertions, 66 deletions

diff --git a/app-cdr/graveman/ChangeLog b/app-cdr/graveman/ChangeLog
index 26498c7c7cc1..ad84d2e15f41 100644
--- a/app-cdr/graveman/ChangeLog
+++ b/app-cdr/graveman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/graveman
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.24 2005/10/16 06:01:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.25 2005/12/03 12:01:19 dertobi123 Exp $
+
+  03 Dec 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  -graveman-0.3.11.ebuild, graveman-0.3.12_p4.ebuild,
+  graveman-0.3.12_p4-r1.ebuild:
+  Removed 0.3.11 ebuild, moved oggvorbis USE to vorbis, removed sox USE
+  flag and changed RDEPEND.
 
   16 Oct 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   graveman-0.3.12_p4-r1.ebuild:
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 2c9f95e49df4..1cd26c41d06d 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -1,9 +1,7 @@
-MD5 87a196375f782e5cafb461280cd7127b graveman-0.3.11.ebuild 1166
-MD5 952407981ea3ef283ebebf3f14cd90eb graveman-0.3.12_p4-r1.ebuild 1523
-MD5 dda90be5f52bccd4f4a28bfdc1f96920 graveman-0.3.12_p4.ebuild 1213
-MD5 4cdf142851db017197310709d64dbb4e ChangeLog 4371
-MD5 76b896dd67642ee66a4c06ec76c6f898 metadata.xml 232
-MD5 718f528e4862ae730d619cc74f125360 files/digest-graveman-0.3.12_p4-r1 69
-MD5 a0a00426682bbfa8acb8ccf767fa170f files/digest-graveman-0.3.11 67
+MD5 7f183a3642918044786cdb5b2ed7fc4c ChangeLog 4614
 MD5 718f528e4862ae730d619cc74f125360 files/digest-graveman-0.3.12_p4 69
+MD5 718f528e4862ae730d619cc74f125360 files/digest-graveman-0.3.12_p4-r1 69
 MD5 1ee3df22801325fa88de863c22241f22 files/joliet-long.patch 792
+MD5 3408953126283f20f8e6b426e9196ef8 graveman-0.3.12_p4-r1.ebuild 1339
+MD5 81fa2e632198b0e17a5aee605cfc2f21 graveman-0.3.12_p4.ebuild 1238
+MD5 76b896dd67642ee66a4c06ec76c6f898 metadata.xml 232
diff --git a/app-cdr/graveman/files/digest-graveman-0.3.11 b/app-cdr/graveman/files/digest-graveman-0.3.11
deleted file mode 100644
index 8dc8331e5f07..000000000000
--- a/app-cdr/graveman/files/digest-graveman-0.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d48bb27315bd739f327a40dfc2b59556 graveman-0.3.11.tar.gz 883377
diff --git a/app-cdr/graveman/graveman-0.3.11.ebuild b/app-cdr/graveman/graveman-0.3.11.ebuild
deleted file mode 100644
index beaded70e597..000000000000
--- a/app-cdr/graveman/graveman-0.3.11.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/app-cdr/graveman/graveman-0.3.11.ebuild,v 1.7 2005/10/02 18:22:56 dertobi123 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
-HOMEPAGE="http://graveman.tuxfamily.org/"
-SRC_URI="http://graveman.tuxfamily.org/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="debug dvdr flac mp3 nls oggvorbis sox"
-
-DEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.4
-	>=gnome-base/libglade-2.4
-	>=dev-util/intltool-0.22
-	flac? ( >=media-libs/flac-1.1.0 )
-	nls? ( sys-devel/gettext )
-	mp3? ( >=media-libs/libid3tag-0.15
-		>=media-libs/libmad-0.15 )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
-RDEPEND="${DEPEND}
-	>=app-cdr/cdrtools-2.0
-	>=app-cdr/cdrdao-1.1.9
-	media-libs/libmng
-	dvdr? ( >=app-cdr/dvd+rw-tools-5.20 )
-	sox? ( >=media-sound/sox-12.17.0 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable flac) \
-	$(use_enable mp3) \
-	$(use_enable oggvorbis ogg) \
-	$(use_enable debug)"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README* THANKS"
-USE_DESTDIR="1"
diff --git a/app-cdr/graveman/graveman-0.3.12_p4-r1.ebuild b/app-cdr/graveman/graveman-0.3.12_p4-r1.ebuild
index 176c5fd68bd7..7630cbbcaa1f 100644
--- a/app-cdr/graveman/graveman-0.3.12_p4-r1.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p4-r1.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/app-cdr/graveman/graveman-0.3.12_p4-r1.ebuild,v 1.7 2005/10/16 06:01:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/graveman-0.3.12_p4-r1.ebuild,v 1.8 2005/12/03 12:01:19 dertobi123 Exp $
 
 inherit gnome2 eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
-IUSE="debug dvdr flac mp3 nls oggvorbis sox"
+IUSE="debug dvdr flac mp3 nls vorbis"
 
 DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.4
@@ -21,19 +21,20 @@ DEPEND=">=x11-libs/gtk+-2.4
 	nls? ( sys-devel/gettext )
 	mp3? ( >=media-libs/libid3tag-0.15
 		>=media-libs/libmad-0.15 )
-	oggvorbis? ( >=media-libs/libogg-1.0
+	vorbis? ( >=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )"
 RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-2.0
 	>=app-cdr/cdrdao-1.1.9
 	media-libs/libmng
 	dvdr? ( >=app-cdr/dvd+rw-tools-5.20 )
-	sox? ( >=media-sound/sox-12.17.0 )"
+	vorbis? ( >=media-sound/sox-12.17.0 )
+	mp3? ( >=media-sound/sox-12.17.0 )"
 
 G2CONF="${G2CONF} \
 	$(use_enable flac) \
 	$(use_enable mp3) \
-	$(use_enable oggvorbis ogg) \
+	$(use_enable vorbis ogg) \
 	$(use_enable debug)"
 
 S=${WORKDIR}/${P/_p/-}
@@ -42,13 +43,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/joliet-long.patch
-
-	# If mp3 or ogg support is enabled we need sox, #107755
-	if use mp3 || use oggvorbis && use !sox
-	then
-		ewarn "If you would like to enable MP3 or OGG Support you have to activate the sox USE flag"
-		die
-	fi
 }
 DOCS="AUTHORS ChangeLog INSTALL NEWS README* THANKS"
 USE_DESTDIR="1"
diff --git a/app-cdr/graveman/graveman-0.3.12_p4.ebuild b/app-cdr/graveman/graveman-0.3.12_p4.ebuild
index 72531aa72337..308c9fe30071 100644
--- a/app-cdr/graveman/graveman-0.3.12_p4.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p4.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/app-cdr/graveman/graveman-0.3.12_p4.ebuild,v 1.7 2005/10/02 18:22:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/graveman-0.3.12_p4.ebuild,v 1.8 2005/12/03 12:01:19 dertobi123 Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86 ~amd64"
-IUSE="debug dvdr flac mp3 nls oggvorbis sox"
+IUSE="debug dvdr flac mp3 nls vorbis"
 
 DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.4
@@ -21,19 +21,20 @@ DEPEND=">=x11-libs/gtk+-2.4
 	nls? ( sys-devel/gettext )
 	mp3? ( >=media-libs/libid3tag-0.15
 		>=media-libs/libmad-0.15 )
-	oggvorbis? ( >=media-libs/libogg-1.0
+	vorbis? ( >=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )"
 RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-2.0
 	>=app-cdr/cdrdao-1.1.9
 	media-libs/libmng
 	dvdr? ( >=app-cdr/dvd+rw-tools-5.20 )
-	sox? ( >=media-sound/sox-12.17.0 )"
+	vorbis? ( >=media-sound/sox-12.17.0 )
+	mp3? ( >=media-sound/sox-12.17.0)"
 
 G2CONF="${G2CONF} \
 	$(use_enable flac) \
 	$(use_enable mp3) \
-	$(use_enable oggvorbis ogg) \
+	$(use_enable vorbis ogg) \
 	$(use_enable debug)"
 
 S=${WORKDIR}/${P/_p/-}