From d9ff11cbbe1b2a344a2207da016703033d24a5e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 7 Oct 2019 15:13:09 +0200 Subject: [PATCH] sys-apps/ucspi-unix: Drop old (EAPI=0) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-apps/ucspi-unix/Manifest | 1 - .../ucspi-unix-0.36-fix-parallel-build.patch | 19 --------- ...ucspi-unix-0.36-include-sys_socket.h.patch | 11 ----- .../files/ucspi-unix-gentoo-head.patch | 33 --------------- sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild | 38 ------------------ sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild | 40 ------------------- 6 files changed, 142 deletions(-) delete mode 100644 sys-apps/ucspi-unix/files/ucspi-unix-0.36-fix-parallel-build.patch delete mode 100644 sys-apps/ucspi-unix/files/ucspi-unix-0.36-include-sys_socket.h.patch delete mode 100644 sys-apps/ucspi-unix/files/ucspi-unix-gentoo-head.patch delete mode 100644 sys-apps/ucspi-unix/ucspi-unix-0.36-r3.ebuild delete mode 100644 sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest index 074cc8a27cef..2041b6bd1c89 100644 --- a/sys-apps/ucspi-unix/Manifest +++ b/sys-apps/ucspi-unix/Manifest @@ -1,2 +1 @@ -DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633 DIST ucspi-unix-1.0.tar.gz 17391 BLAKE2B 0605c770a5e898ff9fbe9eb1a50fddbe2fcb25b37168f7b6a2fed18a632504d0f80f5f0b39b812de7d4bd6845039e143eab8706429392f7b4178bbbe59713630 SHA512 dc79515908e34cd3bcc8c66f360fe3f4662a5be35c9876b07c609fac0f90e0f498d306d1796ebbade902c7affceece7d18f8acd178a850e42d6d6820d53c1d11 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 - #include - #include -+#include - - 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 -} -- 2.26.2