commit: 4fc22142eec1950e4359d46e4fde1e7d58fec448 Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> AuthorDate: Sat Apr 9 17:48:16 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 11:03:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc22142
net-irc/irker: Version bump Add an option USE flag for new SOCKS support. Update irkerhook-Remove-file-listing.patch with a rebased version that apply on this new version Package-Manager: portage-2.2.26 Gentoo-Bug: https://bugs.gentoo.org/579524 Closes: https://github.com/gentoo/gentoo/pull/1223 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> net-irc/irker/Manifest | 1 + .../files/2.17-irkerhook-Remove-file-listing.patch | 104 +++++++++++++++++++++ net-irc/irker/irker-2.17.ebuild | 56 +++++++++++ 3 files changed, 161 insertions(+) diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 95aab95..78b21e6 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -3,4 +3,5 @@ DIST irker-2.12.tar.gz 41693 SHA256 cf76cc289e54c4d0d745e73a2cd9b8d0e40651890f93 DIST irker-2.13.tar.gz 42733 SHA256 12e8d28f682c6e0bc66d33e8ec69b90db30edef4520ab2ffb26e3b4ff49609c4 SHA512 5aa86354b5f3dabd7e2b46c62df4298b3bc675757b71ee03e2068d9ad14dc35127fb4076ef819ddd0ae84d82937c540516ed77ab5f1177af6dc7381df56af3ac WHIRLPOOL 1cd1da51d5d5834ccdda295833fef20edc4bcae6706b58fdb0fbc1a986e02401c777e8a229b3b074826060554713803201d5fce87878ce6811df7e6f6e1ef52e DIST irker-2.15.tar.gz 43765 SHA256 b4055ae0eb39140481a2b637a64b9d49df1d615f687f6fe05d64b6048e7739fb SHA512 94f4bb33a320f4284d03e75c7090ea4714d30d879e1abbf757c3e6eff8898ca5664f718c6ab2f35cae8377c348d41bc9100832b8a70f1b9f1a03c6f7487c2bfe WHIRLPOOL 15cd397c114f3ef44a2ecc04ae3e511328068c753ac5ff45f0e9bd550732a0bdcd4de181f2eb50ee718130cbb1d9c7dc9ecab2699e589e8b755be4084c280308 DIST irker-2.16.tar.gz 43824 SHA256 3203bdf765fdf70ec9369fce15f52910676f76f1c1714ade3a0411c46f7b38b7 SHA512 6a58938e1d458ad9183d750b4f6d1a4827fffd85caf7c0215c2fa1a9ef5692570c5181ade28f59701bef7398fdc0cfa760fe70d9432b7e54dc7fa663a558fed4 WHIRLPOOL a5de277a01bcd79d7d5951406bacb0346c288860d1265ce99271b6d124bc7bf05e651a9a0ad2f78ddb158061aea142c3579a4d9d4e4944197a72d3f762f73486 +DIST irker-2.17.tar.gz 44139 SHA256 71150b019345c4963d7b94aa38e173c070939ec45360e9ba42a24d9cb25bb2d4 SHA512 030b45c1d64e3c3ebd89aabf99e86d4f3824c8b749ecca02447c0aa1248d928b9c640c3b65ca22f1412d9a9b0609157f7708323234f559111097ee6aa67abac0 WHIRLPOOL f2ff6035ab3080508bc36ccc98b2662d8f63a976c931e5d3ad4a61eb4605dfc10916b98fc39ae8b7afecef8e8f0d2cd132c993a7ab9e0173dfbde4cda91c1312 DIST irker-2.9.tar.gz 41050 SHA256 1c743a86275e8bf91f133b70943a1296d960e2dcc8c5e8dd894bc9a3c9a824b5 SHA512 bdb632414c87ebc3f0d480605a29823d9259defe63a6c6de8f5d1876c13f5a4ab90ef7956a83f62aedf08f17494be7a67bc414e2e30101608f565afd115c5c0f WHIRLPOOL d1c76f1bcc329b4720a823714b1bb6aae81af5913f627474f5b938ac54e09da22f3fbb58f89d79dba0f4833e3a47efeb8f13d2dfffd7a8a2f97c49cf8db200cd diff --git a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch new file mode 100644 index 0000000..356bc9a --- /dev/null +++ b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch @@ -0,0 +1,104 @@ +From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertr...@jacquin.bzh> +Date: Mon, 7 Oct 2013 13:33:30 +0200 +Subject: [PATCH 2/2] irkerhook: Remove file listing + +--- + irkerhook.py | 28 +++------------------------- + 1 file changed, 3 insertions(+), 25 deletions(-) + +diff --git a/irkerhook.py b/irkerhook.py +index 18c9b01..0ba6834 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 +@@ -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") +- 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" +@@ -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. +@@ -309,7 +305,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() +@@ -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] +- commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ") + commit.logmsg = self.svnlook("log").strip() + return commit + def svnlook(self, info): +@@ -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 +- 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 +@@ -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() +- # 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): +@@ -440,17 +432,6 @@ 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 +@@ -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 = "" +- 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.17.ebuild b/net-irc/irker/irker-2.17.ebuild new file mode 100644 index 0000000..dd74618 --- /dev/null +++ b/net-irc/irker/irker-2.17.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2016 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-single-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="socks5" + +DEPEND="app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )" + +src_prepare() { + # https://gitorious.org/irker/irker/merge_requests/25 + epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch" + + epatch "${FILESDIR}/2.17-irkerhook-Remove-file-listing.patch" + + # Rely on systemd eclass for systemd service install + sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \ + || die "sed failed" + + # Prefix support + sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \ + || die "sed failed" +} + +src_install() { + emake DESTDIR="${ED}" install + + python_doscript "${ED}/usr/bin/irkerd" + # Not installed with the default Makefile + python_doscript irk irkerhook.py + + 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 +}
