gentoo resync : 28.04.2021

3 files changed, 7 insertions, 87 deletions

diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 02069435ebb8..e29c89c9f168 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,9 +1,8 @@
 AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25ba6b06420dfd45914d4aff5321ccd9129239e7f66182d91800371f14c81ee4ac6eb39ad96063d7750a40a25e1eccb9dcebbe50502f0bc9 SHA512 de10ae6d6328da636afd8ec0de187b3f29677c3854e111a64df9b15c9d41ef8ec92f2efd65bc361b2fb6b879016b44e2ce9639da937370d71781aca569991d75
 AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c678bcf0c8fd547acbc7c1614995d5fc75261924cb435b0c0fc4d9f94c2fee3781aba407f3cb09e26958d1e09e1338e7e1781fb SHA512 f0d7c699d648f4a89d622f3f2238b967cae7ff139f25390853b195efd3a76c74af80389c20fcd2c1203fc33d006e7e27d9bdfcab4772c7a688fce7d0649d28be
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
-DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
-EBUILD eggdrop-1.8.3.ebuild 1720 BLAKE2B c10f202e1ef55e875b1182d50240f2f1555e13d7d357202dd682d55866eabee4660695f5711139b11ada087dfb47e1367b7ddc55ff6bbee9f4a303b0b177e165 SHA512 8ebf2205e9bbd244a99bd3b9af23ec423bd773f77978d2cf9cf46e174cdd3a01868aad71781175e97d27d5fd5ce609d0aff872e217a4eeafc5acdd8ff70883ba
+DIST eggdrop-1.9.0.tar.gz 2206230 BLAKE2B 1c6c5c77558323ae80b4f486f30d106b2f336c61c50adc10302657c2878a755b48d8286ba70f662b6be132ffd569de5eb269cfca1e6e42675b007de43ccf4746 SHA512 e78e220c8207361c6d7bda06be6d0094d747809ff8554fed2ce4a5fb63df1d87f8b82a98d4f0b98909042af8f6719f4a7bf548f864d3d6dfa8caa57b346d32dc
 EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe
-EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f
+EBUILD eggdrop-1.9.0.ebuild 1458 BLAKE2B 7c9160373af31b1d9a03db59ba46b568fae83c7eca3d5f4cdaecd9bd7b65f7d2a5dee8fe19afd1f93b9035349d5b222640b6dd4dbba27a99ef921ab1e2bc4953 SHA512 2ab3ecf6f61e109fdda976b3373da8255d7998f693eb8aca98bd2e251d58457de43224c52411176953afe45fe2f1888e9c07f7ba89a3adebc11804db549356c4
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
deleted file mode 100644
index 89a942bbaebf..000000000000
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="An IRC bot extensible with C or TCL"
-HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc ipv6 ssl static"
-
-DEPEND="
-	dev-lang/tcl:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-	sys-apps/gentoo-functions
-	${DEPEND}
-"
-
-DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING )
-
-src_prepare() {
-	# https://bugs.gentoo.org/335230
-	# https://github.com/eggheads/eggdrop/issues/526
-	sed -i \
-		-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
-		src/mod/*.mod/Makefile* src/Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf $(use_enable ssl tls) \
-		$(use_enable ipv6 ipv6)
-
-	# https://github.com/eggheads/eggdrop/issues/527
-	emake -j1 config
-}
-
-src_compile() {
-	local target
-
-	if use static && use debug; then
-		target="sdebug"
-	elif use static; then
-		target="static"
-	elif use debug; then
-		target="debug"
-	fi
-
-	emake ${target}
-}
-
-src_install() {
-	# https://github.com/eggheads/eggdrop/issues/527
-	emake -j1 DEST="${D}"/opt/eggdrop install
-
-	use doc && HTML_DOCS=( doc/html/. )
-	rm -r "${D}"/opt/eggdrop/doc/html || die
-	DOC_CONTENTS="
-		Additional documentation can be found
-		in ${EPREFIX}/opt/eggdrop/doc
-	"
-	readme.gentoo_create_doc
-	einstalldocs
-
-	dobin "${FILESDIR}"/eggdrop-installer
-	doman doc/man1/eggdrop.1
-}
-
-pkg_postinst() {
-	# Only display this for new installs
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please run ${EPREFIX}/usr/bin/eggdrop-installer to install your eggdrop bot."
-	fi
-}
diff --git a/net-irc/eggdrop/eggdrop-1.8.4.ebuild b/net-irc/eggdrop/eggdrop-1.9.0.ebuild
index c629643aa509..5d6de0a857df 100644
--- a/net-irc/eggdrop/eggdrop-1.8.4.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.9.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit readme.gentoo-r1
 
+MY_P="${PN}-${PV/_rc/rc}"
 DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
+SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"