6 files changed, 117 insertions, 17 deletions
diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index b20681e6aa1b..97bda2cd06fe 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gnusound
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.7 2004/11/23 02:55:21 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.8 2005/04/27 16:55:56 luckyduck Exp $
+
+*gnusound-0.7 (27 Apr 2005)
+
+  27 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gnusound-0.7-destdir.patch, +gnusound-0.7.ebuild:
+  new upstream version, fixes #90560. added ~amd64 back, seems to work now.
 
   22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/gnusound-0.6.2-destdir.patch, +files/gnusound-0.6.2-gcc34.patch,
diff --git a/media-sound/gnusound/Manifest b/media-sound/gnusound/Manifest
index 8d32f62b8b5e..fd37b6a21abf 100644
--- a/media-sound/gnusound/Manifest
+++ b/media-sound/gnusound/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b90084eb1a5d48a1853a92e37c2fae36 ChangeLog 1118
-MD5 9d6d43b5b85167ed1bd1fd5b03a70c57 gnusound-0.6.2.ebuild 1360
+MD5 5423427ecf45d3e8a5221697f6041e9c gnusound-0.7.ebuild 1328
+MD5 b3c55a0bc48674849f7ea0771842bcaa gnusound-0.6.2.ebuild 1360
+MD5 d90a87c014b0ec97962d0a56c5ea738f ChangeLog 1335
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 f9d51bdd31b53726a453e8107f952c06 files/gnusound-0.6.2-destdir.patch 1524
 MD5 2fc6416b1d46e2e4b4cd98881e3b6ca6 files/digest-gnusound-0.6.2 67
-MD5 7664f0269c796f265829b3d0fc5690c8 files/gnusound-0.6.2-gtkdep.patch 1673
+MD5 0ea9eb52808da58d3b31485199b74e65 files/digest-gnusound-0.7 65
+MD5 81cee6b7a949cef7e03d3a57349701c9 files/gnusound-0.7-destdir.patch 2451
 MD5 ea52d3ae47017d356eddec26a196bd51 files/gnusound-0.6.2-gcc34.patch 425
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBoqaqArHZZzCEUG0RAnTeAJ9/e4pQoS9C8HxhmNPTNMQJZwWqbACfTTCN
-6wWi6gB1jDfjQejZryv2rZc=
-=3R/+
------END PGP SIGNATURE-----
+MD5 7664f0269c796f265829b3d0fc5690c8 files/gnusound-0.6.2-gtkdep.patch 1673
diff --git a/media-sound/gnusound/files/digest-gnusound-0.7 b/media-sound/gnusound/files/digest-gnusound-0.7
new file mode 100644
index 000000000000..cc49f8b0ead0
--- /dev/null
+++ b/media-sound/gnusound/files/digest-gnusound-0.7
@@ -0,0 +1 @@
+MD5 ea3c2a3326cf096db3e3be7ca9bd4ba5 gnusound-0.7.tar.bz2 538950
diff --git a/media-sound/gnusound/files/gnusound-0.7-destdir.patch b/media-sound/gnusound/files/gnusound-0.7-destdir.patch
new file mode 100644
index 000000000000..eaa1990c6df7
--- /dev/null
+++ b/media-sound/gnusound/files/gnusound-0.7-destdir.patch
@@ -0,0 +1,52 @@
+diff -uprN gnusound-0.7.orig/doc/Makefile.in gnusound-0.7/doc/Makefile.in
+--- gnusound-0.7.orig/doc/Makefile.in	2005-04-27 18:26:31.000000000 +0200
++++ gnusound-0.7/doc/Makefile.in	2005-04-27 18:27:05.000000000 +0200
+@@ -52,10 +52,10 @@ uninstall:
+ 
+ install:
+ 	for lang in $(LANGUAGES); do \
+-		mkdir -p $(datadir)/$$lang; \
++		mkdir -p $(DESTDIR)/$(datadir)/$$lang; \
+ 		install -m 644 -o $(owner_user) -g $(owner_group) \
+ 			$$lang/*.xml $$lang/*.html $$lang/topic.dat \
+-			$(datadir)/$$lang; \
++			$(DESTDIR)/$(datadir)/$$lang; \
+ 	done
+ 
+ .PHONY: dist clean veryclean distclean install uninstall
+diff -uprN gnusound-0.7.orig/Makefile.in gnusound-0.7/Makefile.in
+--- gnusound-0.7.orig/Makefile.in	2005-04-27 18:26:31.000000000 +0200
++++ gnusound-0.7/Makefile.in	2005-04-27 18:27:38.000000000 +0200
+@@ -160,12 +160,12 @@ src/$(name): $(objects) .ldflags
+ install: all 
+ 	$(MAKE) -C doc install owner_user=$(owner_user) owner_group=$(owner_group)
+ 	$(MAKE) -C modules install owner_user=$(owner_user) owner_group=$(owner_group)
+-	mkdir -p $(bindir)
+-	mkdir -p $(guidir)
+-	mkdir -p $(desktopdir)
+-	install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) $(bindir)
+-	install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) $(guidir)
+-	install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) $(desktopdir)
++	mkdir -p $(DESTDIR)$(bindir)
++	mkdir -p $(DESTDIR)$(guidir)
++	mkdir -p $(DESTDIR)$(desktopdir)
++	install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) $(DESTDIR)$(bindir)
++	install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) $(DESTDIR)$(guidir)
++	install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) $(DESTDIR)$(desktopdir)
+ 
+ uninstall:
+ 	$(MAKE) -C modules uninstall
+diff -uprN gnusound-0.7.orig/modules/Makefile.in gnusound-0.7/modules/Makefile.in
+--- gnusound-0.7.orig/modules/Makefile.in	2005-04-27 18:26:31.000000000 +0200
++++ gnusound-0.7/modules/Makefile.in	2005-04-27 18:33:15.000000000 +0200
+@@ -60,8 +60,8 @@ $(gnusounddir)/.cflags:
+ 	$(CC) `cat $(gnusounddir)/.cflags` -I$(gnusounddir)/src -I$(gnusounddir)/src/$(gtk) -fPIC -shared  $< -o $@  `cat .$(basename $@).cflags`
+ 
+ install:
+-	mkdir -p $(moduledir)
+-	install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) $(moduledir)
++	mkdir -p $(DESTDIR)$(moduledir)
++	install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) $(DESTDIR)$(moduledir)
+ 
+ uninstall:
+ 	(cd $(moduledir) && rm -f $(module_files))
diff --git a/media-sound/gnusound/gnusound-0.6.2.ebuild b/media-sound/gnusound/gnusound-0.6.2.ebuild
index 59699b839c82..39da4697392a 100644
--- a/media-sound/gnusound/gnusound-0.6.2.ebuild
+++ b/media-sound/gnusound/gnusound-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.5 2004/11/23 02:55:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.6 2005/04/27 16:55:56 luckyduck Exp $
 
 IUSE="libsamplerate"
 
diff --git a/media-sound/gnusound/gnusound-0.7.ebuild b/media-sound/gnusound/gnusound-0.7.ebuild
new file mode 100644
index 000000000000..e5613803820f
--- /dev/null
+++ b/media-sound/gnusound/gnusound-0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.ebuild,v 1.1 2005/04/27 16:55:56 luckyduck Exp $
+
+IUSE="libsamplerate"
+
+inherit gnuconfig eutils
+
+DESCRIPTION="GNUsound is a sound editor for Linux/x86"
+HOMEPAGE="http://gnusound.sourceforge.net/"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# -amd64, -sparc: 0.6.2 - eradicator - segfault on startup
+# added ~amd64 , seems to work now (0.7)
+KEYWORDS="~amd64 ~x86 -sparc"
+
+DEPEND=">=gnome-base/libglade-2.0.1
+	gnome-base/gnome-libs
+	>=gnome-base/libgnomeui-2.2.0.1
+	>=media-libs/audiofile-0.2.3
+	libsamplerate? ( media-libs/libsamplerate )"
+
+src_unpack() {
+	unpack ${A} || die "unpack failure"
+	cd ${S} || die "workdir not found"
+	rm -f doc/Makefile || die "could not remove doc Makefile"
+	rm -f modules/Makefile || die "could not remove modules Makefile"
+	sed -i "s:docrootdir:datadir:" doc/Makefile.in
+
+	epatch ${FILESDIR}/${P}-destdir.patch
+
+	gnuconfig_update
+}
+
+src_compile() {
+	econf \
+		$(use_with libsamplerate) \
+		--enable-optimization \
+		|| die "Configure failure"
+	emake || die "Make failure"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README NOTES TODO CHANGES
+}