changelog:p

4 files changed, 225 insertions, 2 deletions

diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index 9834e0943e5a..8c9e32d3e000 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,6 +1,6 @@
-MD5 8071a0d7175c50cd578a946b9d6fbb10 ChangeLog 915
+MD5 865399b5cb419aaef9b20b59e2b3530b ChangeLog 1049
 MD5 d2fe09c4e1f1bfdcb114d395cb45797a zgv-5.6.ebuild 1130
-MD5 db1ef4c4e47e56909facc274094225d2 zgv-5.7.ebuild 1167
+MD5 3de83cf8b39e770101d04a4c2915493a zgv-5.7.ebuild 1165
 MD5 1c0e7ed3b8b41a4715baee9702d8f75b files/digest-zgv-5.7 59
 MD5 ba2e75d792b52079d132706e51fba34c files/digest-zgv-5.6 59
 MD5 c09d6f10cad027ae5559b8356928c317 files/zgv-5.7-gcc3.patch 7054
diff --git a/media-gfx/zgv/files/digest-zgv-5.7 b/media-gfx/zgv/files/digest-zgv-5.7
new file mode 100644
index 000000000000..7df94e21d9c1
--- /dev/null
+++ b/media-gfx/zgv/files/digest-zgv-5.7
@@ -0,0 +1 @@
+MD5 50f0127c250b6efe9c5f8850b96f3841 zgv-5.7.tar.gz 384977
diff --git a/media-gfx/zgv/files/zgv-5.7-gcc3.patch b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
new file mode 100644
index 000000000000..6c44c16a150a
--- /dev/null
+++ b/media-gfx/zgv/files/zgv-5.7-gcc3.patch
@@ -0,0 +1,170 @@
+diff -u orig/bdf2h.c new/bdf2h.c
+--- orig/bdf2h.c	2003-10-03 06:05:53.573182320 +0200
++++ new/bdf2h.c	2003-10-03 06:16:07.603835472 +0200
+@@ -45,14 +45,14 @@
+  */
+ printf("#ifndef DEFINED_STRUCT_FONTINFO_TAG\n");
+ printf("#define DEFINED_STRUCT_FONTINFO_TAG 1\n");
+-printf("\
+-struct fontinfo_tag
+-  {
+-  signed char *data;
+-  int table[96];
+-  int yofs,fh,oy;
+-  };
+-");
++printf(\
++"struct fontinfo_tag"\
++"  {"\
++"  signed char *data;"\
++"  int table[96];"\
++"  int yofs,fh,oy;"\
++"  };\n"\
++);
+ printf("#endif\n\n");
+ 
+ /* generate font data */
+diff -u orig/font.c new/font.c
+--- orig/font.c	2003-10-03 06:05:53.573182320 +0200
++++ new/font.c	2003-10-03 06:06:10.775567160 +0200
+@@ -37,9 +37,9 @@
+  * best have this:
+  */
+ static char *bitmap_fonts_copyright=
+-"The bitmap fonts zgv uses are: \
+-Copyright 1984-1989, 1994 Adobe Systems Incorporated. \
+-Copyright 1988, 1994 Digital Equipment Corporation.";
++"The bitmap fonts zgv uses are: "\
++"Copyright 1984-1989, 1994 Adobe Systems Incorporated. "\
++"Copyright 1988, 1994 Digital Equipment Corporation.";
+ 
+ 
+ /* prototypes */
+diff -u orig/install-info.c new/install-info.c
+--- orig/install-info.c	2003-10-03 06:05:53.573182320 +0200
++++ new/install-info.c	2003-10-03 06:06:10.775567160 +0200
+@@ -309,38 +309,38 @@
+ void
+ print_help ()
+ {
+-  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
+-\n\
+-Install INFO-FILE in the Info directory file DIR-FILE.\n\
+-\n\
+-Options:\n\
+---delete          Delete existing entries in INFO-FILE;\n\
+-                    don't insert any new entries.\n\
+---dir-file=NAME   Specify file name of Info directory file.\n\
+-                    This is equivalent to using the DIR-FILE argument.\n\
+---entry=TEXT      Insert TEXT as an Info directory entry.\n\
+-                    TEXT should have the form of an Info menu item line\n\
+-                    plus zero or more extra lines starting with whitespace.\n\
+-                    If you specify more than one entry, they are all added.\n\
+-                    If you don't specify any entries, they are determined\n\
+-                    from information in the Info file itself.\n\
+---help            Display this help and exit.\n\
+---info-file=FILE  Specify Info file to install in the directory.\n\
+-                    This is equivalent to using the INFO-FILE argument.\n\
+---info-dir=DIR    Same as --dir-file=DIR/dir.\n\
+---item=TEXT       Same as --entry TEXT.\n\
+-                    An Info directory entry is actually a menu item.\n\
+---quiet           Suppress warnings.\n\
+---remove          Same as --delete.\n\
+---section=SEC     Put this file's entries in section SEC of the directory.\n\
+-                    If you specify more than one section, all the entries\n\
+-                    are added in each of the sections.\n\
+-                    If you don't specify any sections, they are determined\n\
+-                    from information in the Info file itself.\n\
+---version         Display version information and exit.\n\
+-\n\
+-Email bug reports to bug-texinfo@gnu.org.\n\
+-"), progname);
++  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"\
++"\n"\
++"Install INFO-FILE in the Info directory file DIR-FILE.\n"\
++"\n"\
++"Options:\n"\
++"--delete          Delete existing entries in INFO-FILE;\n"\
++"                    don't insert any new entries.\n"\
++"--dir-file=NAME   Specify file name of Info directory file.\n"\
++"                    This is equivalent to using the DIR-FILE argument.\n"\
++"--entry=TEXT      Insert TEXT as an Info directory entry.\n"\
++"                    TEXT should have the form of an Info menu item line\n"\
++"                    plus zero or more extra lines starting with whitespace.\n"\
++"                    If you specify more than one entry, they are all added.\n"\
++"                    If you don't specify any entries, they are determined\n"\
++"                    from information in the Info file itself.\n"\
++"--help            Display this help and exit.\n"\
++"--info-file=FILE  Specify Info file to install in the directory.\n"\
++"                    This is equivalent to using the INFO-FILE argument.\n"\
++"--info-dir=DIR    Same as --dir-file=DIR/dir.\n"\
++"--item=TEXT       Same as --entry TEXT.\n"\
++"                    An Info directory entry is actually a menu item.\n"\
++"--quiet           Suppress warnings.\n"\
++"--remove          Same as --delete.\n"\
++"--section=SEC     Put this file's entries in section SEC of the directory.\n"\
++"                    If you specify more than one section, all the entries\n"\
++"                    are added in each of the sections.\n"\
++"                    If you don't specify any sections, they are determined\n"\
++"                    from information in the Info file itself.\n"\
++"--version         Display version information and exit.\n"\
++"\n"\
++"Email bug reports to bug-texinfo@gnu.org.\n"\
++), progname);
+ }
+ 
+ 
+@@ -360,22 +360,22 @@
+       f = fopen (dirfile, "w");
+       if (f)
+         {
+-          fputs (_("This is the file .../info/dir, which contains the\n\
+-topmost node of the Info hierarchy, called (dir)Top.\n\
+-The first time you invoke Info you start off looking at this node.\n\
+-\n\
+-File: dir,\tNode: Top,\tThis is the top of the INFO tree\n\
+-\n\
+-  This (the Directory node) gives a menu of major topics.\n\
+-  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
+-  \"h\" gives a primer for first-timers,\n\
+-  \"mEmacs<Return>\" visits the Emacs manual, etc.\n\
+-\n\
+-  In Emacs, you can click mouse button 2 on a menu item or cross reference\n\
+-  to select it.\n\
+-\n\
+-* Menu:\n\
+-"), f);
++          fputs (_("This is the file .../info/dir, which contains the\n"\
++"topmost node of the Info hierarchy, called (dir)Top.\n"\
++"The first time you invoke Info you start off looking at this node.\n"\
++"\n"\
++"File: dir,\tNode: Top,\tThis is the top of the INFO tree\n"\
++"\n"\
++"  This (the Directory node) gives a menu of major topics.\n"\
++"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"\
++"  \"h\" gives a primer for first-timers,\n"\
++"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"\
++"\n"\
++"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"\
++"  to select it.\n"\
++"\n"\
++"* Menu:\n"\
++), f);
+           if (fclose (f) < 0)
+             pfatal_with_name (dirfile);
+         }
+@@ -540,10 +540,10 @@
+ 
+         case 'V':
+           printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
+-	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
+-There is NO warranty.  You may redistribute this software\n\
+-under the terms of the GNU General Public License.\n\
+-For more information about these matters, see the files named COPYING.\n"),
++	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n"\
++"There is NO warranty.  You may redistribute this software\n"\
++"under the terms of the GNU General Public License.\n"\
++"For more information about these matters, see the files named COPYING.\n"),
+ 		  "1998");
+           exit (0);
+ 
diff --git a/media-gfx/zgv/zgv-5.7.ebuild b/media-gfx/zgv/zgv-5.7.ebuild
new file mode 100644
index 000000000000..0ed938146901
--- /dev/null
+++ b/media-gfx/zgv/zgv-5.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.7.ebuild,v 1.1 2003/10/03 09:19:52 lanius Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A svgalib console image viewer."
+SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
+HOMEPAGE="http://www.svgalib.org/rus/zgv"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=media-libs/svgalib-1.4.2
+	>=media-libs/jpeg-6b-r2
+	media-libs/libpng
+	>=media-libs/tiff-3.5.5
+	>=sys-libs/zlib-1.1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/src
+	cp Makefile Makefile.orig
+	sed -e "s:-O2 -fomit-frame-pointer -finline-functions:${CFLAGS}:" \
+		Makefile.orig > Makefile
+	epatch ${FILESDIR}/${P}-gcc3.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/info /usr/share/man/man1
+	make PREFIX=${D}/usr \
+		INFODIR=${D}/usr/share/info \
+		MANDIR=${D}/usr/share/man/man1 \
+		install || die
+
+	# Fix info files
+	cd ${D}/usr/share/info
+	rm dir*
+	mv zgv zgv.info
+	for i in 1 2 3 4
+	do
+		mv zgv-$i zgv.info-$i
+	done
+	cd ${S}
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
+}