Version bump.

6 files changed, 19 insertions, 64 deletions

diff --git a/net-libs/socket++/ChangeLog b/net-libs/socket++/ChangeLog
index 4899f4f59c37..fdb0e2bd6988 100644
--- a/net-libs/socket++/ChangeLog
+++ b/net-libs/socket++/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2004/12/16 04:03:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.4 2004/12/16 09:30:28 swegener Exp $
+
+*socket++-1.12.12 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/1.12.10-gcc34.patch, -socket++-1.12.10.ebuild,
+  +socket++-1.12.12.ebuild:
+  Version bump.
 
   16 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
   socket++-1.12.10.ebuild:
diff --git a/net-libs/socket++/Manifest b/net-libs/socket++/Manifest
index 2aceb805840b..76debd2b173a 100644
--- a/net-libs/socket++/Manifest
+++ b/net-libs/socket++/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e7e134f845417cec165f0e91e2ba7d3 socket++-1.12.10.ebuild 948
-MD5 48df88adb2fc05e9457e5a28faf8a01d ChangeLog 699
+MD5 daeb4b14cfecf1ae58af2cfd28610ef0 socket++-1.12.12.ebuild 887
+MD5 f58ad1affd0921b7a81c42edfd1e74ce ChangeLog 883
 MD5 2b3e89005c19886504e6ca523a0659f9 metadata.xml 459
-MD5 a683e58943d8de77b00a47d269d3cdac files/1.12.10-gcc34.patch 1987
-MD5 e65d70ec3026971e3da1033b7d747c2f files/digest-socket++-1.12.10 67
+MD5 de72f99bd9ee929dfc53cbfc508c1c24 files/digest-socket++-1.12.12 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBwQkwI1lqEGTUzyQRAscfAJ4q/oAo1Tuai5NsiwDEob2B2ixpVwCfRtFA
-rfDXAzM31ZW3ZH+W2s1vNFc=
-=hocv
+iD8DBQFBwVW9I1lqEGTUzyQRAnJ7AJwJDy94R3uxxYkXNbc2qqYoLP+NWQCgkqMc
+S7ULOfgV6fCn6ivtmRGnLuU=
+=lK0u
 -----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
deleted file mode 100644
index b557f615315e..000000000000
--- a/net-libs/socket++/files/1.12.10-gcc34.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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++/files/digest-socket++-1.12.10 b/net-libs/socket++/files/digest-socket++-1.12.10
deleted file mode 100644
index b9a1263e865f..000000000000
--- a/net-libs/socket++/files/digest-socket++-1.12.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1636c25b9192bf92c3b0dcb69c907f2a socket++-1.12.10.tar.gz 62741
diff --git a/net-libs/socket++/files/digest-socket++-1.12.12 b/net-libs/socket++/files/digest-socket++-1.12.12
new file mode 100644
index 000000000000..fcf28fbe0158
--- /dev/null
+++ b/net-libs/socket++/files/digest-socket++-1.12.12
@@ -0,0 +1 @@
+MD5 b96e06129504ae2b4005a5834264c5a4 socket++-1.12.12.tar.gz 64373
diff --git a/net-libs/socket++/socket++-1.12.10.ebuild b/net-libs/socket++/socket++-1.12.12.ebuild
index e0105d1866cb..c6c749db4ddd 100644
--- a/net-libs/socket++/socket++-1.12.10.ebuild
+++ b/net-libs/socket++/socket++-1.12.12.ebuild
@@ -1,12 +1,10 @@
 # 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.3 2004/12/16 04:03:48 swegener Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12.ebuild,v 1.1 2004/12/16 09:30:28 swegener Exp $
 
 DESCRIPTION="C++ Socket Library"
-HOMEPAGE="http://members.aon.at/hstraub/linux/socket++/"
-SRC_URI="http://www.hstraub.at/linux/downloads/src/${P}.tar.gz"
+HOMEPAGE="http://www.linuxhacker.at/socketxx/"
+SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
@@ -22,17 +20,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PV}-gcc34.patch
+	WANT_AUTOMAKE=1.7 WANT_AUTOCONF=2.5  ./autogen || die "./autogen failed"
 }
 
 src_compile() {
-	WANT_AUTOMAKE=1.7 WANT_AUTOCONF=2.5  ./autogen || die "./autogen failed"
 	econf $(use_enable debug) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "install failed"
-
 	dodoc AUTHORS ChangeLog NEWS README* THANKS || die "dodoc failed"
 }