Cleanup and gcc-3.4 fixes. Added to -amd64, -sparc.
authorJeremy Huddleston <eradicator@gentoo.org>
Tue, 23 Nov 2004 02:55:21 +0000 (02:55 +0000)
committerJeremy Huddleston <eradicator@gentoo.org>
Tue, 23 Nov 2004 02:55:21 +0000 (02:55 +0000)
media-sound/gnusound/ChangeLog
media-sound/gnusound/Manifest
media-sound/gnusound/files/digest-gnusound-0.6.1 [deleted file]
media-sound/gnusound/files/gnusound-0.6.2-destdir.patch [new file with mode: 0644]
media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch [new file with mode: 0644]
media-sound/gnusound/gnusound-0.6.1.ebuild [deleted file]
media-sound/gnusound/gnusound-0.6.2.ebuild

index 80fd2aa1632094ba91efe01f0dbc16a4d5a585de..b20681e6aa1beb63d499c417283dbdb5fbbdae3f 100644 (file)
@@ -1,6 +1,11 @@
 # 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.6 2004/10/08 07:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.7 2004/11/23 02:55:21 eradicator Exp $
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnusound-0.6.2-destdir.patch, +files/gnusound-0.6.2-gcc34.patch,
+  -gnusound-0.6.1.ebuild, gnusound-0.6.2.ebuild:
+  Cleaned up and added to -amd64, -sparc.
 
   08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
   gnusound-0.6.2.ebuild, +files/gnusound-0.6.2-gtkdep.patch:
index 001cfd1020061d71bc38b2991e308573a30ea789..8d32f62b8b5e61e6b16a5e91678f9817d8a55cf5 100644 (file)
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 79a13a8864a89d8f3fab583d8ff86384 ChangeLog 895
-MD5 f22ab421f3602aa20e1768dcf5f09e1b gnusound-0.6.1.ebuild 1107
-MD5 8bf9bd9a9456d4d2df3029d68181bc0f gnusound-0.6.2.ebuild 1208
+MD5 b90084eb1a5d48a1853a92e37c2fae36 ChangeLog 1118
+MD5 9d6d43b5b85167ed1bd1fd5b03a70c57 gnusound-0.6.2.ebuild 1360
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 144ea19f7fb52c88a88e39c3abe72dba files/digest-gnusound-0.6.1 67
+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 ea52d3ae47017d356eddec26a196bd51 files/gnusound-0.6.2-gcc34.patch 425
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZj5UArHZZzCEUG0RAkC+AJ9ZHLKjgH5kcCdhkSAT5Ey0jqmPvACfUhWy
-GtpHndZNBRfJFSRWMeOir84=
-=4qkV
+iD8DBQFBoqaqArHZZzCEUG0RAnTeAJ9/e4pQoS9C8HxhmNPTNMQJZwWqbACfTTCN
+6wWi6gB1jDfjQejZryv2rZc=
+=3R/+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gnusound/files/digest-gnusound-0.6.1 b/media-sound/gnusound/files/digest-gnusound-0.6.1
deleted file mode 100644 (file)
index d66eec0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4dbf15289dabd2367d8e07cdcfb23ad0 gnusound-0.6.1.tar.bz2 254965
diff --git a/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch b/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch
new file mode 100644 (file)
index 0000000..9d51eef
--- /dev/null
@@ -0,0 +1,41 @@
+--- gnusound-0.6.2/doc/Makefile.in.orig        2004-11-22 18:34:09.525925468 -0800
++++ gnusound-0.6.2/doc/Makefile.in     2004-11-22 18:35:03.293071290 -0800
+@@ -27,9 +27,9 @@
+ 
+ install:
+       for lang in $(LANGUAGES); do \
+-              mkdir -p $(datadir)/$$lang; \
++              mkdir -p $(DESTDIR)$(datadir)/$$lang; \
+               cp $$lang/*.xml $$lang/*.html $$lang/topic.dat \
+-                      $(datadir)/$$lang; \
++                      $(DESTDIR)$(datadir)/$$lang; \
+       done
+ 
+ dist:
+--- gnusound-0.6.2/Makefile.in.orig    2004-11-22 18:38:50.955574862 -0800
++++ gnusound-0.6.2/Makefile.in 2004-11-22 18:39:27.437565359 -0800
+@@ -86,15 +86,15 @@
+ 
+ install: all 
+       $(MAKE) -C doc install
+-      mkdir -p $(bindir)
+-      mkdir -p $(moduledir)
+-      mkdir -p $(pixmapdir)
+-      mkdir -p $(desktopdir)
+-      install -m 755 -o root -g root $(name) $(bindir)
+-      install -m 644 -o root -g root $(module_files) $(moduledir)
+-      install -m 644 -o root -g root $(pixmap_files) $(pixmapdir)
+-      install -m 644 -o root -g root $(lib_files) $(libdir)
+-      install -m 644 -o root -g root $(desktop_files) $(desktopdir)
++      mkdir -p $(DESTDIR)$(bindir)
++      mkdir -p $(DESTDIR)$(moduledir)
++      mkdir -p $(DESTDIR)$(pixmapdir)
++      mkdir -p $(DESTDIR)$(desktopdir)
++      install -m 755 -o root -g root $(name) $(DESTDIR)$(bindir)
++      install -m 644 -o root -g root $(module_files) $(DESTDIR)$(moduledir)
++      install -m 644 -o root -g root $(pixmap_files) $(DESTDIR)$(pixmapdir)
++      install -m 644 -o root -g root $(lib_files) $(DESTDIR)$(libdir)
++      install -m 644 -o root -g root $(desktop_files) $(DESTDIR)$(desktopdir)
+ 
+ uninstall:
+       $(MAKE) -C doc uninstall
diff --git a/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch b/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch
new file mode 100644 (file)
index 0000000..ff26389
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naur gnusound-0.6.2.orig/play.c gnusound-0.6.2/play.c
+--- gnusound-0.6.2.orig/play.c 2003-01-14 21:11:36.000000000 -0800
++++ gnusound-0.6.2/play.c      2004-11-22 18:19:47.000000000 -0800
+@@ -817,7 +817,7 @@
+ 
+     DEBUG("player.draws_requested: %d, player.draws_prevented: %d\n",
+           shl->player.draws_requested, shl->player.draws_prevented);
+- cleanup:
++ cleanup:;
+     pthread_cleanup_pop(1);
+     return NULL;
+ }
diff --git a/media-sound/gnusound/gnusound-0.6.1.ebuild b/media-sound/gnusound/gnusound-0.6.1.ebuild
deleted file mode 100644 (file)
index 6ef61c0..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.1.ebuild,v 1.3 2004/06/25 00:02:38 agriffis Exp $
-
-DESCRIPTION="GNUsound is a sound editor for Linux/x86"
-HOMEPAGE="http://gnusound.sourceforge.net/"
-SRC_URI="http://gnusound.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="libsamplerate"
-
-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
-}
-
-src_compile() {
-       econf `use_with libsamplerate` --enable-optimization || die "Configure failure"
-
-       emake || die "Make failure"
-}
-
-src_install() {
-       einstall || die "make install failure"
-       dodoc LICENSE README NOTES TODO CHANGES
-}
index d4d3a04f49d98090ee2d908b40265831ae78568c..59699b839c82216ce4189cb67e77fa627562003e 100644 (file)
@@ -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/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.4 2004/10/08 07:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.5 2004/11/23 02:55:21 eradicator Exp $
 
 IUSE="libsamplerate"
 
@@ -12,7 +12,8 @@ SRC_URI="http://gnusound.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+# -amd64, -sparc: 0.6.2 - eradicator - segfault on startup
+KEYWORDS="-amd64 x86 -sparc"
 
 DEPEND=">=gnome-base/libglade-2.0.1
        gnome-base/gnome-libs
@@ -30,16 +31,20 @@ src_unpack() {
        # Bug #54980
        epatch ${FILESDIR}/${P}-gtkdep.patch
 
+       # Bug #68345
+       epatch ${FILESDIR}/${P}-gcc34.patch
+
+       epatch ${FILESDIR}/${P}-destdir.patch
+
        gnuconfig_update
 }
 
 src_compile() {
        econf `use_with libsamplerate` --enable-optimization || die "Configure failure"
-
        emake || die "Make failure"
 }
 
 src_install() {
-       einstall || die "make install failure"
-       dodoc LICENSE README NOTES TODO CHANGES
+       make DESTDIR="${D}" install || die
+       dodoc README NOTES TODO CHANGES
 }