rework patches by help of Luca Marturana <lucamarturana AT gmail DOT com> and Michał Kiedrowicz <esqualante AT o2 DOT pl>. Closes bug 208842. Make myself first in metadata.xml. Clean up

(Portage version: 2.1.3.19)

6 files changed, 68 insertions, 21 deletions

diff --git a/app-portage/elogv/ChangeLog b/app-portage/elogv/ChangeLog
index 031caafc2b13..67094ba4d1c9 100644
--- a/app-portage/elogv/ChangeLog
+++ b/app-portage/elogv/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-portage/elogv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogv/ChangeLog,v 1.27 2008/02/04 09:18:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogv/ChangeLog,v 1.28 2008/02/05 08:18:07 opfer Exp $
+
+*elogv-0.6.1-r3 (05 Feb 2008)
+
+  05 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  files/elogv-0.6.1-refresh_screen.patch,
+  files/elogv-0.6.1-segfault_delete.patch,
+  files/elogv-0.6.1-vi_movement.patch, metadata.xml, -elogv-0.6.1-r2.ebuild,
+  +elogv-0.6.1-r3.ebuild:
+  rework patches by help of Luca Marturana <lucamarturana AT gmail DOT com>
+  and Michał Kiedrowicz <esqualante AT o2 DOT pl>. Closes bug 208842. Make
+  myself first in metadata.xml. Clean up
 
 *elogv-0.6.1-r2 (04 Feb 2008)
 
diff --git a/app-portage/elogv/elogv-0.6.1-r2.ebuild b/app-portage/elogv/elogv-0.6.1-r3.ebuild
index 9d84cda26639..cc79dbc806aa 100644
--- a/app-portage/elogv/elogv-0.6.1-r2.ebuild
+++ b/app-portage/elogv/elogv-0.6.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogv/elogv-0.6.1-r2.ebuild,v 1.1 2008/02/04 09:18:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogv/elogv-0.6.1-r3.ebuild,v 1.1 2008/02/05 08:18:07 opfer Exp $
 
 inherit eutils
 
@@ -29,12 +29,12 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# on user request, allow up/down movement with Vi bindings
+	epatch "${FILESDIR}/${P}-vi_movement.patch"
 	# bug 195429
 	epatch "${FILESDIR}/${P}-segfault_delete.patch"
 	# bug 208524
 	epatch "${FILESDIR}/${P}-refresh_screen.patch"
-	# on user request
-	epatch "${FILESDIR}/${P}-vi_movement.patch"
 }
 src_compile() {
 	einfo "Nothing to compile"
diff --git a/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch b/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch
index a6863292295e..177fcd5274cd 100644
--- a/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch
+++ b/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch
@@ -1,21 +1,32 @@
---- elogv.py.orig	2008-02-04 10:14:58.000000000 +0100
-+++ elogv.py	2008-02-04 10:15:48.000000000 +0100
-@@ -129,12 +129,18 @@
+--- elogv.py.orig	2008-02-05 09:00:11.000000000 +0100
++++ elogv.py	2008-02-05 09:11:10.000000000 +0100
+@@ -129,12 +129,21 @@
              
              elif c == ord("a"):
                  self.sort_method[0] = "alphabetical"
-+                self.init_screen()
-+                self.show_log()
++                self.fill_file_pad()
++                self.refresh_file_pad()
++                self.show_log()                
                  
              elif c == ord("t"):
                  self.sort_method[0] = "date"
-+                self.init_screen()
++                self.fill_file_pad()
++                self.refresh_file_pad()
 +                self.show_log()
                  
              elif c == ord("r"):
                  self.sort_method[1] = not self.sort_method[1]
-+                self.init_screen()
++                self.fill_file_pad()
++                self.refresh_file_pad()
 +                self.show_log()
                  
              elif c == ord(" "):
                  # Now is used only for scrolling the text
+@@ -170,6 +179,7 @@
+                 if n:
+                     self.remove_file(n)
+                     self.file_pad.clear()
++                    self.refresh_file_pad()
+                     self.fill_file_pad()
+                     self.refresh_file_pad()
+                     self.show_log()
diff --git a/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch b/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch
index 51c81022be8d..6299dff91f81 100644
--- a/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch
+++ b/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch
@@ -1,5 +1,5 @@
---- elogv.py.orig	2008-02-04 10:10:40.000000000 +0100
-+++ elogv.py	2008-02-04 10:12:01.000000000 +0100
+--- elogv.py.orig	2008-02-05 08:59:43.000000000 +0100
++++ elogv.py	2008-02-05 08:59:47.000000000 +0100
 @@ -172,6 +172,7 @@
                      self.file_pad.clear()
                      self.fill_file_pad()
@@ -8,7 +8,7 @@
  
              elif c == ord("/"):
                  word = ""
-@@ -274,6 +275,11 @@
+@@ -274,6 +275,12 @@
          # so this will prevent a crash
          if self.usel >= len(self.file_list):
              self.usel = len(self.file_list)-1
@@ -17,6 +17,7 @@
 +                self.pposy = self.usel - 10
 +                if self.pposy < 0:
 +                    self.pposy = 0
++
  
          # Sort the list
          if self.sort_method[0] == "alphabetical":
diff --git a/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch b/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch
index cfa49b7e1021..003036c56456 100644
--- a/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch
+++ b/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch
@@ -1,5 +1,5 @@
---- elogv.py.orig	2008-02-04 09:56:41.000000000 +0100
-+++ elogv.py	2008-02-04 10:03:16.000000000 +0100
+--- elogv.py.orig	2008-02-05 08:51:24.000000000 +0100
++++ elogv.py	2008-02-05 08:53:08.000000000 +0100
 @@ -33,10 +33,10 @@
  Elogv is a portage elog viewer based on curses and python,
  you can use these keys to control the behavior of the program:
@@ -8,8 +8,8 @@
 - - Up arrow -> opposite of Down arrow
 - - Pag Down -> Scroll the list down by 10 unit
 - - Pag Up -> opposite of Pag Down
-+ - Down arrow or k -> Scroll the list of files down by 1 unit
-+ - Up arrow or j -> opposite of Down arrow
++ - Down arrow or j -> Scroll the list of files down by 1 unit
++ - Up arrow or k -> opposite of Down arrow
 + - PageDown -> Scroll the list down by 10 unit
 + - PageUp -> opposite of Pag Down
   - End -> Go to the last file of the list
@@ -20,11 +20,35 @@
              
              ## Scrolling keys ##
 -            elif c == curses.KEY_DOWN:
-+            elif c == curses.KEY_DOWN or c == ord("k"):
++            elif c == curses.KEY_DOWN or c == ord("j"):
                  self.change_usel(1)
                  
 -            elif c == curses.KEY_UP:
-+            elif c == curses.KEY_UP or c == ord("j"):
++            elif c == curses.KEY_UP or c == ord("k"):
                  self.change_usel(-1)
  
              elif c == curses.KEY_NPAGE:
+
+--- elogv.1.orig	2008-02-05 09:13:59.000000000 +0100
++++ elogv.1	2008-02-05 09:14:37.000000000 +0100
+@@ -6,16 +6,16 @@
+ .SH USAGE
+ You can use these keys to control the behavior of the program:
+ .TP
+-.B "Down arrow"
++.B "Down arrow or j"
+ Scroll the list of files down by 1 unit
+ .TP
+-.B "Up arrow"
++.B "Up arrow or k"
+ opposite of Down arrow
+ .TP
+-.B "Pag Down"
++.B "PageDown"
+ Scroll the list down by 10 unit
+ .TP
+-.B "Pag Up"
++.B "PageUp"
+ opposite of Pag Down
+ .TP
+ .B End
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
index 3051766fb6b2..4f35384b4528 100644
--- a/app-portage/elogv/metadata.xml
+++ b/app-portage/elogv/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tools-portage</herd>
 <maintainer>
     <email>opfer@gentoo.org</email>
     <name>Christian Faulhammer</name>
 </maintainer>
+<herd>tools-portage</herd>
 </pkgmetadata>