Bump to eggdrop-1.6.21 (bug #338211) including fixes for LDFLAGS (bug #335230) and most parallel make issues (bug #295302). Many thanks to Adam (from Anope) for updating the patches tarball and the SSL patch and adding fixes for bug #196337.

Package-Manager: portage-2.2.0_alpha82-r1/cvs/Linux x86_64

3 files changed, 138 insertions, 3 deletions

diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index 4572475402f3..79ea9484da41 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/eggdrop
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.86 2010/06/17 21:52:12 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.87 2011/12/31 13:41:41 binki Exp $
+
+*eggdrop-1.6.21 (31 Dec 2011)
+
+  31 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> +eggdrop-1.6.21.ebuild:
+  Bump to eggdrop-1.6.21 (bug #338211) including fixes for LDFLAGS (bug
+  #335230) and most parallel make issues (bug #295302). Many thanks to Adam
+  (from Anope) for updating the patches tarball and the SSL patch and adding
+  fixes for bug #196337.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> eggdrop-1.6.18-r3.ebuild,
   eggdrop-1.6.19.ebuild:
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 399a90abd22f..aeb3ad2d171d 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,9 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX eggdrop-installer 2262 RMD160 dca84f9558ebaf267eebbafa374ee9c22a38e3d6 SHA1 a73889c20ff9809dab98d8e3ee7db6ed44991fa9 SHA256 1d9f239bb1f19b1324f22e5d4f3aef92a00b4201c9390297268fe461dde61dbf
 DIST eggdrop-1.6.18-patches-1.3.tar.bz2 323119 RMD160 1519256a34efd0d27d139792b12bac3a63b8a732 SHA1 bd912909d4f9219fdf8b95034fed96884919313e SHA256 f8dfd4208aed41849882ad90ffd9609ceda68920f95c1a16cb24e3b090423c78
 DIST eggdrop-1.6.19-patches-1.0.tar.bz2 316983 RMD160 63f62a77a6fad9a16b8026536fbd551d49c32694 SHA1 2fa8c2db7b4fc210430c50bf52fa46f4f5b49cd7 SHA256 e3ce054323a7ad937cd892f263cf9e6039b410f78bead2321d78997626e93195
+DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 RMD160 7f06cdf35ac681b0308caba4fbb55690f29fe9ad SHA1 cb703933d43e96cfb0a47b9cfc9da30c7ee546cd SHA256 78b3107b711ce2df1e7752eb60d517774f104ba1ba0623bb116b824ab8d069d7
 DIST eggdrop1.6.18.tar.bz2 783676 RMD160 06480616c23bff2b1209e03b5e25b55818c4b195 SHA1 a5c27578324ad718e224248dc54dfd268df9f71e SHA256 e5d0794ee7b819f8c12ff10f521e5cb453fc531ac990867c6bf228f018d38a9e
 DIST eggdrop1.6.19.tar.bz2 811072 RMD160 cc4ccb3efe84a90621f87d2b69234ee605b0751c SHA1 e360afc87417d6bf9a7ddca4f4a464f348e6fad9 SHA256 2e211a0fd20abd382c280807f9430102cd9b95991e359b3bede042549dd7b3cf
+DIST eggdrop1.6.21.tar.bz2 999211 RMD160 1006dfd6a6e735500c2b484eb3061f1d2dfd20f8 SHA1 98ce7220c8aff19d2f8406fcc52aa1807aa0de01 SHA256 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754
 EBUILD eggdrop-1.6.18-r3.ebuild 2526 RMD160 ea46e100a6878c1086ae6d0e41e3b38fa01ba790 SHA1 86b3d2bebbd95b81dba8bba33230a86ab51edb59 SHA256 45cd13e553748b95864771dd33b5dc2e2e0a3b2edaa29370a2a65327e75656e1
 EBUILD eggdrop-1.6.19.ebuild 2640 RMD160 4f3a50fd3607587208b51b0f5dc9273a3d2eeffc SHA1 ac5db97203e73884b6763201c30f93f368b7da27 SHA256 966dfc9d6421870835eb386d8ceec2b1f383754ed24074d2d4c45272c0d50c2a
-MISC ChangeLog 12602 RMD160 69fee2084251cd3669f88be6b50829f4e36f1ae2 SHA1 efbecbfbd338d2d4abf3c7c7e95acd55fde11261 SHA256 7d3b61c221f1472f48e0d0b84cd8101dbd66e6a79339fae5c12c4dd9293e1881
+EBUILD eggdrop-1.6.21.ebuild 2385 RMD160 e887787ed986e305713ced76edfb632636c1d681 SHA1 040c6eec6dd6a237526749678b070a934fc2199c SHA256 ce80111c8d33144c5c9052fe1c1fdf9099da4524a1bff3cbb310f51397bfcc0a
+MISC ChangeLog 12961 RMD160 0ca4bd42ab07fbee77691c8b87faa7f4e14a59fe SHA1 19b6bad4f8847612ccbb9aab9e07bd6bdfdce1a1 SHA256 bcb79d5163e8755f6cf02a2eefc9eb73a4e11d0edf43634d16889bc653763e7a
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCgAGBQJO/xCOAAoJEHQ6UuhrqBBQgFgP/RWLDDA8CmfB36NOH2T5cE4w
+kiQILuJp03dpi3CWRXC92ZSbnIu6b3Ieby5ujI86BK+zAQ9Wq3rpwBq9VCb8lqdW
+1Mu+lFrf4wmefdP1W10T0A5fc3vurH0g/iFHJ7jJpCAlHdshuzOglSH0xUxUlWzv
+ox0MWmIJtWS0iZcWD2ZJ2/rq2lHMKJEKzZirzdLjjlxMw7gg8FFcEhg6jBP7LdM7
++mdycZIZS7BfZHvAAx4qOPPlwwTwDKM2OKEo0S21kzioBowx1+AhvxY5aPo7UI09
+/LXjwiKo68O2nocSsxXWP5gT2yIaZzJ+Qg7pwwiid8yxdT88IWpLxN04BXf48luw
+UwANGnDBOCjK2nR5/4rdWhvcV4bNdB/8qmV4EjTtEBDg817oYNjy18WCjgd1QSwO
+MOcV/GEIufYj2F/C7Kxn5oqrs6jzPszZ1o8P21LhU3cbioXQ1Qmsyrtm7dqc7I9u
+VEz9pY0tjoTT9qYiaNK/clO3P+Dm8S4i9Un9sFtucuhUqIFTbRUdoCH3oDgSw2C8
+3FCGOxgR/ZsxngCymfBrpA0vkprDsPtQmuVEFq+74P3BfB6Arn/g0M4o7DQssCXe
+GCtyIZHhe/cSCC8wk8tP6EXyJOKWrvZr7enV0JszaNquGIQT+m9VOTydbW/w2iX9
+eXB+05WeRwACWzQPckzD
+=L6Dl
+-----END PGP SIGNATURE-----
diff --git a/net-irc/eggdrop/eggdrop-1.6.21.ebuild b/net-irc/eggdrop/eggdrop-1.6.21.ebuild
new file mode 100644
index 000000000000..15e32e3622af
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.6.21.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.21.ebuild,v 1.1 2011/12/31 13:41:41 binki Exp $
+
+EAPI=4
+
+inherit eutils
+
+MY_P="eggdrop${PV}"
+PATCHSET_V="1.0"
+
+DESCRIPTION="An IRC bot extensible with C or TCL"
+HOMEPAGE="http://www.eggheads.org/"
+SRC_URI="ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.bz2
+	http://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
+	!vanilla? (
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-server )
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare()  {
+	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
+}
+
+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 ${target}
+}
+
+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}
+
+	dohtml doc/html/*.html
+
+	dobin "${FILESDIR}"/eggdrop-installer
+	doman doc/man1/eggdrop.1
+}
+
+pkg_postinst() {
+	elog "Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
+}