net-irc/irker: Include @tasn patchset from git://gitorious.org/irker/irker.git

Tom Hacohen (2):
      Fixed utf-8 handling in metadata.
      Git: Fixed presentation of branches containing front-slashes.

Package-Manager: portage-2.2.7

5 files changed, 88 insertions, 2 deletions

diff --git a/net-irc/irker/ChangeLog b/net-irc/irker/ChangeLog
index 2fec67da..c0896c40 100644
--- a/net-irc/irker/ChangeLog
+++ b/net-irc/irker/ChangeLog
@@ -1,3 +1,11 @@
+  05 Oct 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/0002-Fixed-utf-8-handling-in-metadata.patch,
+  +files/0003-Git-Fixed-presentation-of-branches-containing-front-.patch,
+  irker-1.20.ebuild:
+  net-irc/irker: Include @tasn patchset from git://gitorious.org/irker/irker.git
+  Tom Hacohen (2):       Fixed utf-8 handling in metadata.       Git: Fixed
+  presentation of branches containing front-slashes.
+
   23 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
   +files/0001-Register-author_name-as-author-instead-of-email-user.patch,
   files/irkerd.confd, files/irkerd.initd, irker-1.20.ebuild:
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index c3986599..baff85ec 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,7 +1,9 @@
 AUX 0001-Register-author_name-as-author-instead-of-email-user.patch 1565 SHA256 80e9f3f969538c54d528b9438ad9b90a2a280215864181ef57340851e469c77e WHIRLPOOL cc6069301019e9e4a84682f6582d5b7709d97dd14649f62069fb9cf23616e418db0d47ff94398af9e3727f76bece10a23f4ec356c422ded86ba60660b8712bad
+AUX 0002-Fixed-utf-8-handling-in-metadata.patch 1049 SHA256 e3e308af155405a3b65db24ca586c0e7f687cbcf4512659ac066d249f8314b3f WHIRLPOOL e1e708802bb33cae2f1ebdd705303f807d8f3b97c4e76be3c05cbd150717223cdf299e458ccab2dce3c2c3df836f12e9df8e843c26013e485b9fee02b3be4d6d
+AUX 0003-Git-Fixed-presentation-of-branches-containing-front-.patch 1504 SHA256 b717332d181069b3059a5a3ad945bc2c76860e97e837b77e9d384ac4a3ba6695 WHIRLPOOL 22dc9f60a3f5510559856eee49b9975621f0551697b26923e7251ba77e84ad652e206dfde7df6a50114db3612e92a906aad8ec2368cfdc0c8a155965ff37e6b7
 AUX irkerd.confd 500 SHA256 9f0c3754562843a4916c1208d3d68ad6af9cc903905bf1d57585641e876c7146 WHIRLPOOL 9159e614acc00b19af1ac376b880e773f8611b6fff3925a01781e1f7984e45ce38e624a3b19211f593923d435a96d76b9a0145f00fd0b46fc9dd36b0249c3d67
 AUX irkerd.initd 1403 SHA256 061fa09132477b79cb96277e0fac0ab96e7da96e4f80742f3fa261b7ec1ca99b WHIRLPOOL 6fabd5ee39a90f5c0708b1eb5527b5951cf1c3601266398b3ec50054621bdedab18326fc52a1e7e05c57439e4e736a1afcd4047c1bfeb3ee9c203b8245090d1b
 DIST irker-1.20.tar.gz 33436 SHA256 c8d1552a819a1ebe7c6c7be06ff44c50557beddb75735ff6765a7c36df3536dd WHIRLPOOL b66fc9579534a32d05f090c4d6c82bcb9da5b50fdeaf4f934103fc3967d1eed0e13e89a7ec38246113898042fd52189e368c633a7ef1f945d370241813e6ab6a
-EBUILD irker-1.20.ebuild 1315 SHA256 b7de27c28fef2fc77a28115b73fc9a54b34e38835c547387696053bac1acf9a7 WHIRLPOOL cc10091c62c81821a00f2c7511942b3cd878ecbf1960e5e10479499a38b223a4a12a99eb361d8fda6ae3c08cc37e2fe01b959889a7f34fae0477f5c1090bd388
-MISC ChangeLog 880 SHA256 56d0a4e362b7ff32677c3b6b57b2217bc3c12407569b96a9636e0ac8bc380dd1 WHIRLPOOL 1c39dc8fb3514496641a11b26e3dced691f624188dc44a33241101b2bfb66e53191075956f6279199f58fa40f9945545728ee0f5cd1d0170172175506890cce6
+EBUILD irker-1.20.ebuild 1632 SHA256 a342a5157afef615840d44391240c880f2c1f29adc58ffc7419fcc53728cffef WHIRLPOOL abcc029eaf651fb266a035ec7645dbcddec7d8cf88f1f233659cedc050f06a163951a5c61131e2b6c4a57647e1bcb9daed7c14e94e5b35039986d09ddf77ec35
+MISC ChangeLog 1293 SHA256 3e2a41e8127f8a82c3a174cd824dbc1d3d516abd8edd7ff3540aa6f3e6f0d0e4 WHIRLPOOL fe45cda8e0e3e6912f7f41e6e12d6d7f43d264fd4daaa897d08f041d6f98182b1117d7eca6f55b8c8f0445fbf4ad5e0f59271a1bc14b61de9c5660c4bef1618e
 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752
diff --git a/net-irc/irker/files/0002-Fixed-utf-8-handling-in-metadata.patch b/net-irc/irker/files/0002-Fixed-utf-8-handling-in-metadata.patch
new file mode 100644
index 00000000..55ac79d7
--- /dev/null
+++ b/net-irc/irker/files/0002-Fixed-utf-8-handling-in-metadata.patch
@@ -0,0 +1,31 @@
+From 5aaf87249adcc82cde55afc0975b5ef7f450aaa4 Mon Sep 17 00:00:00 2001
+From: Tom Hacohen <tom@stosb.com>
+Date: Tue, 24 Sep 2013 15:55:22 +0100
+Subject: [PATCH 1/2] Fixed utf-8 handling in metadata.
+
+Having utf-8 in the commit metada (e.g author, commit message, files)
+triggers a decoding error:
+"UnicodeDecodeError: 'ascii' codec can't decode byte 0xd7 in position 42:
+ordinal not in range(128)"
+This is because the __unicode__ method of the Commit class, doesn't
+actually return an object of type 'unicode' although it should.
+---
+ irkerhook.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 4b243a2..b4a4164 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -88,7 +88,7 @@ class Commit:
+                     self.url = webview
+             except IOError:
+                 self.url = ""
+-        return self.template % self.__dict__
++        return unicode(self.template % self.__dict__, "utf-8")
+ 
+ class GenericExtractor:
+     "Generic class for encapsulating data from a VCS."
+-- 
+1.8.1.5
+
diff --git a/net-irc/irker/files/0003-Git-Fixed-presentation-of-branches-containing-front-.patch b/net-irc/irker/files/0003-Git-Fixed-presentation-of-branches-containing-front-.patch
new file mode 100644
index 00000000..15dfdddb
--- /dev/null
+++ b/net-irc/irker/files/0003-Git-Fixed-presentation-of-branches-containing-front-.patch
@@ -0,0 +1,40 @@
+From 7f83ca76e428f2aa018084bd2f0800e58dcb0c91 Mon Sep 17 00:00:00 2001
+From: Tom Hacohen <tom@stosb.com>
+Date: Tue, 24 Sep 2013 16:45:42 +0100
+Subject: [PATCH 2/2] Git: Fixed presentation of branches containing
+ front-slashes.
+
+Many projects use hierarchical branch names, for example:
+"devs/tasn/feature-branch"
+Before this commit, the branch above would be printed as "feature-branch"
+instead of "devs/tasn/feature-branch".
+---
+ irkerhook.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index b4a4164..d89cc3b 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -39,7 +39,7 @@ default_channels = "irc://chat.freenode.net/#commits"
+ 
+ version = "1.20"
+ 
+-import os, sys, commands, socket, urllib, subprocess, locale, datetime
++import os, sys, commands, socket, urllib, subprocess, locale, datetime, re
+ from pipes import quote as shellquote
+ try:
+     import simplejson as json	# Faster, also makes us Python-2.5-compatible
+@@ -258,7 +258,8 @@ class GitExtractor(GenericExtractor):
+     def commit_factory(self, commit_id):
+         "Make a Commit object holding data for a specified commit ID."
+         commit = Commit(self, commit_id)
+-        commit.branch = os.path.basename(self.refname)
++        # Get rid of refs/*/ for cleaner output.
++        commit.branch = re.sub(r"^refs/[^/]*/", "", self.refname)
+         # Compute a description for the revision
+         if self.revformat == 'raw':
+             commit.rev = commit.commit
+-- 
+1.8.1.5
+
diff --git a/net-irc/irker/irker-1.20.ebuild b/net-irc/irker/irker-1.20.ebuild
index 2ce1eac4..cd4a0a99 100644
--- a/net-irc/irker/irker-1.20.ebuild
+++ b/net-irc/irker/irker-1.20.ebuild
@@ -22,7 +22,12 @@ RDEPEND="=dev-lang/python-2*
 	dev-python/irc"
 
 src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
 	epatch "${FILESDIR}/0001-Register-author_name-as-author-instead-of-email-user.patch"
+	# https://gitorious.org/irker/irker/merge_requests/23
+	epatch "${FILESDIR}/0002-Fixed-utf-8-handling-in-metadata.patch"
+	# https://gitorious.org/irker/irker/merge_requests/24
+	epatch "${FILESDIR}/0003-Git-Fixed-presentation-of-branches-containing-front-.patch"
 
 	# Rely on systemd eclass for systemd service install
 	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile