gentoo resync : 13.10.2019

7 files changed, 2 insertions, 149 deletions

diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index 6ec7640499cc..1b0630d93b85 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -1,9 +1,3 @@
-AUX ucspi-unix-0.36-fix-parallel-build.patch 507 BLAKE2B 32ee69a9a63efb3b990f4e37c486a36b5d3081b66f2a8010b44468b6842a60f95cc6b6b794afd8ed4b8f782b1cc64fa6b4cab90d46f10685322d57f23c06a7c1 SHA512 6cc195171769fc57654f0ad0dcdc8a54e9655759e53f5c0c68ef0ed77b416e4a2635a5574a53e2112db3dcbdf8097039917ea466ec28a4e2cde9e4b4cc1bfe28
-AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 BLAKE2B d00f18db06e084639a169b487ebe7458127086a31ccae759faf458aea69a6523cc9a6eb69922f161fc861cb3e463b4a73b637011dd8e8e86abd2f9b7080a660f SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161
-AUX ucspi-unix-gentoo-head.patch 1097 BLAKE2B 7ec8f2e5dd32224f14f254d55bdabdf70324d9e0b21e31ad525598e125331778434b600ca0b6a275d4758f83611d1abfbce810913d6ad3d7cb4cc1955639b9d6 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c
-DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
 DIST ucspi-unix-1.0.tar.gz 17391 BLAKE2B 0605c770a5e898ff9fbe9eb1a50fddbe2fcb25b37168f7b6a2fed18a632504d0f80f5f0b39b812de7d4bd6845039e143eab8706429392f7b4178bbbe59713630 SHA512 dc79515908e34cd3bcc8c66f360fe3f4662a5be35c9876b07c609fac0f90e0f498d306d1796ebbade902c7affceece7d18f8acd178a850e42d6d6820d53c1d11
-EBUILD ucspi-unix-0.36-r3.ebuild 974 BLAKE2B 2ae598af6554c6a0345baa60be163adadf12fa63c00cd8f6ff96de9ec6daaaebc7544713cff2cd5f44cb1a18df57dd2814d0747e48b9d0ced90e3ecbd1fa3976 SHA512 798901cc22beb4912e8fa1d779abed5bf9fc5711e43d059019684b88fce3438ebf228bf93ce77172f462aa3bbec784a1f61eac6c3f4af37bc6d5fb147476f9a8
-EBUILD ucspi-unix-0.36-r4.ebuild 1136 BLAKE2B 90bb709947cedc619da1ee9a9cf504ced1267a447610844a874db60b65113e1d76c359c165a1673bc3bb9fa5452bbe257b9ec07a4f975052b0ba1a376e9c4c9f SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec
-EBUILD ucspi-unix-1.0.ebuild 796 BLAKE2B cf4b06846ab2b14f96f5877f2a8c3af89777540c7f90fc2551f9d9e05d9058ee52554c525306d3b82e5958bce7b15a60f3263b3c1c304904169755c6f8caae0e SHA512 e0521ecaa9df43ad6be76235a077914b85249345080eb263c1f51fd825807ed815f88d00c0a5699538e2d254ebe06c502aaee089ff757854a061ea129641c8dd
+EBUILD ucspi-unix-1.0.ebuild 793 BLAKE2B fb3779100a807f8d52383f563b6b9f508786c9a9aeb65a17df416894fefb00945beea972cc4e391ef6c6dc7601fc2a3ed252176015c5ffff52bd7e0000a20554 SHA512 b2f8f4a654bd5dc9f7a36036eafda64e59e532a8660c41df821fa1c2600102fac77b4d0a8a0a63fdf79369fb6564ea66fd50f7f9e69623578a15457279c2ac06
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
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
deleted file mode 100644
index 94fc07cb0022..000000000000
--- a/sys-apps/ucspi-unix/files/ucspi-unix-0.36-fix-parallel-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 0d96450911c5..000000000000
--- a/sys-apps/ucspi-unix/files/ucspi-unix-0.36-include-sys_socket.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index fa360e53c1f1..000000000000
--- a/sys-apps/ucspi-unix/files/ucspi-unix-gentoo-head.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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/ucspi-unix-0.36-r3.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
deleted file mode 100644
index 1a88589733bb..000000000000
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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
deleted file mode 100644
index 4b303d44dde3..000000000000
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
-}
diff --git a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
index dd48c88398ce..393abef9c3fd 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/ucspi-unix/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 # We statically link bglibs.