Depend on virtual/cdrtools instead of app-cdr/cdrtools. Make this package a member of the media-optical herd. Furthermore cleanup.

6 files changed, 14 insertions, 132 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index c1871623d3c9..2602b6358503 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/xcdroast
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.38 2004/09/29 23:06:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.39 2004/10/31 03:41:24 pylon Exp $
+
+  31 Oct 2004; Lars Weiler <pylon@gentoo.org> metadata.xml,
+  -xcdroast-0.98_alpha15-r2.ebuild, xcdroast-0.98_alpha15-r3.ebuild:
+  Depend on virtual/cdrtools instead of app-cdr/cdrtools. Make this package a
+  member of the media-optical herd. Furthermore cleanup.
 
   17 Jun 2004; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r3.ebuild:
   Edited the dependency list, so that GTK+ will not be installed, when GTK2+ is
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index b8e83b322e6e..1de0e3da66a7 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 939c0013782bad60bf95389daa1765a4 ChangeLog 6926
-MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
-MD5 7244bdf090c43f54ea0ef0d01d4a2588 xcdroast-0.98_alpha15-r2.ebuild 2888
-MD5 467f4409cb0a080e4e41952e002eb132 xcdroast-0.98_alpha15-r3.ebuild 2603
+MD5 0c3adc425a1e935e2a197986d7abbde6 ChangeLog 7188
+MD5 de9773674106fb314ae3e9ca1138eb3a xcdroast-0.98_alpha15-r3.ebuild 2571
+MD5 19a367523e7477490a1551c8ea5f9fef metadata.xml 384
 MD5 121eabf95d22bf4f85b5c0426bf133a5 files/64bit_gsize.patch 471
-MD5 cea69309a5dc72515300ef5bd2c898f8 files/digest-xcdroast-0.98_alpha15-r2 335
 MD5 c74d0c61a25d9eefcba4401b5ffdfa0d files/digest-xcdroast-0.98_alpha15-r3 159
 MD5 ccb3a30dc25ffa6c7d78b64ea8cb7f75 files/gtk2locale.patch 643
 MD5 26768959e3621b77b59f887551742eba files/xcdroast-0.98alpha15-dvd.patch 15532
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBW0API1lqEGTUzyQRAjIPAJ0a1ysscNFGgRsDGaezZaC5Vj99wwCfVCAF
-8bdN2t/kMS+MRDl2CiJmvnQ=
-=6bWE
------END PGP SIGNATURE-----
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2
deleted file mode 100644
index e9f56aaf8bfa..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
-MD5 8ad7858aa96d29466b74b093ee82149b xcdroast-0.98_alpha15_new_configure.tar.gz 82301
-MD5 6e9f1d0b8b19c2e67f1f151686ce37f1 cdrecord-prodvd-2.01a12-i586-pc-linux-gnu 375228
-MD5 00ab13ddafcd4737ac5f93928e8d4f5e cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu 381964
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
index 7b72174d780b..abaf3d8c181f 100644
--- a/app-cdr/xcdroast/metadata.xml
+++ b/app-cdr/xcdroast/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>media-optical</herd>
 <maintainer>
 	<email>pylon@gentoo.org</email>
 	<name>Lars Weiler</name>
-	<description>Testing on x86 and ppc (only CD-RW, no DVD!)</description>
+	<description>Testing on x86 and ppc</description>
 </maintainer>
 <longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
 </pkgmetadata>
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
deleted file mode 100644
index f0d2b9d824f5..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild,v 1.7 2004/06/24 21:36:36 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P/_/}
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-HOMEPAGE="http://www.xcdroast.org/"
-SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
-	mirror://gentoo/${P}_new_configure.tar.gz
-	dvdr? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/cdrecord-prodvd-2.01a12-i586-pc-linux-gnu )
-	dvdr? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu )"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE="nls dvdr gtk2 gnome"
-
-DEPEND="
-	gtk2? ( >=x11-libs/gtk+-2.0.3 )
-	!gtk2? ( =x11-libs/gtk+-1.2.10* )
-	!gtk2? ( >=media-libs/gdk-pixbuf-0.16.0 )
-	=dev-libs/glib-1.2*
-	>=media-libs/giflib-3.0
-	>=app-cdr/cdrtools-2.01_alpha17"
-
-src_unpack() {
-	unpack ${P/_/}.tar.gz
-	cd ${S}
-	unpack ${P}_new_configure.tar.gz
-
-	cd ${S}/src
-	use gtk2 && epatch ${FILESDIR}/gtk2locale.patch
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-
-	econf ${myconf} || die
-	make PREFIX=/usr || die
-}
-
-src_install() {
-	make PREFIX=/usr DESTDIR=${D} install || die
-
-	cd doc
-	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
-	cd ..
-
-	# move man pages to /usr/share/man to be LFH compliant
-	mv ${D}/usr/man ${D}/usr/share
-
-	#remove extraneous directory
-	rm ${D}/usr/etc -rf
-
-	#install cdrecord.prodvd
-	if use dvdr; then
-		into /usr/lib/xcdroast-0.98
-		use x86 && newbin ${DISTDIR}/cdrecord-prodvd-2.01a12-i586-pc-linux-gnu cdrecord.prodvd
-		use ppc && newbin ${DISTDIR}/cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu cdrecord.prodvd
-	fi
-
-	if use gnome; then
-		#create a symlink to the pixmap directory
-		dodir /usr/share/pixmaps
-		dosym /usr/lib/xcdroast-0.98/icons/xcdricon.png /usr/share/pixmaps/xcdricon.png
-		#add a menu entry to the gnome menu
-		cat <<EOF >xcdroast.desktop
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Exec=/usr/bin/xcdroast
-Icon=/usr/share/pixmaps/xcdricon.png
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=GNOME;Application;AudioVideo;
-TryExec=
-X-GNOME-DocPath=
-Name[de]=X-CD-Roast
-GenericName[de]=
-Comment[de]=CDs brennen
-Name[sv]=Cd-grill
-GenericName[sv]=
-Comment[sv]=Rosta en CD
-Name[fr]=Grilleur CD
-GenericName[fr]=
-Comment[fr]=Grillez des CDs
-EOF
-		insinto /usr/share/applications
-		doins xcdroast.desktop
-	fi
-}
-
-pkg_postinst() {
-	if use dvdr; then
-		echo
-		einfo "cdrecord-ProDVD has been installed with this package.  It will be used only"
-		einfo "for images larger than 1GB."
-		einfo "You have to type in the license key that is available free for personal use."
-		einfo "See ftp://ftp.berlios.de/pub/cdrecord/ProDVD/README for further information."
-		echo
-	fi
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
index 4a1379151e93..bff13d729b1f 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.9 2004/06/24 21:36:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.10 2004/10/31 03:41:24 pylon Exp $
 
 inherit eutils
 
@@ -21,9 +21,9 @@ DEPEND="
 
 RDEPEND="
 	dvdr? (
-		x86? ( >=app-cdr/cdrecord-prodvd-2.01_alpha24 )
+		x86? ( app-cdr/cdrecord-prodvd )
 	)
-	>=app-cdr/cdrtools-2.01_alpha17"
+	virtual/cdrtools"
 
 src_unpack() {
 	unpack ${P/_/}.tar.gz