net-irc/irker: Version bump

Package-Manager: portage-2.2.26

4 files changed, 30 insertions, 29 deletions

diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index ae33377e..86528842 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,7 +1,7 @@
-AUX 2.16-irkerhook-Register-author_name-as-author-instead-of-.patch 1598 SHA256 6658b2fbeb8f5f5e4d3ba43e678237f7c587586484c315d5e133bff311681e1c WHIRLPOOL 55f7d84770bb8ccda03758fdf2d84ea28a99265622d24a02964f035d20bcd177a9e2f47c501e5387d4ad50949a4123d9ff0c557489bf1cd9ad5db836a02665a1
-AUX 2.16-irkerhook-Remove-file-listing.patch 5972 SHA256 cf8a3a9e23136684cefb8cc9e4a053f3ef3ed1549875a806dd18cbfba667463b WHIRLPOOL 16176b2e5858b70b95139d42d5c01b0f8df9ab15f6fa20ff6023b85c4ecedab4cdb6d1dfb66e6ba4591e935360e64e4f270661f7a9d39c64d55a0b5e6d3e222f
+AUX 2.17-irkerhook-Register-author_name-as-author-instead-of-.patch 1598 SHA256 07424c16ca73ae6b00ad3934bd5b251e8489830f695952eb2c1639706621e157 WHIRLPOOL d6d0285a87331d72330e734c51d33948f1c4d8bca64f2eea08bfc015e8073110ffd272c386058d6f770f4458ca6bf54dd63d29c816c37b0bc3a2b235ff9aee03
+AUX 2.17-irkerhook-Remove-file-listing.patch 5956 SHA256 cdbe17d283848c999414742b68b0cc495768248d3d37e28c1c44f87b8fc95466 WHIRLPOOL b40f8e8afb79b66a34ddba489a3ebe6a31a2b02f90c7b2bbfae3fe7d4705ddc10701a50bac9c3550c08de6b0992172123f4ef6c48cf57bee136eb7c7c06b9db4
 AUX irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886
 AUX irkerd.initd 1210 SHA256 1ca07247036df6dbac2f355044bc66a9b8188ff14af57f84611f711827c1a817 WHIRLPOOL 2c9f3f44e28533d302b0a151e48eb5a63ed414466e9d64ce7bc7cb239ae6b4bd27fa13a9193c7245207733dc2e9047ff3407dda5061791d5b9cf7e625d71a300
-DIST irker-2.16.tar.gz 43824 SHA256 3203bdf765fdf70ec9369fce15f52910676f76f1c1714ade3a0411c46f7b38b7 WHIRLPOOL a5de277a01bcd79d7d5951406bacb0346c288860d1265ce99271b6d124bc7bf05e651a9a0ad2f78ddb158061aea142c3579a4d9d4e4944197a72d3f762f73486
-EBUILD irker-2.16.ebuild 1371 SHA256 5d2a05a807dbd2024ddafd0098a523f4040a9c0d18b0cd3a0053684222fe3315 WHIRLPOOL 71c08ce3bd59b558a0db39a44ce45346ffccdf423a47d016729c0a2e69aa5d3e8f65206eae009581c524d19e6b6b4a4c164944a0e535ac140f6ee2b3e3d904a7
+DIST irker-2.17.tar.gz 44139 SHA256 71150b019345c4963d7b94aa38e173c070939ec45360e9ba42a24d9cb25bb2d4 WHIRLPOOL f2ff6035ab3080508bc36ccc98b2662d8f63a976c931e5d3ad4a61eb4605dfc10916b98fc39ae8b7afecef8e8f0d2cd132c993a7ab9e0173dfbde4cda91c1312
+EBUILD irker-2.17.ebuild 1427 SHA256 c58b06964eb819d2cef5944110a277a724206d6b4a6ec446b42680243f905378 WHIRLPOOL 5492d1bb3e6ae3a248c08aefc27558a918dbbe857103abf9ca33bd54ae166f1727b048d578d0e6dc94e03f849ec06f3c38f2952695a61d51f4b51d357da4404d
 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752
diff --git a/net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch
index 9ef85947..5502cc16 100644
--- a/net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch
+++ b/net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch
@@ -1,4 +1,4 @@
-From 9f876afa6b64638114060018c1b04644035d33f1 Mon Sep 17 00:00:00 2001
+From 93574b7bb660af9ad54280465f8ddf2ca439dcba Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Mon, 23 Sep 2013 23:10:23 +0200
 Subject: [PATCH 1/2] irkerhook: Register author_name as author instead of
@@ -9,10 +9,10 @@ Subject: [PATCH 1/2] irkerhook: Register author_name as author instead of
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index 0a62a54..1aa1884 100755
+index 4f96b1c..18c9b01 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
-@@ -284,15 +284,8 @@ class GitExtractor(GenericExtractor):
+@@ -292,15 +292,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.
diff --git a/net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
index 93cb967d..356bc9ae 100644
--- a/net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch
+++ b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
@@ -1,14 +1,14 @@
-From ced946dff8f94be37d9db578d28e01bb11faf303 Mon Sep 17 00:00:00 2001
+From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Mon, 7 Oct 2013 13:33:30 +0200
 Subject: [PATCH 2/2] irkerhook: Remove file listing
 
 ---
- irkerhook.py | 34 +++-------------------------------
- 1 file changed, 3 insertions(+), 31 deletions(-)
+ irkerhook.py | 28 +++-------------------------
+ 1 file changed, 3 insertions(+), 25 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index 1aa1884..ece6375 100755
+index 18c9b01..0ba6834 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
 @@ -66,7 +66,6 @@ class Commit:
@@ -19,7 +19,7 @@ index 1aa1884..ece6375 100755
          self.logmsg = None
          self.url = None
          self.author_date = None
-@@ -233,7 +232,7 @@ class GitExtractor(GenericExtractor):
+@@ -237,7 +236,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 +28,17 @@ index 1aa1884..ece6375 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"
-@@ -278,9 +277,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]
+@@ -286,9 +285,6 @@ class GitExtractor(GenericExtractor):
+             if self.urlprefix in ('gitweb', 'cgit'):
+                 # Also truncate the commit used for the announced urls
+                 commit.commit = commit.rev
 -        # 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 message line, which is
          # conventionally supposed to be a summary of the commit.  Under
          # other VCSes a different choice may be appropriate.
-@@ -301,7 +297,7 @@ class SvnExtractor(GenericExtractor):
+@@ -309,7 +305,7 @@ class SvnExtractor(GenericExtractor):
              if tok.startswith("--repository="):
                  self.repository = tok[13:]
          self.project = os.path.basename(self.repository)
@@ -47,7 +47,7 @@ index 1aa1884..ece6375 100755
          self.urlprefix = "viewcvs"
          self.load_preferences(os.path.join(self.repository, "irker.conf"))
          self.do_overrides()
-@@ -315,7 +311,6 @@ class SvnExtractor(GenericExtractor):
+@@ -323,7 +319,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 +55,7 @@ index 1aa1884..ece6375 100755
          commit.logmsg = self.svnlook("log").strip()
          return commit
      def svnlook(self, info):
-@@ -359,7 +354,7 @@ class HgExtractor(GenericExtractor):
+@@ -367,7 +362,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 +64,7 @@ index 1aa1884..ece6375 100755
          self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
          self.color = ui.config('irker', 'color')
          self.urlprefix = (ui.config('irker', 'urlprefix') or
-@@ -389,9 +384,6 @@ class HgExtractor(GenericExtractor):
+@@ -397,9 +392,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 +74,7 @@ index 1aa1884..ece6375 100755
          return commit
  
  def hg_hook(ui, repo, **kwds):
-@@ -432,27 +424,7 @@ def ship(extractor, commit, debug):
+@@ -440,17 +432,6 @@ def ship(extractor, commit, debug):
              sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
              raise SystemExit(1)
  
@@ -89,12 +89,12 @@ index 1aa1884..ece6375 100755
 -            metadata.files = "(%s files)" % (len(files),)
 -        else:
 -            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
--    # Message reduction.  The assumption here is that IRC can't handle
--    # lines more than 510 characters long. If we exceed that length, we
--    # try knocking out the file list, on the theory that for notification
--    # purposes the commit text is more important.  If it's still too long
--    # there's nothing much can be done other than ship it expecting the IRC
--    # server to truncate.
+     # Message reduction.  The assumption here is that IRC can't handle
+     # lines more than 510 characters long. If we exceed that length, we
+     # try knocking out the file list, on the theory that for notification
+@@ -458,9 +439,6 @@ def ship(extractor, commit, debug):
+     # there's nothing much can be done other than ship it expecting the IRC
+     # server to truncate.
      privmsg = unicode(metadata)
 -    if len(privmsg) > 510:
 -        metadata.files = ""
diff --git a/net-irc/irker/irker-2.16.ebuild b/net-irc/irker/irker-2.17.ebuild
index 25a02ad2..2c479a4a 100644
--- a/net-irc/irker/irker-2.16.ebuild
+++ b/net-irc/irker/irker-2.17.ebuild
@@ -15,10 +15,11 @@ SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="socks5"
 
 DEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
+	app-text/xmlto
+	socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
 
 src_prepare() {
 	# https://gitorious.org/irker/irker/merge_requests/25