New minor version

5 files changed, 79 insertions, 33 deletions

diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index 1636cd198f06..fa963e06747b 100644
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.5 2002/11/23 02:19:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.6 2002/12/01 01:25:05 foser Exp $
+
+*glame-0.6.4 (30 Nov 2002)
+
+  30 Nov 2002; foser <foser@gentoo.org> glame-0.6.4.ebuild :
+  New minor version
 
 *glame-0.6.3 (05 Aug 2002)
 
diff --git a/media-sound/glame/files/digest-glame-0.6.0 b/media-sound/glame/files/digest-glame-0.6.0
deleted file mode 100644
index 7b7e4d4bc6e3..000000000000
--- a/media-sound/glame/files/digest-glame-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 337a3cb6da2996b5675187e92298b0da glame-0.6.0.tar.gz 1175403
diff --git a/media-sound/glame/files/digest-glame-0.6.4 b/media-sound/glame/files/digest-glame-0.6.4
new file mode 100644
index 000000000000..61d7d4ff312b
--- /dev/null
+++ b/media-sound/glame/files/digest-glame-0.6.4
@@ -0,0 +1 @@
+MD5 b7a8389c42e42ba04749720677a1c48d glame-0.6.4.tar.gz 1226806
diff --git a/media-sound/glame/glame-0.6.0.ebuild b/media-sound/glame/glame-0.6.0.ebuild
deleted file mode 100644
index 1ed0651fd44f..000000000000
--- a/media-sound/glame/glame-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.0.ebuild,v 1.5 2002/10/04 05:53:19 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glame is an audio file editing utility."
-SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
-HOMEPAGE="http://glame.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=dev-util/guile-1.4-r3
-	>=dev-util/glade-0.6.2
-	>=dev-libs/libxml-1.8.16
-	>=media-libs/audiofile-0.2.1"
-
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install () {
-
-	einstall || die
-	dodoc AUTHORS BUGS COPYING CREDITS Changelog MAINTAINERS NEWS README TODO
-
-}
diff --git a/media-sound/glame/glame-0.6.4.ebuild b/media-sound/glame/glame-0.6.4.ebuild
new file mode 100644
index 000000000000..df3837eb8be1
--- /dev/null
+++ b/media-sound/glame/glame-0.6.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.4.ebuild,v 1.1 2002/12/01 01:25:05 foser Exp $
+
+IUSE="nls gnome"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Glame is an audio file editing utility"
+SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
+HOMEPAGE="http://glame.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=dev-util/guile-1.4-r3
+	dev-libs/libxml2
+	>=media-sound/esound-0.2
+	media-libs/audiofile
+	gnome? ( <gnome-base/libglade-2 gnome-base/gnome-libs )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	
+	# fix NLS problem (bug #7587)
+	if [ ! "`use nls`" ]
+	then
+		cd ${S}/src/gui
+		mv swapfilegui.c swapfilegui.c.bad
+		sed -e "s:#include <libintl.h>::" swapfilegui.c.bad > swapfilegui.c
+	fi
+}
+
+src_compile() {
+	if [ "`use gnome`" ]
+	then
+		# Use a valid icon for the GNOME menu entry
+		cp src/gui/glame.desktop src/gui/glame.desktop.old
+		sed -e 's:glame.png:glame-logo.jpg:' \
+			src/gui/glame.desktop.old > src/gui/glame.desktop
+		rm src/gui/glame.desktop.old
+	fi
+	
+	local myconf=""
+
+	use nls	&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+	use gnome || myconf="$myconf --disable-gui"
+
+	# needed to not break configure
+	unset CFLAGS	
+	econf --with-included-gettext ${myconf} || die "Configuration failed"
+	
+	emake || die "Compilation failed"
+}
+
+src_install () {
+	einstall || die "Installation failed"
+	
+	if [ "`use gnome`" ]
+	then
+		dodir /usr/share/pixmaps
+		dosym ../glame/pixmaps/glame-logo.jpg \
+		      /usr/share/pixmaps/glame-logo.jpg
+	fi
+	
+	dodoc ABOUT-NLS AUTHORS BUGS COPYING CREDITS ChangeLog MAINTAINERS \
+		NEWS README TODO
+}
+