Version bump.

(Portage version: 2.0.51.16)

6 files changed, 35 insertions, 30 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 556a46bcf359..ce0f9ebc3ffc 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/epic4
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.45 2004/12/29 03:14:47 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.46 2005/02/17 03:16:05 swegener Exp $
+
+*epic4-2.2 (17 Feb 2005)
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> -epic4-2.1.1.ebuild,
+  +epic4-2.2.ebuild:
+  Version bump.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
index c7f45c49d2da..d855952f7430 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,11 +1,11 @@
 MD5 48a9633e83b359c67f4b517ad2e8ac8a epic4-2.0-r1.ebuild 2126
-MD5 fb8186a3ab474b34c7e4b2ed4d0ac79c ChangeLog 8115
 MD5 b0d3e9d98200475e4c744bf1ef46b87f epic4-1.1.16-r1.ebuild 2071
-MD5 fa9b6300590202c0dc9353d501264bc6 epic4-2.1.1.ebuild 2048
+MD5 b48a9767f8893a3244d72d9ffad686c0 epic4-2.2.ebuild 2054
+MD5 fb8186a3ab474b34c7e4b2ed4d0ac79c ChangeLog 8115
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 202b467aa8e4fa72afb00aa40b4f423d files/2.0-toggle-stop-screen.patch 1628
-MD5 932d329df41bd4d84dadb5620b751c3f files/digest-epic4-2.1.1 135
-MD5 cbb9caa10a6573474c6e18ca5e01b85e files/digest-epic4-2.0-r1 133
-MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
 MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
+MD5 8989f4be2d37fd43a69718f476986247 files/digest-epic4-2.2 133
+MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
 MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16-r1 136
+MD5 202b467aa8e4fa72afb00aa40b4f423d files/2.0-toggle-stop-screen.patch 1628
+MD5 cbb9caa10a6573474c6e18ca5e01b85e files/digest-epic4-2.0-r1 133
diff --git a/net-irc/epic4/epic4-1.1.16-r1.ebuild b/net-irc/epic4/epic4-1.1.16-r1.ebuild
index 47fd8187a5bd..de7a04307a1f 100644
--- a/net-irc/epic4/epic4-1.1.16-r1.ebuild
+++ b/net-irc/epic4/epic4-1.1.16-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/epic4/epic4-1.1.16-r1.ebuild,v 1.6 2004/07/09 22:53:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16-r1.ebuild,v 1.7 2005/02/17 03:16:05 swegener Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-irc/epic4/epic4-2.0-r1.ebuild b/net-irc/epic4/epic4-2.0-r1.ebuild
index 1cea0d7d2bb2..0f0746efe358 100644
--- a/net-irc/epic4/epic4-2.0-r1.ebuild
+++ b/net-irc/epic4/epic4-2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/epic4/epic4-2.0-r1.ebuild,v 1.6 2004/10/23 07:50:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0-r1.ebuild,v 1.7 2005/02/17 03:16:05 swegener Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-irc/epic4/epic4-2.1.1.ebuild b/net-irc/epic4/epic4-2.2.ebuild
index acfcf65e144e..657d269c6abf 100644
--- a/net-irc/epic4/epic4-2.1.1.ebuild
+++ b/net-irc/epic4/epic4-2.2.ebuild
@@ -1,13 +1,15 @@
-# 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/epic4/epic4-2.1.1.ebuild,v 1.1 2004/11/13 18:37:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.2.ebuild,v 1.1 2005/02/17 03:16:05 swegener Exp $
 
 inherit flag-o-matic eutils
 
+HELP_V="20040801"
+
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-BETA/${P}.tar.bz2
-	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz"
+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"
 
 LICENSE="as-is"
 SLOT="0"
@@ -23,6 +25,9 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/epic-defaultserver.patch
+
+	rm -f ${WORKDIR}/help/Makefile
+	find ${WORKDIR}/help -type d -name CVS -print0 | xargs -0 rm -r
 }
 
 src_compile() {
@@ -34,7 +39,7 @@ src_compile() {
 		$(use_with perl) \
 		$(use_with ssl) \
 		|| die "econf failed"
-	make || die "make failed"
+	emake || die "make failed"
 }
 
 src_install () {
@@ -42,22 +47,15 @@ src_install () {
 		sharedir=${D}/usr/share \
 		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
-	rm -f ${D}/usr/bin/epic
-	dosym epic-EPIC4-${PV} /usr/bin/epic
-
 	dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES
+
+	cd ${S}/doc
 	docinto doc
-	cd doc
 	dodoc \
 		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
-		nicknames outputhelp server_groups SILLINESS TS4
-
-	dodir /usr/share/epic
-	tar zxvf ${DISTDIR}/epic4-help-20040801.tar.gz -C ${D}/usr/share/epic
-
-	rm -rf ${D}/usr/share/epic/help/{CVS,Makefile}
+		nicknames outputhelp SILLINESS TS4
 
-	chown -R root:root ${D}/usr/share/epic/help
+	mv ${WORKDIR}/help/* ${D}/usr/share/epic/help
 }
 
 pkg_postinst() {
@@ -67,7 +65,8 @@ pkg_postinst() {
 	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
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]
+	then
 		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 
diff --git a/net-irc/epic4/files/digest-epic4-2.1.1 b/net-irc/epic4/files/digest-epic4-2.2
index db71b725ee1d..e5666ef06d10 100644
--- a/net-irc/epic4/files/digest-epic4-2.1.1
+++ b/net-irc/epic4/files/digest-epic4-2.2
@@ -1,2 +1,2 @@
-MD5 e50c65f2cec7fdc9d546b109fe810d01 epic4-2.1.1.tar.bz2 621473
+MD5 e4d5d799b43f3c7882e8e7616099d4fc epic4-2.2.tar.bz2 623254
 MD5 c283d1c17826708bc265e3f91b860f54 epic4-help-20040801.tar.gz 302562