net-irc/irker: Version bump

6 files changed, 62 insertions, 55 deletions

diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index d70595ac..96593220 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -2,14 +2,14 @@ AUX 1.20-Fixed-utf-8-handling-in-metadata.patch 1049 SHA256 e3e308af155405a3b65d
 AUX 1.20-Git-Fixed-presentation-of-branches-containing-front-.patch 1504 SHA256 b717332d181069b3059a5a3ad945bc2c76860e97e837b77e9d384ac4a3ba6695 WHIRLPOOL 22dc9f60a3f5510559856eee49b9975621f0551697b26923e7251ba77e84ad652e206dfde7df6a50114db3612e92a906aad8ec2368cfdc0c8a155965ff37e6b7
 AUX 1.20-Register-author_name-as-author-instead-of-email-user.patch 1565 SHA256 80e9f3f969538c54d528b9438ad9b90a2a280215864181ef57340851e469c77e WHIRLPOOL cc6069301019e9e4a84682f6582d5b7709d97dd14649f62069fb9cf23616e418db0d47ff94398af9e3727f76bece10a23f4ec356c422ded86ba60660b8712bad
 AUX 1.20-irkerhook-Remove-file-listing.patch 5971 SHA256 e885c10a463f3f29a5aa2d5659b023105f768b738541db94bf3ca654a05286fb WHIRLPOOL b94e1fa7f592671eb6188a66031c885be4ca3c0e8e3b17ee579cb62999bb9b6c8df63283531172e4df7bca809ad264ad38d9b77dcea9d19287c38732cc8217d9
-AUX 2.0-Git-Fixed-presentation-of-branches-containing-front-.patch 1498 SHA256 cab9650669d1836cfd91a6b3218ac0e28ff298547d20536a770dcf987153d3eb WHIRLPOOL def1f4322ba80b27c7381f664422e731c7364612c7902107dafa32ecfa0d1cabbac3a03483f7d757e756f73635b494c9c83ddca286a0f2c6c39ae1a5a6e8c2fa
-AUX 2.0-Register-author_name-as-author-instead-of-email-user.patch 1565 SHA256 1bc3c1f7566cacc08583c37f1a19ee1134d5a40f9938a919066595f95506447c WHIRLPOOL 098d36e2cb295d462390c32376883edc6bb97c2b9c0b1c53cf3e50beb44fce3501fb43084bb6947824ee2ba54bcd78207b083af0d95873d202f370aa6edf0f29
-AUX 2.0-irkerhook-Remove-file-listing.patch 5971 SHA256 d8283ccd00b83caf86a7e8e054313db57e1f2d51d27e097cb91121484127808b WHIRLPOOL f80130f989594f71f2f0aeafc7e600f82f95d94e2a220abe51f12e0486195154197f803e93855f1d085d66f52d51e2d3691c42a8665836f7a25816d9acd4b3d5
+AUX 2.4-Git-Fixed-presentation-of-branches-containing-front-.patch 1557 SHA256 9fa9017b638fa3fcb27cac41c9d7c97280eb4bd009e9d517362687762b1a2f51 WHIRLPOOL 6e1e0cdf96d3701727ba5a61d8d913120a88f2d70793e2b0160310b5ea59cebc19bc94c87580e348ba644fa28a2fa3b59dfa642f21a9e1b4549268555837300e
+AUX 2.4-Register-author_name-as-author-instead-of-email-user.patch 1650 SHA256 bfcd327a4c3b6b60497c75b35d5808f91b3ffde5679f783161b56953d4cad5a1 WHIRLPOOL b727b0cfce68bd9f5e5b8340a3778c692e27afaf60d7e49ad5b774ed208021d6c76b9d41ce0eb1dc77bbce84a3ed04ceda974de80509a09c21b3638396957016
+AUX 2.4-irkerhook-Remove-file-listing.patch 6036 SHA256 21d7a1c5612bde6240bb94cfeda5dd49dd67a1477fa89e648026c5c44e3f3bae WHIRLPOOL dc199eac8c6fe175819ab0309c31f93b99718497d8c00a157668d11d724a11280d30c4bd5efa157d8e1d8a4169b7eebf9bdc0f44260afbc637a1301144a901f4
 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
-DIST irker-2.0.tar.gz 37064 SHA256 7d92582330a05782108f6f2e266ed75f575474b038f4fbc7bc3858589fb40cec WHIRLPOOL cdcfe94ee7becc16564e1317b6d07f14eea03cea87e13128d0d25d077342b86fc7b654b26db0fa7652b82d70d3dc5f4d114211672a424e78b2c9a795cedc153e
+DIST irker-2.4.tar.gz 38441 SHA256 a4cf9f39cbbf68011b7daf62ec2549a23de8d45e689fb4f46fb824dceba7bea9 WHIRLPOOL d7d8c4e2ef7fc8768958621812c7a3637b15ec355470eb40eab7c39f6cf51bfaa88ded11dd7ae4ab0aac6b689993bd8796e32c8341209cc9d64b4bed201c3a3a
 EBUILD irker-1.20.ebuild 1679 SHA256 63836013301fa347a26a82b8270676a52f1cc90a9747544d12dd5bf8dc41a33f WHIRLPOOL 4827021ea8f5f5874d385239aa6de9b68d2d3e0768b0c40c1530ea46020e55ab591b4ea34a75098a873fe958dccbd79a5bdfc0ee7c3f53e6319a0317ccd6e9c4
-EBUILD irker-2.0.ebuild 1532 SHA256 f3b6502a2e27b9892e0b145597fac8d1fd2f76a2f6979f6db6c83f5bdbf788b1 WHIRLPOOL ab291ae77014ce9d6cc52bc3302f3db90c11992544065acb4908b395e0b471d3fdfb570af312a03aceae70a4cb3a55fb464c298ab57587c7baf3b3ca8714eaf5
+EBUILD irker-2.4.ebuild 1532 SHA256 f3b6502a2e27b9892e0b145597fac8d1fd2f76a2f6979f6db6c83f5bdbf788b1 WHIRLPOOL ab291ae77014ce9d6cc52bc3302f3db90c11992544065acb4908b395e0b471d3fdfb570af312a03aceae70a4cb3a55fb464c298ab57587c7baf3b3ca8714eaf5
 MISC ChangeLog 2394 SHA256 f1df22814c02a40990a23fb37e69ac3865e3431a3dab2c057f0e7b2a83d8d30d WHIRLPOOL 6a93b38abf663d59230a7bc7bde058c8e7eec0138301c65bc1d285695e49ce6eec881ccc9a5479f2a8acbe754ab31fac961fdc1affc41d28a1ceb14ca8f16800
 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752
diff --git a/net-irc/irker/files/2.0-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.0-Register-author_name-as-author-instead-of-email-user.patch
deleted file mode 100644
index d34b5723..00000000
--- a/net-irc/irker/files/2.0-Register-author_name-as-author-instead-of-email-user.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dd34537fe2042fd300388554e6667b9e0b8ee498 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <beber@meleeweb.net>
-Date: Mon, 23 Sep 2013 23:10:23 +0200
-Subject: [PATCH] Register author_name as author instead of email userpart
-
----
- irkerhook.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 8087935..2a6c6da 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -274,14 +274,9 @@ class GitExtractor(GenericExtractor):
-         # Design choice: for git we ship only the first line, which is
-         # conventionally supposed to be a summary of the commit.  Under
-         # other VCSes a different choice may be appropriate.
--        commit.author_name = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
-+        commit.author = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
-         commit.mail = do("git log -1 '--pretty=format:%ae' " + shellquote(commit.commit))
-         commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit))
--        # This discards the part of the author's address after @.
--        # Might be be nice to ship the full email address, if not
--        # for spammers' address harvesters - getting this wrong
--        # would make the freenode #commits channel into harvester heaven.
--        commit.author = commit.mail.split("@")[0]
-         commit.author_date, commit.commit_date = \
-             do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
-         return commit
--- 
-1.8.4.3
-
diff --git a/net-irc/irker/files/2.0-Git-Fixed-presentation-of-branches-containing-front-.patch b/net-irc/irker/files/2.4-Git-Fixed-presentation-of-branches-containing-front-.patch
index 085c3464..09315b4c 100644
--- a/net-irc/irker/files/2.0-Git-Fixed-presentation-of-branches-containing-front-.patch
+++ b/net-irc/irker/files/2.4-Git-Fixed-presentation-of-branches-containing-front-.patch
@@ -1,30 +1,33 @@
-From 32f9252f172934d542dfe61bf1e1acc6076ddbce Mon Sep 17 00:00:00 2001
+From fbfb3932180f2888cc8f3c7929b20824c8aa749c Mon Sep 17 00:00:00 2001
 From: Tom Hacohen <tom@stosb.com>
 Date: Tue, 24 Sep 2013 16:45:42 +0100
-Subject: [PATCH] Git: Fixed presentation of branches containing front-slashes.
+Subject: [PATCH 3/3] 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".
+
+Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  irkerhook.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index bfcfbea..b1de125 100755
+index f11cc47..2ff2dc3 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
 @@ -39,7 +39,7 @@ default_channels = "irc://chat.freenode.net/#commits"
  
- version = "2.0"
+ version = "2.4"
  
 -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
-@@ -257,7 +257,8 @@ class GitExtractor(GenericExtractor):
+@@ -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)
@@ -35,5 +38,5 @@ index bfcfbea..b1de125 100755
          if self.revformat == 'raw':
              commit.rev = commit.commit
 -- 
-1.8.4.3
+1.8.5.1
 
diff --git a/net-irc/irker/files/2.4-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.4-Register-author_name-as-author-instead-of-email-user.patch
new file mode 100644
index 00000000..e468f177
--- /dev/null
+++ b/net-irc/irker/files/2.4-Register-author_name-as-author-instead-of-email-user.patch
@@ -0,0 +1,35 @@
+From d86bf470abab6c60cf9708f45086a95339ee9e9b Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+Date: Mon, 23 Sep 2013 23:10:23 +0200
+Subject: [PATCH 1/3] Register author_name as author instead of email userpart
+
+Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
+---
+ irkerhook.py | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 4ea7fbe..00b52f4 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -275,15 +275,8 @@ class GitExtractor(GenericExtractor):
+         # Design choice: for git we ship only the first message line, which is
+         # conventionally supposed to be a summary of the commit.  Under
+         # other VCSes a different choice may be appropriate.
+-        commit.author_name, commit.mail, commit.logmsg = \
+-            do("git log -1 '--pretty=format:%an%n%ae%n%s' " + shellquote(commit.commit)).split("\n")
+-        # This discards the part of the author's address after @.
+-        # Might be be nice to ship the full email address, if not
+-        # for spammers' address harvesters - getting this wrong
+-        # would make the freenode #commits channel into harvester heaven.
+-        commit.author = commit.mail.split("@")[0]
+-        commit.author_date, commit.commit_date = \
+-            do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
++        commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit))
++        commit.author = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
+         return commit
+ 
+ class SvnExtractor(GenericExtractor):
+-- 
+1.8.5.1
+
diff --git a/net-irc/irker/files/2.0-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.4-irkerhook-Remove-file-listing.patch
index eb87ec19..b191be30 100644
--- a/net-irc/irker/files/2.0-irkerhook-Remove-file-listing.patch
+++ b/net-irc/irker/files/2.4-irkerhook-Remove-file-listing.patch
@@ -1,14 +1,15 @@
-From 3f906cac2506ec677d5dc8c8e03db8da8b478639 Mon Sep 17 00:00:00 2001
+From e752dd8257b60ea8e93fc54c4805a3dbd817b118 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Mon, 7 Oct 2013 13:33:30 +0200
-Subject: [PATCH] irkerhook: Remove file listing
+Subject: [PATCH 2/3] irkerhook: Remove file listing
 
+Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  irkerhook.py | 34 +++-------------------------------
  1 file changed, 3 insertions(+), 31 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index 2a6c6da..bfcfbea 100755
+index 00b52f4..f11cc47 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
 @@ -57,7 +57,6 @@ class Commit:
@@ -19,7 +20,7 @@ index 2a6c6da..bfcfbea 100755
          self.logmsg = None
          self.url = None
          self.author_date = None
-@@ -223,7 +222,7 @@ class GitExtractor(GenericExtractor):
+@@ -224,7 +223,7 @@ class GitExtractor(GenericExtractor):
          self.channels = do("git config --get irker.channels")
          self.email = do("git config --get irker.email")
          self.tcp = do("git config --bool --get irker.tcp")
@@ -28,17 +29,17 @@ index 2a6c6da..bfcfbea 100755
          self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
          self.color = do("git config --get irker.color")
          self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
-@@ -268,9 +267,6 @@ class GitExtractor(GenericExtractor):
+@@ -269,9 +268,6 @@ class GitExtractor(GenericExtractor):
              commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
          if not commit.rev:
              commit.rev = commit.commit[:12]
 -        # Extract the meta-information for the commit
 -        commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
 -        commit.files = " ".join(commit.files.strip().split("\n")[1:])
-         # Design choice: for git we ship only the first line, which is
+         # Design choice: for git we ship only the first message line, which is
          # conventionally supposed to be a summary of the commit.  Under
          # other VCSes a different choice may be appropriate.
-@@ -294,7 +290,7 @@ class SvnExtractor(GenericExtractor):
+@@ -292,7 +288,7 @@ class SvnExtractor(GenericExtractor):
              if tok.startswith("--repository="):
                  self.repository = tok[13:]
          self.project = os.path.basename(self.repository)
@@ -47,7 +48,7 @@ index 2a6c6da..bfcfbea 100755
          self.urlprefix = "viewcvs"
          self.load_preferences(os.path.join(self.repository, "irker.conf"))
          self.do_overrides()
-@@ -308,7 +304,6 @@ class SvnExtractor(GenericExtractor):
+@@ -306,7 +302,6 @@ class SvnExtractor(GenericExtractor):
          commit.rev = "r%s" % self.id
          commit.author = self.svnlook("author")
          commit.commit_date = self.svnlook("date").partition('(')[0]
@@ -55,7 +56,7 @@ index 2a6c6da..bfcfbea 100755
          commit.logmsg = self.svnlook("log").strip()
          return commit
      def svnlook(self, info):
-@@ -352,7 +347,7 @@ class HgExtractor(GenericExtractor):
+@@ -350,7 +345,7 @@ class HgExtractor(GenericExtractor):
          self.channels = ui.config('irker', 'channels')
          self.email = ui.config('irker', 'email')
          self.tcp = str(ui.configbool('irker', 'tcp'))  # converted to bool again in do_overrides
@@ -64,7 +65,7 @@ index 2a6c6da..bfcfbea 100755
          self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
          self.color = ui.config('irker', 'color')
          self.urlprefix = (ui.config('irker', 'urlprefix') or
-@@ -382,9 +377,6 @@ class HgExtractor(GenericExtractor):
+@@ -380,9 +375,6 @@ class HgExtractor(GenericExtractor):
          commit.author_date = \
              datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S')
          commit.logmsg = ctx.description()
@@ -74,7 +75,7 @@ index 2a6c6da..bfcfbea 100755
          return commit
  
  def hg_hook(ui, repo, **kwds):
-@@ -425,27 +417,7 @@ def ship(extractor, commit, debug):
+@@ -423,27 +415,7 @@ def ship(extractor, commit, debug):
              sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
              raise SystemExit, 1
  
@@ -103,5 +104,5 @@ index 2a6c6da..bfcfbea 100755
      # Anti-spamming guard.  It's deliberate that we get maxchannels not from
      # the user-filtered metadata but from the extractor data - means repo
 -- 
-1.8.4.3
+1.8.5.1
 
diff --git a/net-irc/irker/irker-2.0.ebuild b/net-irc/irker/irker-2.4.ebuild
index 181a8bd1..181a8bd1 100644
--- a/net-irc/irker/irker-2.0.ebuild
+++ b/net-irc/irker/irker-2.4.ebuild