remove old version - fix build with glibc-2.8 (bug #228173)

(Portage version: 2.1.4.5)

4 files changed, 55 insertions, 35 deletions

diff --git a/sys-apps/ucspi-unix/ChangeLog b/sys-apps/ucspi-unix/ChangeLog
index 97173c45f75e..f10306027719 100644
--- a/sys-apps/ucspi-unix/ChangeLog
+++ b/sys-apps/ucspi-unix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ucspi-unix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ChangeLog,v 1.18 2008/03/28 21:46:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ChangeLog,v 1.19 2008/11/07 13:44:38 bangert Exp $
+
+*ucspi-unix-0.36-r3 (07 Nov 2008)
+
+  07 Nov 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/ucspi-unix-0.36-include-sys_socket.h.patch,
+  -ucspi-unix-0.36-r1.ebuild, +ucspi-unix-0.36-r3.ebuild:
+  remove old version - fix build with glibc-2.8 (bug #228173)
 
   28 Mar 2008; Markus Meier <maekke@gentoo.org> ucspi-unix-0.36-r2.ebuild:
   amd64 stable, bug #207626
diff --git a/sys-apps/ucspi-unix/files/ucspi-unix-0.36-include-sys_socket.h.patch b/sys-apps/ucspi-unix/files/ucspi-unix-0.36-include-sys_socket.h.patch
new file mode 100644
index 000000000000..0d96450911c5
--- /dev/null
+++ b/sys-apps/ucspi-unix/files/ucspi-unix-0.36-include-sys_socket.h.patch
@@ -0,0 +1,11 @@
+diff -Naur ucspi-unix-0.36.orig/env.c ucspi-unix-0.36/env.c
+--- ucspi-unix-0.36.orig/env.c	2002-06-10 23:12:06.000000000 +0200
++++ ucspi-unix-0.36/env.c	2008-11-06 16:31:09.000000000 +0100
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sysdeps.h>
++#include <sys/socket.h>
+ 
+ extern const char* utoa(unsigned long);
+ 
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
deleted file mode 100644
index 6e61374f6c42..000000000000
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.8 2007/02/26 21:16:41 bangert Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A ucspi implementation for unix sockets"
-HOMEPAGE="http://untroubled.org/ucspi-unix/"
-SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.009-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo-head.patch
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS} -I/usr/lib/bglibs/include" > conf-cc
-	echo "$(tc-getCC) -s -L/usr/lib/bglibs/lib" > conf-ld
-	make || die  #don't use emake b/c of jobserver
-}
-
-src_install() {
-	dobin unixserver unixclient unixcat || die
-	doman unixserver.1 unixclient.1
-	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
-}
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
new file mode 100644
index 000000000000..169b9cdba0ec
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild,v 1.1 2008/11/07 13:44:38 bangert Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A ucspi implementation for unix sockets"
+HOMEPAGE="http://untroubled.org/ucspi-unix/"
+SRC_URI="http://untroubled.org/ucspi-unix/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.019-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-gentoo-head.patch
+	epatch "${FILESDIR}"/${P}-include-sys_socket.h.patch
+}
+
+src_compile() {
+	use kernel_linux && PEERCRED="-DHASPEERCRED=1"
+	echo "$(tc-getCC) ${CFLAGS} -I/usr/lib/bglibs/include ${PEERCRED} -D_GNU_SOURCE" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS} -L/usr/lib/bglibs/lib" > conf-ld
+	make || die  #don't use emake b/c of jobserver
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat || die
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
+}