[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/, net-im/prosody/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     363e5885780c380ea78a23f714f8ee9f37067c44
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 23:52:39 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 00:24:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363e5885

net-im/prosody: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-im/prosody/Manifest                            |  1 -
 .../prosody/files/prosody-0.11.2-r1-gentoo.patch   | 16 -----
 net-im/prosody/files/prosody.initd-r2              | 46 -------------
 net-im/prosody/files/prosody.service               | 13 ----
 net-im/prosody/files/prosody.tmpfilesd             |  1 -
 net-im/prosody/metadata.xml                        |  1 -
 net-im/prosody/prosody-0.11.5-r1.ebuild            | 78 ----------------------
 7 files changed, 156 deletions(-)

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index ded27dd5ec2..6db7e0ac624 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1 @@
-DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20

diff --git a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
deleted file mode 100644
index 94423a834ae..00000000000
--- a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/prosody.cfg.lua.dist	2019-03-19 15:11:16.355743969 +0100
-+++ b/prosody.cfg.lua.dist	2019-03-19 15:14:42.810995725 +0100
-@@ -32,6 +32,13 @@
- -- will look for modules first. For community modules, see https://modules.prosody.im/
- --plugin_paths = {}
- 
-+-- Gentoo uses the jabber:jabber uid/gid for all Jabber-related services
-+prosody_user = "jabber"
-+prosody_group = "jabber"
-+
-+-- Make sure prosodyctl checks in the right spot for the PID file
-+pidfile = "/run/jabber/prosody.pid"
-+
- -- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
- -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules

diff --git a/net-im/prosody/files/prosody.initd-r2 b/net-im/prosody/files/prosody.initd-r2
deleted file mode 100644
index a6b623dd622..00000000000
--- a/net-im/prosody/files/prosody.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prosody is a server for Jabber/XMPP written in Lua."
-description_reload="Reload configuration and reopen log files."
-extra_started_commands="reload"
-pidfile="/var/run/jabber/prosody.pid"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
-		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
-		return 1
-	fi
-	luac -p /etc/jabber/prosody.cfg.lua
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
-	checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
-	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
-	ebegin "Starting Prosody XMPP Server"
-	prosodyctl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Prosody XMPP Server"
-	prosodyctl stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration of Prosody XMPP Server"
-	prosodyctl reload
-	eend $?
-}

diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
deleted file mode 100644
index 5c5ea87bd54..00000000000
--- a/net-im/prosody/files/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP (Jabber) server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecReload=/usr/bin/prosodyctl reload
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-im/prosody/files/prosody.tmpfilesd b/net-im/prosody/files/prosody.tmpfilesd
deleted file mode 100644
index 924ba434659..00000000000
--- a/net-im/prosody/files/prosody.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/jabber   710 jabber jabber

diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index d73f165dd53..c67f0b41b88 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -14,7 +14,6 @@
 		added functionality, or prototype new protocols.
 	</longdescription>
 	<use>
-		<flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
 		<flag name="libevent">Use libevent for event handling</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-im/prosody/prosody-0.11.5-r1.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild
deleted file mode 100644
index 2e89c9c96e9..00000000000
--- a/net-im/prosody/prosody-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
-RESTRICT="!test? ( test )"
-
-BASE_DEPEND="
-	net-im/jabber-base
-	dev-lua/LuaBitOp
-	!jit? ( >=dev-lang/lua-5.1:0 )
-	jit? ( dev-lang/luajit:2 )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:= )
-	>=net-dns/libidn-1.1:=
-"
-
-DEPEND="
-	${BASE_DEPEND}
-	test? ( dev-lua/busted )
-"
-
-RDEPEND="
-	${BASE_DEPEND}
-	~dev-lua/luaexpat-1.3.0
-	dev-lua/luafilesystem
-	!ipv6? ( dev-lua/luasocket )
-	ipv6? ( >=dev-lua/luasocket-3 )
-	libevent? ( >=dev-lua/luaevent-0.4.3 )
-	mysql? ( dev-lua/luadbi[mysql] )
-	postgres? ( dev-lua/luadbi[postgres] )
-	sqlite? ( dev-lua/luadbi[sqlite] )
-	ssl? ( dev-lua/luasec )
-	zlib? ( dev-lua/lua-zlib )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	./configure \
-		--ostype=linux \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysconfdir="${EPREFIX}${JABBER_ETC}" \
-		--datadir="${EPREFIX}${JABBER_SPOOL}" \
-		--with-lua-include="${EPREFIX}/usr/include" \
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
-		--runwith=lua"$(usev jit)" \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" || die "configure failed"
-
-	rm makefile && mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}