gentoo resync : 27.10.2018

5 files changed, 3 insertions, 182 deletions

diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index e7837a7b33a8..676ad8e993b1 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,9 +1,4 @@
-AUX eggdrop-1.6.21-fix-gcc5-remove-inline.patch 1551 BLAKE2B f94634c58ea761152e4c5f6488b651e0548eb58ea56560520a2794351d1bd560d9c668fe8f2673dad1d35bc66ccb0020e9c0dfe321bdc3963deac26749cb6cc8 SHA512 66c4bc3a632736cdef4d6b641e9ff30ce4e479114067901c208e26379f21e563c515b381690b3204c2437ae8a71ea756103185fe8bb508f0b22d9a907c5622ff
-AUX eggdrop-1.6.21-fix-memset.patch 323 BLAKE2B d51ac90bd22751528ba1d0b57e41e14b1f801bd468ce3b225a8d4248896b3d3fde493357a03e3bf14fc640908f4916b4665b9b39e9d140b02ca00e0aba921667 SHA512 91f422c7af4d3f5dd11d770eb6f6495f321fa8be2d51bbcb7b39756e8e3137a397175a997ea8fdcd74783b72bebcac052866f297c2ae70a4f649c5fb9b4b6c04
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
-DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 BLAKE2B 5589b4c826b6144b2c5b68df485dfc361edf699d4cd6cf2760f410716664d34cc3dd7f22f2b5af67264ec5f4071e9a17907fa9796bd2712a9a86cbd6122a9c27 SHA512 d7d5d740c68997101f360096612700919c890c4254708102e962427de5929ce98f0f2eb5ad8dc8a56de60e8b610d502edeae7de2ac762fe0981134da379b6e64
 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
-DIST eggdrop1.6.21.tar.bz2 999211 BLAKE2B f804ebe4f06176a6de7331d409f97ed1c3159cc32a8a06cb8c5c6e6a83bf181c7b9624a2a4aaee4d36361903a21b7ee1c052466faeebda357bb0675052e3a5da SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653
-EBUILD eggdrop-1.6.21-r1.ebuild 2465 BLAKE2B 03701c6e050130c794db1ed6283a7088e57d54cae32cade79a3e070db13503d133a63daf444ea6046441ee407782ec21e060379906b95614e4efd03c220322de SHA512 19bdab29fa8becca0031e6156366a81b2b940da499284cfe4dfc6bfaf00a861a09aa4e5cfd4542c37f2ada8327b36800f901104d0db95cd2ec2ed0adc76dce16
-EBUILD eggdrop-1.8.3.ebuild 1717 BLAKE2B b485a0aed5e0955b012cb72a4a9b0d077efe74ac5180006d4c5f6f068b5b7b05a963db1e548f8e63b17be869f5342f4d498ad02665c521f723d2f8c5338269f8 SHA512 38df420deb37f962a53795853abfdd50a83237d1220bf5b66c1c21887dbd7a61a6e62b9db6a93cf0abf0c646a09b56a50943405660021037b50579d3049ee26a
+EBUILD eggdrop-1.8.3.ebuild 1718 BLAKE2B 6a1e26f655876c6de4aeeb157662d12c5d7fed80016e8a36e18ee829bdef17dff9f4336a54ac891ebf63c414be2aaadb9a07a271dfc9eb79d1484225ba9ddefc SHA512 fbaf51a3ee4ecd4428d4bfff8a2d09b0a09e4b7f9a954906fb7c644cec70e59f7b325655c3e452a31107432f6100c3993e7bc858b818681e1a80ec0fd50deaea
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
deleted file mode 100644
index f2f6d79bb71f..000000000000
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_P="eggdrop${PV}"
-PATCHSET_V="1.0"
-
-DESCRIPTION="An IRC bot extensible with C or TCL"
-HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="
-	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~binki/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCHSET_V}.tar.bz2"
-
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug mysql postgres ssl static vanilla"
-
-REQUIRED_USE="vanilla? ( !mysql !postgres !ssl )"
-
-DEPEND="
-	dev-lang/tcl:0
-	sys-apps/gentoo-functions
-	!vanilla? (
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql:*[server] )
-		ssl? ( dev-libs/openssl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare()  {
-	# fix bug 571004 and a QA warning
-	epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" \
-		"${FILESDIR}/${P}-fix-memset.patch"
-	if use vanilla; then
-		rm -f "${WORKDIR}"/patch/[1-6]*.patch || die
-	fi
-
-	EPATCH_SUFFIX="patch" epatch
-
-	# fix bug #335230
-	sed -i \
-		-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
-		src/mod/*.mod/Makefile* src/Makefile.in || die
-	default
-}
-
-src_configure() {
-	use mysql    || ( echo mysql ; echo mystats ) >>disabled_modules
-	use postgres || echo pgstats >>disabled_modules
-	use static   && ( echo rijndael ; echo twofish ) >>disabled_modules
-
-	econf $(use_with ssl)
-
-	emake 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 -j1 ${target} # fixes #533490
-}
-
-src_install() {
-	local a b
-	emake DEST="${D}"/opt/eggdrop install
-
-	for a in doc/*; do
-		[ -f ${a} ] && dodoc ${a}
-	done
-
-	for a in src/mod/*.mod; do
-		for b in README UPDATES INSTALL TODO CONTENTS; do
-			[[ -f ${a}/${b} ]] && newdoc ${a}/${b} ${b}.${a##*/}
-		done
-	done
-
-	dodoc text/motd.*
-
-	use vanilla || dodoc \
-		src/mod/botnetop.mod/botnetop.conf \
-		src/mod/gseen.mod/gseen.conf \
-		src/mod/mc_greet.mod/mc_greet.conf \
-		src/mod/stats.mod/stats.conf \
-		src/mod/away.mod/away.doc \
-		src/mod/rcon.mod/matchbot.tcl \
-		src/mod/mystats.mod/tools/mystats.{conf,sql} \
-		src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql}
-
-	dodoc -r doc/html
-
-	dobin "${FILESDIR}"/eggdrop-installer
-	doman doc/man1/eggdrop.1
-}
-
-pkg_postinst() {
-	elog "Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
-}
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
index 45e57088d8b5..2fd93b403c24 100644
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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 ia64 ~mips ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
deleted file mode 100644
index f7bcd8b80bca..000000000000
--- a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/src/net.c b/src/net.c
-index 68c245c..e48fb76 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *port)
- /* Returns a socket number for a listening socket that will accept any
-  * connection -- port # is returned in port
-  */
--inline int open_listen(int *port)
-+int open_listen(int *port)
- {
-   return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
- }
-diff --git a/src/proto.h b/src/proto.h
-index 117347e..e80e30b 100644
---- a/src/proto.h
-+++ b/src/proto.h
-@@ -271,7 +271,7 @@ int getsock(int);
- void killsock(int);
- void killtclsock(int);
- int answer(int, char *, unsigned long *, unsigned short *, int);
--inline int open_listen(int *);
-+int open_listen(int *);
- int open_address_listen(IP addr, int *);
- int open_telnet(char *, int);
- int open_telnet_dcc(int, char *, char *);
-diff --git a/src/tclhash.c b/src/tclhash.c
-index 822f920..7281ceb 100644
---- a/src/tclhash.c
-+++ b/src/tclhash.c
-@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
-   nfree(tl);
- }
- 
--inline void garbage_collect_tclhash(void)
-+void garbage_collect_tclhash(void)
- {
-   tcl_bind_list_t *tl, *tl_next, *tl_prev;
-   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
-diff --git a/src/tclhash.h b/src/tclhash.h
-index 4069014..3bd85a7 100644
---- a/src/tclhash.h
-+++ b/src/tclhash.h
-@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b {
- 
- #ifndef MAKING_MODS
- 
--inline void garbage_collect_tclhash(void);
-+void garbage_collect_tclhash(void);
- 
- void init_bind(void);
- void kill_bind(void);
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
deleted file mode 100644
index f4d60f322dac..000000000000
--- a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/md5/md5c.c b/src/md5/md5c.c
-index 4dce058..cfdf97c 100644
---- a/src/md5/md5c.c
-+++ b/src/md5/md5c.c
-@@ -267,5 +267,5 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx)
- 	result[14] = ctx->d >> 16;
- 	result[15] = ctx->d >> 24;
- 
--	egg_memset(ctx, 0, sizeof(ctx));
-+	egg_memset(ctx, 0, sizeof(*ctx));
- }