Cleanup ebuild and fix broken C++ code #116999 by Markus Ullmann.

Package-Manager: portage-2.1_pre2

4 files changed, 48 insertions, 22 deletions

diff --git a/net-irc/ezbounce/ChangeLog b/net-irc/ezbounce/ChangeLog
index c8d4bfd45699..4382ed9fd789 100644
--- a/net-irc/ezbounce/ChangeLog
+++ b/net-irc/ezbounce/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/ezbounce
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.6 2004/09/12 17:05:54 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.7 2005/12/28 21:01:45 vapier Exp $
+
+  28 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ezbounce-1.04a-c++.patch, ezbounce-1.04a.ebuild:
+  Cleanup ebuild and fix broken C++ code #116999 by Markus Ullmann.
 
   12 Sep 2004; Sven Wegener <swegener@gentoo.org> ezbounce-1.04a.ebuild:
   Modified ebuild to install sample configuration files. Closes bug #63780.
diff --git a/net-irc/ezbounce/Manifest b/net-irc/ezbounce/Manifest
index 914c2bca02d1..f2720f05900f 100644
--- a/net-irc/ezbounce/Manifest
+++ b/net-irc/ezbounce/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6f851d845e72186a1bcd2c916feb8907 ChangeLog 925
-MD5 76896e5070f62fda4201255663b9c7d2 ezbounce-1.04a.ebuild 803
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 b73fc71d0e0405711ed5beb8e18d7dfb ChangeLog 1100
+MD5 0c7246f52286d5199f6dad972295a2bd ezbounce-1.04a.ebuild 872
 MD5 77781fdeabcd004ae4478c14971a9644 files/digest-ezbounce-1.04a 66
+MD5 a188d3a975f80d9891ead25c01f790f6 files/ezbounce-1.04a-c++.patch 976
 MD5 2c41dd7703df2b1d7c993f8665105122 files/ezbounce-1.04a-crash-fix.patch 945
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFBRIH8I1lqEGTUzyQRAj9dAJ9qPVQRlzVgW5im+ujWGAvFgPERjgCfZ1WR
-zxiw9z7MQo7LfWeBxcavKMQ=
-=LqsF
+iD8DBQFDsv1V2+ySkm8kpY0RAhZCAJsFr9gP8VazH4ti0ti0jj3/KTmVVQCdEKCZ
+c9ZC8c6xWGOQFYNYGqTvtgw=
+=b3D6
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ezbounce/ezbounce-1.04a.ebuild b/net-irc/ezbounce/ezbounce-1.04a.ebuild
index bc7bbd0cfe35..06c445d2f763 100644
--- a/net-irc/ezbounce/ezbounce-1.04a.ebuild
+++ b/net-irc/ezbounce/ezbounce-1.04a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.04a.ebuild,v 1.7 2004/09/12 17:05:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.04a.ebuild,v 1.8 2005/12/28 21:01:45 vapier Exp $
 
 inherit eutils
 
@@ -10,29 +10,27 @@ SRC_URI="http://druglord.freelsd.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
+
 DEPEND=">=net-misc/mdidentd-1.04a
 	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
 	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-crash-fix.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-crash-fix.patch
+	epatch "${FILESDIR}"/${P}-c++.patch
 }
 
 src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl"
-
-	econf ${myconf} || die
-	emake  || die
+	econf $(use_with ssl) || die
+	emake CXX_OPTIMIZATIONS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dobin ezbounce
+	dobin ezbounce || die
+	dosym ezbounce /usr/bin/ezb
 	dodoc CHANGES TODO README ezb.conf sample.*
 	doman misc/ezbounce.1
 }
diff --git a/net-irc/ezbounce/files/ezbounce-1.04a-c++.patch b/net-irc/ezbounce/files/ezbounce-1.04a-c++.patch
new file mode 100644
index 000000000000..a40f078e0040
--- /dev/null
+++ b/net-irc/ezbounce/files/ezbounce-1.04a-c++.patch
@@ -0,0 +1,23 @@
+Fix some broken C++ code ... __list_iter doesn't implement get(), nor
+does __list_core implement insert() ...
+
+http://bugs.gentoo.org/116999
+
+--- ezbounce-1.04a/lib/linkedlist.h
++++ ezbounce-1.04a/lib/linkedlist.h
+@@ -89,7 +89,6 @@ public:
+     list_iterator(__list_core * x) : __list_iter(x) { }
+     T * next()          { return (T *) __list_iter::next(); }
+     T * remove()        { return (T *) __list_iter::remove(); }
+-    T * get(void)       { return (T *) __list_iter::get(); }
+     T * set(int x)      { return (T *) __list_iter::set(x); }
+ };
+     
+@@ -97,7 +96,6 @@ template <class T> class list : public _
+ {    
+ public:
+     int add(T *x)         { return __list_core::add((void *) x); }
+-    int add(int w, T * x) { return __list_core::insert(w, (void *) x); }
+     T * get(int idx)      { return (T *) __list_core::get(idx); }
+     T * remove(int idx)   { return (T *) __list_core::remove(idx); }
+     bool remove(T * d)    { return __list_core::remove(d); }