gentoo resync : 30.06.2018

3 files changed, 86 insertions, 3 deletions

diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index e6155009e428..6a2c221e1436 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -2,6 +2,8 @@ AUX eggdrop-1.6.21-fix-gcc5-remove-inline.patch 1551 BLAKE2B f94634c58ea761152e4
 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 2464 BLAKE2B 5a40cc3bb38a13c1c1ca344019ad535ec01c244ffdb7c26d6b83945634f597e9143cd03f6ad1cfdb7929f9f00e4513ff7f59d0a364083671ba1fc6e2740b0db1 SHA512 509f82d3d4ce3a1c9762f212d254e488d501f358172df9fc2982b1f8b1cd69436494d02815940059aaa2b3e9c25b6c2b2878666af74bb2684557a55c92b6364e
+EBUILD eggdrop-1.6.21-r1.ebuild 2465 BLAKE2B 03701c6e050130c794db1ed6283a7088e57d54cae32cade79a3e070db13503d133a63daf444ea6046441ee407782ec21e060379906b95614e4efd03c220322de SHA512 19bdab29fa8becca0031e6156366a81b2b940da499284cfe4dfc6bfaf00a861a09aa4e5cfd4542c37f2ada8327b36800f901104d0db95cd2ec2ed0adc76dce16
+EBUILD eggdrop-1.8.3.ebuild 1722 BLAKE2B 43844eef97f44a92f683ec91a3f86262e493afc2fed194d164ef602e95cbb4b4aba4749e4566572b422b5e94fedea8936c1e270d56b193335664323b24c11eb0 SHA512 aad08f18d7b804d9a2091dac85e4c9a5a7a9c64bdb31e72581f64001d31c9c6924e30ff676cd6b02fa4a4d489896211f57e5ca64d6fde6b5b5016daca7cfdce2
 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
index b9e9aed74280..f2f6d79bb71f 100644
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_P="eggdrop${PV}"
 PATCHSET_V="1.0"
 
 DESCRIPTION="An IRC bot extensible with C or TCL"
-HOMEPAGE="http://www.eggheads.org/"
+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"
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
new file mode 100644
index 000000000000..86d8765154b1
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~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
+}