Clean up ebuild and compiling with gcc-4.1 #113736; thanks to everyone.

(Portage version: 2.1.1_rc1-r4)

9 files changed, 362 insertions, 5 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index 43b93d057daf..405643678bae 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/bitchx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.52 2005/03/22 18:40:30 blubb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.53 2006/09/06 07:03:03 vapier Exp $
+
+*bitchx-1.1-r3 (06 Sep 2006)
+
+  06 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/1.1/bitchx-1.1-build.patch, files/1.1/bitchx-1.1-gcc34.patch,
+  +files/1.1/bitchx-1.1-gcc41.patch, +files/1.1/bitchx-1.1-headers.patch,
+  +bitchx-1.1-r3.ebuild:
+  Clean up ebuild and compiling with gcc-4.1 #113736; thanks to everyone.
 
   22 Mar 2005; <blubb@gentoo.org> bitchx-1.1-r2.ebuild:
   pseudo-fixing bug #61133 with an ugly hack, prevents bitchx from building with
diff --git a/net-irc/bitchx/bitchx-1.1-r3.ebuild b/net-irc/bitchx/bitchx-1.1-r3.ebuild
new file mode 100644
index 000000000000..7b75986c242c
--- /dev/null
+++ b/net-irc/bitchx/bitchx-1.1-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r3.ebuild,v 1.1 2006/09/06 07:03:03 vapier Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=ircii-pana-${PV}-final
+S=${WORKDIR}/BitchX
+DESCRIPTION="An IRC Client"
+HOMEPAGE="http://www.bitchx.org/"
+SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sh ~sparc ~x86"
+IUSE="cdrom cjk esd gnome gtk ipv6 ncurses ssl xmms"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ncurses? ( sys-libs/ncurses )
+	xmms? ( media-sound/xmms )
+	esd? (
+		>=media-sound/esound-0.2.5
+		>=media-libs/audiofile-0.1.5
+	)
+	gtk? (
+		=x11-libs/gtk+-1.2*
+		>=media-libs/imlib-1.9.10-r1
+	)
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	use cjk && epatch "${FILESDIR}"/${PV}/${P}-cjk.patch
+	epatch "${FILESDIR}"/${PV}/${P}-hebrew.patch
+	epatch "${FILESDIR}"/${PV}/${P}-freenode.patch
+	epatch "${FILESDIR}"/${PV}/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${PV}/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${PV}/${P}-headers.patch
+	epatch "${FILESDIR}"/${PV}/${P}-build.patch
+	epatch "${FILESDIR}"/fPIC.patch
+	epatch "${FILESDIR}"/BitchX-64bit.patch
+
+	sed -i \
+		-e "s/#undef LATIN1/#define LATIN1 ON/;" \
+		include/config.h
+}
+
+src_compile() {
+	replace-flags -O[3-9] -O2
+	append-flags -fno-strict-aliasing
+
+	local myconf
+
+	use esd && use gtk \
+		&& myconf="${myconf} --enable-sound" \
+		|| myconf="${myconf} --disable-sound"
+	if use gtk && use gnome ; then
+		if use amd64 ; then
+			ewarn "gtkBitchX is broken on amd64, so we're building it"
+			ewarn "with USE=-gtk.  See http://bugs.gentoo.org/61133"
+			myconf="${myconf} --without-gtk"
+		else
+			einfo "gtkBitchX will be built, if you want BitchX please run:"
+			einfo "USE=-gtk emerge bitchx"
+			myconf="${myconf} --with-gtk"
+		fi
+		epause 10
+	else
+		myconf="${myconf} --without-gtk"
+	fi
+
+	# lamer@gentoo.org BROKEN, will not work with our socks
+	# implementations, is looking for a SOCKSConnect function that our
+	# dante packages don't have :-(
+	# use socks5 \
+	#	&& myconf="${myconf} --with-socks=5" \
+	#	|| myconf="${myconf} --without-socks"
+
+	econf \
+		--with-plugins \
+		$(use_enable cdrom) \
+		$(use_with ssl) \
+		$(use_enable ipv6) \
+		${myconf} || die
+
+	emake || die "make failed"
+	emake -C contrib vh1 || die "make vh1 failed"
+}
+
+src_install () {
+	einstall || die
+	dobin contrib/vh1 || die
+	if ! use amd64 && use gnome && use gtk ; then
+		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
+	else
+		dosym BitchX-1.1-final /usr/bin/BitchX
+	fi
+
+	cd "${S}"
+	dodoc bugs Changelog README* IPv6-support
+
+	cd "${S}"/doc
+	insinto /usr/include/X11/bitmaps
+	doins BitchX.xpm || die
+	dodoc README.* *.txt */*.txt tcl/*
+	dohtml -r *
+
+	cd "${S}"/dll
+	insinto /usr/lib/bx/wav
+	doins wavplay/*.wav || die
+	docinto plugins
+	dodoc nap/README.nap
+	newdoc acro/README README.acro
+	newdoc arcfour/README README.arcfour
+	newdoc blowfish/README README.blowfish
+	newdoc qbx/README README.qbx
+}
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-build.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-build.patch
new file mode 100644
index 000000000000..45de9cc6014f
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-build.patch
@@ -0,0 +1,53 @@
+dll/aim/Makefile.in: Fix parallel building
+
+dll/hint/Makefile.in: BitchX.hints is a data file, not a plugin
+
+dll/Makefile.in: Let portage do the stripping
+
+Makefile.in: Let portage do the compression
+
+--- dll/aim/Makefile.in
++++ dll/aim/Makefile.in
+@@ -184,7 +184,7 @@
+ aim.o: $(srcdir)/aim.c
+ 	$(CC) $(AIMDEFS) $(CFLAGS) $(SHLIB_CFLAGS) -c $(srcdir)/aim.c
+ 
+-aim$(SHLIB_SUFFIX): $(OBJS) 
++aim$(SHLIB_SUFFIX): $(OBJS) toc
+ 	$(SHLIB_LD) $(OBJS) $(SHLIB_CFLAGS) -o aim$(SHLIB_SUFFIX) -Ltoc -ltoc
+ 
+ dummy:
+--- dll/hint/Makefile.in
++++ dll/hint/Makefile.in
+@@ -178,4 +178,4 @@
+ 
+ install:
+ 	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+-	$(INSTALL) $(srcdir)/BitchX.hints $(PLUGINDIR)/@HINT_FILE@
++	$(INSTALL_DATA) $(srcdir)/BitchX.hints $(PLUGINDIR)/@HINT_FILE@
+--- dll/Makefile.in
++++ dll/Makefile.in
+@@ -206,12 +206,6 @@
+ 			|| case "$$makeflags" in *=*) exit 1;; *k*) ;; *) exit 1;; esac; \
+ 		done; \
+ 	)
+-	@( \
+-		if test x"$(PLUGINS)" != x""; then \
+-			strip --strip-unneeded $(PLUGINDIR)/*$(SHLIB_SUFFIX) || :; \
+-			echo Your plugins [$(PLUGINS)] are now located in $(PLUGINDIR);\
+-		fi; \
+-	)
+ 
+ install_local: all
+ 	$(INSTALL) -d $(local_dir)/.BitchX/plugins
+--- Makefile.in
++++ Makefile.in
+@@ -302,8 +298,6 @@
+ 			done; \
+ 		fi; \
+ 	)
+-	(find $(mandir)/man1/BitchX.1 -type f ! -name '*.bz2' ! -name '*.gz' -name '*' | \
+-		(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
+ 
+ installdirs:
+ 	umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch
index 642e9eed6920..db549a6824ca 100644
--- a/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch
@@ -1,13 +1,15 @@
---- source/term.c.orig	2004-06-19 21:40:36.757653368 +0000
-+++ source/term.c	2004-06-19 21:41:31.783563978 +0000
-@@ -91,8 +91,8 @@
+--- source/term.c
++++ source/term.c
+@@ -91,8 +91,10 @@
  #define Tgetflag(x) 	tgetflag(x.tname)
  #endif
  
 -extern  char    *getenv();
 -extern	char	*tparm();
 +extern  char    *getenv(const char *name);
++#ifndef TPARM_DECLARED
 +extern	char	*tparm(char *str, ...);
++#endif
  
  /*
   * The old code assumed termcap. termcap is almost always present, but on
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-gcc41.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc41.patch
new file mode 100644
index 000000000000..065198818cb1
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc41.patch
@@ -0,0 +1,119 @@
+GCC 4.0 is more picky about static declarations for variables previously
+declared non-static.
+
+From Andreas Jochens <aj@andaco.de>, for Debian bug #290365.
+
+ dll/aim/toc/server.c |    4 ++--
+ dll/aim/toc/toc.c    |    6 +++---
+ include/modval.h     |   16 ++++++++--------
+ source/ctcp.c        |    2 +-
+ source/timer.c       |    2 +-
+ 5 files changed, 15 insertions(+), 15 deletions(-)
+
+Index: ircii-pana-1.1/dll/aim/toc/server.c
+===================================================================
+--- ircii-pana-1.1.orig/dll/aim/toc/server.c	2003-04-10 21:09:06.000000000 -0400
++++ ircii-pana-1.1/dll/aim/toc/server.c	2005-07-27 22:34:21.000000000 -0400
+@@ -7,14 +7,14 @@
+ #include <unistd.h>
+ #include "toc.h"
+ 
+-static time_t lastsent = 0;
++time_t lastsent = 0;
+ time_t login_time = 0;
+ int my_evil;
+ int is_idle = 0;
+ int lag_ms = 0;
+ int time_to_idle = 600;
+ int is_away = 0;
+-static struct timeval lag_tv;
++struct timeval lag_tv;
+ 
+ void serv_add_buddy(char *name)
+ {
+Index: ircii-pana-1.1/dll/aim/toc/toc.c
+===================================================================
+--- ircii-pana-1.1.orig/dll/aim/toc/toc.c	2003-04-10 21:09:06.000000000 -0400
++++ ircii-pana-1.1/dll/aim/toc/toc.c	2005-07-27 22:34:21.000000000 -0400
+@@ -39,9 +39,9 @@
+ #include "toc.h"
+ 
+ /* descriptor for talking to TOC */
+-static int toc_fd;
+-static int seqno;
+-static unsigned int peer_ver=0;
++int toc_fd;
++int seqno;
++unsigned int peer_ver=0;
+ int state;
+ /* static int inpa=-1; */
+ int permdeny = PERMIT_PERMITALL;
+Index: ircii-pana-1.1/include/modval.h
+===================================================================
+--- ircii-pana-1.1.orig/include/modval.h	2003-04-10 21:09:07.000000000 -0400
++++ ircii-pana-1.1/include/modval.h	2005-07-27 22:34:21.000000000 -0400
+@@ -650,7 +650,7 @@ extern Function_ptr *global;
+ #define start_time ((time_t) *((time_t *)global[START_TIME]))
+ #define idle_time() ((time_t) *((time_t *)global[IDLE_TIME]()))
+ 
+-#define loading_global ((int) *((int *)global[LOADING_GLOBAL]))
++#define loading_global (*((int *)global[LOADING_GLOBAL]))
+ #define target_window (*((Window **)global[TARGET_WINDOW]))
+ #define current_window (*((Window **)global[CURRENT_WINDOW]))
+ #define invisible_list (*((Window **)global[INVISIBLE_LIST]))
+@@ -665,12 +665,12 @@ extern Function_ptr *global;
+ #define dll_variable (*((IrcVariableDll **)global[DLL_VARIABLE]))
+ #define dll_ctcp (*((CtcpEntryDll **)global[DLL_CTCP]))
+ #define dll_window (*((WindowDll **)global[DLL_WINDOW]))
+-#define window_display ((int) *((int *)global[WINDOW_DISPLAY]))
+-#define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG]))
++#define window_display (*((int *)global[WINDOW_DISPLAY]))
++#define status_update_flag (*((int *)global[STATUS_UPDATE_FLAG]))
+ #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY]))
+ #define autoreply_array (*((NickTab *)global[AUTOREPLY_ARRAY]))
+-#define identd ((int) *((int *)global[IDENTD_SOCKET]))
+-#define doing_notice ((int) *((int *)global[DOING_NOTICE]))
++#define identd (*((int *)global[IDENTD_SOCKET]))
++#define doing_notice (*((int *)global[DOING_NOTICE]))
+ #define last_sent_msg_body (*((char **)global[LAST_SENT_MSG_BODY]))
+ #define sent_nick (*((char **)global[SENT_NICK]))
+ 
+@@ -698,9 +698,9 @@ extern Function_ptr *global;
+ #ifdef GUI
+ #ifndef MAIN_SOURCE
+ #define lastclicklinedata ((char *) *global[LASTCLICKLINEDATA])
+-#define contextx ((int) *((int *)global[CONTEXTX]))
+-#define contexty ((int) *((int *)global[CONTEXTY]))
+-#define guiipc ((int) *((int *)global[GUIIPC]))
++#define contextx (*((int *)global[CONTEXTX]))
++#define contexty (*((int *)global[CONTEXTY]))
++#define guiipc (*((int *)global[GUIIPC]))
+ #endif
+ #define gui_mutex_lock() ((void (*)(void)) global[GUI_MUTEX_LOCK])()
+ #define gui_mutex_unlock() ((void (*)(void))global[GUI_MUTEX_UNLOCK])()
+Index: ircii-pana-1.1/source/ctcp.c
+===================================================================
+--- ircii-pana-1.1.orig/source/ctcp.c	2003-05-27 03:00:22.000000000 -0400
++++ ircii-pana-1.1/source/ctcp.c	2005-07-27 22:34:21.000000000 -0400
+@@ -176,7 +176,7 @@ CtcpEntryDll *dll_ctcp = NULL;
+ 
+ /* CDE do ops and unban logging */
+ 
+-static char	*ctcp_type[] =
++char	*ctcp_type[] =
+ {
+ 	"PRIVMSG",
+ 	"NOTICE"
+Index: ircii-pana-1.1/source/timer.c
+===================================================================
+--- ircii-pana-1.1.orig/source/timer.c	2003-04-10 21:09:07.000000000 -0400
++++ ircii-pana-1.1/source/timer.c	2005-07-27 22:34:21.000000000 -0400
+@@ -148,7 +148,7 @@ BUILT_IN_COMMAND(timercmd)
+  * This is put here on purpose -- we dont want any of the above functions
+  * to have any knowledge of this struct.
+  */
+-static TimerList *PendingTimers;
++TimerList *PendingTimers;
+ static char *schedule_timer (TimerList *ntimer);
+ 
+ static char *current_exec_timer = empty_string;
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-headers.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-headers.patch
new file mode 100644
index 000000000000..e28552260192
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-headers.patch
@@ -0,0 +1,49 @@
+--- ./dll/aim/toc/interface.c
++++ ./dll/aim/toc/interface.c
+@@ -8,6 +8,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <time.h>
+ #include "toc.h"
+ 
+--- ./dll/possum/llist.c
++++ ./dll/possum/llist.c
+@@ -1,4 +1,5 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "llist.h"
+ 
+ llist *lmake(size_t size) {
+--- ./dll/europa/europa.c
++++ ./dll/europa/europa.c
+@@ -5,6 +5,8 @@
+   the file COPYING for details.
+  */
+ 
++#include <string.h>
++
+ #define MOD_VERSION "0.01"
+ #define MOD_NAME "Europa"
+ #include "europa.h"
+--- ./dll/arcfour/md5.c
++++ ./dll/arcfour/md5.c
+@@ -1,5 +1,6 @@
+ /* MD5 Message Digest algorithm */
+ 
++#include <string.h>
+ #include "md5.h"
+ 
+ /* Prototypes */
+--- contrib/vh1.c
++++ contrib/vh1.c
+@@ -30,6 +30,8 @@
+ #include <netinet/in.h>
+ #if !defined(linux)
+ #include <netinet/in_var.h>
++#else
++#include <arpa/inet.h>
+ #endif
+ #include <netdb.h>
+ 
diff --git a/net-irc/bitchx/files/digest-bitchx-1.1-r1 b/net-irc/bitchx/files/digest-bitchx-1.1-r1
index 3967cc2f290d..5721630b3fc2 100644
--- a/net-irc/bitchx/files/digest-bitchx-1.1-r1
+++ b/net-irc/bitchx/files/digest-bitchx-1.1-r1
@@ -1 +1,3 @@
 MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476
+RMD160 4105de2587964146e2391a26a8a16e3d0059a93f ircii-pana-1.1-final.tar.gz 2532476
+SHA256 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57 ircii-pana-1.1-final.tar.gz 2532476
diff --git a/net-irc/bitchx/files/digest-bitchx-1.1-r2 b/net-irc/bitchx/files/digest-bitchx-1.1-r2
index 3967cc2f290d..5721630b3fc2 100644
--- a/net-irc/bitchx/files/digest-bitchx-1.1-r2
+++ b/net-irc/bitchx/files/digest-bitchx-1.1-r2
@@ -1 +1,3 @@
 MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476
+RMD160 4105de2587964146e2391a26a8a16e3d0059a93f ircii-pana-1.1-final.tar.gz 2532476
+SHA256 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57 ircii-pana-1.1-final.tar.gz 2532476
diff --git a/net-irc/bitchx/files/digest-bitchx-1.1-r3 b/net-irc/bitchx/files/digest-bitchx-1.1-r3
new file mode 100644
index 000000000000..5721630b3fc2
--- /dev/null
+++ b/net-irc/bitchx/files/digest-bitchx-1.1-r3
@@ -0,0 +1,3 @@
+MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476
+RMD160 4105de2587964146e2391a26a8a16e3d0059a93f ircii-pana-1.1-final.tar.gz 2532476
+SHA256 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57 ircii-pana-1.1-final.tar.gz 2532476