Revision bump for an updated patchset. Only change is the removal of the longer handles patch, because it breaks linking with other bots that are not patched, bug 86579. Rewrote the eggdrop-installer script.

Package-Manager: portage-2.0.51.19

7 files changed, 43 insertions, 34 deletions

diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index 63d8a4bcb62a..5580fda6c730 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/eggdrop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.38 2005/04/03 18:12:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.39 2005/04/03 20:58:39 swegener Exp $
+
+*eggdrop-1.6.17-r2 (03 Apr 2005)
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org> files/eggdrop-installer,
+  eggdrop-1.6.17.ebuild, -eggdrop-1.6.17-r1.ebuild,
+  +eggdrop-1.6.17-r2.ebuild:
+  Revision bump for an updated patchset. Only change is the removal of the
+  longer handles patch, because it breaks linking with other bots that are not
+  patched, bug 86579. Rewrote the eggdrop-installer script.
 
   03 Apr 2005; Sven Wegener <swegener@gentoo.org>
   -files/eggdrop-1.6.15-botchk.patch, -files/eggdrop-1.6.15-config.patch,
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index f3103d9eee28..b95c28813a85 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3dd3492660b1a1395891d71acdc24de9 eggdrop-1.6.17.ebuild 2183
-MD5 6d21e3e58c7b29848c6be56b71b3d105 ChangeLog 6321
+MD5 62f31d8a6a61e414ccdf004363b59563 eggdrop-1.6.17.ebuild 2188
+MD5 1e53626aa34666422c13562a2e456358 eggdrop-1.6.17-r2.ebuild 2274
+MD5 8e963d6365ff1d9b2dfde7e89ecf0abb ChangeLog 6726
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 6b1308dc13633239bd7c16c54b497795 eggdrop-1.6.17-r1.ebuild 2270
-MD5 5b8b9111c2d45de7c0794fac9c830820 files/digest-eggdrop-1.6.17-r1 145
+MD5 553b1bc88e6b98c27766e4e361c41490 files/digest-eggdrop-1.6.17-r2 145
 MD5 6b09026c13cde0090d7b943e6a4e1535 files/digest-eggdrop-1.6.17 145
-MD5 a0c1fc8d184c3a0214e009cf56fc86b1 files/eggdrop-installer 2264
+MD5 d1c7b90b504d49b5f9f19cab742f227c files/eggdrop-installer 2268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCUDIKI1lqEGTUzyQRAtH/AKC82Qtg4M1M0NBHEyZYxzRxA67yygCdGZch
-nnJKDOuRtbG8yADOd58E9Qw=
-=AIZX
+iD8DBQFCUFkYI1lqEGTUzyQRAoZNAJ9fNOxTpDP3uNgDw3ZYMmtJoMUKzACbBkf8
+GKf+00WfJJqoheaef8rLArg=
+=J0xv
 -----END PGP SIGNATURE-----
diff --git a/net-irc/eggdrop/eggdrop-1.6.17-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild
index 27f4834fd309..b1266885ca4c 100644
--- a/net-irc/eggdrop/eggdrop-1.6.17-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17-r1.ebuild,v 1.1 2005/03/05 00:37:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild,v 1.1 2005/04/03 20:58:39 swegener Exp $
 
 inherit eutils
 
-MY_P=eggdrop${PV}
-PATCHSET_V=1.1
+MY_P="eggdrop${PV}"
+PATCHSET_V="1.2"
 
 DESCRIPTION="An IRC bot extensible with C or Tcl."
 HOMEPAGE="http://www.eggheads.org/"
diff --git a/net-irc/eggdrop/eggdrop-1.6.17.ebuild b/net-irc/eggdrop/eggdrop-1.6.17.ebuild
index 0047a050a149..33ff21caa998 100644
--- a/net-irc/eggdrop/eggdrop-1.6.17.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.17.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17.ebuild,v 1.11 2005/04/03 15:41:57 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17.ebuild,v 1.12 2005/04/03 20:58:39 swegener Exp $
 
 inherit eutils
 
-MY_P=eggdrop${PV}
-PATCHSET_V=1.0
+MY_P="eggdrop${PV}"
+PATCHSET_V="1.0"
 
 DESCRIPTION="An IRC bot extensible with C or Tcl."
 HOMEPAGE="http://www.eggheads.org/"
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1 b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1
deleted file mode 100644
index b612d981bddc..000000000000
--- a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 95b3744a45ac1420cf08d88ee0ed0b6c eggdrop1.6.17.tar.gz 1021902
-MD5 b043e0e1903a0b93e3d58b0a7996b94e eggdrop-1.6.17-patches-1.1.tar.bz2 320876
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2 b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
new file mode 100644
index 000000000000..8c1a4c1d5518
--- /dev/null
+++ b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
@@ -0,0 +1,2 @@
+MD5 95b3744a45ac1420cf08d88ee0ed0b6c eggdrop1.6.17.tar.gz 1021902
+MD5 46fbe146c406bd2fb49d25a3c7edd494 eggdrop-1.6.17-patches-1.2.tar.bz2 320542
diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
index 40aa75d90c33..604b4b9ae6fe 100644
--- a/net-irc/eggdrop/files/eggdrop-installer
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.8 2004/09/12 15:31:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.9 2005/04/03 20:58:39 swegener Exp $
 
 source /etc/init.d/functions.sh || {
 	echo "${0}: Could not source /etc/init.d/functions.sh!"
@@ -10,19 +10,14 @@ source /etc/init.d/functions.sh || {
 
 # Checks to see if user is trying to install eggdrop as root.
 root_check() {
-	einfo "Installing Eggdrop"
-	einfo
-
-	if [ "${HOME}" = "/root" ] || [ "$(whoami)" == "root" ]
+	if [ "${HOME}" = "/root" ] || [ "$(whoami)" = "root" ]
 	then
-		einfo "You should not be installing eggdrop as root."
-		einfo
-		einfo "Installing eggdrop as root leaves your computer vulnerable"
-		einfo "to attack from other irc clients. Please use the eggdrop-installer"
-		einfo "script as the user who you wish to run eggdrop with"
+		ewarn "You should not be installing eggdrop as root."
+		ewarn
+		ewarn "Installing eggdrop as root leaves your computer vulnerable"
+		ewarn "to attack from other irc clients. Please use the eggdrop-installer"
+		ewarn "script as the user who you wish to run eggdrop with"
 		exit 1
-	else
-		install_eggdrop
 	fi
 }
 
@@ -36,8 +31,12 @@ USAGE_END
 	exit 1
 }
 
+# Install eggdrop
 install_eggdrop() {
-	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	einfo "Installing Eggdrop"
+	einfo
+
+	root_check
 
 	if [ -d "${bot_dir}" ]
 	then
@@ -45,7 +44,7 @@ install_eggdrop() {
 		exit 1
 	fi
 
-	einfo "Creating directories for your ${bot_name}..."
+	einfo "Creating directories for your eggdrop..."
 	for dir in logs filesys/incoming text tmp scripts var
 	do
 		mkdir -p "${bot_dir}/${dir}"
@@ -75,10 +74,11 @@ install_eggdrop() {
 	einfo "eggdrop website at http://www.egghelper.org/"
 }
 
-if [ ! -n "${1}" ]
+if [ -z "${1}" ]
 then
 	usage
 else
 	bot_name="${1}"
-	root_check
+	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	install_eggdrop
 fi