1 |
commit: 4fc22142eec1950e4359d46e4fde1e7d58fec448 |
2 |
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> |
3 |
AuthorDate: Sat Apr 9 17:48:16 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 25 11:03:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc22142 |
7 |
|
8 |
net-irc/irker: Version bump |
9 |
|
10 |
Add an option USE flag for new SOCKS support. |
11 |
Update irkerhook-Remove-file-listing.patch with a rebased version that apply on this new version |
12 |
|
13 |
Package-Manager: portage-2.2.26 |
14 |
Gentoo-Bug: https://bugs.gentoo.org/579524 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/1223 |
16 |
|
17 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
18 |
|
19 |
net-irc/irker/Manifest | 1 + |
20 |
.../files/2.17-irkerhook-Remove-file-listing.patch | 104 +++++++++++++++++++++ |
21 |
net-irc/irker/irker-2.17.ebuild | 56 +++++++++++ |
22 |
3 files changed, 161 insertions(+) |
23 |
|
24 |
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest |
25 |
index 95aab95..78b21e6 100644 |
26 |
--- a/net-irc/irker/Manifest |
27 |
+++ b/net-irc/irker/Manifest |
28 |
@@ -3,4 +3,5 @@ DIST irker-2.12.tar.gz 41693 SHA256 cf76cc289e54c4d0d745e73a2cd9b8d0e40651890f93 |
29 |
DIST irker-2.13.tar.gz 42733 SHA256 12e8d28f682c6e0bc66d33e8ec69b90db30edef4520ab2ffb26e3b4ff49609c4 SHA512 5aa86354b5f3dabd7e2b46c62df4298b3bc675757b71ee03e2068d9ad14dc35127fb4076ef819ddd0ae84d82937c540516ed77ab5f1177af6dc7381df56af3ac WHIRLPOOL 1cd1da51d5d5834ccdda295833fef20edc4bcae6706b58fdb0fbc1a986e02401c777e8a229b3b074826060554713803201d5fce87878ce6811df7e6f6e1ef52e |
30 |
DIST irker-2.15.tar.gz 43765 SHA256 b4055ae0eb39140481a2b637a64b9d49df1d615f687f6fe05d64b6048e7739fb SHA512 94f4bb33a320f4284d03e75c7090ea4714d30d879e1abbf757c3e6eff8898ca5664f718c6ab2f35cae8377c348d41bc9100832b8a70f1b9f1a03c6f7487c2bfe WHIRLPOOL 15cd397c114f3ef44a2ecc04ae3e511328068c753ac5ff45f0e9bd550732a0bdcd4de181f2eb50ee718130cbb1d9c7dc9ecab2699e589e8b755be4084c280308 |
31 |
DIST irker-2.16.tar.gz 43824 SHA256 3203bdf765fdf70ec9369fce15f52910676f76f1c1714ade3a0411c46f7b38b7 SHA512 6a58938e1d458ad9183d750b4f6d1a4827fffd85caf7c0215c2fa1a9ef5692570c5181ade28f59701bef7398fdc0cfa760fe70d9432b7e54dc7fa663a558fed4 WHIRLPOOL a5de277a01bcd79d7d5951406bacb0346c288860d1265ce99271b6d124bc7bf05e651a9a0ad2f78ddb158061aea142c3579a4d9d4e4944197a72d3f762f73486 |
32 |
+DIST irker-2.17.tar.gz 44139 SHA256 71150b019345c4963d7b94aa38e173c070939ec45360e9ba42a24d9cb25bb2d4 SHA512 030b45c1d64e3c3ebd89aabf99e86d4f3824c8b749ecca02447c0aa1248d928b9c640c3b65ca22f1412d9a9b0609157f7708323234f559111097ee6aa67abac0 WHIRLPOOL f2ff6035ab3080508bc36ccc98b2662d8f63a976c931e5d3ad4a61eb4605dfc10916b98fc39ae8b7afecef8e8f0d2cd132c993a7ab9e0173dfbde4cda91c1312 |
33 |
DIST irker-2.9.tar.gz 41050 SHA256 1c743a86275e8bf91f133b70943a1296d960e2dcc8c5e8dd894bc9a3c9a824b5 SHA512 bdb632414c87ebc3f0d480605a29823d9259defe63a6c6de8f5d1876c13f5a4ab90ef7956a83f62aedf08f17494be7a67bc414e2e30101608f565afd115c5c0f WHIRLPOOL d1c76f1bcc329b4720a823714b1bb6aae81af5913f627474f5b938ac54e09da22f3fbb58f89d79dba0f4833e3a47efeb8f13d2dfffd7a8a2f97c49cf8db200cd |
34 |
|
35 |
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 |
36 |
new file mode 100644 |
37 |
index 0000000..356bc9a |
38 |
--- /dev/null |
39 |
+++ b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch |
40 |
@@ -0,0 +1,104 @@ |
41 |
+From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001 |
42 |
+From: Bertrand Jacquin <bertrand@×××××××.bzh> |
43 |
+Date: Mon, 7 Oct 2013 13:33:30 +0200 |
44 |
+Subject: [PATCH 2/2] irkerhook: Remove file listing |
45 |
+ |
46 |
+--- |
47 |
+ irkerhook.py | 28 +++------------------------- |
48 |
+ 1 file changed, 3 insertions(+), 25 deletions(-) |
49 |
+ |
50 |
+diff --git a/irkerhook.py b/irkerhook.py |
51 |
+index 18c9b01..0ba6834 100755 |
52 |
+--- a/irkerhook.py |
53 |
++++ b/irkerhook.py |
54 |
+@@ -66,7 +66,6 @@ class Commit: |
55 |
+ self.rev = None |
56 |
+ self.mail = None |
57 |
+ self.author = None |
58 |
+- self.files = None |
59 |
+ self.logmsg = None |
60 |
+ self.url = None |
61 |
+ self.author_date = None |
62 |
+@@ -237,7 +236,7 @@ class GitExtractor(GenericExtractor): |
63 |
+ self.channels = do("git config --get irker.channels") |
64 |
+ self.email = do("git config --get irker.email") |
65 |
+ self.tcp = do("git config --bool --get irker.tcp") |
66 |
+- 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' |
67 |
++ 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' |
68 |
+ self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier |
69 |
+ self.color = do("git config --get irker.color") |
70 |
+ self.urlprefix = do("git config --get irker.urlprefix") or "gitweb" |
71 |
+@@ -286,9 +285,6 @@ class GitExtractor(GenericExtractor): |
72 |
+ if self.urlprefix in ('gitweb', 'cgit'): |
73 |
+ # Also truncate the commit used for the announced urls |
74 |
+ commit.commit = commit.rev |
75 |
+- # Extract the meta-information for the commit |
76 |
+- commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) |
77 |
+- commit.files = " ".join(commit.files.strip().split("\n")[1:]) |
78 |
+ # Design choice: for git we ship only the first message line, which is |
79 |
+ # conventionally supposed to be a summary of the commit. Under |
80 |
+ # other VCSes a different choice may be appropriate. |
81 |
+@@ -309,7 +305,7 @@ class SvnExtractor(GenericExtractor): |
82 |
+ if tok.startswith("--repository="): |
83 |
+ self.repository = tok[13:] |
84 |
+ self.project = os.path.basename(self.repository) |
85 |
+- 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' |
86 |
++ 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' |
87 |
+ self.urlprefix = "viewcvs" |
88 |
+ self.load_preferences(os.path.join(self.repository, "irker.conf")) |
89 |
+ self.do_overrides() |
90 |
+@@ -323,7 +319,6 @@ class SvnExtractor(GenericExtractor): |
91 |
+ commit.rev = "r%s" % self.id |
92 |
+ commit.author = self.svnlook("author") |
93 |
+ commit.commit_date = self.svnlook("date").partition('(')[0] |
94 |
+- commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ") |
95 |
+ commit.logmsg = self.svnlook("log").strip() |
96 |
+ return commit |
97 |
+ def svnlook(self, info): |
98 |
+@@ -367,7 +362,7 @@ class HgExtractor(GenericExtractor): |
99 |
+ self.channels = ui.config('irker', 'channels') |
100 |
+ self.email = ui.config('irker', 'email') |
101 |
+ self.tcp = str(ui.configbool('irker', 'tcp')) # converted to bool again in do_overrides |
102 |
+- 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' |
103 |
++ 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' |
104 |
+ self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier |
105 |
+ self.color = ui.config('irker', 'color') |
106 |
+ self.urlprefix = (ui.config('irker', 'urlprefix') or |
107 |
+@@ -397,9 +392,6 @@ class HgExtractor(GenericExtractor): |
108 |
+ commit.author_date = \ |
109 |
+ datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S') |
110 |
+ commit.logmsg = ctx.description() |
111 |
+- # Extract changed files from status against first parent |
112 |
+- st = self.repository.status(ctx.p1().node(), ctx.node()) |
113 |
+- commit.files = ' '.join(st[0] + st[1] + st[2]) |
114 |
+ return commit |
115 |
+ |
116 |
+ def hg_hook(ui, repo, **kwds): |
117 |
+@@ -440,17 +432,6 @@ def ship(extractor, commit, debug): |
118 |
+ sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data) |
119 |
+ raise SystemExit(1) |
120 |
+ |
121 |
+- # Rewrite the file list if too long. The objective here is only |
122 |
+- # to be easier on the eyes. |
123 |
+- if extractor.cialike \ |
124 |
+- and extractor.cialike.lower() != "none" \ |
125 |
+- and len(metadata.files) > int(extractor.cialike): |
126 |
+- files = metadata.files.split() |
127 |
+- dirs = set([d.rpartition('/')[0] for d in files]) |
128 |
+- if len(dirs) == 1: |
129 |
+- metadata.files = "(%s files)" % (len(files),) |
130 |
+- else: |
131 |
+- metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs)) |
132 |
+ # Message reduction. The assumption here is that IRC can't handle |
133 |
+ # lines more than 510 characters long. If we exceed that length, we |
134 |
+ # try knocking out the file list, on the theory that for notification |
135 |
+@@ -458,9 +439,6 @@ def ship(extractor, commit, debug): |
136 |
+ # there's nothing much can be done other than ship it expecting the IRC |
137 |
+ # server to truncate. |
138 |
+ privmsg = unicode(metadata) |
139 |
+- if len(privmsg) > 510: |
140 |
+- metadata.files = "" |
141 |
+- privmsg = unicode(metadata) |
142 |
+ |
143 |
+ # Anti-spamming guard. It's deliberate that we get maxchannels not from |
144 |
+ # the user-filtered metadata but from the extractor data - means repo |
145 |
|
146 |
diff --git a/net-irc/irker/irker-2.17.ebuild b/net-irc/irker/irker-2.17.ebuild |
147 |
new file mode 100644 |
148 |
index 0000000..dd74618 |
149 |
--- /dev/null |
150 |
+++ b/net-irc/irker/irker-2.17.ebuild |
151 |
@@ -0,0 +1,56 @@ |
152 |
+# Copyright 1999-2016 Gentoo Foundation |
153 |
+# Distributed under the terms of the GNU General Public License v2 |
154 |
+# $Id$ |
155 |
+ |
156 |
+EAPI=5 |
157 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
158 |
+PYTHON_REQ_USE="ssl" |
159 |
+ |
160 |
+inherit python-single-r1 systemd eutils |
161 |
+ |
162 |
+DESCRIPTION="Submission tools for IRC notifications" |
163 |
+HOMEPAGE="http://www.catb.org/esr/irker/" |
164 |
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" |
165 |
+ |
166 |
+LICENSE="BSD" |
167 |
+SLOT="0" |
168 |
+KEYWORDS="~amd64 ~x86" |
169 |
+IUSE="socks5" |
170 |
+ |
171 |
+DEPEND="app-text/docbook-xml-dtd:4.1.2 |
172 |
+ app-text/xmlto |
173 |
+ socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )" |
174 |
+ |
175 |
+src_prepare() { |
176 |
+ # https://gitorious.org/irker/irker/merge_requests/25 |
177 |
+ epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch" |
178 |
+ |
179 |
+ epatch "${FILESDIR}/2.17-irkerhook-Remove-file-listing.patch" |
180 |
+ |
181 |
+ # Rely on systemd eclass for systemd service install |
182 |
+ sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \ |
183 |
+ || die "sed failed" |
184 |
+ |
185 |
+ # Prefix support |
186 |
+ sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \ |
187 |
+ || die "sed failed" |
188 |
+} |
189 |
+ |
190 |
+src_install() { |
191 |
+ emake DESTDIR="${ED}" install |
192 |
+ |
193 |
+ python_doscript "${ED}/usr/bin/irkerd" |
194 |
+ # Not installed with the default Makefile |
195 |
+ python_doscript irk irkerhook.py |
196 |
+ |
197 |
+ newinitd "${FILESDIR}/irkerd.initd" irkerd |
198 |
+ newconfd "${FILESDIR}/irkerd.confd" irkerd |
199 |
+ |
200 |
+ systemd_dounit irkerd.service |
201 |
+ |
202 |
+ dodoc NEWS README hacking.txt security.txt |
203 |
+ dohtml irkerd.html irkerhook.html |
204 |
+ |
205 |
+ docinto examples |
206 |
+ dodoc filter-example.py filter-test.py |
207 |
+} |