summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/irssi/ChangeLog8
-rw-r--r--net-irc/irssi/files/digest-irssi-0.8.10_rc51
-rw-r--r--net-irc/irssi/files/irssi-socks-fix.patch25
-rw-r--r--net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild3
-rw-r--r--net-irc/irssi/irssi-0.8.10_rc5.ebuild82
5 files changed, 34 insertions, 85 deletions
diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 69edc1373f72..3829bc31bd90 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-irc/irssi
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.58 2005/01/22 17:19:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.59 2005/02/28 23:41:05 swegener Exp $
+
+ 01 Mar 2005; Sven Wegener <swegener@gentoo.org>
+ +files/irssi-socks-fix.patch, irssi-0.8.10_rc5-r1.ebuild,
+ -irssi-0.8.10_rc5.ebuild:
+ Added a patch that fixes wrong include order if socks support is enabled.
+ Closes bug #83522.
22 Jan 2005; Sven Wegener <swegener@gentoo.org>
irssi-0.8.10_rc5-r1.ebuild:
diff --git a/net-irc/irssi/files/digest-irssi-0.8.10_rc5 b/net-irc/irssi/files/digest-irssi-0.8.10_rc5
deleted file mode 100644
index 9c4282384575..000000000000
--- a/net-irc/irssi/files/digest-irssi-0.8.10_rc5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c0b6c1533c85e918f41ded1238e4ca1 irssi-0.8.10-rc5.tar.gz 1192158
diff --git a/net-irc/irssi/files/irssi-socks-fix.patch b/net-irc/irssi/files/irssi-socks-fix.patch
new file mode 100644
index 000000000000..c0445ec24153
--- /dev/null
+++ b/net-irc/irssi/files/irssi-socks-fix.patch
@@ -0,0 +1,25 @@
+diff -Nur irssi.orig/src/core/network.h irssi/src/core/network.h
+--- irssi.orig/src/core/network.h 2005-03-01 00:36:21.634296397 +0100
++++ irssi/src/core/network.h 2005-03-01 00:36:37.204104608 +0100
+@@ -1,10 +1,6 @@
+ #ifndef __NETWORK_H
+ #define __NETWORK_H
+
+-#ifdef HAVE_SOCKS_H
+-#include <socks.h>
+-#endif
+-
+ #include <sys/types.h>
+ #ifndef WIN32
+ # include <sys/socket.h>
+@@ -13,6 +9,10 @@
+ # include <arpa/inet.h>
+ #endif
+
++#ifdef HAVE_SOCKS_H
++#include <socks.h>
++#endif
++
+ #ifndef AF_INET6
+ # ifdef PF_INET6
+ # define AF_INET6 PF_INET6
diff --git a/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild b/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild
index 87e8e0853fae..6cc455a123ac 100644
--- a/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild
+++ b/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild,v 1.2 2005/01/22 17:19:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild,v 1.3 2005/02/28 23:41:05 swegener Exp $
inherit perl-module eutils
@@ -40,6 +40,7 @@ src_unpack() {
die "sed doc/Makefile.in failed"
epatch ${WORKDIR}/${P}-CVS-20050121.patch
+ epatch ${FILESDIR}/irssi-socks-fix.patch
}
src_compile() {
diff --git a/net-irc/irssi/irssi-0.8.10_rc5.ebuild b/net-irc/irssi/irssi-0.8.10_rc5.ebuild
deleted file mode 100644
index 0727322f122e..000000000000
--- a/net-irc/irssi/irssi-0.8.10_rc5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc5.ebuild,v 1.7 2005/01/21 00:39:48 swegener Exp $
-
-inherit perl-module eutils
-
-MY_P="${P//_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/"
-SRC_URI="http://irssi.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="nls ipv6 perl ssl socks5"
-
-RDEPEND="!net-irc/irssi-cvs
- >=dev-libs/glib-2.2.1
- sys-libs/ncurses
- ssl? ( dev-libs/openssl )
- perl? ( dev-lang/perl )
- socks5? ( >=net-misc/dante-1.1.13 )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- >=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # Ugly hack to work around compression of the html files.
- # Remove this if prepalldocs is changed to avoid gzipping html files.
- sed -i \
- -e 's/[^ ]\+\.html//g' docs/Makefile.in || \
- die "sed doc/Makefile.in failed"
-}
-
-src_compile() {
- if use ssl
- then
- myconf="--with-openssl-include=/usr --with-openssl-libs=/usr"
- else
- myconf="--disable-ssl"
- fi
-
- econf \
- --with-glib2 \
- --without-servertest \
- --with-proxy \
- --with-ncurses \
- $(use_enable nls) \
- $(use_with perl) \
- $(use_enable ipv6) \
- $(use_with socks5 socks) \
- ${myconf} || die "./configure failed"
- emake || die "emake failed"
-}
-
-src_install() {
- if use perl
- then
- for dir in ${S}/src/perl/{common,irc,textui,ui}
- do
- cd ${dir}
- perl-module_src_prep
- done
- cd ${S}
- fi
-
- make \
- DESTDIR=${D} \
- docdir=/usr/share/doc/${PF} \
- gnulocaledir=${D}/usr/share/locale \
- install || die "make install failed"
-
- prepalldocs
- dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
- dohtml -r ${S}/docs/. || die "dohtml failed"
-}