Added note per bug #130885 , moved local file out to mirrors and small cleanup

(Portage version: 2.1.2_pre3-r4)

7 files changed, 60 insertions, 25 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 568af81cba2c..94ec51f1060c 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/epic4
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.56 2006/09/05 21:40:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.57 2006/10/18 21:20:33 jokey Exp $
+
+  18 Oct 2006; Markus Ullmann <jokey@gentoo.org> -files/local,
+  -epic4-1.1.16-r1.ebuild, epic4-2.0-r1.ebuild, epic4-2.2.ebuild,
+  epic4-2.4.ebuild:
+  Added note per bug #130885 , moved local file out to mirrors and small cleanup
 
 *epic4-2.4 (05 Sep 2006)
 
diff --git a/net-irc/epic4/epic4-2.0-r1.ebuild b/net-irc/epic4/epic4-2.0-r1.ebuild
index 2af0d028cd8c..3d2f534b239d 100644
--- a/net-irc/epic4/epic4-2.0-r1.ebuild
+++ b/net-irc/epic4/epic4-2.0-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0-r1.ebuild,v 1.11 2005/09/11 14:01:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0-r1.ebuild,v 1.12 2006/10/18 21:20:33 jokey Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz
+	mirror://gentoo/epic4-local.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -77,7 +78,7 @@ pkg_postinst() {
 	einfo "in the future, simply create an empty file with this name."
 
 	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
+		cp ${WORKDIR}/epic4-local ${ROOT}/usr/share/epic/script/local
 	fi
 
 	# Fix for bug 59075
diff --git a/net-irc/epic4/epic4-2.2.ebuild b/net-irc/epic4/epic4-2.2.ebuild
index a982cb40c68c..2c7b520be02a 100644
--- a/net-irc/epic4/epic4-2.2.ebuild
+++ b/net-irc/epic4/epic4-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.2.ebuild,v 1.12 2005/09/11 14:01:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.2.ebuild,v 1.13 2006/10/18 21:20:33 jokey Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,7 +9,8 @@ HELP_V="20050315"
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
+	mirror://gentoo/epic4-local.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -68,15 +69,24 @@ src_install () {
 }
 
 pkg_postinst() {
-	einfo "If /usr/share/epic/script/local does not exist, I will now"
-	einfo "create it.  If you do not like the look/feel of this file, or"
-	einfo "if you'd prefer to use your own script, simply remove this"
-	einfo "file.  If you want to prevent this file from being installed"
-	einfo "in the future, simply create an empty file with this name."
-
 	if [ ! -f ${ROOT}/usr/share/epic/script/local ]
 	then
-		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
+		einfo "/usr/share/epic/script/local does not exist, I will now"
+		einfo "create it. If you do not like the look/feel of this file, or"
+		einfo "if you'd prefer to use your own script, simply remove this"
+		einfo "file.  If you want to prevent this file from being installed"
+		einfo "in the future, simply create an empty file with this name."
+		cp ${WORKDIR}/epic4-local ${ROOT}/usr/share/epic/script/local
+		echo
+		einfo "This provided local startup script adds a number of nifty"
+		einfo "features to Epic including tab completion, a comprehensive set"
+		einfo "of aliases, and channel-by-channel logging.  To prevent"
+		einfo "unintentional conflicts with your own scripting, if either the"
+		einfo "~/.ircrc or ~/.epicrc script files exist, then the local script"
+		einfo "is *not* run.  If you like the script but want to make careful"
+		einfo "additions (such as selecting your usual servers or setting your"
+		einfo "nickname), simply copy /usr/share/epic/script/local to ~/.ircrc"
+		einfo "and then add your additions to the copy."
 	fi
 
 	# Fix for bug 59075
diff --git a/net-irc/epic4/epic4-2.4.ebuild b/net-irc/epic4/epic4-2.4.ebuild
index 388e3f376cce..44713e7c3c04 100644
--- a/net-irc/epic4/epic4-2.4.ebuild
+++ b/net-irc/epic4/epic4-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.4.ebuild,v 1.1 2006/09/05 21:40:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.4.ebuild,v 1.2 2006/10/18 21:20:33 jokey Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,11 +9,12 @@ HELP_V="20050315"
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
+	mirror://gentoo/epic4-local.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc-macos sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
@@ -68,15 +69,24 @@ src_install () {
 }
 
 pkg_postinst() {
-	einfo "If /usr/share/epic/script/local does not exist, I will now"
-	einfo "create it.  If you do not like the look/feel of this file, or"
-	einfo "if you'd prefer to use your own script, simply remove this"
-	einfo "file.  If you want to prevent this file from being installed"
-	einfo "in the future, simply create an empty file with this name."
-
 	if [ ! -f ${ROOT}/usr/share/epic/script/local ]
 	then
-		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
+		einfo "/usr/share/epic/script/local does not exist, I will now"
+		einfo "create it. If you do not like the look/feel of this file, or"
+		einfo "if you'd prefer to use your own script, simply remove this"
+		einfo "file.  If you want to prevent this file from being installed"
+		einfo "in the future, simply create an empty file with this name."
+		cp ${WORKDIR}/epic4-local ${ROOT}/usr/share/epic/script/local
+		echo
+		einfo "This provided local startup script adds a number of nifty"
+		einfo "features to Epic including tab completion, a comprehensive set"
+		einfo "of aliases, and channel-by-channel logging.  To prevent"
+		einfo "unintentional conflicts with your own scripting, if either the"
+		einfo "~/.ircrc or ~/.epicrc script files exist, then the local script"
+		einfo "is *not* run.  If you like the script but want to make careful"
+		einfo "additions (such as selecting your usual servers or setting your"
+		einfo "nickname), simply copy /usr/share/epic/script/local to ~/.ircrc"
+		einfo "and then add your additions to the copy."
 	fi
 
 	# Fix for bug 59075
diff --git a/net-irc/epic4/files/digest-epic4-2.0-r1 b/net-irc/epic4/files/digest-epic4-2.0-r1
index ea2a3f861724..b4b2727dc87b 100644
--- a/net-irc/epic4/files/digest-epic4-2.0-r1
+++ b/net-irc/epic4/files/digest-epic4-2.0-r1
@@ -1,2 +1,5 @@
 MD5 81c50c94762bd33349826b2f5b5e6278 epic4-2.0.tar.bz2 627102
 MD5 c283d1c17826708bc265e3f91b860f54 epic4-help-20040801.tar.gz 302562
+MD5 9e55061deeb335b75b3a9a293d2c190c epic4-local.bz2 6530
+RMD160 ed7e0d3f8c9d24794b4a9718ae31982934e4056f epic4-local.bz2 6530
+SHA256 4509ac8e491ac0b75dc5ddcef845b02b3610804dd98de9b5b98d58630be322cd epic4-local.bz2 6530
diff --git a/net-irc/epic4/files/digest-epic4-2.2 b/net-irc/epic4/files/digest-epic4-2.2
index 4ee0e124873c..78910488664e 100644
--- a/net-irc/epic4/files/digest-epic4-2.2
+++ b/net-irc/epic4/files/digest-epic4-2.2
@@ -4,3 +4,6 @@ SHA256 7f3f011c2392e19c0f12ae669c28f14e8a730918778809191672300dced76291 epic4-2.
 MD5 9888d1af465ca72bf9a02487264071a5 epic4-help-20050315.tar.gz 332502
 RMD160 b4237357e905468ab4fd7710283d6bffee067c5e epic4-help-20050315.tar.gz 332502
 SHA256 714afd07348731e6ac82e1f6548acc12e84539b3106ab27fa5d00ed5696256f7 epic4-help-20050315.tar.gz 332502
+MD5 9e55061deeb335b75b3a9a293d2c190c epic4-local.bz2 6530
+RMD160 ed7e0d3f8c9d24794b4a9718ae31982934e4056f epic4-local.bz2 6530
+SHA256 4509ac8e491ac0b75dc5ddcef845b02b3610804dd98de9b5b98d58630be322cd epic4-local.bz2 6530
diff --git a/net-irc/epic4/files/digest-epic4-2.4 b/net-irc/epic4/files/digest-epic4-2.4
index 9d2e938bb7f7..a841a92c9b95 100644
--- a/net-irc/epic4/files/digest-epic4-2.4
+++ b/net-irc/epic4/files/digest-epic4-2.4
@@ -4,3 +4,6 @@ SHA256 b2a7e2465950081feb1f8f438a662a1c41c2d53f9888f07c7a316733871f4125 epic4-2.
 MD5 9888d1af465ca72bf9a02487264071a5 epic4-help-20050315.tar.gz 332502
 RMD160 b4237357e905468ab4fd7710283d6bffee067c5e epic4-help-20050315.tar.gz 332502
 SHA256 714afd07348731e6ac82e1f6548acc12e84539b3106ab27fa5d00ed5696256f7 epic4-help-20050315.tar.gz 332502
+MD5 9e55061deeb335b75b3a9a293d2c190c epic4-local.bz2 6530
+RMD160 ed7e0d3f8c9d24794b4a9718ae31982934e4056f epic4-local.bz2 6530
+SHA256 4509ac8e491ac0b75dc5ddcef845b02b3610804dd98de9b5b98d58630be322cd epic4-local.bz2 6530