Added WANT_AUTO* to get the right version of the autotools. Added a gcc-3.4 patch. Thanks to AJ Armstrong <aja@gentoo.org> and ville <vzheiska@cs.helsinki.fi>.

5 files changed, 84 insertions, 11 deletions

diff --git a/net-libs/socket++/ChangeLog b/net-libs/socket++/ChangeLog
index ae1017856f74..4899f4f59c37 100644
--- a/net-libs/socket++/ChangeLog
+++ b/net-libs/socket++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/socket++
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.2 2004/06/24 23:18:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.3 2004/12/16 04:03:48 swegener Exp $
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  socket++-1.12.10.ebuild:
+  Added WANT_AUTO* to get the right version of the autotools. Added a gcc-3.4
+  patch. Thanks to AJ Armstrong <aja@gentoo.org> and ville
+  <vzheiska@cs.helsinki.fi>.
 
 *socket++-1.12.10 (23 Jun 2004)
 
diff --git a/net-libs/socket++/Manifest b/net-libs/socket++/Manifest
index 850217e13cc1..2aceb805840b 100644
--- a/net-libs/socket++/Manifest
+++ b/net-libs/socket++/Manifest
@@ -1,4 +1,15 @@
-MD5 16c1c0c7a19930f9baceb8e84fad9cd7 socket++-1.12.10.ebuild 781
-MD5 70a2595bf7995adcbcbf2c59f52f2ba2 ChangeLog 441
-MD5 a69c2dd3522dfb6a77cf803655524100 metadata.xml 494
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5e7e134f845417cec165f0e91e2ba7d3 socket++-1.12.10.ebuild 948
+MD5 48df88adb2fc05e9457e5a28faf8a01d ChangeLog 699
+MD5 2b3e89005c19886504e6ca523a0659f9 metadata.xml 459
+MD5 a683e58943d8de77b00a47d269d3cdac files/1.12.10-gcc34.patch 1987
 MD5 e65d70ec3026971e3da1033b7d747c2f files/digest-socket++-1.12.10 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBwQkwI1lqEGTUzyQRAscfAJ4q/oAo1Tuai5NsiwDEob2B2ixpVwCfRtFA
+rfDXAzM31ZW3ZH+W2s1vNFc=
+=hocv
+-----END PGP SIGNATURE-----
diff --git a/net-libs/socket++/files/1.12.10-gcc34.patch b/net-libs/socket++/files/1.12.10-gcc34.patch
new file mode 100644
index 000000000000..b557f615315e
--- /dev/null
+++ b/net-libs/socket++/files/1.12.10-gcc34.patch
@@ -0,0 +1,47 @@
+--- socket++/sig.cpp.orig	2003-03-14 11:02:40.000000000 -0700
++++ socket++/sig.cpp	2004-12-15 20:13:52.758514376 -0700
+@@ -49,7 +49,7 @@
+   if (v.empty ()) {
+     struct sigaction sa;
+     if (sigaction (signo, 0, &sa) == -1) throw sigerr();
+-    if (sa.sa_handler != sighnd_type (&sighandler)) {
++    if (sa.sa_handler != (void(*)(int)) sighnd_type (&sighandler)) {
+       // setting for the first time
+       sa.sa_handler = (void(*)(int)) sighnd_type (&sighandler);
+       if (sigemptyset (&sa.sa_mask) == -1) throw sigerr();
+@@ -90,7 +90,7 @@
+   
+   struct sigaction sa;
+   if (sigaction (signo, 0, &sa) == -1) throw sigerr();
+-  if (sa.sa_handler == sighnd_type (&sighandler)) {
++  if (sa.sa_handler == (void(*)(int)) sighnd_type (&sighandler)) {
+     sa.sa_handler = (void(*)(int)) sighnd_type (SIG_DFL);
+     if (sigemptyset (&sa.sa_mask) == -1) throw sigerr();
+     sa.sa_flags = 0;
+@@ -120,7 +120,7 @@
+ {
+   struct sigaction sa;
+   if (sigaction (siga, 0, &sa) == -1) throw sigerr();
+-  if (sa.sa_handler != sighnd_type (&sighandler)) {
++  if (sa.sa_handler != (void(*)(int))sighnd_type (&sighandler)) {
+     sa.sa_handler = (void(*)(int)) sighnd_type (&sighandler);
+     if (sigemptyset (&sa.sa_mask) == -1) throw sigerr();
+     sa.sa_flags = 0;
+@@ -133,7 +133,7 @@
+ {
+   struct sigaction sa;
+   if (sigaction (siga, 0, &sa) == -1) throw sigerr();
+-  if (sa.sa_handler != sighnd_type (&sighandler)) {
++  if (sa.sa_handler != (void(*)(int))sighnd_type (&sighandler)) {
+     sa.sa_handler = (void(*)(int)) sighnd_type (&sighandler);
+     if (sigemptyset (&sa.sa_mask) == -1) throw sigerr();
+     sa.sa_flags = 0;
+@@ -147,7 +147,7 @@
+ {
+   struct sigaction sa;
+   if (sigaction (signo, 0, &sa) == -1) throw sigerr();
+-  if (sa.sa_handler != sighnd_type (&sighandler)) {
++  if (sa.sa_handler != (void(*)(int))sighnd_type (&sighandler)) {
+     sa.sa_handler = (void(*)(int)) sighnd_type (&sighandler);
+     if (sigemptyset (&sa.sa_mask) == -1) throw sigerr();
+     sa.sa_flags = 0;
diff --git a/net-libs/socket++/metadata.xml b/net-libs/socket++/metadata.xml
index d151fd6c70ab..59bbda3dbbab 100644
--- a/net-libs/socket++/metadata.xml
+++ b/net-libs/socket++/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>swegener@gentoo.org</email>
+		<description>Primary Maintainer</description>
 	</maintainer>
 	<longdescription>Socket++ library defines a family of C++ classes that can be used more effectively than directly calling the underlying low-level system functions.</longdescription>
 </pkgmetadata>
diff --git a/net-libs/socket++/socket++-1.12.10.ebuild b/net-libs/socket++/socket++-1.12.10.ebuild
index 8e715afd9295..e0105d1866cb 100644
--- a/net-libs/socket++/socket++-1.12.10.ebuild
+++ b/net-libs/socket++/socket++-1.12.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.10.ebuild,v 1.2 2004/06/24 23:18:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.10.ebuild,v 1.3 2004/12/16 04:03:48 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="C++ Socket Library"
 HOMEPAGE="http://members.aon.at/hstraub/linux/socket++/"
@@ -10,14 +12,21 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="debug"
 
-DEPEND="sys-devel/automake
-	sys-devel/autoconf
+DEPEND="=sys-devel/automake-1.7*
+	=sys-devel/autoconf-2.59*
 	sys-devel/libtool
 	sys-apps/texinfo"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
+
 src_compile() {
-	./autogen || die "./autogen failed"
+	WANT_AUTOMAKE=1.7 WANT_AUTOCONF=2.5  ./autogen || die "./autogen failed"
 	econf $(use_enable debug) || die "econf failed"
 	emake || die "emake failed"
 }
@@ -25,5 +34,5 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "install failed"
 
-	dodoc AUTHORS ChangeLog NEWS README* THANKS
+	dodoc AUTHORS ChangeLog NEWS README* THANKS || die "dodoc failed"
 }