diff options
| -rw-r--r-- | metadata/md5-cache/net-irc/irker-1.20 | 2 | ||||
| -rw-r--r-- | net-irc/irker/ChangeLog | 4 | ||||
| -rw-r--r-- | net-irc/irker/Manifest | 5 | ||||
| -rw-r--r-- | net-irc/irker/files/0004-irkerhook-Remove-file-listing.patch | 107 | ||||
| -rw-r--r-- | net-irc/irker/irker-1.20.ebuild | 2 |
5 files changed, 117 insertions, 3 deletions
diff --git a/metadata/md5-cache/net-irc/irker-1.20 b/metadata/md5-cache/net-irc/irker-1.20 index edd0aa3d..24e48769 100644 --- a/metadata/md5-cache/net-irc/irker-1.20 +++ b/metadata/md5-cache/net-irc/irker-1.20 @@ -10,4 +10,4 @@ RDEPEND==dev-lang/python-2* dev-python/irc SLOT=0 SRC_URI=http://www.catb.org/esr/irker/irker-1.20.tar.gz _eclasses_=eutils 4878e7f88afc0ba0866ac112190b0fd4 multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 fa36040985cb5e3cdd31d44be94d15bc python-utils-r1 3b392f7373bcc74b7c97ae0acd9ec0e6 systemd e80fe2d5b43ec0f0160c6e8ef931fa4c toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c6f360c21a60918a3ca8a117ebbea369 +_md5_=f60e2053084c05b4d81df21047f55974 diff --git a/net-irc/irker/ChangeLog b/net-irc/irker/ChangeLog index c0896c40..85dde172 100644 --- a/net-irc/irker/ChangeLog +++ b/net-irc/irker/ChangeLog @@ -1,3 +1,7 @@ + 07 Oct 2013; Bertrand Jacquin <beber@meleeweb.net> + +files/0004-irkerhook-Remove-file-listing.patch, irker-1.20.ebuild: + net-irc/irker: Remove file listing + 05 Oct 2013; Bertrand Jacquin <beber@meleeweb.net> +files/0002-Fixed-utf-8-handling-in-metadata.patch, +files/0003-Git-Fixed-presentation-of-branches-containing-front-.patch, diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index baff85ec..1249352f 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,9 +1,10 @@ AUX 0001-Register-author_name-as-author-instead-of-email-user.patch 1565 SHA256 80e9f3f969538c54d528b9438ad9b90a2a280215864181ef57340851e469c77e WHIRLPOOL cc6069301019e9e4a84682f6582d5b7709d97dd14649f62069fb9cf23616e418db0d47ff94398af9e3727f76bece10a23f4ec356c422ded86ba60660b8712bad AUX 0002-Fixed-utf-8-handling-in-metadata.patch 1049 SHA256 e3e308af155405a3b65db24ca586c0e7f687cbcf4512659ac066d249f8314b3f WHIRLPOOL e1e708802bb33cae2f1ebdd705303f807d8f3b97c4e76be3c05cbd150717223cdf299e458ccab2dce3c2c3df836f12e9df8e843c26013e485b9fee02b3be4d6d AUX 0003-Git-Fixed-presentation-of-branches-containing-front-.patch 1504 SHA256 b717332d181069b3059a5a3ad945bc2c76860e97e837b77e9d384ac4a3ba6695 WHIRLPOOL 22dc9f60a3f5510559856eee49b9975621f0551697b26923e7251ba77e84ad652e206dfde7df6a50114db3612e92a906aad8ec2368cfdc0c8a155965ff37e6b7 +AUX 0004-irkerhook-Remove-file-listing.patch 5971 SHA256 e885c10a463f3f29a5aa2d5659b023105f768b738541db94bf3ca654a05286fb WHIRLPOOL b94e1fa7f592671eb6188a66031c885be4ca3c0e8e3b17ee579cb62999bb9b6c8df63283531172e4df7bca809ad264ad38d9b77dcea9d19287c38732cc8217d9 AUX irkerd.confd 500 SHA256 9f0c3754562843a4916c1208d3d68ad6af9cc903905bf1d57585641e876c7146 WHIRLPOOL 9159e614acc00b19af1ac376b880e773f8611b6fff3925a01781e1f7984e45ce38e624a3b19211f593923d435a96d76b9a0145f00fd0b46fc9dd36b0249c3d67 AUX irkerd.initd 1403 SHA256 061fa09132477b79cb96277e0fac0ab96e7da96e4f80742f3fa261b7ec1ca99b WHIRLPOOL 6fabd5ee39a90f5c0708b1eb5527b5951cf1c3601266398b3ec50054621bdedab18326fc52a1e7e05c57439e4e736a1afcd4047c1bfeb3ee9c203b8245090d1b DIST irker-1.20.tar.gz 33436 SHA256 c8d1552a819a1ebe7c6c7be06ff44c50557beddb75735ff6765a7c36df3536dd WHIRLPOOL b66fc9579534a32d05f090c4d6c82bcb9da5b50fdeaf4f934103fc3967d1eed0e13e89a7ec38246113898042fd52189e368c633a7ef1f945d370241813e6ab6a -EBUILD irker-1.20.ebuild 1632 SHA256 a342a5157afef615840d44391240c880f2c1f29adc58ffc7419fcc53728cffef WHIRLPOOL abcc029eaf651fb266a035ec7645dbcddec7d8cf88f1f233659cedc050f06a163951a5c61131e2b6c4a57647e1bcb9daed7c14e94e5b35039986d09ddf77ec35 -MISC ChangeLog 1293 SHA256 3e2a41e8127f8a82c3a174cd824dbc1d3d516abd8edd7ff3540aa6f3e6f0d0e4 WHIRLPOOL fe45cda8e0e3e6912f7f41e6e12d6d7f43d264fd4daaa897d08f041d6f98182b1117d7eca6f55b8c8f0445fbf4ad5e0f59271a1bc14b61de9c5660c4bef1618e +EBUILD irker-1.20.ebuild 1696 SHA256 06f562030ab8f9f9c032cd3ac6925247d9d06e1d20fcff90501d69240b3f61ed WHIRLPOOL 8d2fb90d6c0860fd2810130f13c71cd0a99c915aadde8c698682c708828f09117742468dfd256a6c0022a5578b998a0980fe3915b5dc2e4f896fdab199539fba +MISC ChangeLog 1454 SHA256 dbc55d7135621e2db73ac5f35dc6f9f6cf8da0e1eaa9051677259ca1f1a64b33 WHIRLPOOL 1c8255b58f876c6d1cd1df8ddcfa257a75d193956e665f2de2230da0ec973e56e9593af98405bf3cd7eca4653ea6921ba50b9208b143a291eccd78fc1397e7d9 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752 diff --git a/net-irc/irker/files/0004-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/0004-irkerhook-Remove-file-listing.patch new file mode 100644 index 00000000..790dcfd8 --- /dev/null +++ b/net-irc/irker/files/0004-irkerhook-Remove-file-listing.patch @@ -0,0 +1,107 @@ +From 0d91f4f1f9b2affeac6ddf6289eb61df62068871 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <beber@meleeweb.net> +Date: Mon, 7 Oct 2013 13:33:30 +0200 +Subject: [PATCH] irkerhook: Remove file listing + +--- + irkerhook.py | 34 +++------------------------------- + 1 file changed, 3 insertions(+), 31 deletions(-) + +diff --git a/irkerhook.py b/irkerhook.py +index 566c990..9bee04a 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 +@@ -223,7 +222,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" +@@ -268,9 +267,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 line, which is + # conventionally supposed to be a summary of the commit. Under + # other VCSes a different choice may be appropriate. +@@ -294,7 +290,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() +@@ -308,7 +304,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): +@@ -352,7 +347,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 +@@ -382,9 +377,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): +@@ -417,27 +409,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 +-- +1.8.1.5 + diff --git a/net-irc/irker/irker-1.20.ebuild b/net-irc/irker/irker-1.20.ebuild index cd4a0a99..979c03cf 100644 --- a/net-irc/irker/irker-1.20.ebuild +++ b/net-irc/irker/irker-1.20.ebuild @@ -29,6 +29,8 @@ src_prepare() { # https://gitorious.org/irker/irker/merge_requests/24 epatch "${FILESDIR}/0003-Git-Fixed-presentation-of-branches-containing-front-.patch" + epatch "${FILESDIR}/0004-irkerhook-Remove-file-listing.patch" + # Rely on systemd eclass for systemd service install sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile |