removed the wrong patch, so now doing the right one, plus restoring the needed

Package-Manager: portage-2.1.3.9

4 files changed, 32 insertions, 85 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 967abb7db286..85b64ecd53ba 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.33 2007/09/22 16:23:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.34 2007/09/23 07:00:23 opfer Exp $
+
+  23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/qemacs-0.3.1-libpng-1_2.patch,
+  +files/qemacs-0.3.1-manpage-ref-fix.patch:
+  removed the wrong patch, so now doing the right one, plus restoring the needed
 
   22 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/qemacs-0.3.1-Makefile-gentoo.patch,
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 7c7fe20a527e..061c04f5f1bf 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX qemacs-0.3.1-libpng-1_2.patch 2127 RMD160 2d7ea36256c9da684f0c6326bde71d34ebefdbd1 SHA1 96e18d88849568cf0f23a999a18bea41f59ef6b6 SHA256 bd5a75a5985916c545b420e05bb2d613123b909a60a61cd71f0f71cb7ba655d6
-MD5 7e2d72773332e9b101002410297fe2b1 files/qemacs-0.3.1-libpng-1_2.patch 2127
-RMD160 2d7ea36256c9da684f0c6326bde71d34ebefdbd1 files/qemacs-0.3.1-libpng-1_2.patch 2127
-SHA256 bd5a75a5985916c545b420e05bb2d613123b909a60a61cd71f0f71cb7ba655d6 files/qemacs-0.3.1-libpng-1_2.patch 2127
+AUX qemacs-0.3.1-manpage-ref-fix.patch 446 RMD160 2a2e9ab6a1db88a124a502212544e17e7678da31 SHA1 b6d919c13a4882043557502c31aca55d1baece18 SHA256 b6148e3c8e054422619d9d002c5bd883237343ce962755cdace5c3c56c9fba4a
+MD5 15367c95b748438df7b023042082b9ad files/qemacs-0.3.1-manpage-ref-fix.patch 446
+RMD160 2a2e9ab6a1db88a124a502212544e17e7678da31 files/qemacs-0.3.1-manpage-ref-fix.patch 446
+SHA256 b6148e3c8e054422619d9d002c5bd883237343ce962755cdace5c3c56c9fba4a files/qemacs-0.3.1-manpage-ref-fix.patch 446
 AUX qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371 RMD160 84ec85b6466f175d60ce6527cd8a4e570a32bd6e SHA1 e3f900404aac4a36d2a667b9ec7e144ae9b6bd4d SHA256 de4f3b478c0437c8bb98397b69d5758196d29bb5c426cc6ca230d049860fd919
 MD5 1c78ea9b6992b7e6b2491a2c26d42fb3 files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371
 RMD160 84ec85b6466f175d60ce6527cd8a4e570a32bd6e files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371
@@ -26,10 +26,10 @@ EBUILD qemacs-0.3.2_pre20070226.ebuild 3122 RMD160 01f1caef50e5de35edbd97e4e133c
 MD5 a222e52d2d9626f59a5598349913cf43 qemacs-0.3.2_pre20070226.ebuild 3122
 RMD160 01f1caef50e5de35edbd97e4e133ce2b7b313317 qemacs-0.3.2_pre20070226.ebuild 3122
 SHA256 2e88ded189abe47edb1092a9d5b18a0b25154cea673c6fb5cb84c1567b439a63 qemacs-0.3.2_pre20070226.ebuild 3122
-MISC ChangeLog 5787 RMD160 5ab37575bf3f585f79bf33bd1334da639e866759 SHA1 1a122ae748ff0339a298c9898bccad0a3dac6cad SHA256 708132d6755f7969521ba99bf5b95688ef9f9d84387614af10c1e0112f7121c3
-MD5 9fe7d6551160ae551dcd5f14c1c2541e ChangeLog 5787
-RMD160 5ab37575bf3f585f79bf33bd1334da639e866759 ChangeLog 5787
-SHA256 708132d6755f7969521ba99bf5b95688ef9f9d84387614af10c1e0112f7121c3 ChangeLog 5787
+MISC ChangeLog 6009 RMD160 a08363d67eb6c16163ffec0acbb8130ba76f7eda SHA1 5abf5bb8ce947fa94c1cd34a9f0feaaa73964420 SHA256 c392a26cd66a965b7e28116bef2a5f6bd8a119aed19d79b1d03188f1e5176da6
+MD5 29b082268645e30259f7107add2cf0a6 ChangeLog 6009
+RMD160 a08363d67eb6c16163ffec0acbb8130ba76f7eda ChangeLog 6009
+SHA256 c392a26cd66a965b7e28116bef2a5f6bd8a119aed19d79b1d03188f1e5176da6 ChangeLog 6009
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -40,7 +40,7 @@ SHA256 7c91ed001b105cabc8416de6093e0c03758b7e0b9fc3c601a22ddd7927162475 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG9UFpNQqtfCuFneMRAkGtAKCCE4SBpYFmAcdSImu5iZYD772O5QCePUxA
-db55TvBGYaZFDECAlIDblHM=
-=4AL9
+iD8DBQFG9g8QNQqtfCuFneMRAoa5AKCC4SWl7sv4oUUqtJ9T6ovzHf+ZTwCfXmbB
++0P0R/XNIp6kTvjbiFj16Qc=
+=lrP/
 -----END PGP SIGNATURE-----
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch b/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch
deleted file mode 100644
index 566677375d3f..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# This patch has been taken from the openSUSE bug tracker found at
-# http://lists.opensuse.org/archive/opensuse-commit/2006-Jun/0984.html,
-# fixing the use of outdated functions of libpng, see bug #141566
---- /tmp/html2png.c	2006-07-25 09:53:14.000000000 +0200
-+++ html2png.c	2006-07-25 09:56:30.000000000 +0200
-@@ -186,13 +186,12 @@
- }
- 
- #ifdef CONFIG_PNG_OUTPUT
--extern void png_write_init();
- 
- int png_save(QEditScreen *s, const char *filename)
- {
-     CFBContext *cfb = s->private;
--    png_struct * volatile png_ptr = NULL;
--    png_info * volatile info_ptr = NULL;
-+    png_structp png_ptr = NULL;
-+    png_infop info_ptr = NULL;
-     png_byte *row_ptr, *row_pointers[1], *row = NULL;
-     int w, h, x, y;
-     unsigned int r, g, b, v;
-@@ -202,32 +201,30 @@
-     row = malloc(3 * s->width);
-     if (!row)
-         goto fail;
--    png_ptr = malloc(sizeof (png_struct));
-+    png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-     if (!png_ptr)
-         goto fail;
--    info_ptr = malloc(sizeof (png_info));
--    if (!info_ptr)
--        goto fail;
-+    info_ptr = png_create_info_struct (png_ptr);
-+    if (!info_ptr) {
-+	png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-+         goto fail;
-+    }
-     
-     f = fopen(filename, "w");
-     if (!f) 
-         goto fail;
- 
-     if (setjmp(png_ptr->jmpbuf)) {
--        png_write_destroy(png_ptr);
-+      png_destroy_write_struct(&png_ptr, &info_ptr);
-     fail:
-         /* free pointers before returning.  Make sure you clean up
-            anything else you've done. */
--        free(png_ptr);
--        free(info_ptr);
-         free(row);
-         if (f)
-             fclose(f);
-         return -1;
-     }
- 
--    png_info_init(info_ptr);
--    png_write_init(png_ptr);
-     png_init_io(png_ptr, f);
-     
-     data = (unsigned int *)cfb->base;
-@@ -259,10 +256,8 @@
-         data = (void *)((char *)data + cfb->wrap);
-     }
-     png_write_end(png_ptr, info_ptr);
--    png_write_destroy(png_ptr);
-+    png_destroy_write_struct (&png_ptr, &info_ptr);
- 
--    free(png_ptr);
--    free(info_ptr);
-     free(row);
-     fclose(f);
-     return 0;
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
new file mode 100644
index 000000000000..0dca195bd2eb
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
@@ -0,0 +1,15 @@
+--- qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
++++ qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
+@@ -1,10 +1,10 @@
+ .\"                                      Hey, EMACS: -*- nroff -*-
+-.TH QE 1 "October 21, 2001"
++.TH QEMACS 1 "October 21, 2001"
+ .\" Please adjust this date whenever revising the manpage.
+ .SH NAME
+ QEmacs \- tiny full-screen editor
+ .SH SYNOPSIS
+-.B qe
++.B qemacs
+ .RB [options]
+ .RI file...
+ .SH DESCRIPTION