Adding gcc3 patch. Closes #31399.

4 files changed, 129 insertions, 3 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index fe8b237a1a8f..0e3df18552e6 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.1 2003/06/26 15:21:29 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.2 2003/10/18 14:54:35 mholzer Exp $
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> moc-1.1.0.ebuild,
+  files/moc-1.1.0-gcc3.patch:
+  Adding gcc3 patch. Closes #31399.
 
 *moc-1.1.0 (26 Jun 2003)
 
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 4d61e381ff99..f731f4c58365 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,3 +1,4 @@
+MD5 6b768ccc9c0fb0808572baa8b397a752 ChangeLog 491
+MD5 d9b8a9756c5645f87dc7529e243eeaac moc-1.1.0.ebuild 691
 MD5 a90f9e3223b6e3cb5a0bf42b862d130e files/digest-moc-1.1.0 61
-MD5 ee98d6e2abe6421b1188fa71916e872a moc-1.1.0.ebuild 615
-MD5 0793133d5e0fe28a37babe8ce4ad83de ChangeLog 353
+MD5 ffe585145e5d7dfe41d78a4b05a36802 files/moc-1.1.0-gcc3.patch 4196
diff --git a/media-sound/moc/files/moc-1.1.0-gcc3.patch b/media-sound/moc/files/moc-1.1.0-gcc3.patch
new file mode 100644
index 000000000000..518f04bc9eea
--- /dev/null
+++ b/media-sound/moc/files/moc-1.1.0-gcc3.patch
@@ -0,0 +1,115 @@
+diff -ur moc-1.1.0/interface.c moc-1.1.0-gentoo/interface.c
+--- moc-1.1.0/interface.c	2002-12-01 10:33:23.000000000 +1300
++++ moc-1.1.0-gentoo/interface.c	2003-10-18 23:25:01.000000000 +1300
+@@ -573,36 +573,33 @@
+ 		wbkgd (main_subwin, COLOR_PAIR(1));
+ 	werase (main_subwin);
+ 
+-	mvwprintw (main_subwin, 0, 0, "\
+-  UP, DOWN	Move up and down in the menu
+-  PAGE UP/DOWN	Move one page up/down
+-  HOME, END	Move to the first, last item
+-  ENTER		Start playing files (from this file) or go to directory
+-  s		Stop playing
+-  n		Next song
+-  p		Pause/unpause
+-  LEFT, RIGHT	Seek backward, forward
+-  h		Show this help screen
+-  f		Switch between short and full names
+-  m		Go to the music directory (requires an entry in the config)
+-  r		Redraw the screen
+-  a/A		Add file to the playlist / Add directory recursively
+-  d/C		Delete item from the playlist / Clear the playlist
+-  l		Switch between playlist and file list
+-  S/R		Switch shuffle / repeat
+-");
++	mvwprintw (main_subwin, 0, 0, "\n"
++"  UP, DOWN	Move up and down in the menu\n"
++"  PAGE UP/DOWN	Move one page up/down\n"
++"  HOME, END	Move to the first, last item\n"
++"  ENTER		Start playing files (from this file) or go to directory\n"
++"  s		Stop playing\n"
++"  n		Next song\n"
++"  p		Pause/unpause\n"
++"  LEFT, RIGHT	Seek backward, forward\n"
++"  h		Show this help screen\n"
++"  f		Switch between short and full names\n"
++"  m		Go to the music directory (requires an entry in the config)\n"
++"  r		Redraw the screen\n"
++"  a/A		Add file to the playlist / Add directory recursively\n"
++"  d/C		Delete item from the playlist / Clear the playlist\n"
++"  l		Switch between playlist and file list\n"
++"  S/R		Switch shuffle / repeat\n");
+ 
+ #ifdef VERSION_CHECKER
+-	wprintw (main_subwin, "\
+-  v		Check if a newer version of the MOC is available
+-");
++	wprintw (main_subwin, "\n"
++"  v		Check if a newer version of the MOC is available\n");
+ #endif
+-	
++
+ #ifdef HAVE_OSS
+-	wprintw (main_subwin, "\
+-  '.' , ','	Increase, decrease volume by 5%
+-  '>' , '<'	Increase, decrease volume by 1%
+-");
++	wprintw (main_subwin, "\n"
++"  '.' , ','	Increase, decrease volume by 5%\n"
++"  '>' , '<'	Increase, decrease volume by 1%\n");
+ #endif
+ 
+ 	wrefresh (main_subwin);
+diff -ur moc-1.1.0/main.c moc-1.1.0-gentoo/main.c
+--- moc-1.1.0/main.c	2002-12-01 22:39:18.000000000 +1300
++++ moc-1.1.0-gentoo/main.c	2003-10-18 23:21:15.000000000 +1300
+@@ -77,27 +77,27 @@
+ 
+ /* Show program usage and exit */
+ static void usage (const char *prg_name) {
+-	printf ("\
+-"PACKAGE_STRING"
+-Usage:
+-%s [OPTIONS]... [FILE]...
+--V --version		Show program version and exit.
+--h --help		Show usage and exit.
+--r --recursively	Add files in direstories given as an argument
+-			recursively.
+--f --fullinfo		Show titles (eg from id3tags) instead of names in the
+-			menu (default).
+--s --shortinfo		Show file names in the menu (opposite to -f).
+--m --musicdir		Go to your music directory after start (requires such
+-			entry in the config file).
+--e --errors		Show errors in streams.
+--n --no-errors		Do not show errors in streams (opposite to -e).
+--p --priority N		Set the priority to a given value.
+--l --dont-play		Don't start playing files added as command line
+-			arguments.
+--R --repeat		Turn on repeat.
+--E --no-repeat		Turn off repeat.
+-", prg_name);
++	printf ("\n"
++PACKAGE_STRING"\n"
++"Usage:\n"
++"%s [OPTIONS]... [FILE]...\n"
++"-V --version		Show program version and exit.\n"
++"-h --help		Show usage and exit.\n"
++"-r --recursively	Add files in direstories given as an argument\n"
++"			recursively.\n"
++"-f --fullinfo		Show titles (eg from id3tags) instead of names in the\n"
++"			menu (default).\n"
++"-s --shortinfo		Show file names in the menu (opposite to -f).\n"
++"-m --musicdir		Go to your music directory after start (requires such\n"
++"			entry in the config file).\n"
++"-e --errors		Show errors in streams.\n"
++"-n --no-errors		Do not show errors in streams (opposite to -e).\n"
++"-p --priority N		Set the priority to a given value.\n"
++"-l --dont-play		Don't start playing files added as command line\n"
++"			arguments.\n"
++"-R --repeat		Turn on repeat.\n"
++"-E --no-repeat		Turn off repeat.\n"
++, prg_name);
+ }
+ 
+ /* Return the current directory name */
diff --git a/media-sound/moc/moc-1.1.0.ebuild b/media-sound/moc/moc-1.1.0.ebuild
index 40c9ced13056..e469ce42643f 100644
--- a/media-sound/moc/moc-1.1.0.ebuild
+++ b/media-sound/moc/moc-1.1.0.ebuild
@@ -16,6 +16,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.patch
+}
+
 src_compile() {
 	local myconf
 	use oggvorbis || myconf="--without-ogg"