* [gentoo-commits] repo/gentoo:master commit in: net-irc/irker/, net-irc/irker/files/
@ 2019-12-29 8:53 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2019-12-29 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 86f45811d1efe4833cc6c5f0b9fc1ae0fd254258
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 08:53:07 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 08:53:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f45811
net-irc/irker: Remove old
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-irc/irker/Manifest | 6 --
...thor_name-as-author-instead-of-email-user.patch | 32 -------
.../files/2.7-irkerhook-Remove-file-listing.patch | 105 ---------------------
net-irc/irker/irker-2.11.ebuild | 51 ----------
net-irc/irker/irker-2.12.ebuild | 51 ----------
net-irc/irker/irker-2.13.ebuild | 51 ----------
net-irc/irker/irker-2.15.ebuild | 57 -----------
net-irc/irker/irker-2.16.ebuild | 57 -----------
net-irc/irker/irker-2.18.ebuild | 55 -----------
net-irc/irker/irker-2.9.ebuild | 51 ----------
10 files changed, 516 deletions(-)
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 107eeded430..e49117995b6 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,7 +1 @@
-DIST irker-2.11.tar.gz 41504 BLAKE2B a3baabf3021a25acb8d91b7fc24321f2fe962725add38c274e0ed0ff25c120b6b008656d549a32c40b01046e697195ba9ad0cfa8b07767291d0aa722d8db0ecc SHA512 b95824f8a68103f7094b13044263e422e98efef163425d88217a7c3f89ef83bf8c4116055b34f92d86ce1641f9c74215a4488c084eba95c56f8cf95fc8067e9b
-DIST irker-2.12.tar.gz 41693 BLAKE2B 923a3bbfaad490bf5b2c6c6073336b329f5c90324c5be10c54cee02ee05d5097689b5613e2366f0230780fa8230d508c0f8f504c5a59b600a8d4b39901c61837 SHA512 73606deb3f2b96d72501e876dd05f146e62298fa1f7a051c0f831f0db9fc9554f991b1d645c17ccb9032c7da287c142eedf69b262cf3445ae6b0937a24a5bdb4
-DIST irker-2.13.tar.gz 42733 BLAKE2B e6a630c9ba2f64a971f53c8d4f2664153bd0c8afd141fd2c9a1278a85e2360bf9324783420af05039d00b1fd8a54889b189dca0e35fda3ba746b84bbad75e711 SHA512 5aa86354b5f3dabd7e2b46c62df4298b3bc675757b71ee03e2068d9ad14dc35127fb4076ef819ddd0ae84d82937c540516ed77ab5f1177af6dc7381df56af3ac
-DIST irker-2.15.tar.gz 43765 BLAKE2B 0b69f8d61bc4368e686e48fda8823a02ef1c4c0ce1eb2d689c885f181ae5f37659af92e24b25d496395c3081d06d9c2528e61999374d549d0e04d856e635c2cf SHA512 94f4bb33a320f4284d03e75c7090ea4714d30d879e1abbf757c3e6eff8898ca5664f718c6ab2f35cae8377c348d41bc9100832b8a70f1b9f1a03c6f7487c2bfe
-DIST irker-2.16.tar.gz 43824 BLAKE2B 85043f3a2f9d4d10570b856a0e561c439dc584892bac1625ecee304e234e34e33b0fca97bc39b252ef224c3ac12c420fff699eda349d0264fe342e993e99e3b9 SHA512 6a58938e1d458ad9183d750b4f6d1a4827fffd85caf7c0215c2fa1a9ef5692570c5181ade28f59701bef7398fdc0cfa760fe70d9432b7e54dc7fa663a558fed4
DIST irker-2.18.tar.gz 44284 BLAKE2B 355d9004c77c7635e5ee068d6521b2d1b8c3e0ae4b0d2fa39e71c16a4ecc2272c5a487dafd296a3d02aa5072c734f454875939b99f66c4321ab2970da78216ef SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606
-DIST irker-2.9.tar.gz 41050 BLAKE2B 1cf24c57acd511eed14028187ae0195c54a9d5b2a5daa245875afa44af52fd63aae5495b271ea8f1106c34a1c6bfff44d3dd0d7d60556835c20ba9b41112a4ec SHA512 bdb632414c87ebc3f0d480605a29823d9259defe63a6c6de8f5d1876c13f5a4ab90ef7956a83f62aedf08f17494be7a67bc414e2e30101608f565afd115c5c0f
diff --git a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
deleted file mode 100644
index a19da1f4a48..00000000000
--- a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 108e898c600cf7a80a3d01a83a270c7579460b42 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <beber@meleeweb.net>
-Date: Mon, 23 Sep 2013 23:10:23 +0200
-Subject: [PATCH 1/3] Register author_name as author instead of email userpart
-
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
----
- irkerhook.py | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 5f15032..36a875e 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -275,15 +275,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.7-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
deleted file mode 100644
index cbbb38c22ea..00000000000
--- a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 82376d74107035950ef4181fdc889ae9409378b6 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <beber@meleeweb.net>
-Date: Mon, 7 Oct 2013 13:33:30 +0200
-Subject: [PATCH 2/3] irkerhook: Remove file listing
-
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
----
- irkerhook.py | 34 +++-------------------------------
- 1 file changed, 3 insertions(+), 31 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 36a875e..f2f82cf 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
-@@ -224,7 +223,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"
-@@ -269,9 +268,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 message line, which is
- # conventionally supposed to be a summary of the commit. Under
- # other VCSes a different choice may be appropriate.
-@@ -292,7 +288,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()
-@@ -306,7 +302,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):
-@@ -350,7 +345,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
-@@ -380,9 +375,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):
-@@ -423,27 +415,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
diff --git a/net-irc/irker/irker-2.11.ebuild b/net-irc/irker/irker-2.11.ebuild
deleted file mode 100644
index 9b6fdbbae2e..00000000000
--- a/net-irc/irker/irker-2.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-irkerhook-Remove-file-listing.patch"
-
- # 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
-
- 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/irker-2.12.ebuild b/net-irc/irker/irker-2.12.ebuild
deleted file mode 100644
index 9b6fdbbae2e..00000000000
--- a/net-irc/irker/irker-2.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-irkerhook-Remove-file-listing.patch"
-
- # 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
-
- 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/irker-2.13.ebuild b/net-irc/irker/irker-2.13.ebuild
deleted file mode 100644
index 9b6fdbbae2e..00000000000
--- a/net-irc/irker/irker-2.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-irkerhook-Remove-file-listing.patch"
-
- # 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
-
- 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/irker-2.15.ebuild b/net-irc/irker/irker-2.15.ebuild
deleted file mode 100644
index 6965033dce3..00000000000
--- a/net-irc/irker/irker-2.15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-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
-}
diff --git a/net-irc/irker/irker-2.16.ebuild b/net-irc/irker/irker-2.16.ebuild
deleted file mode 100644
index 9ebbbfed8ae..00000000000
--- a/net-irc/irker/irker-2.16.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-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 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-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
-}
diff --git a/net-irc/irker/irker-2.18.ebuild b/net-irc/irker/irker-2.18.ebuild
deleted file mode 100644
index a74d4266ec3..00000000000
--- a/net-irc/irker/irker-2.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 systemd
-
-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 ~arm ~x86"
-IUSE="socks5"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
-
-DOCS=( NEWS README hacking.txt security.txt )
-HTML_DOCS=( irkerd.html irkerhook.html )
-
-src_prepare() {
- default
-
- # Rely on systemd eclass for systemd service install
- sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
- || die "sed failed"
-
- # Prefix support
- sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
- || die "sed failed"
-}
-
-src_install() {
- default
-
- 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
-
- docinto examples
- dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.9.ebuild b/net-irc/irker/irker-2.9.ebuild
deleted file mode 100644
index 9b6fdbbae2e..00000000000
--- a/net-irc/irker/irker-2.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto"
-
-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.7-irkerhook-Remove-file-listing.patch"
-
- # 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
-
- dodoc NEWS README hacking.txt security.txt
- dohtml irkerd.html irkerhook.html
-
- docinto examples
- dodoc filter-example.py filter-test.py
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/irker/, net-irc/irker/files/
@ 2022-07-03 18:12 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2022-07-03 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 906cdff29ce89248d6c00805c16f36cee0c032c9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 17:55:15 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 18:12:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906cdff2
net-irc/irker: update systemd service file
- fix the User by also setting DynamicUser (no need for new system
user, and also much better security)
- Better EPREFIX placeholder
- Some more security options for less capabilities
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26212
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-irc/irker/files/irkerd.service | 21 +++++++++++++++++++++
.../{irker-2.22-r1.ebuild => irker-2.22-r2.ebuild} | 8 +++-----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/net-irc/irker/files/irkerd.service b/net-irc/irker/files/irkerd.service
new file mode 100644
index 000000000000..232a8d5811a5
--- /dev/null
+++ b/net-irc/irker/files/irkerd.service
@@ -0,0 +1,21 @@
+# Copyright 2012 Wulf C. Krueger <philantrop@exherbo.org>
+# Copyright 2022 Arthur Zamarin <arthurzam@gentoo.org>
+# Distributed under the terms of the BSD LICENSE
+
+[Unit]
+Description=Internet Relay Chat (IRC) notification daemon
+Requires=network.target
+Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1)
+
+[Service]
+ExecStart=@EPREFIX@/usr/bin/irkerd
+User=irker
+DynamicUser=yes
+NoNewPrivileges=yes
+CapabilityBoundingSet=
+PrivateDevices=yes
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
+Alias=irker.service
diff --git a/net-irc/irker/irker-2.22-r1.ebuild b/net-irc/irker/irker-2.22-r2.ebuild
similarity index 86%
rename from net-irc/irker/irker-2.22-r1.ebuild
rename to net-irc/irker/irker-2.22-r2.ebuild
index e2bf844a14f6..085be79ae727 100644
--- a/net-irc/irker/irker-2.22-r1.ebuild
+++ b/net-irc/irker/irker-2.22-r2.ebuild
@@ -39,12 +39,10 @@ src_prepare() {
default
# Rely on systemd eclass for systemd service install
- sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
- || die "sed failed"
+ sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed"
# Prefix support
- sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
- || die "sed failed"
+ sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed"
}
src_install() {
@@ -57,7 +55,7 @@ src_install() {
newinitd "${FILESDIR}"/irkerd.initd irkerd
newconfd "${FILESDIR}"/irkerd.confd irkerd
- systemd_dounit irkerd.service
+ systemd_dounit "${WORKDIR}"/irkerd.service
docinto examples
dodoc filter-example.py filter-test.py
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-03 18:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-29 8:53 [gentoo-commits] repo/gentoo:master commit in: net-irc/irker/, net-irc/irker/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-07-03 18:12 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox