Revbump to make sure people do not end up with broken eggdrop-installer.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 127 insertions, 16 deletions

diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index b7ab6d29c4e9..2fa26aeade86 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/eggdrop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.94 2014/12/21 12:08:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.95 2014/12/21 12:12:35 mgorny Exp $
+
+*eggdrop-1.6.21-r1 (21 Dec 2014)
+
+  21 Dec 2014; Michał Górny <mgorny@gentoo.org> +eggdrop-1.6.21-r1.ebuild:
+  Revbump to make sure people do not end up with broken eggdrop-installer.
 
   21 Dec 2014; Michał Górny <mgorny@gentoo.org> eggdrop-1.6.21.ebuild,
   files/eggdrop-installer:
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index a3ac0fa447f7..fba8b849ea40 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -4,25 +4,26 @@ Hash: SHA256
 AUX eggdrop-installer 2264 SHA256 2faac940a569d63de10e6141f7d30c626bc7e4065f522acf5ee586362e35d1d2 SHA512 921c0c51c5f024ff0b35626abbe92314d770418598cbd267f4e1775d734b63c082243e30a3250e6f9a4e79b3de0d5b60f427f97638cde01c6804bee4b5f77312 WHIRLPOOL d201c231ac3048ab15ff41d5168d9563d50e84d5d82ca329dc861edd2cd0fe8fe9ad69d64cfb3990019f95a3a00ab61565a9c47c9016d163b8b4efb0c6b11df7
 DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 SHA256 78b3107b711ce2df1e7752eb60d517774f104ba1ba0623bb116b824ab8d069d7 SHA512 d7d5d740c68997101f360096612700919c890c4254708102e962427de5929ce98f0f2eb5ad8dc8a56de60e8b610d502edeae7de2ac762fe0981134da379b6e64 WHIRLPOOL 202294f941d064b89348b270823d6b5f6e61483d56d32bde699857efe03c9aafec3ad4a9b6d503ffd97eefe6c6d4912e95546bd12f028e95c52d0e31e2086a1d
 DIST eggdrop1.6.21.tar.bz2 999211 SHA256 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754 SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653 WHIRLPOOL fc8115d6c5f1ac2878bb3811f303fe797f7b813d74f2c5c0be5a703a7e29d652b791a0a5e98842792f2466443c8571c983cd89fd516f36136f62a394060b052d
+EBUILD eggdrop-1.6.21-r1.ebuild 2418 SHA256 09cf420b12dcc35af69c91606fc73a37f80d4976749501091be7a6527a1ed76f SHA512 0186662e0992118af3fe006d0968dbbed10be70149aed428d4eeb2fc78eb7aa9721d2b72ed7e8fc4431ae53e5664ef470a1f4529f0da09e3e8387b82901373ba WHIRLPOOL be945f778e85bea8e87a518db9c06a6b9bbbf624d1e5db56424e65b66d69e47e5927be3d77c110dc796e378eac9ae3e68d9ca736b65dc96178b8be05b97c682d
 EBUILD eggdrop-1.6.21.ebuild 2409 SHA256 14989913fb547fd1ddc5761466f65343a09f667a48838a531ee443212a0e82b4 SHA512 e7648f81ef4231c96bb5c98a95628d7ab12c180ec9b90533c3381b2170e4c71d3302297e3fc80659347f6fb3a1c6579759994a08502e42ed9e1394ea17e3ad3e WHIRLPOOL 5539e4b8c05eda8d53d86d022e64613448b8766752e34a96064426dd272fdbdfaddd66f242acaa2f9886bd3bca3fe34debdb3acd602bf9582e020ad4fb087822
-MISC ChangeLog 13923 SHA256 7b634990e96a93cb779fc3ca0cc8f9c11e0cd9cca669bd3d85ecd797e5bda1b7 SHA512 370337f23bac304f82dbf36d738f258cb60cc282885a816d44a915777e817851d352d82f94eb82cf6c61dd977cdc1c0131e44e2af18826e2719bced43b898989 WHIRLPOOL 11243b22c869e8b480c744fca3b1bc0cb9fd671445c9b7532eb5dd7d3515a38d8eef274a66aa50ddd1c7d9e843d4fa2891f44c80545f23b99eeb0b4d7becf577
+MISC ChangeLog 14110 SHA256 2ebbb0cd9720071c05428f05ac5dd570299166b9c2f0d420af8ccac2a05707dc SHA512 356aabe16667070946521c8b82475f4442ae4a4464c67b663c61e8ec8f5d730eec67e3707845f605e9a39647dddfc0b6e77eb9f26e918f1658fc3d961ff921ca WHIRLPOOL 27e18cab75cb51f612c7eda4233d652eaafcc78f2975ce57e25fa58ee38130940b00c294458158ba5ca1e33194a3856dc7a5d87d8a92d738eb37e71e4f42cb9d
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUlrghXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUlrk0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVaIP/AzA5XCXY1e9WqJnEI9YvXXQ
-LrAB5oc9zjAymsgfy4VyM/hPo8+PGpUmNgzv2B+sq3v4ATtz19TyxQX8KeUwGQno
-4/diLzEfSPAiFFasXcwIA3LXNM5hO/4jdaql7K5hp3wHVydntg6FuubVmZcN8qby
-R+zypu6PJcKEV7zZJwF6NrpErLAClJjMQbFSc2Jj9+ycjD2RpFm4vuV5PISgi8h2
-EmPlv7UwXM8FeNeKfc14GYrH9ZvbeigcHjkVZNtuzcoJ6waw/uW2fSoCgWBTCckg
-aUFKpGFXPb5pLqm+MLBtDwnzSiFatStZMVKZp5a7UaEA22KEaHZ84VdFCw1QiCrC
-IAealM6Ug96R22y/S2T/yEev5BuIiKfD2uGeluF+ZMYWQstSdrmEP4mrXAUz96Er
-xcKLrZATty5dQr1uk5xLcgB0VfqvF0q0nts4ZR3kS6DRP7ezfKq7hLSjp7tdtzvi
-WdkFMq8lyuZvEAiMfzeccSsIhoo7u51NwtbT3pSithA746D1eOu7PKEbzFXFwzyR
-wGCMon+dzmN+2TxVLnqR6mpfMAHROXcysRKtpEY2TUhNcATOsqm9oclF/OhdXJqo
-BQ7bG6sHVSGOJnPcbG3f6Uo5/nuZ66JcfUElES3gZ6iGk9qlq06zEVPXA3pjQord
-qumsDNrMprxmaWM6rYmA
-=5cNP
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO82oQAI9YggOZqPjYlw4rLqVhaxmv
+6ouP65HXSxtfdiD3mAOApSIQz9Vd4KaezYGAE3aMqcT7kuBUPGzCo7jpF08eeozG
+xGFt3T+0UweTEpulZ3HUfsaSh4QNj2DeBsQw6p8abaWTa9P9inEBdm0TcyQ6jXTF
+fxJ5O+QMi8SzCwjvL3LR/iiswos2cWN+Auf8kCU+cPQ+8YlR/jws2bsYeD57L1iM
+Z7bhGi6YT8XtcRf0TmgxakOAiuHF/P9rmmhO2lAZkcopSVllFmr+7mq368f67UHA
+HCQic2j+CKeFlvQrlJAqAFLsGh9NeGNeHRgXHmWvABRIYS0ENRQCDgOffoblKPjk
+qNsyIA6O2uK5TJ1dFhr9GTDdPxSFHtXBp2pQTWGyOhRKpT+i6Vxr2lzGt2iTUD28
+MMZeYz+0my4aMxQO78f8YAR8JB0+r93pNCG8Tl3O8ntit0TeLlbbRO9G6a9NGkle
+ihTOFsKMdzzb9FWRxFskCx1v+UD/IFj/lBhuPIy9+Blmd0MCmrgQiMr1HJOh+cLC
+Pvl5UNA4yMu6evFU6ybgWw9ltDwcvATaBaNkveN/Wxw0mBac5Cony4YtdG2rStOO
+AhU34gXk1Ba1Eff/n/4v1ht7uYnBkBYiFEmueox/Y4FXHMYi2AlJ0Ixyr9cV96jH
+4wgr8FgiHbi8x6gvNGA6
+=RMoj
 -----END PGP SIGNATURE-----
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
new file mode 100644
index 000000000000..507d2cac1d7f
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/12/21 12:12:35 mgorny 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
+	sys-apps/gentoo-functions
+	!vanilla? (
+		mysql? ( virtual/mysql )
+		postgres? ( virtual/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."
+}