reinit the tree, so we can have metadata

8 files changed, 195 insertions, 0 deletions

diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
new file mode 100644
index 000000000000..fdd135c570da
--- /dev/null
+++ b/sys-apps/ucspi-unix/Manifest
@@ -0,0 +1,10 @@
+AUX ucspi-unix-0.36-fix-parallel-build.patch 507 SHA256 9b852dae310804c8939058a8724108f1ed1877f0899c6189ef264e281d37e644 SHA512 6cc195171769fc57654f0ad0dcdc8a54e9655759e53f5c0c68ef0ed77b416e4a2635a5574a53e2112db3dcbdf8097039917ea466ec28a4e2cde9e4b4cc1bfe28 WHIRLPOOL 3661be582aeadbfc471f075a8630b6f2189a8bc971e6e8c5b1715f5627aa933df66acfca444e4b6007a3a47409c3914e11b96ad8a7b7a7b5d384dee46c98808a
+AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 SHA256 b84cd70caf30112503a25474e67cab0b73baa38d2fb9577dce1193ed4b3771a1 SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161 WHIRLPOOL 0e9605b66ac4b238ae1d671f5c5e20918a8b98da9b17befd9718306cb61d37efa52d4f1585945c8fbd69ba862ceddb9405f78151fc05f3a5018e1bb15f999300
+AUX ucspi-unix-gentoo-head.patch 1097 SHA256 50f675e44de2c10b917441cfa0bbd77b119b545ae2819cd2cfb623e12c75ddd8 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c WHIRLPOOL 6f9c757c108e111249877f9472830ae61d1da87264d7c94de4b8e312048b6c71be9a7c3fa81a720dbfb2ce9488d6f9cd52a93e585ffeee99992ed0b02250bc61
+DIST ucspi-unix-0.36.tar.gz 14175 SHA256 428d23fcc91b4dd66f64932978cd26316b82d2599cff7a512690ff1ec9df02e2 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633 WHIRLPOOL cd844fe51122c0157b6ef32907a0781b31a8fec709ac747c968dcb5a90b07e565afd00a4425982757985e9c33cf4f93a78c635a77f310b43381441ffa0f2274b
+EBUILD ucspi-unix-0.36-r2.ebuild 868 SHA256 aad680eb08cc196b03061087b0b21cd07833f8f8213c399b9cc95f2067b220bc SHA512 735c533c82e3c268e32c910d846d2c66a6d649e331090b31e549fbfc59192171fce5f819f0139927c961551cf493521d74dff2a1b790ec6c93f9e4c2117fe7e2 WHIRLPOOL 2bc4f897919d01bf1a1ab6eed583b09797b8a4abec2d0f32594107ef060e3d67f23d0626b96ffec2dc0b3c921fd99082999cf89cd6088c09775a6b00a018aac8
+EBUILD ucspi-unix-0.36-r3.ebuild 966 SHA256 b7d15b626df8145f0009663ce2184f64e5e8ffc39808dec7dd4f7ae4c980a48c SHA512 4d5c666ccb1eb116299aed23f02799e41c950771315704bcf586d9158fd9e6b1bc6250f9c12b043b2fc2246c0482ce0613014d984302c91964b16c21d9d3d408 WHIRLPOOL 25e3d85aae079afa98390887e59a5a65334ceef0a1531bd3895dfcb3e4b2f003db4f2681deef9fc579117338c8d2625fad7166e4ee84235178ba2d960692d3b9
+EBUILD ucspi-unix-0.36-r4.ebuild 1136 SHA256 b657830d3f04d9ec460c87b10d91adbe693327374a5cfdbb89412793bb844c49 SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec WHIRLPOOL 5ae50867d037fb7eff090319439eefb903c173d2e4cec5b4bfe5f6f557fdbebfb14cbbdd5ba8c23c7607186ab7379ce36c91822b82e71f8d79e6a0586ede2bb5
+MISC ChangeLog 3724 SHA256 18c20bb1be44ccc0d8750ab111c10211b2ca7cf8ad72bc775e846270949f38ae SHA512 d368eb28916134b06575ebd1564c64cad980d3d768dca4b668caf5dd6d24af01ed91a45e5986b61e0b6021e1bcd857d8072bddc5e40a402bc60bac25103871ab WHIRLPOOL c3690a2e09dcc78c8df1f8168d57acb241ba1fdb2490c7a3db4c48dd4746177dde995c026a4c0ed25b10211ef5e07b8f638ec73f5d77aafd4b2374ac0e952d27
+MISC ChangeLog-2015 3266 SHA256 08b132cff5bf2c906e32e9b6c4d5f33d8af08e77608099ecf4072bd71681162e SHA512 ebee63e2d95174a704f8a6b62fe2c6e7a76f2faa38888930e89850fba3e78cdacb3b13043b5196ebd1b53cc6d06151ffa610548632b093235f2728b4dbed44c9 WHIRLPOOL 4edd3e6eeb2042b41a5c33304bd81e374dbad4bb2078007236dc75f39ebe02d57f0c0e4c51540ba114beb6d868f663d718ce2c2ae435be022355f8ef4a08f5cb
+MISC metadata.xml 433 SHA256 b77b70380b5c9b1508ab03b222cf275ace654c68b7d37580047af15f5d09f265 SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e WHIRLPOOL 8bd2c4e9a6d0bda394d95759fa56a842d2eeb6ce637f26a38572171952bd03b56532a810fa67663728023bd1c8fe11a3b0207595e688947a10b4d8ec7f01dd66
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/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/files/ucspi-unix-gentoo-head.patch b/sys-apps/ucspi-unix/files/ucspi-unix-gentoo-head.patch
new file mode 100644
index 000000000000..fa360e53c1f1
--- /dev/null
+++ b/sys-apps/ucspi-unix/files/ucspi-unix-gentoo-head.patch
@@ -0,0 +1,33 @@
+--- ucspi-unix-0.36/Makefile.orig	2003-12-26 18:50:34.000000000 -0500
++++ ucspi-unix-0.36/Makefile	2003-12-26 18:50:56.000000000 -0500
+@@ -18,18 +18,18 @@
+ 	( echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -1 conf-cc` '-I. -o $${base}.o -c $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-cc` '-I. -o $${base}.o -c $$source $${1+"$$@"}'; \
+ 	) >compile
+ 	chmod 755 compile
+ 
+ conf_bin.c: conf-bin
+-	head -1 conf-bin | \
++	head -n 1 conf-bin | \
+ 	  sed -e 's/"/\\"/g' \
+ 	      -e 's/^/const char conf_bin[] = "/' \
+ 	      -e 's/$$/";/' >conf_bin.c
+ 
+ conf_man.c: conf-man
+-	head -1 conf-man | \
++	head -n 1 conf-man | \
+ 	  sed -e 's/"/\\"/g' \
+ 	      -e 's/^/const char conf_man[] = "/' \
+ 	      -e 's/$$/";/' >conf_man.c
+@@ -55,7 +55,7 @@
+ load: conf-ld
+ 	( echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec `head -1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\
++	  echo exec `head -n 1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\
+ 	) >load
+ 	chmod 755 load
+ 
diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
new file mode 100644
index 000000000000..3f12c38d92fb
--- /dev/null
+++ b/sys-apps/ucspi-unix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<longdescription lang="en">
+This package contains UNIX domain socket client and server programs that
+conform to UCSPI, the UNIX Client-Server Program Interface.
+</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
new file mode 100644
index 000000000000..c199289d166f
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A ucspi implementation for unix sockets"
+HOMEPAGE="http://untroubled.org/ucspi-unix/"
+SRC_URI="${HOMEPAGE}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
+}
+
+src_compile() {
+	use kernel_linux && PEERCRED="-DHASPEERCRED=1"
+	echo "$(tc-getCC) ${CFLAGS} -I/usr/lib/bglibs/include ${PEERCRED}" > 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
+}
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..4510f80e066c
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+	# fails parallel build, bug #297986
+	emake -j1 || die
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat || die
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
+}
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..4b303d44dde3
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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=""
+
+# We statically link bglibs.
+DEPEND=">=dev-libs/bglibs-1.106"
+# Block other unixcat installers. #480546
+RDEPEND="!net-analyzer/mk-livestatus"
+
+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) ${CPPFLAGS} ${CFLAGS} -I${SYSROOT}/usr/include/bglibs ${has_peercred} -D_GNU_SOURCE" > conf-cc
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -L${SYSROOT}/usr/$(get_libdir)/bglibs" > conf-ld
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
+}