new version

4 files changed, 37 insertions, 10 deletions

diff --git a/app-cdr/gtoaster/files/digest-gtoaster-1.0_beta3 b/app-cdr/gtoaster/files/digest-gtoaster-1.0_beta3
new file mode 100644
index 000000000000..ac800491874d
--- /dev/null
+++ b/app-cdr/gtoaster/files/digest-gtoaster-1.0_beta3
@@ -0,0 +1 @@
+MD5 3756a86ebf5b49948902ba1bf10809ad gtoaster1.0Beta3.tgz 2437120
diff --git a/app-cdr/gtoaster/files/digest-gtoaster-1.2_beta2 b/app-cdr/gtoaster/files/digest-gtoaster-1.2_beta2
deleted file mode 100644
index 2c7156c9bbc4..000000000000
--- a/app-cdr/gtoaster/files/digest-gtoaster-1.2_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6f6a5be6333ae05bf0393e9ced6004f gtoaster1.0Beta2.tgz 2375680
diff --git a/app-cdr/gtoaster/files/gtoaster.desktop b/app-cdr/gtoaster/files/gtoaster.desktop
new file mode 100644
index 000000000000..b822b6b8172b
--- /dev/null
+++ b/app-cdr/gtoaster/files/gtoaster.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Gnome Toaster
+Comment=GNOME Frontend for creating Data, Audio and Mixed Mode CD
+Exec=gtoaster
+Icon=gtoaster.png
+Terminal=0
+Type=Application
diff --git a/app-cdr/gtoaster/gtoaster-1.2_beta2.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild
index 39baf0fc8a66..9a9c0d1f3f1b 100644
--- a/app-cdr/gtoaster/gtoaster-1.2_beta2.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Desktop Team <desktop@cvs.gentoo.org>
 # Author Claes Nästén <pekdon@gmx.net>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.2_beta2.ebuild,v 1.1 2001/10/18 21:42:47 hallski Exp $
+# /home/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.2_beta2.ebuild,v 1.1 2001/10/18 21:42:47 hallski Exp
 
-P=gtoaster1.0Beta2
-PV=1.0beta2
+# Fix so that updating can only be done by 'cp old.ebuild new.ebuild'
+MY_P="`echo ${P} |sed -e 's:-::' -e 's:_b:B:'`"
 S=${WORKDIR}/gtoaster
 DESCRIPTION="GTK+ Frontend for cdrecord"
-SRC_URI="http://gnometoaster.rulez.org/archive/${P}.tgz"
+SRC_URI="http://gnometoaster.rulez.org/archive/${MY_P}.tgz"
 HOMEPAGE="http://gnometoaster.rulez.org/"
 
 DEPEND=">=x11-libs/gtk+-1.2
@@ -17,16 +17,23 @@ DEPEND=">=x11-libs/gtk+-1.2
 
 RDEPEND=">=app-cdr/cdrecord-1.9
 	 >=media-sound/sox-12
-	 >=media-sound/mpg123-0.59"
+	 >=media-sound/mpg123-0.59
+	 >=media-sound/mp3info-0.8.4
+	 ogg? ( >=media-sound/vorbis-tools-1.0_rc2 )
+	 ogg? ( >=media-sound/oggtst-0.0 )"
+
 
 src_compile() {
+
 	local myconf
-	use gnome	&& myconf="$myconf --with-gnome"
-	use gnome	|| myconf="$myconf --without-gnome"
+	use nls		|| myconf="$myconf --disable-nls"
+	use gnome	&& myconf="$myconf --with-gnome --with-orbit"
+	use gnome	|| myconf="$myconf --without-gnome --without-orbit"
 	use esd		&& myconf="$myconf --with-esd"
 	use esd		|| myconf="$myconf --without-esd"
 	use oss		&& myconf="$myconf --with-oss"
 	use oss		|| myconf="$myconf --without-oss"
+
 	
 	./configure --host=${CHOST}					\
 		    --prefix=/usr					\
@@ -39,7 +46,8 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
+
 	make prefix=${D}/usr						\
 	     sysconfdir=${D}/etc					\
 	     localstatedir=${D}/var/lib					\
@@ -47,7 +55,19 @@ src_install () {
 	     mandir=${D}/usr/share/man					\
 	     install || die
 
-	dodoc Changelog* COPYING INSTALL NEWS README TODO
+	dodoc ABOUT-NLS AUTHORS ChangeLog* COPYING INSTALL NEWS README TODO
+	docinto user-guide
+	dodoc Documentation/*.txt
+	dodoc Documentation/*.html
+	dodoc Documentation/*.png
+
+        # Install icon and .desktop for menu entry
+        if [ "`use gnome`" ] ; then
+                insinto /usr/share/pixmaps
+                doins ${S}/icons/gtoaster.png
+                insinto /usr/share/gnome/apps/Applications
+                doins ${FILESDIR}/gtoaster.desktop
+        fi
 }