diff options
author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2016-08-18 20:53:52 +0100 |
---|---|---|
committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2016-08-18 20:53:52 +0100 |
commit | ea44ae93c1c31152938290bdeafbdf6c8d283435 (patch) | |
tree | 74626959fa5d202b4360ba4165c03a87403cb1c0 | |
parent | profiles/desktop: Disable flash (diff) | |
download | portage-ea44ae93c1c31152938290bdeafbdf6c8d283435.tar.xz |
net-irc/irker: Remove since all changes were merged upstream including
last patches
-rw-r--r-- | metadata/md5-cache/net-irc/irker-2.17 | 12 | ||||
-rw-r--r-- | net-irc/irker/Manifest | 7 | ||||
-rw-r--r-- | net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch | 32 | ||||
-rw-r--r-- | net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch | 104 | ||||
-rw-r--r-- | net-irc/irker/files/irkerd.confd | 20 | ||||
-rwxr-xr-x | net-irc/irker/files/irkerd.initd | 41 | ||||
-rw-r--r-- | net-irc/irker/irker-2.17.ebuild | 57 | ||||
-rw-r--r-- | net-irc/irker/metadata.xml | 8 |
8 files changed, 0 insertions, 281 deletions
diff --git a/metadata/md5-cache/net-irc/irker-2.17 b/metadata/md5-cache/net-irc/irker-2.17 deleted file mode 100644 index 62b53db3..00000000 --- a/metadata/md5-cache/net-irc/irker-2.17 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto socks5? ( dev-python/PySocks[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) virtual/pkgconfig -DESCRIPTION=Submission tools for IRC notifications -EAPI=5 -HOMEPAGE=http://www.catb.org/esr/irker -IUSE=socks5 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -SLOT=0 -SRC_URI=http://www.catb.org/esr/irker/irker-2.17.tar.gz -_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 -_md5_=86bf6ac23f627d3c8edd624cd78ca21e diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest deleted file mode 100644 index 86528842..00000000 --- a/net-irc/irker/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 2.17-irkerhook-Register-author_name-as-author-instead-of-.patch 1598 SHA256 07424c16ca73ae6b00ad3934bd5b251e8489830f695952eb2c1639706621e157 WHIRLPOOL d6d0285a87331d72330e734c51d33948f1c4d8bca64f2eea08bfc015e8073110ffd272c386058d6f770f4458ca6bf54dd63d29c816c37b0bc3a2b235ff9aee03 -AUX 2.17-irkerhook-Remove-file-listing.patch 5956 SHA256 cdbe17d283848c999414742b68b0cc495768248d3d37e28c1c44f87b8fc95466 WHIRLPOOL b40f8e8afb79b66a34ddba489a3ebe6a31a2b02f90c7b2bbfae3fe7d4705ddc10701a50bac9c3550c08de6b0992172123f4ef6c48cf57bee136eb7c7c06b9db4 -AUX irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886 -AUX irkerd.initd 1210 SHA256 1ca07247036df6dbac2f355044bc66a9b8188ff14af57f84611f711827c1a817 WHIRLPOOL 2c9f3f44e28533d302b0a151e48eb5a63ed414466e9d64ce7bc7cb239ae6b4bd27fa13a9193c7245207733dc2e9047ff3407dda5061791d5b9cf7e625d71a300 -DIST irker-2.17.tar.gz 44139 SHA256 71150b019345c4963d7b94aa38e173c070939ec45360e9ba42a24d9cb25bb2d4 WHIRLPOOL f2ff6035ab3080508bc36ccc98b2662d8f63a976c931e5d3ad4a61eb4605dfc10916b98fc39ae8b7afecef8e8f0d2cd132c993a7ab9e0173dfbde4cda91c1312 -EBUILD irker-2.17.ebuild 1427 SHA256 c58b06964eb819d2cef5944110a277a724206d6b4a6ec446b42680243f905378 WHIRLPOOL 5492d1bb3e6ae3a248c08aefc27558a918dbbe857103abf9ca33bd54ae166f1727b048d578d0e6dc94e03f849ec06f3c38f2952695a61d51f4b51d357da4404d -MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752 diff --git a/net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch b/net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch deleted file mode 100644 index 5502cc16..00000000 --- a/net-irc/irker/files/2.17-irkerhook-Register-author_name-as-author-instead-of-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93574b7bb660af9ad54280465f8ddf2ca439dcba Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -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 4f96b1c..18c9b01 100755 ---- a/irkerhook.py -+++ b/irkerhook.py -@@ -292,15 +292,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.17-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch deleted file mode 100644 index 356bc9ae..00000000 --- a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@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/files/irkerd.confd b/net-irc/irker/files/irkerd.confd deleted file mode 100644 index 42ae7323..00000000 --- a/net-irc/irker/files/irkerd.confd +++ /dev/null @@ -1,20 +0,0 @@ -# /etc/conf.d/irkerd: config file for /etc/init.d/irkerd - -# Nick-Serv login -# IRKERD_NICK="" - -# Nick-Server password -# IRKERD_PASSWORD="" - -# Log file, if none syslog is used (facility daemon) -# IRKERD_LOGFILE="" - -# Debug Level (critical, error, warning, info, debug) -# IRKERD_LOGLEVEL="" - -# To run an anonymous irkerd safely. It should not be able -# to write to anywhere on your system -# IRKERD_USER="" - -# see man pages for irkerd for valid cmdline options -# IRKERD_OPTS="" diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd deleted file mode 100755 index 5973cbc7..00000000 --- a/net-irc/irker/files/irkerd.initd +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/files/irker.init,v 1.1 2012/10/13 05:53:35 patrick Exp $ - -: ${pidfile:=/run/${RC_SVCNAME}.pid} - -: ${IRKERD_NICK:=} -: ${IRKERD_PASSWORD:=} -: ${IRKERD_USER:=nobody} - -depend() { - use net -} - -start () { - if [[ ${IRKERD_LOGFILE} ]] ; then - checkpath -f \ - -o "${IRKERD_USER}" \ - "${IRKERD_LOGFILE}" \ - || return 1 - fi - - if [[ -z "${IRKERD_USER}" ]] ; then - die "IRKERD_USER is mandatory" - fi - - [[ ${IRKERD_LOGLEVEL} ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}" - [[ ${IRKERD_LOGFILE} ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}" - [[ ${IRKERD_NICK} ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}" - [[ ${IRKERD_PASSWORD} ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}" - - ebegin "Starting ${RC_SVCNAME}" - start-stop-daemon --start \ - --quiet --background \ - --user "${IRKERD_USER}" \ - --make-pidfile --pidfile "${pidfile}" \ - --exec /usr/bin/irkerd \ - -- ${IRKERD_OPTS} < /dev/null - eend $? -} diff --git a/net-irc/irker/irker-2.17.ebuild b/net-irc/irker/irker-2.17.ebuild deleted file mode 100644 index 2c479a4a..00000000 --- a/net-irc/irker/irker-2.17.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 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-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}/${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/metadata.xml b/net-irc/irker/metadata.xml deleted file mode 100644 index 05930384..00000000 --- a/net-irc/irker/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> -</pkgmetadata> |