3 files changed, 35 insertions, 51 deletions

diff --git a/net-irc/cyclone/ChangeLog b/net-irc/cyclone/ChangeLog
index 76bbfaaf7864..72f3725cc0de 100644
--- a/net-irc/cyclone/ChangeLog
+++ b/net-irc/cyclone/ChangeLog
@@ -1,29 +1,9 @@
 # ChangeLog for net-irc/cyclone
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/ChangeLog,v 1.9 2004/07/01 22:20:35 eradicator Exp $
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  cyclone-0.3.1.1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> cyclone-0.3.1.1.ebuild:
-  src_postinst() -> pkg_postinst(); IUSE; tidy
-
-  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  cyclone-0.3.1.1.ebuild:
-  Masked cyclone-0.3.1.1.ebuild stable for ppc
-
-  03 Jan 2004; Chuck Short <zul@gentoo.org> cyclone-0.3.1.1.ebuild:
-  Updated copyright years
-
-  21 May 2003; Martin Holzer <mholzer@gentoo.org> cyclone-0.3.1.1.ebuild:
-  Adding x86 to KEYWORKS. Closes #21413.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/ChangeLog,v 1.1 2002/07/12 05:53:44 blocke Exp $
 
 *cyclone-0.3.1.1 (12 Jul 2002)
 
-  30 Oct 2002; Jon Nall <nall@gentoo.org> cyclone-0.3.1.1.ebuild :
-  Added ~ppc to KEYWORDS
-
   12 Jul 2002; Bruce A. Locke <blocke@shivan.org> cyclone-0.3.1.1.ebuild:
 
   Initial ebuild version.
diff --git a/net-irc/cyclone/Manifest b/net-irc/cyclone/Manifest
index f50bc9b46cf2..5086a0562309 100644
--- a/net-irc/cyclone/Manifest
+++ b/net-irc/cyclone/Manifest
@@ -1,5 +1,4 @@
-MD5 eeb72d580d57afa98322796df997ef6d ChangeLog 1022
-MD5 0452952c5cdbd549f4e106c8808bb888 cyclone-0.3.1.1.ebuild 3782
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 9220920a3a114c37912cba4b8478f49f ChangeLog 440
+MD5 6939c6599e4576f6e0932ec6332e989c cyclone-0.3.1.1.ebuild 3808
 MD5 0bd50ab68ee1e3e2d0135f402bece427 files/digest-cyclone-0.3.1.1 67
 MD5 1e39d487d36b4205327d85f126b9831c files/res_init.c 6485
diff --git a/net-irc/cyclone/cyclone-0.3.1.1.ebuild b/net-irc/cyclone/cyclone-0.3.1.1.ebuild
index de726aca08ed..23336da5bb24 100644
--- a/net-irc/cyclone/cyclone-0.3.1.1.ebuild
+++ b/net-irc/cyclone/cyclone-0.3.1.1.ebuild
@@ -1,38 +1,39 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.15 2004/07/01 22:20:35 eradicator Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.1 2002/07/12 05:53:44 blocke Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="IRC daemon with hostname cloaking, SOCKS proxy checking and other advanced features"
-HOMEPAGE="http://www.slashnet.org"
 SRC_URI="ftp://ftp.slashnet.org/pub/cyclone/server/${P}.tar.gz"
-
-LICENSE="GPL-2"
+HOMEPAGE="http://www.slashnet.org"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
+KEYWORDS="*"
+LICENSE="GPL & BSD"
+DEPEND="virtual/glibc"
 
 src_unpack() {
+
 	unpack ${P}.tar.gz
-	cp ${FILESDIR}/res_init.c ${S}/src
+	cp ${FILESDIR}/res_init.c ${S}/src	
+
 }
 
 src_compile() {
+
 	# Server administrators are encouraged to customize the following
 	# variables if actually deploying cyclone in an IRC network.  Upon
 	# merging of this package a config file is created in /etc/cyclone
 	# which is reused whenever this package is upgraded.
 
-	# If you wish to modify this configuration in the future, you can
-	# either edit this ebuild or edit the created /etc/cyclone/config and
+	# If you wish to modify this configuration in the future, you can 
+	# either edit this ebuild or edit the created /etc/cyclone/config and 
 	# remerge this ebuild.
 
 	if [ -f /etc/cyclone/config ]
 	then
 		einfo Reusing compile time configuration stored in /etc/cyclone/config...
 		einfo To reset the configuration delete the config file and remerge.
-
+		
 		cp /etc/cyclone/config ${S}/.config
 	else
 		einfo No previous configuration found... using defaults defined in ebuild...
@@ -78,16 +79,17 @@ END_OF_CONFIG
 
 	mv Config Config.orig
 	sed -e 's|DEFOPT="-O2"|DEFOPT="${CFLAGS}"|' \
-		-e 's|more ChangeLog||' \
-		-e 's|clear||' Config.orig > Config
+		-e 's|more ChangeLog||'   Config.orig > Config
 	chmod +x Config
 	yes "" | ./Config -n
 
 	# compile it
 	emake RES="res_init.o" || die
+
 }
 
-src_install() {
+src_install () {
+
 	# store generated .config file
 	dodir /etc/cyclone
 	cp ${S}/.config ${D}/etc/cyclone/config
@@ -100,8 +102,7 @@ src_install() {
 	mv ${D}/usr/bin/ircd ${D}/usr/bin/cyclone-ircd
 
 	# documentation files
-	dodoc AUTHORS ChangeLog INSTALL README doc/oper.txt
-	dodoc doc/NOTICE doc/rfc* doc/Crule.readme doc/cyclone.gif doc/Operators
+	dodoc AUTHORS ChangeLog COPYING INSTALL README {doc/*:-history}
 
 	# install sample configuration file
 	cp ${S}/doc/example.conf ${D}/etc/cyclone/ircd.conf
@@ -114,16 +115,20 @@ src_install() {
 	chmod 755 ${D}/etc/cyclone/chkconf ${D}/etc/cyclone/encrypt
 	chmod 644 ${D}/etc/cyclone/example.conf ${D}/etc/cyclone/ircd.motd
 	chmod 600 ${D}/etc/cyclone/ircd.conf ${D}/etc/cyclone/config
+
 }
 
-pkg_postinst() {
-	einfo "Please read the documentation.  The default /etc/cyclone/ircd.conf"
-	einfo "will need to be edited and file permissions changed so only root"
-	einfo "and the account under which the ircd will run can read the plaintext"
-	einfo "passwords stored in that file."
+
+src_postinst()
+{
+
+	einfo Please read the documentation.  The default /etc/cyclone/ircd.conf
+	einfo will need to be edited and file permissions changed so only root
+	einfo and the account under which the ircd will run can read the plaintext
+	einfo passwords stored in that file.
 	einfo
-	einfo "Failure to modify the ircd.conf will result in cyclone-ircd"
-	einfo "quietly refusing to run.  Read the documentation and config file."
+	einfo Failure to modify the ircd.conf will result in cyclone-ircd
+	einfo quietly refusing to run.  Read the documentation and config file.
 
 }