Revision bump to include new megahal version, bug #140868. Thanks to Pavel Shirov!

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 16 insertions, 133 deletions

diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index e5871136dbc1..fed98e705bde 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -7,9 +7,9 @@ RMD160 9650133633d35f289dd4f057ecc4e05599b421c0 files/eggdrop-installer 2268
 SHA256 e477782910b219d681ff351cb6ede22b588cbf9b287d897d813220e52e619cd3 files/eggdrop-installer 2268
 DIST eggdrop-1.6.17-patches-1.0.tar.bz2 309154 RMD160 87f3610b15b928d3bec266958762244b7e472be1 SHA1 97abccf8da85063f4f12c7526ae5c7fbf041fbe5 SHA256 11de8cff328a2587f701532ed059973322b073334450edb32180615d0f5a0982
 DIST eggdrop-1.6.17-patches-1.4.tar.bz2 319594 RMD160 4ec178e99244b376d11c7829e1377d63692e37be SHA1 f2bd7796c8f342f0e856384a26ebec7bc39150e1 SHA256 07076b3ab602977f1580bbf0f74ec2fc1ac279d265df21720750a89625b96bac
-DIST eggdrop-1.6.18-patches-1.0.tar.bz2 319957 RMD160 3d8d18d3bdb256fcf098a574a5a958655a779e48 SHA1 0c996c27fddc4723a5498caffb05c169670f5b87 SHA256 049b2d1cd27ef5d2daabc6c55a8bf153f2ab6f32486ee9eecdec4c225c0a2abd
+DIST eggdrop-1.6.18-patches-1.1.tar.bz2 318020 RMD160 9bb8cb2de90657b0ff915a05f02bac072102e6af SHA1 9bcfb8e9b6d334543825be7f291d0c718ab359e8 SHA256 b5f3c860a047bf016d32d5db0b7ad4ba5e8b2b9eaec709fff9c6da4d0c1791cd
 DIST eggdrop1.6.17.tar.gz 1021902 RMD160 28155b6ea80ad63b09a3ad636f970f1f8533e399 SHA1 0bf27f7a793be3b6f0d63420e213a0fb28024a0a SHA256 a14fe1558dac6214c13b7bc469e10d654e4571c2a86cb3ff773d505a009591be
-DIST eggdrop1.6.18.tar.gz 1025608 RMD160 49c283803886d27b2ecd31ab64b8b4d6e40087e7 SHA1 1c8979305e0c7c690324dfa46ee9d35b7274d92f SHA256 ee6c1729a26dd726136d6f859f79817427acea0331023429eb0bfe374d674c7a
+DIST eggdrop1.6.18.tar.bz2 783676 RMD160 06480616c23bff2b1209e03b5e25b55818c4b195 SHA1 a5c27578324ad718e224248dc54dfd268df9f71e SHA256 e5d0794ee7b819f8c12ff10f521e5cb453fc531ac990867c6bf228f018d38a9e
 EBUILD eggdrop-1.6.17-r2.ebuild 2529 RMD160 c279b4fa0e6653747a0764ba294a1933b92a2615 SHA1 d09dbb531e12c6504f3b3ccdcf60c22956d78d4c SHA256 4ee73334e901a748dbc8ee4d9f97c35586c8064209ad79b3e4ee8ab2c72f69d1
 MD5 2c865a6a06ced0c9ffe598fb49d8da3b eggdrop-1.6.17-r2.ebuild 2529
 RMD160 c279b4fa0e6653747a0764ba294a1933b92a2615 eggdrop-1.6.17-r2.ebuild 2529
@@ -18,14 +18,14 @@ EBUILD eggdrop-1.6.17.ebuild 2188 RMD160 f61038029fa7ee6132994f26e8b80da18a6c187
 MD5 62f31d8a6a61e414ccdf004363b59563 eggdrop-1.6.17.ebuild 2188
 RMD160 f61038029fa7ee6132994f26e8b80da18a6c1879 eggdrop-1.6.17.ebuild 2188
 SHA256 2f7fa54ef0d7b3379568c192c696ff48347b8af4d3a405418cbdaf876dd3e4f0 eggdrop-1.6.17.ebuild 2188
-EBUILD eggdrop-1.6.18.ebuild 2526 RMD160 950f8d96d7d121384ee531b963c825c6b10d3132 SHA1 00d361fb3ea7b11edfd6c040508126514e9495d8 SHA256 4502288609499f0a4adc58d34cbec7539b4cf0a26c6ec32621ba117e78309bce
-MD5 9b085a18eb44130b3ce91c41a08475c4 eggdrop-1.6.18.ebuild 2526
-RMD160 950f8d96d7d121384ee531b963c825c6b10d3132 eggdrop-1.6.18.ebuild 2526
-SHA256 4502288609499f0a4adc58d34cbec7539b4cf0a26c6ec32621ba117e78309bce eggdrop-1.6.18.ebuild 2526
-MISC ChangeLog 7839 RMD160 d0fff3ac2b432d17d5a4044c84f68163c0d4f807 SHA1 e42489e5d6ad563cb1f1f198f51a23da0d203da5 SHA256 c419e8d41d67c6f7bad9d519577612550ea33c556eb8b9b5f6ddf87a2c92baa5
-MD5 81b8e2a865db379ebd8fa4e11637bb3c ChangeLog 7839
-RMD160 d0fff3ac2b432d17d5a4044c84f68163c0d4f807 ChangeLog 7839
-SHA256 c419e8d41d67c6f7bad9d519577612550ea33c556eb8b9b5f6ddf87a2c92baa5 ChangeLog 7839
+EBUILD eggdrop-1.6.18-r1.ebuild 2530 RMD160 22a8344a63ac5752fad0772235be78e31bc7c215 SHA1 1e03cfec8ab58919dde79716d27cf4318efdcaff SHA256 596f37197cf08331f8127df3454e04d2c0b08115dcd70c6b50fbc43174cdc391
+MD5 d0bcae8016b26e2ed0e01edffa7df4c2 eggdrop-1.6.18-r1.ebuild 2530
+RMD160 22a8344a63ac5752fad0772235be78e31bc7c215 eggdrop-1.6.18-r1.ebuild 2530
+SHA256 596f37197cf08331f8127df3454e04d2c0b08115dcd70c6b50fbc43174cdc391 eggdrop-1.6.18-r1.ebuild 2530
+MISC ChangeLog 8064 RMD160 436e346a670e9e4fd9f424e40a14e76153c3df94 SHA1 6d7b766b26697a6695199caa02034dd996456553 SHA256 4a689ac4529f893dfe215fbafd64186ac045a3c821dbe85359f305f6eca358fe
+MD5 b37769837dad0270c94d3a24112cc68e ChangeLog 8064
+RMD160 436e346a670e9e4fd9f424e40a14e76153c3df94 ChangeLog 8064
+SHA256 4a689ac4529f893dfe215fbafd64186ac045a3c821dbe85359f305f6eca358fe ChangeLog 8064
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -36,13 +36,13 @@ SHA256 913616f4e556255137222bde6471e3efec1ccf59cb27b86ab60eaef8fc3cff6c files/di
 MD5 fcee6aa344d6e92170bb1d4aac999144 files/digest-eggdrop-1.6.17-r2 527
 RMD160 f9437d505fd8e820c18e3c340dcd9afd3c64668f files/digest-eggdrop-1.6.17-r2 527
 SHA256 e9fb747ede9552f56bfb24e15f70dedecfca7e27d722676500c04fbb8c74669d files/digest-eggdrop-1.6.17-r2 527
-MD5 dfa39f1d58cdb34fade4e18776daa695 files/digest-eggdrop-1.6.18 527
-RMD160 7491f44c1980f69e908f8a5441ee981c791c4c89 files/digest-eggdrop-1.6.18 527
-SHA256 fab5dc8ee224d929133d5990198e090fef071b881c19767658828458ee899440 files/digest-eggdrop-1.6.18 527
+MD5 efa2acd5cfb82fb0c34c77345fa00390 files/digest-eggdrop-1.6.18-r1 527
+RMD160 e75f1be2d10b6d378330732e40622ca4d36cc513 files/digest-eggdrop-1.6.18-r1 527
+SHA256 9fbc251c162418e524f491145764ced3bf8a33e35a16d411855ded05c83274d0 files/digest-eggdrop-1.6.18-r1 527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEz8cvI1lqEGTUzyQRAveTAJwLLa1XC3Qral4cWcU7xc8o1rfV7wCfQj7o
-4T0UxVC35jA6nlhceXDUZzc=
-=sATQ
+iD8DBQFE03szI1lqEGTUzyQRAktSAKChEu/deFgZy3SQyyJxWJ8xiJngpwCfeSF9
+m8WREy4z6zS/WCCZXHoIhhY=
+=cBa5
 -----END PGP SIGNATURE-----
diff --git a/net-irc/eggdrop/eggdrop-1.6.18.ebuild b/net-irc/eggdrop/eggdrop-1.6.18.ebuild
deleted file mode 100644
index 9f6019b2f69b..000000000000
--- a/net-irc/eggdrop/eggdrop-1.6.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.18.ebuild,v 1.1 2006/08/01 21:27:58 swegener Exp $
-
-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.gz
-	mirror://gentoo/${P}-patches-${PATCHSET_V}.tar.bz2
-	http://dev.gentoo.org/~swegener/distfiles/${P}-patches-${PATCHSET_V}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug static mysql postgres ssl vanilla"
-
-DEPEND="dev-lang/tcl
-	!vanilla? (
-		mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql )
-		ssl? ( dev-libs/openssl )
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack()  {
-	unpack ${A}
-	cd "${S}"
-
-	if use vanilla
-	then
-		einfo "Excluding patches that install additional modules, this effectively"
-		einfo "disables the mysql, postgres and ssl USE flags."
-		echo
-		rm "${WORKDIR}"/patch/[1-8]*.patch
-	fi
-
-	EPATCH_SUFFIX="patch" epatch || die "epatch failed"
-}
-
-src_compile() {
-	local target=""
-
-	use mysql    || ( echo mysql ; echo mystats ) >>disabled_modules
-	use postgres || echo pgstats >>disabled_modules
-
-	econf $(use_with ssl) || die "econf failed"
-
-	make config || die "module config failed"
-
-	if use static && use debug
-	then
-		target="sdebug"
-	elif use static
-	then
-		target="static"
-	elif use debug
-	then
-		target="debug"
-	fi
-
-	emake -j1 ${target} || die "emake ${target} failed"
-}
-
-src_install() {
-	local a b
-	make DEST="${D}"/opt/eggdrop install || die "make install failed"
-
-	for a in doc/*
-	do
-		[ -f ${a} ] && dodoc ${a}
-	done
-
-	cd "${S}"/src/mod
-	for a in *.mod
-	do
-		for b in README UPDATES INSTALL TODO CONTENTS
-		do
-			[[ -f ${a}/${b} ]] && newdoc ${a}/${b} ${b}.${a}
-		done
-	done
-
-	cd "${S}"
-
-	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() {
-	einfo
-	einfo "NOTE: IPV6 support has been dropped by upstream maintainers."
-	einfo "Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
-	einfo
-}
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.18 b/net-irc/eggdrop/files/digest-eggdrop-1.6.18
deleted file mode 100644
index 08869b13e5a8..000000000000
--- a/net-irc/eggdrop/files/digest-eggdrop-1.6.18
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a7b39be8c2a17fb428aa91ae12fcf967 eggdrop-1.6.18-patches-1.0.tar.bz2 319957
-RMD160 3d8d18d3bdb256fcf098a574a5a958655a779e48 eggdrop-1.6.18-patches-1.0.tar.bz2 319957
-SHA256 049b2d1cd27ef5d2daabc6c55a8bf153f2ab6f32486ee9eecdec4c225c0a2abd eggdrop-1.6.18-patches-1.0.tar.bz2 319957
-MD5 c2734a51926bdf0380d8bb53f5a7b2ee eggdrop1.6.18.tar.gz 1025608
-RMD160 49c283803886d27b2ecd31ab64b8b4d6e40087e7 eggdrop1.6.18.tar.gz 1025608
-SHA256 ee6c1729a26dd726136d6f859f79817427acea0331023429eb0bfe374d674c7a eggdrop1.6.18.tar.gz 1025608