diff options
-rw-r--r-- | metadata/md5-cache/net-irc/irker-1.20 | 13 | ||||
-rw-r--r-- | net-irc/irker/ChangeLog | 7 | ||||
-rw-r--r-- | net-irc/irker/Manifest | 8 | ||||
-rw-r--r-- | net-irc/irker/files/1.20-Fixed-utf-8-handling-in-metadata.patch | 31 | ||||
-rw-r--r-- | net-irc/irker/files/1.20-Git-Fixed-presentation-of-branches-containing-front-.patch | 40 | ||||
-rw-r--r-- | net-irc/irker/files/1.20-Register-author_name-as-author-instead-of-email-user.patch | 32 | ||||
-rw-r--r-- | net-irc/irker/files/1.20-irkerhook-Remove-file-listing.patch | 107 | ||||
-rw-r--r-- | net-irc/irker/irker-1.20.ebuild | 57 |
8 files changed, 8 insertions, 287 deletions
diff --git a/metadata/md5-cache/net-irc/irker-1.20 b/metadata/md5-cache/net-irc/irker-1.20 deleted file mode 100644 index 9a5184dd..00000000 --- a/metadata/md5-cache/net-irc/irker-1.20 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install prepare setup -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_python2_6 python_single_target_python2_7 python_single_target_python2_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=dev-python/irc -SLOT=0 -SRC_URI=http://www.catb.org/esr/irker/irker-1.20.tar.gz -_eclasses_=eutils a82a329b538368791f5a6113c60e557e multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 82a55861314bbcedaf1e08ed4dd651b3 python-utils-r1 49ee0ca5e1019d8f256a23692dad2642 systemd 9f063b2cc19c5e8030911372aa246c4e toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=8fceca477fabea6520eb4700f2e0f573 diff --git a/net-irc/irker/ChangeLog b/net-irc/irker/ChangeLog index 4f879ae0..dbb66004 100644 --- a/net-irc/irker/ChangeLog +++ b/net-irc/irker/ChangeLog @@ -1,3 +1,10 @@ + 13 Dec 2013; Bertrand Jacquin <beber@meleeweb.net> + -files/1.20-Fixed-utf-8-handling-in-metadata.patch, + -files/1.20-Git-Fixed-presentation-of-branches-containing-front-.patch, + -files/1.20-Register-author_name-as-author-instead-of-email-user.patch, + -files/1.20-irkerhook-Remove-file-listing.patch, -irker-1.20.ebuild: + net-irc/irker: Drop old + *irker-2.0 (20 Nov 2013) 20 Nov 2013; Bertrand Jacquin <beber@meleeweb.net> diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index 96593220..aeb9b0cf 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,15 +1,9 @@ -AUX 1.20-Fixed-utf-8-handling-in-metadata.patch 1049 SHA256 e3e308af155405a3b65db24ca586c0e7f687cbcf4512659ac066d249f8314b3f WHIRLPOOL e1e708802bb33cae2f1ebdd705303f807d8f3b97c4e76be3c05cbd150717223cdf299e458ccab2dce3c2c3df836f12e9df8e843c26013e485b9fee02b3be4d6d -AUX 1.20-Git-Fixed-presentation-of-branches-containing-front-.patch 1504 SHA256 b717332d181069b3059a5a3ad945bc2c76860e97e837b77e9d384ac4a3ba6695 WHIRLPOOL 22dc9f60a3f5510559856eee49b9975621f0551697b26923e7251ba77e84ad652e206dfde7df6a50114db3612e92a906aad8ec2368cfdc0c8a155965ff37e6b7 -AUX 1.20-Register-author_name-as-author-instead-of-email-user.patch 1565 SHA256 80e9f3f969538c54d528b9438ad9b90a2a280215864181ef57340851e469c77e WHIRLPOOL cc6069301019e9e4a84682f6582d5b7709d97dd14649f62069fb9cf23616e418db0d47ff94398af9e3727f76bece10a23f4ec356c422ded86ba60660b8712bad -AUX 1.20-irkerhook-Remove-file-listing.patch 5971 SHA256 e885c10a463f3f29a5aa2d5659b023105f768b738541db94bf3ca654a05286fb WHIRLPOOL b94e1fa7f592671eb6188a66031c885be4ca3c0e8e3b17ee579cb62999bb9b6c8df63283531172e4df7bca809ad264ad38d9b77dcea9d19287c38732cc8217d9 AUX 2.4-Git-Fixed-presentation-of-branches-containing-front-.patch 1557 SHA256 9fa9017b638fa3fcb27cac41c9d7c97280eb4bd009e9d517362687762b1a2f51 WHIRLPOOL 6e1e0cdf96d3701727ba5a61d8d913120a88f2d70793e2b0160310b5ea59cebc19bc94c87580e348ba644fa28a2fa3b59dfa642f21a9e1b4549268555837300e AUX 2.4-Register-author_name-as-author-instead-of-email-user.patch 1650 SHA256 bfcd327a4c3b6b60497c75b35d5808f91b3ffde5679f783161b56953d4cad5a1 WHIRLPOOL b727b0cfce68bd9f5e5b8340a3778c692e27afaf60d7e49ad5b774ed208021d6c76b9d41ce0eb1dc77bbce84a3ed04ceda974de80509a09c21b3638396957016 AUX 2.4-irkerhook-Remove-file-listing.patch 6036 SHA256 21d7a1c5612bde6240bb94cfeda5dd49dd67a1477fa89e648026c5c44e3f3bae WHIRLPOOL dc199eac8c6fe175819ab0309c31f93b99718497d8c00a157668d11d724a11280d30c4bd5efa157d8e1d8a4169b7eebf9bdc0f44260afbc637a1301144a901f4 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 DIST irker-2.4.tar.gz 38441 SHA256 a4cf9f39cbbf68011b7daf62ec2549a23de8d45e689fb4f46fb824dceba7bea9 WHIRLPOOL d7d8c4e2ef7fc8768958621812c7a3637b15ec355470eb40eab7c39f6cf51bfaa88ded11dd7ae4ab0aac6b689993bd8796e32c8341209cc9d64b4bed201c3a3a -EBUILD irker-1.20.ebuild 1679 SHA256 63836013301fa347a26a82b8270676a52f1cc90a9747544d12dd5bf8dc41a33f WHIRLPOOL 4827021ea8f5f5874d385239aa6de9b68d2d3e0768b0c40c1530ea46020e55ab591b4ea34a75098a873fe958dccbd79a5bdfc0ee7c3f53e6319a0317ccd6e9c4 EBUILD irker-2.4.ebuild 1532 SHA256 f3b6502a2e27b9892e0b145597fac8d1fd2f76a2f6979f6db6c83f5bdbf788b1 WHIRLPOOL ab291ae77014ce9d6cc52bc3302f3db90c11992544065acb4908b395e0b471d3fdfb570af312a03aceae70a4cb3a55fb464c298ab57587c7baf3b3ca8714eaf5 -MISC ChangeLog 2394 SHA256 f1df22814c02a40990a23fb37e69ac3865e3431a3dab2c057f0e7b2a83d8d30d WHIRLPOOL 6a93b38abf663d59230a7bc7bde058c8e7eec0138301c65bc1d285695e49ce6eec881ccc9a5479f2a8acbe754ab31fac961fdc1affc41d28a1ceb14ca8f16800 +MISC ChangeLog 2747 SHA256 2c49722488a5896afe14dcbc2901b3f4a7b757f61b58ee06befebb267bcae506 WHIRLPOOL c9ce15b79eb484e2c176bcaf7d9087def1010125bcab660a13085a94c9044c6dd14e2d3cbbd415963ad16827c2ba6b4798ff06abcae1ab44abf1084c4ea7982e MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752 diff --git a/net-irc/irker/files/1.20-Fixed-utf-8-handling-in-metadata.patch b/net-irc/irker/files/1.20-Fixed-utf-8-handling-in-metadata.patch deleted file mode 100644 index 55ac79d7..00000000 --- a/net-irc/irker/files/1.20-Fixed-utf-8-handling-in-metadata.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5aaf87249adcc82cde55afc0975b5ef7f450aaa4 Mon Sep 17 00:00:00 2001 -From: Tom Hacohen <tom@stosb.com> -Date: Tue, 24 Sep 2013 15:55:22 +0100 -Subject: [PATCH 1/2] Fixed utf-8 handling in metadata. - -Having utf-8 in the commit metada (e.g author, commit message, files) -triggers a decoding error: -"UnicodeDecodeError: 'ascii' codec can't decode byte 0xd7 in position 42: -ordinal not in range(128)" -This is because the __unicode__ method of the Commit class, doesn't -actually return an object of type 'unicode' although it should. ---- - irkerhook.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/irkerhook.py b/irkerhook.py -index 4b243a2..b4a4164 100755 ---- a/irkerhook.py -+++ b/irkerhook.py -@@ -88,7 +88,7 @@ class Commit: - self.url = webview - except IOError: - self.url = "" -- return self.template % self.__dict__ -+ return unicode(self.template % self.__dict__, "utf-8") - - class GenericExtractor: - "Generic class for encapsulating data from a VCS." --- -1.8.1.5 - diff --git a/net-irc/irker/files/1.20-Git-Fixed-presentation-of-branches-containing-front-.patch b/net-irc/irker/files/1.20-Git-Fixed-presentation-of-branches-containing-front-.patch deleted file mode 100644 index 15dfdddb..00000000 --- a/net-irc/irker/files/1.20-Git-Fixed-presentation-of-branches-containing-front-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7f83ca76e428f2aa018084bd2f0800e58dcb0c91 Mon Sep 17 00:00:00 2001 -From: Tom Hacohen <tom@stosb.com> -Date: Tue, 24 Sep 2013 16:45:42 +0100 -Subject: [PATCH 2/2] Git: Fixed presentation of branches containing - front-slashes. - -Many projects use hierarchical branch names, for example: -"devs/tasn/feature-branch" -Before this commit, the branch above would be printed as "feature-branch" -instead of "devs/tasn/feature-branch". ---- - irkerhook.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/irkerhook.py b/irkerhook.py -index b4a4164..d89cc3b 100755 ---- a/irkerhook.py -+++ b/irkerhook.py -@@ -39,7 +39,7 @@ default_channels = "irc://chat.freenode.net/#commits" - - version = "1.20" - --import os, sys, commands, socket, urllib, subprocess, locale, datetime -+import os, sys, commands, socket, urllib, subprocess, locale, datetime, re - from pipes import quote as shellquote - try: - import simplejson as json # Faster, also makes us Python-2.5-compatible -@@ -258,7 +258,8 @@ class GitExtractor(GenericExtractor): - def commit_factory(self, commit_id): - "Make a Commit object holding data for a specified commit ID." - commit = Commit(self, commit_id) -- commit.branch = os.path.basename(self.refname) -+ # Get rid of refs/*/ for cleaner output. -+ commit.branch = re.sub(r"^refs/[^/]*/", "", self.refname) - # Compute a description for the revision - if self.revformat == 'raw': - commit.rev = commit.commit --- -1.8.1.5 - diff --git a/net-irc/irker/files/1.20-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/1.20-Register-author_name-as-author-instead-of-email-user.patch deleted file mode 100644 index 0042684f..00000000 --- a/net-irc/irker/files/1.20-Register-author_name-as-author-instead-of-email-user.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 33596784f1ef15aaa985e8ec9667eaa692e3d179 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <beber@meleeweb.net> -Date: Mon, 23 Sep 2013 23:10:23 +0200 -Subject: [PATCH] Register author_name as author instead of email userpart - ---- - irkerhook.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/irkerhook.py b/irkerhook.py -index 4b243a2..566c990 100755 ---- a/irkerhook.py -+++ b/irkerhook.py -@@ -274,14 +274,9 @@ class GitExtractor(GenericExtractor): - # 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. -- commit.author_name = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit)) -+ commit.author = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit)) - commit.mail = do("git log -1 '--pretty=format:%ae' " + shellquote(commit.commit)) - commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit)) -- # 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("|") - return commit --- -1.8.3.2 - diff --git a/net-irc/irker/files/1.20-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/1.20-irkerhook-Remove-file-listing.patch deleted file mode 100644 index 790dcfd8..00000000 --- a/net-irc/irker/files/1.20-irkerhook-Remove-file-listing.patch +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index 0d1f257f..00000000 --- a/net-irc/irker/irker-1.20.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 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=( python{2_7,2_6} ) - -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="" - -DEPEND="app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto" -RDEPEND="dev-python/irc" - -src_prepare() { - # https://gitorious.org/irker/irker/merge_requests/25 - epatch "${FILESDIR}/${PV}-Register-author_name-as-author-instead-of-email-user.patch" - # https://gitorious.org/irker/irker/merge_requests/23 - epatch "${FILESDIR}/${PV}-Fixed-utf-8-handling-in-metadata.patch" - # https://gitorious.org/irker/irker/merge_requests/24 - epatch "${FILESDIR}/${PV}-Git-Fixed-presentation-of-branches-containing-front-.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() { - 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 -} |