Tidied the ebuilds. Added small upstream patch for 2.0, which only affects a small group of users, so no bump. Marked 2.0 stable on x86.

9 files changed, 114 insertions, 48 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 0f3d8d68b0da..18db3f283d29 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.38 2004/07/09 22:53:51 swegener Exp $
+
+  10 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.0-toggle-stop-screen.patch, epic4-1.1.14-r1.ebuild,
+  epic4-1.1.14.ebuild, epic4-1.1.16-r1.ebuild, epic4-1.1.16.ebuild,
+  epic4-1.2.6.ebuild, epic4-2.0.ebuild:
+  Tidied the ebuilds. Added small upstream patch for 2.0, which only affects a
+  small group of users, so no bump. Marked 2.0 stable on x86.
 
   05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> epic4-2.0.ebuild:
   Stable on alpha.
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
index a3bb8c21829e..d2024c348292 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,17 +1,20 @@
+MD5 b4de71da364d193711bc344c40d4814b ChangeLog 6748
 MD5 2126bc2551c8b217722ee9f39778482b epic4-1.1.14-r1.ebuild 1970
+MD5 d25dda060113f00b1a6113e65c0fd409 epic4-1.1.14.ebuild 2052
 MD5 7382f153471ecd9d331c7b34367906e9 epic4-1.1.16-r1.ebuild 2028
+MD5 c4eac3bd808c63535e93e21b8965dd68 epic4-1.1.16.ebuild 1972
 MD5 962de59c7ed6849bd8044c45bb3be70e epic4-1.2.6.ebuild 2049
 MD5 1e0a29344619fd20b412847e929651ab epic4-2.0.ebuild 1925
-MD5 d25dda060113f00b1a6113e65c0fd409 epic4-1.1.14.ebuild 2052
-MD5 b4de71da364d193711bc344c40d4814b ChangeLog 6748
-MD5 c4eac3bd808c63535e93e21b8965dd68 epic4-1.1.16.ebuild 1972
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
-MD5 d8cd6ac89cfea4ef74dcd4aa53d49a2e files/digest-epic4-2.0 133
-MD5 33df45dcbc3a9e94246c4ee10474f332 files/epic4-1.0.1-gcc33.patch 850
-MD5 b18fec6f550fe601efccc79f5526b2e7 files/digest-epic4-1.1.14-r1 136
-MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
-MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16-r1 136
+MD5 e6a45cfe779c57a64b8a6eac132801eb epic4-2.0-r1.ebuild 2019
 MD5 b18fec6f550fe601efccc79f5526b2e7 files/digest-epic4-1.1.14 136
+MD5 b18fec6f550fe601efccc79f5526b2e7 files/digest-epic4-1.1.14-r1 136
 MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16 136
+MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16-r1 136
 MD5 5892130581f76c4e2c4fa1dea13e7410 files/digest-epic4-1.2.6 135
+MD5 d8cd6ac89cfea4ef74dcd4aa53d49a2e files/digest-epic4-2.0 133
+MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
+MD5 33df45dcbc3a9e94246c4ee10474f332 files/epic4-1.0.1-gcc33.patch 850
+MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
+MD5 140e2002f6f2c2a4614435c7d8c4b411 files/2.0-toggle-stop-screen.patch 1839
+MD5 d8cd6ac89cfea4ef74dcd4aa53d49a2e files/digest-epic4-2.0-r1 133
diff --git a/net-irc/epic4/epic4-1.1.14-r1.ebuild b/net-irc/epic4/epic4-1.1.14-r1.ebuild
index 9b2ebc4770ec..5aead5ca2f42 100644
--- a/net-irc/epic4/epic4-1.1.14-r1.ebuild
+++ b/net-irc/epic4/epic4-1.1.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14-r1.ebuild,v 1.6 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14-r1.ebuild,v 1.7 2004/07/09 22:53:51 swegener Exp $
 
 inherit flag-o-matic
 
@@ -31,15 +31,15 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
 src_install () {
 	einstall \
 		sharedir=${D}/usr/share \
-		libexecdir=${D}/usr/lib/misc || die
+		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
 	rm -f ${D}/usr/bin/epic
 	dosym epic-EPIC4-${PV} /usr/bin/epic
@@ -66,7 +66,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-1.1.14.ebuild b/net-irc/epic4/epic4-1.1.14.ebuild
index 51f683350620..1244d52054e0 100644
--- a/net-irc/epic4/epic4-1.1.14.ebuild
+++ b/net-irc/epic4/epic4-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14.ebuild,v 1.6 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14.ebuild,v 1.7 2004/07/09 22:53:51 swegener Exp $
 
 inherit flag-o-matic
 
@@ -42,15 +42,15 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
 src_install () {
 	einstall \
 		sharedir=${D}/usr/share \
-		libexecdir=${D}/usr/lib/misc || die
+		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
 	rm -f ${D}/usr/bin/epic
 	dosym epic-EPIC4-${PV} /usr/bin/epic
@@ -72,7 +72,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-1.1.16-r1.ebuild b/net-irc/epic4/epic4-1.1.16-r1.ebuild
index 790356886d03..47fd8187a5bd 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
 # 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.5 2004/06/24 23:04:07 agriffis Exp $
+# $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 $
 
 inherit flag-o-matic eutils
 
@@ -33,9 +33,9 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
 src_install() {
@@ -68,7 +68,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-1.1.16.ebuild b/net-irc/epic4/epic4-1.1.16.ebuild
index e54a4a6ee2c2..e45a0a72ce07 100644
--- a/net-irc/epic4/epic4-1.1.16.ebuild
+++ b/net-irc/epic4/epic4-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.7 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16.ebuild,v 1.8 2004/07/09 22:53:51 swegener Exp $
 
 inherit flag-o-matic
 
@@ -30,15 +30,15 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
 src_install () {
 	einstall \
 		sharedir=${D}/usr/share \
-		libexecdir=${D}/usr/lib/misc || die
+		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
 	rm -f ${D}/usr/bin/epic
 	dosym epic-EPIC4-${PV} /usr/bin/epic
@@ -65,7 +65,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-1.2.6.ebuild b/net-irc/epic4/epic4-1.2.6.ebuild
index f580919b4107..385d4c9d1c17 100644
--- a/net-irc/epic4/epic4-1.2.6.ebuild
+++ b/net-irc/epic4/epic4-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.2.6.ebuild,v 1.4 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.2.6.ebuild,v 1.5 2004/07/09 22:53:51 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,15 +33,15 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
 src_install () {
 	einstall \
 		sharedir=${D}/usr/share \
-		libexecdir=${D}/usr/lib/misc || die
+		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
 	rm -f ${D}/usr/bin/epic
 	dosym epic-EPIC4-${PV} /usr/bin/epic
@@ -68,7 +68,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-2.0.ebuild b/net-irc/epic4/epic4-2.0.ebuild
index f731c3b320ad..251c67aa3a59 100644
--- a/net-irc/epic4/epic4-2.0.ebuild
+++ b/net-irc/epic4/epic4-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0.ebuild,v 1.8 2004/06/24 23:04:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0.ebuild,v 1.9 2004/07/09 22:53:51 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,31 +11,37 @@ SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ia64 alpha ~hppa sparc ~amd64"
+KEYWORDS="x86 ~ppc ~ia64 alpha ~hppa sparc ~amd64"
 IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-toggle-stop-screen.patch
+	epatch ${FILESDIR}/epic-defaultserver.patch
+}
+
 src_compile() {
 	replace-flags "-O?" "-O"
 
-	epatch ${FILESDIR}/epic-defaultserver.patch || die "patch failed"
-
 	econf \
 		--libexecdir=/usr/lib/misc \
 		`use_with ipv6` \
 		`use_with perl` \
 		`use_with ssl` \
-		|| die
-	make || die
+		|| die "econf failed"
+	make || die "make failed"
 }
 
 src_install () {
 	einstall \
 		sharedir=${D}/usr/share \
-		libexecdir=${D}/usr/lib/misc || die
+		libexecdir=${D}/usr/lib/misc || die "einstall failed"
 
 	rm -f ${D}/usr/bin/epic
 	dosym epic-EPIC4-${PV} /usr/bin/epic
@@ -62,7 +68,7 @@ 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 [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	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/2.0-toggle-stop-screen.patch b/net-irc/epic4/files/2.0-toggle-stop-screen.patch
new file mode 100644
index 000000000000..d4abac5bb36e
--- /dev/null
+++ b/net-irc/epic4/files/2.0-toggle-stop-screen.patch
@@ -0,0 +1,50 @@
+Commiter   : jnelson
+CVSROOT    : /home/cvs/repository
+Module     : epic4
+Commit time: 2004-05-28 15:32:43 UTC
+
+Modified files:
+     source/irc.c source/window.c
+
+Log message:
+
+Bug fix as a personal favor.
+
+---------------------- diff included ----------------------
+Index: epic4/source/irc.c
+diff -u epic4/source/irc.c:1.707 epic4/source/irc.c:1.708
+--- epic4/source/irc.c:1.707	Wed Mar 24 22:26:59 2004
++++ epic4/source/irc.c	Fri May 28 10:32:33 2004
+@@ -52,7 +52,7 @@
+ /*
+  * In theory, this number is incremented for every commit.
+  */
+-const unsigned long	commit_id = 710;
++const unsigned long	commit_id = 711;
+ 
+ /*
+  * As a way to poke fun at the current rage of naming releases after
+Index: epic4/source/window.c
+diff -u epic4/source/window.c:1.94 epic4/source/window.c:1.95
+--- epic4/source/window.c:1.94	Mon Feb 16 15:46:27 2004
++++ epic4/source/window.c	Fri May 28 10:32:33 2004
+@@ -1,4 +1,4 @@
+-/* $EPIC: window.c,v 1.94 2004/02/16 21:46:27 jnelson Exp $ */
++/* $EPIC: window.c,v 1.95 2004/05/28 15:32:33 jnelson Exp $ */
+ /*
+  * window.c: Handles the organzation of the logical viewports (``windows'')
+  * for irc.  This includes keeping track of what windows are open, where they
+@@ -5278,10 +5278,10 @@
+ /* toggle_stop_screen: the BIND function TOGGLE_STOP_SCREEN */
+ void 	toggle_stop_screen (char unused, char *not_used)
+ {
+-	char toggle[7];
++	char toggle[7], *p = toggle;
+ 
+ 	strlcpy(toggle, "TOGGLE", sizeof toggle);
+-	window_hold_mode(current_window, (char **)&toggle);
++	window_hold_mode(current_window, (char **)&p);
+ 	update_all_windows();
+ }
+ 
+----------------------- End of diff -----------------------