gentoo Easter resync : 12.04.2020

5 files changed, 195 insertions, 9 deletions

diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 022422d4396d..737d09317758 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,6 +1,9 @@
-AUX anope-conf.d-v2 352 BLAKE2B 38bacb495ff0be9e8f8cc635bdd9eb1927b6d120bcb65ddfbc436da2b0292ee1dc52c750094d8ee24c23d503050a176db309b5025a0f5b4655354e10aa089c19 SHA512 6e8af033c85a1e102b00934d1c2d0d01f25c6e3ed0c2775e9e3fa5f8e3ee33c8803eb49ded5a73501c7f3940ba234270009f69f89314f0dd77534ee3a5694d54
+AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
+AUX example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
 AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
+DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
 EBUILD anope-2.0.6.ebuild 4979 BLAKE2B 171b9a4e79cc20788f2d60aca8d20c308bea3d8d08241365d02180c57344402efd9a8ef7a5abea257af5fe2fc494526bbf885cfe8d394441aa38454d4b2aafa5 SHA512 cd4a6e963604249d1ebcb6fd7faa28bd588253285bb39afa9ba8d6144782a59fcd5ac19761419cc28620d08dadd5009e5ab1bf9c6eabe9f1112cfdba2bdf62ad
-MISC metadata.xml 1205 BLAKE2B 2e7f5630a4f37d67f2b0657cba7822989625944c17a3ddef390107ef6c2b1979666a380c3b1316cfe9b16f295c248dc0ec79ce7a3bf5a0c48f970dfeb64a992c SHA512 45d98156923f6b4c1736ed2310deaff937d63ab4a4da10275cfc57fb966eba6e9581f47a89d9825e58606a651395cadafe6ae9b36f153ad9c189ca12a30888ce
+EBUILD anope-2.0.7.ebuild 4284 BLAKE2B b632b76b133bfaea5d75bb84e1a8027b42743dd3cba955f645ae98f0c23243f56379a6704b3f69b268f19119fec3c5e4198a466038c32c31f6152c8ffe24a712 SHA512 8c1b0cbf7ffe5aed6646db95a9dde91948e224e78465854aa3e106e4bdb49cff5aec76161af284a33b78a0ff1c18e749302334e91757c2081b7c275f58031abe
+MISC metadata.xml 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
new file mode 100644
index 000000000000..7761a88223ae
--- /dev/null
+++ b/net-irc/anope/anope-2.0.7.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
+SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
+REQUIRED_USE="
+	sql? ( || ( mysql sqlite ) )
+"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	acct-group/anope
+	acct-user/anope
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ssl? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( dev-db/sqlite:3 )
+	tre? ( dev-libs/tre )
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pid-patch.patch"
+	"${FILESDIR}/example.conf-user.patch"
+)
+
+S="${WORKDIR}/${P}-source"
+
+src_prepare() {
+	anope_enable_mod() {
+		local modulefile=${1}
+		ln -s "extra/${modulefile}" "modules/" || \
+			die "Failed to use ${modulefile}"
+	}
+
+	# These all require MySQL specifically
+	if use mysql ; then
+	   anope_enable_mod "m_mysql.cpp"
+	   anope_enable_mod "stats/irc2sql/irc2sql.cpp"
+	   anope_enable_mod "stats/irc2sql/irc2sql.h"
+	   anope_enable_mod "stats/irc2sql/tables.cpp"
+	   anope_enable_mod "stats/irc2sql/utils.cpp"
+	   anope_enable_mod "stats/m_chanstats.cpp"
+	   anope_enable_mod "stats/cs_fantasy_top.cpp"
+	   anope_enable_mod "stats/cs_fantasy_stats.cpp"
+	   anope_enable_mod "m_sql_log.cpp"
+	   anope_enable_mod "m_sql_oper.cpp"
+	fi
+
+	use sqlite && anope_enable_mod "m_sqlite.cpp"
+
+	# Any SQL implementation
+	if use sql ; then
+	   anope_enable_mod "m_sql_authentication.cpp"
+	   anope_enable_mod "m_sql.cpp"
+	   anope_enable_mod "m_sql_live.cpp"
+	fi
+
+	if use ldap ; then
+		anope_enable_mod "m_ldap.cpp"
+		anope_enable_mod "m_ldap_authentication.cpp"
+		anope_enable_mod "m_ldap_oper.cpp"
+	fi
+
+	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
+	use pcre && anope_enable_mod "m_regex_pcre.cpp"
+	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
+	use tre && anope_enable_mod "m_regex_tre.cpp"
+
+	# Unconditional modules
+	anope_enable_mod "m_regex_posix.cpp"
+
+	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
+	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
+
+	# Copy anope.conf for fixup to comply w/ prefix
+	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
+
+	# Look in the right place for modules
+	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
+		"${T}/anope-conf.d-v2" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBIN_DIR="libexec/anope"
+		-DDB_DIR="../var/lib/anope"
+		-DDOC_DIR="share/doc/${PF}"
+		-DLIB_DIR="$(get_libdir)/anope"
+		-DLOCALE_DIR="share/locale"
+		-DCONF_DIR="/etc/anope"
+		-DLOGS_DIR="../var/log/anope/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/anope-init.d" "${PN}"
+	newconfd "${T}/anope-conf.d-v2" "${PN}"
+
+	dosym ../libexec/anope/services /usr/bin/services
+	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
+
+	keepdir /var/log/anope /var/lib/anope/backups
+	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+
+	dodoc -r docs/* data/example.conf
+
+	insinto /etc/anope
+	newins data/example.conf services.conf
+
+	fowners anope:anope /var/log/anope
+	fowners anope:anope /var/lib/anope/backups/
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		# Only tell them about this on a fresh install.
+		elog
+		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
+		ewarn "Edit /etc/anope/services.conf to configure Anope."
+		elog
+	else
+		# We're replacing some versions. Find out which.
+		local ver
+		for ver in ${REPLACING_VERSIONS} ; do
+			if ver_test ${ver} -lt 2.0.7 ; then
+				# In this version, we introduced correct FHS structure
+				# We need the users to make some changes to their services.conf
+				ewarn "Please modify your services.conf to include the following directive:"
+				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
+				ewarn "This is needed because Anope now starts as root and drops down."
+				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
+			fi
+		done
+	fi
+}
diff --git a/net-irc/anope/files/anope-conf.d-v2 b/net-irc/anope/files/anope-conf.d-v2
index fbe7c3c5017a..0eeabdbbb685 100644
--- a/net-irc/anope/files/anope-conf.d-v2
+++ b/net-irc/anope/files/anope-conf.d-v2
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# user to run ultimate-ircd as
+# user to run anope as
 ANOPE_USER="anope"
 
 # Additional commandline parameters
diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/example.conf-user.patch
new file mode 100644
index 000000000000..7f7a3826cb10
--- /dev/null
+++ b/net-irc/anope/files/example.conf-user.patch
@@ -0,0 +1,13 @@
+--- a/data/example.conf
++++ b/data/example.conf
+@@ -375,8 +375,8 @@
+ 	 * On Linux/UNIX systems Anope can setuid and setgid to this user and group
+ 	 * after starting up. This is useful if Anope has to bind to privileged ports
+ 	 */
+-	#user = "anope"
+-	#group = "anope"
++	user = "anope"
++	group = "anope"
+ 
+ 	/*
+ 	 * The case mapping used by services. This must be set to a valid locale name
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index ddb7e3c5b209..0ca16f3bed07 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,16 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription>Anope IRC Services</longdescription>
+	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Anope IRC Services provide user and channel management services for an
+		IRC server. It is a well-known package which continues to be actively
+		developed. It has support for multiple different IRCd linking protocols.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">anope</remote-id>
 		<remote-id type="github">anope/anope</remote-id>
 	</upstream>
 	<use>
+		<flag name="ldap">Build LDAP modules for e.g. opertypes</flag>
+		<flag name="ssl">Provide SSL services using OpenSSL</flag>
+		<flag name="sql">Build modules which require SQL</flag>
+		<flag name="tre">Use <pkg>dev-libs/tre</pkg> for regular expressions</flag>
+
+		<!-- pre 2.0.7 USE flags; deprecated -->
 		<flag name="chanstats">Channel Statistics</flag>
 		<flag name="cs-fantasy-stats">Enables the STATS and GSTATS commands</flag>
-		<flag name="cs-fantasy-top">Enables the (G)TOP and  (G)TOP10 commands</flag>
+		<flag name="cs-fantasy-top">Enables the (G)TOP and (G)TOP10 commands</flag>
 		<flag name="irc2sql">Stores channel statistics in a mysql database</flag>
 		<flag name="ldap-auth">Authorize through LDAP</flag>
 		<flag name="ldap-oper">Dynamically ties users to Anope opertypes via LDAP</flag>
@@ -18,7 +35,5 @@
 		<flag name="sql-auth">Authorize through SQL</flag>
 		<flag name="sql-log">Additional log target in SQL</flag>
 		<flag name="sql-oper">Allows granting users services operator privileges from SQL</flag>
-		<flag name="ssl">Provide SSL services using OpenSSL</flag>
-		<flag name="tre">Use <pkg>dev-libs/tre</pkg> for regular expressions</flag>
 	</use>
 </pkgmetadata>