gentoo resync : 02.09.2020

3 files changed, 1 insertions, 173 deletions

diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 692e0ca2399e..d52055042450 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -3,8 +3,6 @@ AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519
 AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
-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 5003 BLAKE2B d6d518195763f6673b6472daf36cf8e9ee792a04026b4289741b573cf6b3be669bb03e6a4be436ea5fb5ce4f66ad350918cf7bd6f97ef83b49589ebf7e9b0145 SHA512 9987c769735d6e1521c67143698ceeb3fa3143a020fe34b85d81a254f7b3761908ee1c5200b9999f73f51d7cb686236ecba9002f4e290c8ecdca82592f95bd98
 EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a
-MISC metadata.xml 1649 BLAKE2B 8d692618d256a242f3314f3bf1df6825e487771dced98ac88d3bc1f697f35d716e514f4789357eaef053a925bc51dbfeb3bcd4144fe31aaa70c11c83b2241a72 SHA512 8622b5d345ec80b7ef759a02bf74690c4755cc10d169d2f61718893d620611012fc98fc85ca912c6ce4a8294df6f69e8129a8649433de7d274ae1e171af15c44
+MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
deleted file mode 100644
index 1d78f2271b9f..000000000000
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake user
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="https://anope.org"
-SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chanstats cs-fantasy-stats cs-fantasy-top gnutls irc2sql ldap
-	ldap-auth ldap-oper mysql pcre posix sql-auth sql-log sql-oper
-	sqlite ssl tre"
-
-REQUIRED_USE="
-	chanstats? ( mysql )
-	cs-fantasy-stats? ( chanstats mysql )
-	cs-fantasy-top? ( chanstats mysql )
-	irc2sql? ( mysql )
-	ldap-auth? ( ldap )
-	ldap-oper? ( ldap )
-	sql-auth? ( || ( mysql sqlite ) )
-	sql-log? ( mysql )
-	sql-oper? ( mysql )"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="${BDEPEND}
-	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 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" )
-
-S="${WORKDIR}/${P}-source"
-
-pkg_pretend() {
-	local replaced_version
-	for replaced_version in ${REPLACING_VERSIONS} ; do
-		if ver_test ${replaced_version} -lt 1.8.7 && [[ -f ${ROOT}/opt/anope/data/nick.db ]]; then
-			eerror "It looks like you have an older version of Anope installed."
-			eerror "To upgrade, shut down Anope and copy your databases to"
-			eerror "${ROOT}/var/lib/anope and your configuration to ${ROOT}/etc/anope"
-			eerror "You can do this by:"
-			eerror "# mkdir -p ${ROOT}/var/lib/anope ${ROOT}/etc/anope"
-			eerror "# chown anope:anope ${ROOT}/var/lib/anope"
-			eerror "# mv ${ROOT}/opt/anope/data/*.db ${ROOT}/var/lib/anope"
-			eerror "# mv ${ROOT}/opt/anope/data/services.conf ${ROOT}/etc/anope"
-			die "Please move your anope database files from /opt/anope/data"
-		fi
-	done
-}
-
-pkg_setup() {
-	enewgroup anope
-	enewuser anope -1 -1 -1 anope
-}
-
-src_prepare() {
-	anope_use_extra() {
-		local useflag=$1
-		local modulefile=$2
-		if use $useflag; then
-			ln -s "extra/${modulefile}" "modules/" || \
-				die "Failed to use ${modulefile}"
-		fi
-	}
-
-	anope_use_extra mysql			"m_mysql.cpp"
-	anope_use_extra sqlite			"m_sqlite.cpp"
-	anope_use_extra ssl			"m_ssl_openssl.cpp"
-	anope_use_extra gnutls			"m_ssl_gnutls.cpp"
-	anope_use_extra posix			"m_regex_posix.cpp"
-	anope_use_extra pcre			"m_regex_pcre.cpp"
-	anope_use_extra tre			"m_regex_tre.cpp"
-	anope_use_extra ldap			"m_ldap.cpp"
-	anope_use_extra sql-auth		"m_sql_authentication.cpp"
-	anope_use_extra sql-log			"m_sql_log.cpp"
-	anope_use_extra sql-oper		"m_sql_oper.cpp"
-	anope_use_extra ldap-auth		"m_ldap_authentication.cpp"
-	anope_use_extra ldap-oper		"m_ldap_oper.cpp"
-	anope_use_extra chanstats		"stats/m_chanstats.cpp"
-	anope_use_extra cs-fantasy-top		"stats/cs_fantasy_top.cpp"
-	anope_use_extra cs-fantasy-stats	"stats/cs_fantasy_stats.cpp"
-	anope_use_extra irc2sql			"stats/irc2sql/irc2sql.cpp"
-	anope_use_extra irc2sql			"stats/irc2sql/irc2sql.h"
-	anope_use_extra irc2sql			"stats/irc2sql/tables.cpp"
-	anope_use_extra irc2sql			"stats/irc2sql/utils.cpp"
-
-	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
-	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || 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}"
-	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
-	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
-		 "${T}/anope-conf.d-v2" || die
-	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 -R anope:anope /etc/anope
-	fperms -R 0700 /etc/anope
-	fperms 0755 /var/log/anope
-	fperms -R 0750 /var/lib/anope
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]] ; then
-		local directory
-		directory="${ROOT}"/var/lib/anope/pre-update
-		elog "Making a backup of your databases to ${directory}"
-		if [ ! -d "${directory}" ]; then
-			mkdir -p "${directory}" || die "failed to create backup directory"
-			chown anope:anope "${directory}"/../ || die "failed to chown data directory"
-		fi
-		# don't die otherwise merge will fail if there are no existing databases
-		cp "${ROOT}"/var/lib/anope/*.db "${directory}"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		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
-	fi
-}
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index 9826ad83c454..01ccc819ffe1 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -19,17 +19,5 @@
 		<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="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>
-		<flag name="posix">Add support for POSIX Compatible Regular Expressions</flag>
-		<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>
 	</use>
 </pkgmetadata>