EAPI2 - multilib ready - use local var - use newstyle bglibs paths - fix parallel build (bug #297986)

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 70 insertions, 13 deletions

diff --git a/sys-apps/ucspi-unix/ChangeLog b/sys-apps/ucspi-unix/ChangeLog
index e2cb962a9eb4..97af75b867c8 100644
--- a/sys-apps/ucspi-unix/ChangeLog
+++ b/sys-apps/ucspi-unix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/ucspi-unix
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ChangeLog,v 1.23 2009/12/22 21:45:32 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ChangeLog,v 1.24 2010/01/14 18:20:45 bangert Exp $
+
+*ucspi-unix-0.36-r4 (14 Jan 2010)
+
+  14 Jan 2010; Thilo Bangert <bangert@gentoo.org>
+  +ucspi-unix-0.36-r4.ebuild,
+  +files/ucspi-unix-0.36-fix-parallel-build.patch:
+  EAPI2 - multilib ready - use local var - use newstyle bglibs paths - fix
+  parallel build (bug #297986)
 
   22 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   ucspi-unix-0.36-r3.ebuild:
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index 11d8e6872cbd..b2409e58398d 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ucspi-unix-0.36-fix-parallel-build.patch 507 RMD160 b36f63cf19d11ebae93221c785b1d79b3779df63 SHA1 b995849eb8eb7f521ee2c10a51b21021e6a41e6c SHA256 9b852dae310804c8939058a8724108f1ed1877f0899c6189ef264e281d37e644
 AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 RMD160 d592a17996228058ed7889aec8900fde6bfcafaf SHA1 09ca67ed3f7370b39fea3ea1cd37582d57ee85d1 SHA256 b84cd70caf30112503a25474e67cab0b73baa38d2fb9577dce1193ed4b3771a1
 AUX ucspi-unix-gentoo-head.patch 1097 RMD160 6080a8e60ed9cf4ab7b46cf83f1b9f9ae02de627 SHA1 6aec46f7156da6814730174a71798185d5353169 SHA256 50f675e44de2c10b917441cfa0bbd77b119b545ae2819cd2cfb623e12c75ddd8
 DIST ucspi-unix-0.36.tar.gz 14175 RMD160 21185525ac0161c14ca917ecfc3ac289ef8f398d SHA1 f5ced751f1829a896fbd854987fd7774eb338a75 SHA256 428d23fcc91b4dd66f64932978cd26316b82d2599cff7a512690ff1ec9df02e2
 EBUILD ucspi-unix-0.36-r2.ebuild 988 RMD160 61e64d6704a7c88a5430269bb2f4efdb1ac00bc4 SHA1 683ec54bd952cdfb56cea47f89eea557a3bba874 SHA256 9462b7d1c1f355a4a5f3a241d17d0cc9758305a8ed9178308940450e9b1104e5
 EBUILD ucspi-unix-0.36-r3.ebuild 1089 RMD160 a8cd2675a6caa957abafda0e3ed2ed3afe5685f5 SHA1 8aecff91c2883c1be9eb05ef4c57cdd99c9c69d5 SHA256 d8a6c9e674a21ee6b3418bd3758c6c2f7c0ff22c6e932e70fe6216f5b7ca66b7
-MISC ChangeLog 2890 RMD160 a62120acc0190091345c1818bb1a97ad3c56015f SHA1 abb4be9e3f83f89ddcbe1b6c2bc94df4c8493636 SHA256 0d80072f5d1862c7424a101d38117345610961a8a54659c7fd154a553dba3b04
+EBUILD ucspi-unix-0.36-r4.ebuild 1113 RMD160 381810a37faf01bdd85a29633a1ffae9433b0ec6 SHA1 9b7bd3cab480d733513a028fb41b511fa458252a SHA256 036e7c5397cf2a153a9aa89a19a236cd9c6d504fd6085695c6c37c19120db616
+MISC ChangeLog 3161 RMD160 529b62cec16654a3b533d19839babfff0d37d046 SHA1 fad8153c5d5fd75786d940542cae9fa7b75d3960 SHA256 ab36b73e57eace451ea5f7aa4cfe2fb977644481aeac7a6373b27ae9717debd8
 MISC metadata.xml 434 RMD160 77757ddf7f863ab84ac144dc7a3e59dfdc2e03d6 SHA1 ec277ff1d021f151986d4d14d9e889c72444e6c2 SHA256 04617dc59b00086a763ad5afc147ae1ac272d13b7bced600cf44e0c082bda3da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksxPewACgkQAiZjviIA2XhegQCg9ExKfKHQwIdmyfJ0oma4S9Vy
-qjQAn0Cf5cCNCwxcY619R+QRFfe8N+8S
-=qB2S
------END PGP SIGNATURE-----
diff --git a/sys-apps/ucspi-unix/files/ucspi-unix-0.36-fix-parallel-build.patch b/sys-apps/ucspi-unix/files/ucspi-unix-0.36-fix-parallel-build.patch
new file mode 100644
index 000000000000..94fc07cb0022
--- /dev/null
+++ b/sys-apps/ucspi-unix/files/ucspi-unix-0.36-fix-parallel-build.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig	2010-01-14 14:42:14.000000000 +0100
++++ Makefile	2010-01-14 14:42:42.000000000 +0100
+@@ -41,14 +41,14 @@
+ 	./load insthier -linstaller
+ 	mv insthier installer
+ 
+-instcheck: load insthier.o
++instcheck: load insthier.o installer instshow
+ 	./load insthier -linstcheck
+ 	mv insthier instcheck
+ 
+ insthier.o: compile insthier.c conf_bin.c conf_man.c
+ 	./compile insthier.c
+ 
+-instshow: load insthier.o
++instshow: load insthier.o installer
+ 	./load insthier -linstshow
+ 	mv insthier instshow
+ 
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild
new file mode 100644
index 000000000000..89a459475a50
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/01/14 18:20:45 bangert Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs multilib
+
+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.106"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gentoo-head.patch
+	epatch "${FILESDIR}"/${P}-include-sys_socket.h.patch
+	epatch "${FILESDIR}"/${P}-fix-parallel-build.patch
+}
+
+src_configure() {
+	local has_peercred
+	use kernel_linux && has_peercred="-DHASPEERCRED=1"
+
+	echo "$(tc-getCC) ${CFLAGS} -I/usr/include/bglibs ${has_peercred} -D_GNU_SOURCE" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS} -L/usr/$(get_libdir)/bglibs" > conf-ld
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat || die
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
+}