Version bump. Removed old ebuilds.

8 files changed, 50 insertions, 130 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 20c568c5a7eb..6e6b90b6fd8c 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.43 2004/10/19 12:28:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.44 2004/11/13 18:37:34 swegener Exp $
+
+*epic4-2.1.1 (13 Nov 2004)
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/epic4-1.0.1-gcc33.patch, -epic4-1.1.14-r1.ebuild,
+  -epic4-1.2.6.ebuild, +epic4-2.1.1.ebuild:
+  Version bump. Removed old ebuilds.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> epic4-2.0-r1.ebuild:
   Stable on amd64.
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
index f942ea7b9af6..cea5dbdc24d8 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,14 +1,21 @@
-MD5 a5418f988d7e1475555e1564656ccdda ChangeLog 7791
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f2fccf33340a1c7b9094bc84eb1e7fc5 ChangeLog 8010
+MD5 b0d3e9d98200475e4c744bf1ef46b87f epic4-1.1.16-r1.ebuild 2071
 MD5 48a9633e83b359c67f4b517ad2e8ac8a epic4-2.0-r1.ebuild 2126
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 3d8a658ef2f439aac818ddd74768a745 epic4-1.1.14-r1.ebuild 2031
-MD5 b0d3e9d98200475e4c744bf1ef46b87f epic4-1.1.16-r1.ebuild 2071
-MD5 62d7c77553c86131f67ca28beda17843 epic4-1.2.6.ebuild 2110
+MD5 fa9b6300590202c0dc9353d501264bc6 epic4-2.1.1.ebuild 2048
 MD5 202b467aa8e4fa72afb00aa40b4f423d files/2.0-toggle-stop-screen.patch 1628
-MD5 cbb9caa10a6573474c6e18ca5e01b85e files/digest-epic4-2.0-r1 133
-MD5 33df45dcbc3a9e94246c4ee10474f332 files/epic4-1.0.1-gcc33.patch 850
-MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
-MD5 b18fec6f550fe601efccc79f5526b2e7 files/digest-epic4-1.1.14-r1 136
 MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16-r1 136
+MD5 cbb9caa10a6573474c6e18ca5e01b85e files/digest-epic4-2.0-r1 133
 MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
-MD5 5892130581f76c4e2c4fa1dea13e7410 files/digest-epic4-1.2.6 135
+MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
+MD5 932d329df41bd4d84dadb5620b751c3f files/digest-epic4-2.1.1 135
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBllR2I1lqEGTUzyQRAvt1AKCHHzR5HQiKoIwqQLHJe8ESZjFeAACfZcWy
+HthM0eD8syyQlmISYfbUGUY=
+=7rwm
+-----END PGP SIGNATURE-----
diff --git a/net-irc/epic4/epic4-1.1.14-r1.ebuild b/net-irc/epic4/epic4-1.1.14-r1.ebuild
deleted file mode 100644
index 5aead5ca2f42..000000000000
--- a/net-irc/epic4/epic4-1.1.14-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.7 2004/07/09 22:53:51 swegener Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Epic4 IRC Client"
-HOMEPAGE="http://epicsol.org/"
-SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
-	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc ~ia64 ~alpha ~hppa"
-IUSE="ipv6 perl ssl tcltk"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	perl? ( >=dev-lang/perl-5.6.1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	tcltk? ( dev-lang/tcl )"
-
-src_compile() {
-	replace-flags "-O?" "-O"
-
-	myconf=""
-
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} `use_with perl`"
-	myconf="${myconf} `use_with ssl`"
-	myconf="${myconf} `use_with tcltk`"
-
-	econf \
-		--libexecdir=/usr/lib/misc \
-		${myconf} || die "econf failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	einstall \
-		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
-	docinto doc
-	cd doc
-	dodoc *.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load
-	dodoc nicknames outputhelp server_groups SILLINESS TS4
-
-	dodir /usr/share/epic
-	tar zxvf ${DISTDIR}/epic4-help-20030114.tar.gz -C ${D}/usr/share/epic
-
-	rm -f ${D}/usr/share/epic/help/Makefile
-	rm -rf ${D}/usr/share/epic/help/CVS
-
-	chown -R root:root ${D}/usr/share/epic/help
-}
-
-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/
-	fi
-}
diff --git a/net-irc/epic4/epic4-1.2.6.ebuild b/net-irc/epic4/epic4-2.1.1.ebuild
index 44f9f19d5829..acfcf65e144e 100644
--- a/net-irc/epic4/epic4-1.2.6.ebuild
+++ b/net-irc/epic4/epic4-2.1.1.ebuild
@@ -1,40 +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/epic4/epic4-1.2.6.ebuild,v 1.6 2004/08/02 21:12:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.1.1.ebuild,v 1.1 2004/11/13 18:37:34 swegener Exp $
 
 inherit flag-o-matic eutils
 
 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-20030114.tar.gz"
+	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ia64 ~alpha ~hppa"
-IUSE="ipv6 perl ssl tcltk"
+KEYWORDS="~x86 ~ppc ~ia64 ~alpha ~hppa ~sparc ~amd64 ~ppc-macos"
+IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	tcltk? ( dev-lang/tcl )"
+	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
-src_compile() {
-	replace-flags "-O?" "-O"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	myconf=""
-
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} `use_with perl`"
-	myconf="${myconf} `use_with ssl`"
-	myconf="${myconf} `use_with tcltk`"
+	epatch ${FILESDIR}/epic-defaultserver.patch
+}
 
-	epatch ${FILESDIR}/epic-defaultserver.patch || die "patch failed"
+src_compile() {
+	replace-flags "-O?" "-O"
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die "econf failed"
-
+		$(use_with ipv6) \
+		$(use_with perl) \
+		$(use_with ssl) \
+		|| die "econf failed"
 	make || die "make failed"
 }
 
@@ -49,14 +48,14 @@ src_install () {
 	dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES
 	docinto doc
 	cd doc
-	dodoc *.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load
-	dodoc nicknames outputhelp server_groups SILLINESS TS4
+	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-20030114.tar.gz -C ${D}/usr/share/epic
+	tar zxvf ${DISTDIR}/epic4-help-20040801.tar.gz -C ${D}/usr/share/epic
 
-	rm -f ${D}/usr/share/epic/help/Makefile
-	rm -rf ${D}/usr/share/epic/help/CVS
+	rm -rf ${D}/usr/share/epic/help/{CVS,Makefile}
 
 	chown -R root:root ${D}/usr/share/epic/help
 }
@@ -71,4 +70,7 @@ pkg_postinst() {
 	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
 		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
+
+	# Fix for bug 59075
+	chmod 755 ${ROOT}/usr/share/epic/help
 }
diff --git a/net-irc/epic4/files/digest-epic4-1.1.14-r1 b/net-irc/epic4/files/digest-epic4-1.1.14-r1
deleted file mode 100644
index 782fa69b5800..000000000000
--- a/net-irc/epic4/files/digest-epic4-1.1.14-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b041aeb0490fd542cd68dacb6f05c425 epic4-1.1.14.tar.bz2 607595
-MD5 f4220b4cf989e320fbbd6051c5117307 epic4-help-20030114.tar.gz 287157
diff --git a/net-irc/epic4/files/digest-epic4-1.2.6 b/net-irc/epic4/files/digest-epic4-1.2.6
deleted file mode 100644
index 1f6755bd0085..000000000000
--- a/net-irc/epic4/files/digest-epic4-1.2.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ecc6c1088eb18162c373216ab4b6760 epic4-1.2.6.tar.bz2 622450
-MD5 f4220b4cf989e320fbbd6051c5117307 epic4-help-20030114.tar.gz 287157
diff --git a/net-irc/epic4/files/digest-epic4-2.1.1 b/net-irc/epic4/files/digest-epic4-2.1.1
new file mode 100644
index 000000000000..db71b725ee1d
--- /dev/null
+++ b/net-irc/epic4/files/digest-epic4-2.1.1
@@ -0,0 +1,2 @@
+MD5 e50c65f2cec7fdc9d546b109fe810d01 epic4-2.1.1.tar.bz2 621473
+MD5 c283d1c17826708bc265e3f91b860f54 epic4-help-20040801.tar.gz 302562
diff --git a/net-irc/epic4/files/epic4-1.0.1-gcc33.patch b/net-irc/epic4/files/epic4-1.0.1-gcc33.patch
deleted file mode 100644
index 551eb819f55c..000000000000
--- a/net-irc/epic4/files/epic4-1.0.1-gcc33.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- epic4-1.0.1/source/status.c	2003-07-18 20:16:45.000000000 +0200
-+++ epic4-1.0.1.gcc33/source/status.c	2003-07-18 20:17:24.000000000 +0200
-@@ -36,7 +36,7 @@
-  * Maximum number of "%" expressions in a status line format.  If you change
-  * this number, you must manually change the sprintf() in make_status 
-  */
--#define STATUS_FUNCTION(x) static Char * ## x (Window *window, int map, int key)
-+#define STATUS_FUNCTION(x) static Char * x (Window *window, int map, int key)
- #define MAX_FUNCTIONS 40
- #define MAX_STATUS_USER 39
- 
---- epic4-1.0.1/source/info.c.sh.in	2003-07-18 20:17:00.000000000 +0200
-+++ epic4-1.0.1.gcc33/source/info.c.sh.in	2003-07-18 20:17:13.000000000 +0200
-@@ -20,7 +20,7 @@
-  */
- 
- #ifdef __STDC__
--#define my_paste(x, y, z) x ## y ## z
-+#define my_paste(x, y, z) x y z
- #else
- #define my_paste(x, y, z) x/**/y/**/z
- #endif