fix sorting for time, reported in bug 207220, patch provided by Jouini Kosonen <jouni DOT kosonen AT tukesoft DOT com>

(Portage version: 2.1.3.19)

4 files changed, 131 insertions, 2 deletions

diff --git a/app-portage/elogviewer/ChangeLog b/app-portage/elogviewer/ChangeLog
index b584dffed691..3af1c000a277 100644
--- a/app-portage/elogviewer/ChangeLog
+++ b/app-portage/elogviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/elogviewer
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.24 2007/12/21 08:03:55 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.25 2008/01/24 08:20:34 opfer Exp $
+
+*elogviewer-0.5.2-r1 (24 Jan 2008)
+
+  24 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/elogviewer-0.5.2-timesort.patch, +elogviewer-0.5.2-r1.ebuild:
+  fix sorting for time, reported in bug 207220, patch provided by Jouini
+  Kosonen <jouni DOT kosonen AT tukesoft DOT com>
 
   21 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
   -elogviewer-0.5.1-r2.ebuild, elogviewer-0.5.2.ebuild:
diff --git a/app-portage/elogviewer/elogviewer-0.5.2-r1.ebuild b/app-portage/elogviewer/elogviewer-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..fa45dc2bc037
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-0.5.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-0.5.2-r1.ebuild,v 1.1 2008/01/24 08:20:34 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="GTK+ based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="http://sourceforge.net/projects/elogviewer/"
+
+SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sys-apps/portage-2.1
+	>=dev-python/pygtk-2.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-timesort.patch"
+}
+src_install() {
+	dobin "${WORKDIR}"/elogviewer || die "dobin failed"
+	dodoc "${WORKDIR}"/CHANGELOG
+	doman "${WORKDIR}"/elogviewer.1
+	make_desktop_entry elogviewer Elogviewer "" "System" ||
+		die "Couldn't make desktop entry"
+}
+
+pkg_postinst() {
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in /etc/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elogviewer/files/digest-elogviewer-0.5.2-r1 b/app-portage/elogviewer/files/digest-elogviewer-0.5.2-r1
new file mode 100644
index 000000000000..cd2c80a04ec7
--- /dev/null
+++ b/app-portage/elogviewer/files/digest-elogviewer-0.5.2-r1
@@ -0,0 +1,3 @@
+MD5 3182e9f36ae994d7dd8a6819883bf14c elogviewer-0.5.2.tar.gz 14151
+RMD160 0e4244622aeaa739e70fe2eda7a4b31d03420890 elogviewer-0.5.2.tar.gz 14151
+SHA256 22801fc77a68fd377b5fba0d0a25bdfb5c48f5524d7c3970212e3577f0e2b490 elogviewer-0.5.2.tar.gz 14151
diff --git a/app-portage/elogviewer/files/elogviewer-0.5.2-timesort.patch b/app-portage/elogviewer/files/elogviewer-0.5.2-timesort.patch
new file mode 100644
index 000000000000..e3223bf84e4d
--- /dev/null
+++ b/app-portage/elogviewer/files/elogviewer-0.5.2-timesort.patch
@@ -0,0 +1,70 @@
+--- elogviewer	2007-09-20 10:47:05.000000000 +0300
++++ elogviewer	2008-01-23 23:50:12.000000000 +0200
+@@ -123,26 +123,29 @@
+ 		#otime = '%Y-%m-%d %H:%M:%S'
+ 		# see modules time and locale
+ 		otime = '%x %X'
++		vtime = '%Y-%m-%d %H:%M:%S'
+ 
+ 		(c, p, t) = filename.split(':')
+ 		t = time.strptime(t, itime)
++		st = time.strftime(vtime, t)
+ 		t = time.strftime(otime, t)
+ 		
+ 		self.category = c
+ 		self.package = p
+-		self.timestamp = t
++		self.timestamp = st
++		self.timesort = t
+ 		self.filename = filename
+ 
+ 
+ from glob import glob
+ from gobject import TYPE_STRING
+-( CATEGORY, PACKAGE, TIMESTAMP, FILENAME ) = range(4)
++( CATEGORY, PACKAGE, TIMESTAMP, TIMESORT, FILENAME ) = range(5)
+ class TreeStore(gtk.TreeStore):
+ 
+ 	def __init__(self):
+ 
+ 		gtk.TreeStore.__init__( self,
+-				TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING )
++				TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING )
+ 
+ 	def get_filename(self, iter):
+ 		if not iter:
+@@ -169,14 +172,14 @@
+ 				iter = self.insert_before(None, None)
+ 				self.set_value(iter, 0, e.category)
+ 			self.append(iter, (None,
+-						e.package, e.timestamp, e.filename))
++						e.package, e.timestamp, e.timesort, e.filename))
+ 
+ 	def populate_flat(self):
+ 		self.clear()
+ 		iter = self.get_iter_first()
+ 		for e in [Elog(filename) for filename in glob('*:*:*.log')]:
+ 			self.append(iter,
+-					(e.category, e.package, e.timestamp, e.filename))
++					(e.category, e.package, e.timestamp, e.timesort, e.filename))
+ 
+ 
+ class TreeViewColumn(gtk.TreeViewColumn):
+@@ -184,7 +187,7 @@
+ 	def __init__(self, title=None, *args, **kargs):
+ 		gtk.TreeViewColumn.__init__(self, title, *args, **kargs)
+ 
+-		self.set_sort_column_id(TIMESTAMP)
++		self.set_sort_column_id(TIMESORT)
+ 
+ 
+ class TreeView(gtk.TreeView):
+@@ -197,7 +200,7 @@
+ 		self.append_column(TreeViewColumn(
+ 			'Package', gtk.CellRendererText(), text=PACKAGE))
+ 		self.append_column(TreeViewColumn(
+-			'Time', gtk.CellRendererText(), text=TIMESTAMP))
++			'Time', gtk.CellRendererText(), text=TIMESORT))
+ 		
+ 		self.set_enable_search(True)
+ 		self.set_search_column(PACKAGE)