[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcli/files/, profiles/, dev-libs/libcli/

[Michał Górny]

commit:     fec3c6c98ed2fc43d1f07a668eba5f6b5407f212
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 08:11:42 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 08:11:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec3c6c9

dev-libs/libcli: Remove last-rited pkg

Closes: https://bugs.gentoo.org/694180
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libcli/Manifest                          |  2 -
 dev-libs/libcli/files/libcli-1.9.4-ldflags.patch  | 11 ------
 dev-libs/libcli/files/libcli-1.9.7-libdir.patch   | 24 ------------
 dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch | 29 ---------------
 dev-libs/libcli/libcli-1.9.7.ebuild               | 37 -------------------
 dev-libs/libcli/libcli-1.9.8.4.ebuild             | 45 -----------------------
 dev-libs/libcli/metadata.xml                      | 12 ------
 profiles/package.mask                             |  6 ---
 8 files changed, 166 deletions(-)

diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
deleted file mode 100644
index e150549bc70..00000000000
--- a/dev-libs/libcli/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f
-DIST libcli-1.9.8.4.tar.gz 29618 BLAKE2B cb901f5cd852449f3223f9b048fb483d2d4f5052dc29cb18714d7f5631be96b5ad99c61e09da778b4559760c5497bdaa61e9d68f75bb25e6c4c4475bdc4899e8 SHA512 731156f75b777be209d10db74e786af868c5e82ddfb7f882a07c1f385bae554a02897a53b4d5684e9f941b4ea72d465e3e8b32dda3cdf377ae728e4ac6eb5afb

diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
deleted file mode 100644
index 4b78c0ddb28..00000000000
--- a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@
- libcli.o: libcli.h
- 
- clitest: clitest.o $(LIB)
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. -lcli
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lcli
- 
- clitest.exe: clitest.c libcli.o
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< libcli.o -lws2_32

diff --git a/dev-libs/libcli/files/libcli-1.9.7-libdir.patch b/dev-libs/libcli/files/libcli-1.9.7-libdir.patch
deleted file mode 100644
index 99f817095ad..00000000000
--- a/dev-libs/libcli/files/libcli-1.9.7-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libcli-1.9.7/Makefile
-+++ libcli-1.9.7/Makefile
-@@ -1,6 +1,7 @@
- UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
- DESTDIR =
- PREFIX = /usr/local
-+libdir = $(PREFIX)/lib
- 
- MAJOR = 1
- MINOR = 9
-@@ -50,10 +51,10 @@
- 	rm -f *.o $(LIB)* $(LIB_STATIC) clitest
- 
- install: $(LIB)
--	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
-+	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir)
- 	install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
--	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
--	cd $(DESTDIR)$(PREFIX)/lib && \
-+	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
- 

diff --git a/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
deleted file mode 100644
index 31c5024cb7b..00000000000
--- a/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libcli-1.9.8-4/Makefile
-+++ libcli-1.9.8-4/Makefile
-@@ -8,6 +8,7 @@
- UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
- DESTDIR =
- PREFIX = /usr/local
-+libdir = $(PREFIX)/lib
- 
- MAJOR = 1
- MINOR = 9
-@@ -64,14 +65,14 @@
- 	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz
- 
- install: $(TARGET_LIBS)
--	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
-+	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir)
- 	install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
-   ifeq (1,$(STATIC_LIB))
--	install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib
-+	install -m 0644 $(LIB_STATIC) $(DESTDIR)$(libdir)
-   endif
-   ifeq (1,$(DYNAMIC_LIB))
--	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
--	cd $(DESTDIR)$(PREFIX)/lib && \
-+	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
-   endif

diff --git a/dev-libs/libcli/libcli-1.9.7.ebuild b/dev-libs/libcli/libcli-1.9.7.ebuild
deleted file mode 100644
index 36ea4dee1e2..00000000000
--- a/dev-libs/libcli/libcli-1.9.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="http://sites.dparrish.com/libcli"
-SRC_URI="https://github.com/dparrish/libcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.9.7-libdir.patch" \
-		"${FILESDIR}/${PN}-1.9.4-ldflags.patch"
-}
-
-src_compile() {
-	emake OPTIM="" DEBUG="" \
-		CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" \
-		libdir="/usr/$(get_libdir)" install
-
-	dobin clitest
-	dodoc README
-}

diff --git a/dev-libs/libcli/libcli-1.9.8.4.ebuild b/dev-libs/libcli/libcli-1.9.8.4.ebuild
deleted file mode 100644
index dd838091cec..00000000000
--- a/dev-libs/libcli/libcli-1.9.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PV="$(ver_rs 3 -)"
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="https://github.com/dparrish/libcli"
-SRC_URI="https://github.com/dparrish/libcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.4-ldflags.patch"
-	"${FILESDIR}/${PN}-1.9.8.4-libdir.patch"
-)
-
-src_compile() {
-	emake OPTIM="" DEBUG="" \
-		CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" \
-		libdir="/usr/$(get_libdir)" install
-
-	dobin clitest
-	dodoc README
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.a" -delete || die
-	fi
-}

diff --git a/dev-libs/libcli/metadata.xml b/dev-libs/libcli/metadata.xml
deleted file mode 100644
index a31d2d70c48..00000000000
--- a/dev-libs/libcli/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">libcli provides a shared library for including a Cisco-like command-line
-		interface into other software. It's a telnet interface which supports
-		command-line editing, history, authentication and callbacks for a
-		user-definable function tree.</longdescription>
-	<upstream>
-		<remote-id type="github">dparrish/libcli</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 2975d311004..1d654bd98b3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -711,12 +711,6 @@ dev-libs/libhome
 dev-libs/libcxml
 dev-libs/locked_sstream
 
-# Michał Górny <mgorny@g.o> (2019-09-12)
-# Unmaintained.  No reverse dependencies.  Its presence breaks
-# pulseaudio (#672468).
-# Removal in 30 days.  Bug #694180.
-dev-libs/libcli
-
 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.
 # Masked for removal.