Fix some broken C++ code #116999 by Markus Ullmann.

Package-Manager: portage-2.1_pre2

4 files changed, 48 insertions, 21 deletions

diff --git a/net-misc/mdidentd/ChangeLog b/net-misc/mdidentd/ChangeLog
index aedcc07431cf..095ffc0a043d 100644
--- a/net-misc/mdidentd/ChangeLog
+++ b/net-misc/mdidentd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mdidentd
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mdidentd/ChangeLog,v 1.4 2005/08/23 13:20:13 flameeyes Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mdidentd/ChangeLog,v 1.5 2005/12/28 20:57:55 vapier Exp $
+
+  28 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/mdidentd-1.04a-c++.patch, mdidentd-1.04a.ebuild:
+  Fix some broken C++ code #116999 by Markus Ullmann.
 
   23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mdidentd-1.04a.ebuild:
   Use -1 instead of /bin/false on enewuser call.
diff --git a/net-misc/mdidentd/Manifest b/net-misc/mdidentd/Manifest
index 11d35916b3bd..c1bbc55798f8 100644
--- a/net-misc/mdidentd/Manifest
+++ b/net-misc/mdidentd/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22851f50fb5ce52150b3035c5ac1e295 ChangeLog 626
-MD5 ccc6f68a059fbf5c557cb90ce4a89e86 mdidentd-1.04a.ebuild 1073
+MD5 47a04d4bbc57024ad948ff98c62a1d09 ChangeLog 786
+MD5 bb24159ce9ff81560bf15e634d686e1e files/1.04a-pidfile.patch 483
 MD5 344e73b9ea63553c5430cf7cb26a83cf files/1.04a-security.patch 2804
 MD5 77781fdeabcd004ae4478c14971a9644 files/digest-mdidentd-1.04a 66
+MD5 a188d3a975f80d9891ead25c01f790f6 files/mdidentd-1.04a-c++.patch 976
 MD5 a04345a764fc7c6ca71d3ffbb4a16c6f files/mdidentd.conf.d 286
-MD5 bb24159ce9ff81560bf15e634d686e1e files/1.04a-pidfile.patch 483
 MD5 752deb910376ea926065c57efb096911 files/mdidentd.init.d 487
+MD5 418653f6ebc9d7d570ffabe1b6497f6f mdidentd-1.04a.ebuild 1088
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDCyKlj5H05b2HAEkRAiwqAJ9l5TRPWkhti8KIcaz/l7W6qczqfQCbBTed
-1h4GaNZjsrcoEn9N1eLjm/4=
-=or8O
+iD8DBQFDsvxv2+ySkm8kpY0RAvC3AKC0/rfVP8z67vEPa7lbPm5zZ2kLsQCgsPor
+aQQm/PeV54UTxUdAnEAUzPg=
+=3XbL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mdidentd/files/mdidentd-1.04a-c++.patch b/net-misc/mdidentd/files/mdidentd-1.04a-c++.patch
new file mode 100644
index 000000000000..a40f078e0040
--- /dev/null
+++ b/net-misc/mdidentd/files/mdidentd-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); }
diff --git a/net-misc/mdidentd/mdidentd-1.04a.ebuild b/net-misc/mdidentd/mdidentd-1.04a.ebuild
index 037571ee4811..47d9fa57d97b 100644
--- a/net-misc/mdidentd/mdidentd-1.04a.ebuild
+++ b/net-misc/mdidentd/mdidentd-1.04a.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-misc/mdidentd/mdidentd-1.04a.ebuild,v 1.7 2005/08/23 13:20:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mdidentd/mdidentd-1.04a.ebuild,v 1.8 2005/12/28 20:57:55 vapier Exp $
 
 inherit eutils
 
@@ -10,11 +10,10 @@ SRC_URI="http://druglord.freelsd.org/ezbounce/ezbounce-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
 
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl )"
 
 S=${WORKDIR}/ezbounce-${PV}
 
@@ -25,22 +24,21 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-security.patch
-	epatch ${FILESDIR}/${PV}-pidfile.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-security.patch
+	epatch "${FILESDIR}"/${PV}-pidfile.patch
+	epatch "${FILESDIR}"/${P}-c++.patch #116999
 }
 
 src_compile() {
-	econf `use_with ssl` || die
+	econf $(use_with ssl) || die
 	emake -C mdidentd CXX_OPTIMIZATIONS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dosbin mdidentd/mdidentd
+	dosbin mdidentd/mdidentd || die
 	dodoc mdidentd/README
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mdidentd.init.d mdidentd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/mdidentd.conf.d mdidentd
+	newinitd "${FILESDIR}"/mdidentd.init.d mdidentd
+	newconfd "${FILESDIR}"/mdidentd.conf.d mdidentd
 }