From 60924f040fa10fd0fe5b10adbaa0ec8623fe3983 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 21 Jun 2014 00:43:24 +0200 Subject: net-irc/irker: Version bump Package-Manager: portage-2.2.10 --- metadata/md5-cache/net-irc/irker-2.11 | 13 +++ metadata/md5-cache/net-irc/irker-2.9 | 13 --- net-irc/irker/ChangeLog | 9 ++ net-irc/irker/Manifest | 10 +- ...egister-author_name-as-author-instead-of-.patch | 32 +++++++ .../files/2.11-irkerhook-Remove-file-listing.patch | 104 +++++++++++++++++++++ ...egister-author_name-as-author-instead-of-.patch | 32 ------- .../files/2.9-irkerhook-Remove-file-listing.patch | 104 --------------------- net-irc/irker/irker-2.11.ebuild | 60 ++++++++++++ net-irc/irker/irker-2.9.ebuild | 60 ------------ 10 files changed, 223 insertions(+), 214 deletions(-) create mode 100644 metadata/md5-cache/net-irc/irker-2.11 delete mode 100644 metadata/md5-cache/net-irc/irker-2.9 create mode 100644 net-irc/irker/files/2.11-irkerhook-Register-author_name-as-author-instead-of-.patch create mode 100644 net-irc/irker/files/2.11-irkerhook-Remove-file-listing.patch delete mode 100644 net-irc/irker/files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch delete mode 100644 net-irc/irker/files/2.9-irkerhook-Remove-file-listing.patch create mode 100644 net-irc/irker/irker-2.11.ebuild delete mode 100644 net-irc/irker/irker-2.9.ebuild diff --git a/metadata/md5-cache/net-irc/irker-2.11 b/metadata/md5-cache/net-irc/irker-2.11 new file mode 100644 index 00000000..e7fa4136 --- /dev/null +++ b/metadata/md5-cache/net-irc/irker-2.11 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install prepare +DEPEND=virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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 +REQUIRED_USE=python_targets_python2_7 +SLOT=0 +SRC_URI=http://www.catb.org/esr/irker/irker-2.11.tar.gz +_eclasses_=eutils 025442f2eecab39ad0b4e541b6e142af multibuild 46527a4656956da3d58acff72c9b59b1 multilib fac675dcccf94392371a6abee62d909f multiprocessing c2d96fb38f2596209e98fceda58ba1ed python-r1 36d89a1c51cb1e624d5cdbea26adb9ad python-utils-r1 6164ef644981c5dffdf4cf891caed613 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 48b38a216afb92db6314d6c3187abea3 +_md5_=31694f0ddb512f8128a0c7685846e387 diff --git a/metadata/md5-cache/net-irc/irker-2.9 b/metadata/md5-cache/net-irc/irker-2.9 deleted file mode 100644 index efafd57d..00000000 --- a/metadata/md5-cache/net-irc/irker-2.9 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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 -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -SRC_URI=http://www.catb.org/esr/irker/irker-2.9.tar.gz -_eclasses_=eutils 025442f2eecab39ad0b4e541b6e142af multibuild 46527a4656956da3d58acff72c9b59b1 multilib fac675dcccf94392371a6abee62d909f multiprocessing c2d96fb38f2596209e98fceda58ba1ed python-r1 36d89a1c51cb1e624d5cdbea26adb9ad python-utils-r1 6164ef644981c5dffdf4cf891caed613 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 48b38a216afb92db6314d6c3187abea3 -_md5_=31694f0ddb512f8128a0c7685846e387 diff --git a/net-irc/irker/ChangeLog b/net-irc/irker/ChangeLog index b60615b0..72d58fc1 100644 --- a/net-irc/irker/ChangeLog +++ b/net-irc/irker/ChangeLog @@ -1,3 +1,12 @@ +*irker-2.11 (20 Jun 2014) + + 20 Jun 2014; Bertrand Jacquin + +files/2.11-irkerhook-Register-author_name-as-author-instead-of-.patch, + +files/2.11-irkerhook-Remove-file-listing.patch, +irker-2.11.ebuild, + -files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch, + -files/2.9-irkerhook-Remove-file-listing.patch, -irker-2.9.ebuild: + net-irc/irker: Version bump + *irker-2.9 (06 Jun 2014) 06 Jun 2014; Bertrand Jacquin diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 1dea8fd2..a435832d 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,8 +1,8 @@ -AUX 2.9-irkerhook-Register-author_name-as-author-instead-of-.patch 1596 SHA256 59b9003957b0767e8e972469b4c2da7749d6b7e9be3791f99aca700afd80797c WHIRLPOOL b9830086fd92d58f08c339deab41d22284f5d6f42a6f76e7107248e5124579f3341ff928a530b3688d451cb5ba0d6c366e3a4159ee309fd12d3438a0aeeed933 -AUX 2.9-irkerhook-Remove-file-listing.patch 5970 SHA256 f8de5befb68a7532fbf6d327d4eb0332aa116ebc3fa9a19599cd48544dcaec0f WHIRLPOOL f606e945203911ab5658773dd68ba61931d486e858ada037ac84723bf3445b24f9cbc246e41d5bc83eb2b07e86ff82ed693af25ade68ed5097b4e41226079de4 +AUX 2.11-irkerhook-Register-author_name-as-author-instead-of-.patch 1596 SHA256 59b9003957b0767e8e972469b4c2da7749d6b7e9be3791f99aca700afd80797c WHIRLPOOL b9830086fd92d58f08c339deab41d22284f5d6f42a6f76e7107248e5124579f3341ff928a530b3688d451cb5ba0d6c366e3a4159ee309fd12d3438a0aeeed933 +AUX 2.11-irkerhook-Remove-file-listing.patch 5970 SHA256 f8de5befb68a7532fbf6d327d4eb0332aa116ebc3fa9a19599cd48544dcaec0f WHIRLPOOL f606e945203911ab5658773dd68ba61931d486e858ada037ac84723bf3445b24f9cbc246e41d5bc83eb2b07e86ff82ed693af25ade68ed5097b4e41226079de4 AUX irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886 AUX irkerd.initd 1210 SHA256 1ca07247036df6dbac2f355044bc66a9b8188ff14af57f84611f711827c1a817 WHIRLPOOL 2c9f3f44e28533d302b0a151e48eb5a63ed414466e9d64ce7bc7cb239ae6b4bd27fa13a9193c7245207733dc2e9047ff3407dda5061791d5b9cf7e625d71a300 -DIST irker-2.9.tar.gz 41050 SHA256 1c743a86275e8bf91f133b70943a1296d960e2dcc8c5e8dd894bc9a3c9a824b5 WHIRLPOOL d1c76f1bcc329b4720a823714b1bb6aae81af5913f627474f5b938ac54e09da22f3fbb58f89d79dba0f4833e3a47efeb8f13d2dfffd7a8a2f97c49cf8db200cd -EBUILD irker-2.9.ebuild 1609 SHA256 6f2ca63af09c064518e8656fc085ac43c271403bec9a48622b21d4bd5e75e7de WHIRLPOOL 9eae0e477b0ed05d1cd6f2da747308df9dc0b9cbb271879805538b22910d32fc41eab6afa3bc35f08d16b6cc4bd2579ad5c49be8ace7e711cfdc5787d07e5983 -MISC ChangeLog 5612 SHA256 7e69e132e3656d90c6896ab2a769a39f1947ca22565916c2013d422c9c85face WHIRLPOOL 81e36f212a147a8acec165ce6adeed080697a677f5665acfb7d5274c730a5343dbb19c644827c236eee4c1b01963694959aea946c3db345e03d98feff0b4f2c4 +DIST irker-2.11.tar.gz 41504 SHA256 f7fa5b6020089c7fcb96429c2ce8621ccd9f1ebd14e112c5388b5701201802ab WHIRLPOOL 71d95d32e49b718d59b6a7e63ac267d1cc244281bd557f7914da9292aa0cef4049433a0135637d2bd95ce076128f4b22ac89f4c1148e41d156e6ded785e111cd +EBUILD irker-2.11.ebuild 1609 SHA256 6f2ca63af09c064518e8656fc085ac43c271403bec9a48622b21d4bd5e75e7de WHIRLPOOL 9eae0e477b0ed05d1cd6f2da747308df9dc0b9cbb271879805538b22910d32fc41eab6afa3bc35f08d16b6cc4bd2579ad5c49be8ace7e711cfdc5787d07e5983 +MISC ChangeLog 6010 SHA256 4d3367b05114864c61400773365d55a4f231ae50e59e4823d44633195003afbf WHIRLPOOL 2908f3e394a93cbef66db1d3d070e68c343941907ff84d292f9456d838a335c1bfc0f753fa8808165e57b7604d9c0d8b8b81d7ba81c810fbd454a36ba476da2e MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752 diff --git a/net-irc/irker/files/2.11-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.11-irkerhook-Register-author_name-as-author-instead-of-.patch new file mode 100644 index 00000000..c459887b --- /dev/null +++ b/net-irc/irker/files/2.11-irkerhook-Register-author_name-as-author-instead-of-.patch @@ -0,0 +1,32 @@ +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.11-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.11-irkerhook-Remove-file-listing.patch new file mode 100644 index 00000000..f8e2293b --- /dev/null +++ b/net-irc/irker/files/2.11-irkerhook-Remove-file-listing.patch @@ -0,0 +1,104 @@ +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.9-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch deleted file mode 100644 index c459887b..00000000 --- a/net-irc/irker/files/2.9-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.9-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.9-irkerhook-Remove-file-listing.patch deleted file mode 100644 index f8e2293b..00000000 --- a/net-irc/irker/files/2.9-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/irker-2.11.ebuild b/net-irc/irker/irker-2.11.ebuild new file mode 100644 index 00000000..47687ba0 --- /dev/null +++ b/net-irc/irker/irker-2.11.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-1.20.ebuild,v 1.1 2013/05/22 03:40:55 patrick Exp $ + +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="" + +# irkerhook.py and irk does not yet support >=dev-lang/python-3 +REQUIRED_USE="python_targets_python2_7" + +DEPEND="virtual/python-argparse[${PYTHON_USEDEP}] + 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.9.ebuild b/net-irc/irker/irker-2.9.ebuild deleted file mode 100644 index 47687ba0..00000000 --- a/net-irc/irker/irker-2.9.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-1.20.ebuild,v 1.1 2013/05/22 03:40:55 patrick Exp $ - -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="" - -# irkerhook.py and irk does not yet support >=dev-lang/python-3 -REQUIRED_USE="python_targets_python2_7" - -DEPEND="virtual/python-argparse[${PYTHON_USEDEP}] - 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