Ebuild cleanup. Added gcc-3.4 fix thanks to James <James@superbug.demon.co.uk> in bug #71139. Added to ~amd64.

4 files changed, 34 insertions, 17 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 3a9d660c5a6a..65c3b8e3b5f4 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.7 2004/09/24 18:37:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.8 2004/11/17 00:27:30 eradicator Exp $
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/moc-1.1.0-gcc34.patch, moc-1.1.0.ebuild:
+  Ebuild cleanup. Added gcc-3.4 fix thanks to James
+  <James@superbug.demon.co.uk> in bug #71139. Added to ~amd64.
 
   24 Sep 2004; Sven Wegener <swegener@gentoo.org> moc-1.1.0.ebuild:
   Fixed CVS keyword replacement.
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index ef4c0aa0174f..5d1466aa246f 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 93d89a9d6793d705f057c003c996a33e ChangeLog 834
+MD5 606594acd84d916df9a6422bd1c42768 ChangeLog 1059
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 86739b3fcbb4dd14f31404e39e44bfda moc-1.1.0.ebuild 917
+MD5 7aa066d4ac7f846dafab385deda91947 moc-1.1.0.ebuild 1005
 MD5 a90f9e3223b6e3cb5a0bf42b862d130e files/digest-moc-1.1.0 61
 MD5 ffe585145e5d7dfe41d78a4b05a36802 files/moc-1.1.0-gcc3.patch 4196
+MD5 5a9ee40731b6659c61c667199e041802 files/moc-1.1.0-gcc34.patch 211
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBVGluI1lqEGTUzyQRAsGFAJ9530eTV5EPu7pzMqfrF1Js9yYL2QCdE6Rb
-/PkgUizLNX2soE/PK8B/FvE=
-=J01c
+iD8DBQFBmpsOArHZZzCEUG0RAsgYAJ4rwiZC6qFKXpqG2nZK+b6w5H0LlgCfXVcO
+w8NunIiIuVCdm2xDKmQ/Co4=
+=vml0
 -----END PGP SIGNATURE-----
diff --git a/media-sound/moc/files/moc-1.1.0-gcc34.patch b/media-sound/moc/files/moc-1.1.0-gcc34.patch
new file mode 100644
index 000000000000..00e234978d1b
--- /dev/null
+++ b/media-sound/moc/files/moc-1.1.0-gcc34.patch
@@ -0,0 +1,10 @@
+--- interface.c.org	2004-11-14 12:02:20.299531311 +0000
++++ interface.c	2004-11-14 12:02:30.669978183 +0000
+@@ -1033,6 +1033,7 @@
+ 					return_menu ();
+ 					break;
+ 				default:
++					break;
+ 			}
+ 		}
+ #endif
diff --git a/media-sound/moc/moc-1.1.0.ebuild b/media-sound/moc/moc-1.1.0.ebuild
index 4bd3f0347cd5..8d6a2535edb3 100644
--- a/media-sound/moc/moc-1.1.0.ebuild
+++ b/media-sound/moc/moc-1.1.0.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-1.1.0.ebuild,v 1.9 2004/09/24 18:37:26 swegener Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-1.1.0.ebuild,v 1.10 2004/11/17 00:27:30 eradicator Exp $
 
 IUSE="oggvorbis mad oss"
 
+inherit eutils
+
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://moc.daper.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 x86"
 
 DEPEND="media-libs/libao
 	sys-libs/ncurses
 	oggvorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad sys-libs/zlib )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc3.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {
@@ -37,5 +37,6 @@ src_compile() {
 }
 
 src_install () {
-	einstall || die
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }