Version bump, plus add patch to make it compile with gcc4, bug 139934

(Portage version: 2.1.2-r9)

8 files changed, 106 insertions, 17 deletions

diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog
index 7c1b7ba945bd..73f6a92fec89 100644
--- a/net-irc/dircproxy/ChangeLog
+++ b/net-irc/dircproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/dircproxy
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.17 2006/04/05 17:03:32 mcummings Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.18 2007/02/17 15:25:43 armin76 Exp $
+
+*dircproxy-1.2.0_beta2 (17 Feb 2007)
+
+  17 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/dircproxy-gcc4.patch, dircproxy-1.0.5.ebuild,
+  dircproxy-1.1.0-r1.ebuild, +dircproxy-1.2.0_beta2.ebuild:
+  Version bump, plus add patch to make it compile with gcc4, bug 139934
 
   05 Apr 2006; <mcumming@gentoo.org> dircproxy-1.1.0-r1.ebuild:
   Marking 1.1.0-r1 ~sparc
diff --git a/net-irc/dircproxy/dircproxy-1.0.5.ebuild b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
index 29e641daea98..dad095301cf7 100644
--- a/net-irc/dircproxy/dircproxy-1.0.5.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.14 2006/04/05 17:03:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.15 2007/02/17 15:25:43 armin76 Exp $
+
+inherit eutils
 
 DESCRIPTION="an IRC proxy server"
-SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/stable/${P}.tar.gz"
 HOMEPAGE="http://dircproxy.securiweb.net/"
+SRC_URI="http://dircproxy.securiweb.net/pub/1.0/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha amd64"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/dircproxy-gcc4.patch"
+}
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO INSTALL
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* INSTALL
 }
diff --git a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
index 29ef595c4525..89f007643d07 100644
--- a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.5 2006/04/05 17:03:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.6 2007/02/17 15:25:43 armin76 Exp $
 
 inherit eutils
 
 DESCRIPTION="an IRC proxy server"
 HOMEPAGE="http://dircproxy.securiweb.net/"
-SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/unstable/${P}.tar.gz"
+SRC_URI="http://dircproxy-securiweb.net/pub/1.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	epatch ${FILESDIR}/${PV}-less-lag-on-attach.patch
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO INSTALL
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* INSTALL
 }
diff --git a/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild b/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild
new file mode 100644
index 000000000000..d9f9143f4470
--- /dev/null
+++ b/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild,v 1.1 2007/02/17 15:25:43 armin76 Exp $
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="an IRC proxy server"
+SRC_URI="http://dircproxy.securiweb.net/pub/1.2/${MY_P}.tar.bz"
+HOMEPAGE="http://dircproxy.securiweb.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS README* TODO INSTALL
+}
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.0.5 b/net-irc/dircproxy/files/digest-dircproxy-1.0.5
index 0f2816f335b4..ef8a1784026b 100644
--- a/net-irc/dircproxy/files/digest-dircproxy-1.0.5
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.0.5
@@ -1 +1,3 @@
 MD5 33b92e0f28530a5faa9fea801d1ad807 dircproxy-1.0.5.tar.gz 217965
+RMD160 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b dircproxy-1.0.5.tar.gz 217965
+SHA256 caec20ed458a5606be8700400ecba27aff00ad6227ff0e8d4db1d3d5bf9f9d37 dircproxy-1.0.5.tar.gz 217965
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1
index 6da95c6d8130..cea41304cdcf 100644
--- a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1
@@ -1 +1,3 @@
 MD5 066bd39d80f286ae5ce69a2adbbd01e4 dircproxy-1.1.0.tar.gz 250060
+RMD160 7c7f622a4b67854e608a68191a0537fc83b94045 dircproxy-1.1.0.tar.gz 250060
+SHA256 f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e dircproxy-1.1.0.tar.gz 250060
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2
new file mode 100644
index 000000000000..c0c495826201
--- /dev/null
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2
@@ -0,0 +1,3 @@
+MD5 850443437f709276ff21a173bbf98456 dircproxy-1.2.0-beta2.tar.bz 314480
+RMD160 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369 dircproxy-1.2.0-beta2.tar.bz 314480
+SHA256 3d663100f10b71dba4e118f7c41c2cf826e5a5ba0dfcd04381c2e84eb7c459c5 dircproxy-1.2.0-beta2.tar.bz 314480
diff --git a/net-irc/dircproxy/files/dircproxy-gcc4.patch b/net-irc/dircproxy/files/dircproxy-gcc4.patch
new file mode 100644
index 000000000000..bf4da5bca82f
--- /dev/null
+++ b/net-irc/dircproxy/files/dircproxy-gcc4.patch
@@ -0,0 +1,47 @@
+--- ../tmp-orig/dircproxy-1.0.5/src/dcc_net.c   2001-12-21 21:15:55.000000000 +0100
++++ ./src/dcc_net.c 2004-12-14 15:40:45.976549384 +0100
+@@ -364,7 +364,8 @@
+       n = p->next;
+       _dccnet_free(p);
+ 
+-      p = (l ? l->next : proxies) = n;
++      if (l) l->next = n; else proxies = n;
++      p = n;
+     } else {
+       l = p;
+       p = p->next;
+diff -urN ../tmp-orig/dircproxy-1.0.5/src/irc_server.c ./src/irc_server.c
+--- ../tmp-orig/dircproxy-1.0.5/src/irc_server.c    2002-01-31 15:56:37.000000000 +0100
++++ ./src/irc_server.c  2004-12-14 15:39:49.163186328 +0100
+@@ -700,7 +700,8 @@
+               free(s);
+ 
+               /* Was in the squelch list, so remove it and stop looking */
+-              s = (l ? l->next : p->squelch_modes) = n;
++              if (l) l->next = n; else p->squelch_modes = n;
++              s = n;
+               squelch = 1;
+               break;
+             } else {
+@@ -741,7 +742,8 @@
+               free(s);
+ 
+               /* Was in the squelch list, so remove it and stop looking */
+-              s = (l ? l->next : p->squelch_modes) = n;
++              if (l) l->next = n; else p->squelch_modes = n;
++              s = n;
+               squelch = 1;
+               break;
+             } else {
+diff -urN ../tmp-orig/dircproxy-1.0.5/src/net.c ./src/net.c
+--- ../tmp-orig/dircproxy-1.0.5/src/net.c   2002-01-01 18:55:23.000000000 +0100
++++ ./src/net.c 2004-12-14 15:41:43.499804520 +0100
+@@ -459,7 +459,7 @@
+     return 0;
+   }
+   
+-  l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last);
++  l = (buff == SB_IN) ? &s->in_buff_last : &s->out_buff_last;
+ 
+   /* Check whether we can just add to the existing buffer */
+   if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) {