From 7b5e2c3d617289b3c74303f41176e84ca14d1228 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 21 Feb 2016 19:56:00 +0000 Subject: net-irc/irker: Version bump Package-Manager: portage-2.2.26 --- metadata/md5-cache/net-irc/irker-2.13 | 12 --- metadata/md5-cache/net-irc/irker-2.16 | 12 +++ net-irc/irker/Manifest | 8 +- ...egister-author_name-as-author-instead-of-.patch | 32 ------- .../files/2.13-irkerhook-Remove-file-listing.patch | 104 --------------------- ...egister-author_name-as-author-instead-of-.patch | 32 +++++++ .../files/2.16-irkerhook-Remove-file-listing.patch | 104 +++++++++++++++++++++ net-irc/irker/irker-2.13.ebuild | 56 ----------- net-irc/irker/irker-2.16.ebuild | 56 +++++++++++ 9 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 metadata/md5-cache/net-irc/irker-2.13 create mode 100644 metadata/md5-cache/net-irc/irker-2.16 delete mode 100644 net-irc/irker/files/2.13-irkerhook-Register-author_name-as-author-instead-of-.patch delete mode 100644 net-irc/irker/files/2.13-irkerhook-Remove-file-listing.patch create mode 100644 net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch create mode 100644 net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch delete mode 100644 net-irc/irker/irker-2.13.ebuild create mode 100644 net-irc/irker/irker-2.16.ebuild diff --git a/metadata/md5-cache/net-irc/irker-2.13 b/metadata/md5-cache/net-irc/irker-2.13 deleted file mode 100644 index 88637c8a..00000000 --- a/metadata/md5-cache/net-irc/irker-2.13 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto virtual/pkgconfig -DESCRIPTION=Submission tools for IRC notifications -EAPI=5 -HOMEPAGE=http://www.catb.org/esr/irker -IUSE=python_targets_python2_7 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -SLOT=0 -SRC_URI=http://www.catb.org/esr/irker/irker-2.13.tar.gz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=9b0955cce9f8b9296869b1c6502daedf diff --git a/metadata/md5-cache/net-irc/irker-2.16 b/metadata/md5-cache/net-irc/irker-2.16 new file mode 100644 index 00000000..6dbca3b4 --- /dev/null +++ b/metadata/md5-cache/net-irc/irker-2.16 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto virtual/pkgconfig +DESCRIPTION=Submission tools for IRC notifications +EAPI=5 +HOMEPAGE=http://www.catb.org/esr/irker +IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +SLOT=0 +SRC_URI=http://www.catb.org/esr/irker/irker-2.16.tar.gz +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=109e3360868abfc98539b3bf1f4bef45 diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 578b819b..ae33377e 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,7 +1,7 @@ -AUX 2.13-irkerhook-Register-author_name-as-author-instead-of-.patch 1598 SHA256 2521c45bbac8a3e52c4c35e5e580ee9c6f9daabab9394996d6cb3438636c9491 WHIRLPOOL 8ab020d9fe9f3995bc5c9bc4dfe951256f21f866a370bb84d26cde2d7d02c42c458c57dc738ad174131bdd848416bac92b0d844343a906bd10e717fd478375d7 -AUX 2.13-irkerhook-Remove-file-listing.patch 5972 SHA256 29fa0054b4541387399ea29d557eec9f78378e34ab839c359da85b0bda148c89 WHIRLPOOL 955d3e181d26c9f0b8cad1c30d56471fd3d38665141bbcdf59342220a69cf09f977e39f43e2ce31d23d3ae55306589c8b9718622b6397af0a4bb9518d2f66240 +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 irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886 AUX irkerd.initd 1210 SHA256 1ca07247036df6dbac2f355044bc66a9b8188ff14af57f84611f711827c1a817 WHIRLPOOL 2c9f3f44e28533d302b0a151e48eb5a63ed414466e9d64ce7bc7cb239ae6b4bd27fa13a9193c7245207733dc2e9047ff3407dda5061791d5b9cf7e625d71a300 -DIST irker-2.13.tar.gz 42733 SHA256 12e8d28f682c6e0bc66d33e8ec69b90db30edef4520ab2ffb26e3b4ff49609c4 WHIRLPOOL 1cd1da51d5d5834ccdda295833fef20edc4bcae6706b58fdb0fbc1a986e02401c777e8a229b3b074826060554713803201d5fce87878ce6811df7e6f6e1ef52e -EBUILD irker-2.13.ebuild 1361 SHA256 760e88623fd64c3bdee8a54e14759203433a1297c9d9f2c55428bde2dc63233a WHIRLPOOL cf962431d77b57a56c52cdc81b5d09d348af9f7d5ac1940f4f1a1c53e11ae695e459c3f0eda7916ae3b21eb61a5717be9b867bd692d4469894e3684e9724a6a7 +DIST irker-2.16.tar.gz 43824 SHA256 3203bdf765fdf70ec9369fce15f52910676f76f1c1714ade3a0411c46f7b38b7 WHIRLPOOL a5de277a01bcd79d7d5951406bacb0346c288860d1265ce99271b6d124bc7bf05e651a9a0ad2f78ddb158061aea142c3579a4d9d4e4944197a72d3f762f73486 +EBUILD irker-2.16.ebuild 1371 SHA256 5d2a05a807dbd2024ddafd0098a523f4040a9c0d18b0cd3a0053684222fe3315 WHIRLPOOL 71c08ce3bd59b558a0db39a44ce45346ffccdf423a47d016729c0a2e69aa5d3e8f65206eae009581c524d19e6b6b4a4c164944a0e535ac140f6ee2b3e3d904a7 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752 diff --git a/net-irc/irker/files/2.13-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.13-irkerhook-Register-author_name-as-author-instead-of-.patch deleted file mode 100644 index fe877b75..00000000 --- a/net-irc/irker/files/2.13-irkerhook-Register-author_name-as-author-instead-of-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8775a9d04b720cf5fb9ce8220e643b3731ea3cb7 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Mon, 23 Sep 2013 23:10:23 +0200 -Subject: [PATCH 1/2] irkerhook: Register author_name as author instead of - email userpart - ---- - irkerhook.py | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/irkerhook.py b/irkerhook.py -index 1ee62fe..536848b 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): diff --git a/net-irc/irker/files/2.13-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.13-irkerhook-Remove-file-listing.patch deleted file mode 100644 index 3314ef0a..00000000 --- a/net-irc/irker/files/2.13-irkerhook-Remove-file-listing.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 77c87a35a1013ccd6914c89bdf7a7722696e0ad2 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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(-) - -diff --git a/irkerhook.py b/irkerhook.py -index 536848b..0ad2b22 100755 ---- a/irkerhook.py -+++ b/irkerhook.py -@@ -57,7 +57,6 @@ class Commit: - self.rev = None - self.mail = None - self.author = None -- self.files = None - self.logmsg = None - self.url = None - self.author_date = None -@@ -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") -- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' -+ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' - 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" -@@ -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 message line, which is - # conventionally supposed to be a summary of the commit. Under - # other VCSes a different choice may be appropriate. -@@ -292,7 +288,7 @@ class SvnExtractor(GenericExtractor): - if tok.startswith("--repository="): - self.repository = tok[13:] - self.project = os.path.basename(self.repository) -- self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' -+ self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' - self.urlprefix = "viewcvs" - self.load_preferences(os.path.join(self.repository, "irker.conf")) - self.do_overrides() -@@ -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] -- commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ") - commit.logmsg = self.svnlook("log").strip() - return commit - def svnlook(self, info): -@@ -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 -- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' -+ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' - self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier - self.color = ui.config('irker', 'color') - self.urlprefix = (ui.config('irker', 'urlprefix') or -@@ -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() -- # Extract changed files from status against first parent -- st = self.repository.status(ctx.p1().node(), ctx.node()) -- commit.files = ' '.join(st[0] + st[1] + st[2]) - return commit - - def hg_hook(ui, repo, **kwds): -@@ -423,27 +415,7 @@ def ship(extractor, commit, debug): - sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data) - raise SystemExit(1) - -- # Rewrite the file list if too long. The objective here is only -- # to be easier on the eyes. -- if extractor.cialike \ -- and extractor.cialike.lower() != "none" \ -- and len(metadata.files) > int(extractor.cialike): -- files = metadata.files.split() -- dirs = set([d.rpartition('/')[0] for d in files]) -- if len(dirs) == 1: -- 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. - privmsg = unicode(metadata) -- if len(privmsg) > 510: -- metadata.files = "" -- privmsg = unicode(metadata) - - # Anti-spamming guard. It's deliberate that we get maxchannels not from - # the user-filtered metadata but from the extractor data - means repo diff --git a/net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch new file mode 100644 index 00000000..9ef85947 --- /dev/null +++ b/net-irc/irker/files/2.16-irkerhook-Register-author_name-as-author-instead-of-.patch @@ -0,0 +1,32 @@ +From 9f876afa6b64638114060018c1b04644035d33f1 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 23 Sep 2013 23:10:23 +0200 +Subject: [PATCH 1/2] irkerhook: Register author_name as author instead of + email userpart + +--- + irkerhook.py | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/irkerhook.py b/irkerhook.py +index 0a62a54..1aa1884 100755 +--- a/irkerhook.py ++++ b/irkerhook.py +@@ -284,15 +284,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): diff --git a/net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch new file mode 100644 index 00000000..93cb967d --- /dev/null +++ b/net-irc/irker/files/2.16-irkerhook-Remove-file-listing.patch @@ -0,0 +1,104 @@ +From ced946dff8f94be37d9db578d28e01bb11faf303 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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(-) + +diff --git a/irkerhook.py b/irkerhook.py +index 1aa1884..ece6375 100755 +--- a/irkerhook.py ++++ b/irkerhook.py +@@ -66,7 +66,6 @@ class Commit: + self.rev = None + self.mail = None + self.author = None +- self.files = None + self.logmsg = None + self.url = None + self.author_date = None +@@ -233,7 +232,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") +- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' ++ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' + 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] +- # 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): + if tok.startswith("--repository="): + self.repository = tok[13:] + self.project = os.path.basename(self.repository) +- self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' ++ self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' + self.urlprefix = "viewcvs" + self.load_preferences(os.path.join(self.repository, "irker.conf")) + self.do_overrides() +@@ -315,7 +311,6 @@ class SvnExtractor(GenericExtractor): + commit.rev = "r%s" % self.id + commit.author = self.svnlook("author") + commit.commit_date = self.svnlook("date").partition('(')[0] +- commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ") + commit.logmsg = self.svnlook("log").strip() + return commit + def svnlook(self, info): +@@ -359,7 +354,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 +- self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' ++ self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s' + 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): + commit.author_date = \ + datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S') + commit.logmsg = ctx.description() +- # Extract changed files from status against first parent +- st = self.repository.status(ctx.p1().node(), ctx.node()) +- commit.files = ' '.join(st[0] + st[1] + st[2]) + return commit + + def hg_hook(ui, repo, **kwds): +@@ -432,27 +424,7 @@ def ship(extractor, commit, debug): + sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data) + raise SystemExit(1) + +- # Rewrite the file list if too long. The objective here is only +- # to be easier on the eyes. +- if extractor.cialike \ +- and extractor.cialike.lower() != "none" \ +- and len(metadata.files) > int(extractor.cialike): +- files = metadata.files.split() +- dirs = set([d.rpartition('/')[0] for d in files]) +- if len(dirs) == 1: +- 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. + privmsg = unicode(metadata) +- if len(privmsg) > 510: +- metadata.files = "" +- privmsg = unicode(metadata) + + # Anti-spamming guard. It's deliberate that we get maxchannels not from + # the user-filtered metadata but from the extractor data - means repo diff --git a/net-irc/irker/irker-2.13.ebuild b/net-irc/irker/irker-2.13.ebuild deleted file mode 100644 index 86629321..00000000 --- a/net-irc/irker/irker-2.13.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ssl" - -inherit python-r1 systemd eutils - -DESCRIPTION="Submission tools for IRC notifications" -HOMEPAGE="http://www.catb.org/esr/irker" -SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto" - -src_prepare() { - # https://gitorious.org/irker/irker/merge_requests/25 - epatch "${FILESDIR}/${PV}-irkerhook-Register-author_name-as-author-instead-of-.patch" - epatch "${FILESDIR}/${PV}-irkerhook-Remove-file-listing.patch" - - # Rely on systemd eclass for systemd service install - sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile - - # Prefix support - sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service -} - -src_install() { - python_install () { - emake DESTDIR="${ED}" install - - python_doscript "${ED}/usr/bin/irkerd" - # Not installed with the default Makefile - python_doscript irk irkerhook.py - } - - python_foreach_impl python_install - - newinitd "${FILESDIR}/irkerd.initd" irkerd - newconfd "${FILESDIR}/irkerd.confd" irkerd - - systemd_dounit irkerd.service - - dodoc NEWS README hacking.txt security.txt - dohtml irkerd.html irkerhook.html - - docinto examples - dodoc filter-example.py filter-test.py -} diff --git a/net-irc/irker/irker-2.16.ebuild b/net-irc/irker/irker-2.16.ebuild new file mode 100644 index 00000000..25a02ad2 --- /dev/null +++ b/net-irc/irker/irker-2.16.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="ssl" + +inherit python-r1 systemd eutils + +DESCRIPTION="Submission tools for IRC notifications" +HOMEPAGE="http://www.catb.org/esr/irker" +SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto" + +src_prepare() { + # https://gitorious.org/irker/irker/merge_requests/25 + epatch "${FILESDIR}/${PV}-irkerhook-Register-author_name-as-author-instead-of-.patch" + epatch "${FILESDIR}/${PV}-irkerhook-Remove-file-listing.patch" + + # Rely on systemd eclass for systemd service install + sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile + + # Prefix support + sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service +} + +src_install() { + python_install () { + emake DESTDIR="${ED}" install + + python_doscript "${ED}/usr/bin/irkerd" + # Not installed with the default Makefile + python_doscript irk irkerhook.py + } + + python_foreach_impl python_install + + newinitd "${FILESDIR}/irkerd.initd" irkerd + newconfd "${FILESDIR}/irkerd.confd" irkerd + + systemd_dounit irkerd.service + + dodoc NEWS README hacking.txt security.txt + dohtml irkerd.html irkerhook.html + + docinto examples + dodoc filter-example.py filter-test.py +} -- cgit v1.2.3