gentoo resync : 18.05.2019

4 files changed, 80 insertions, 3 deletions

diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
index 14f702501c26..3a5ebb4d9cf3 100644
--- a/dev-libs/libcli/Manifest
+++ b/dev-libs/libcli/Manifest
@@ -1,5 +1,8 @@
-AUX libcli-1.9.4-ldflags.patch 367 BLAKE2B 9b7100376810125f09fdc67d9a29498bf9569a12c361119eb13dbe80ed0c9837f328944055c1723574cab3f9046173894c26eabf6ced1c40313acfe494960ae7 SHA512 bc1848fe5ae0f913aa4063e4efacf87bce9010255efb8f1b6b7c2acce79d45af50860d6040405ba8d6e2e5239a0075059070be719a6607a937180fce1930a4cf
+AUX libcli-1.9.4-ldflags.patch 298 BLAKE2B 8449418a864518df9a254a058e3ae50b773b5fd7f3de52181ee2ae0ce7ae4583b982140655efe6991facac731dbeb92ff1b57433e84b01c656efcefccb97a618 SHA512 d93b6197a6b6d5a0f0efc80ab9fbd8f1ca5749008290daa66bb9f725eaa9cf5c9dc1e5ba76cb3b067c6bf36f26842ea2140c2cb7819f5b84e60155b2953f2936
 AUX libcli-1.9.7-libdir.patch 814 BLAKE2B 587c571b61da391899a41c27e6805936f69f5e50d9220cade7f05bd4e565199424efcd5c5c7bac1ffe5b020281aa6d566bd7da510f59dbb12f4b9e59429809ba SHA512 2056600d5560196119bc690fc5c02151e7376608408c5b7205eadf7e69f4138758738c34203b93b2ceaa938de58d1b81e9050d259245e9e739ae3bc385a9a2a6
+AUX libcli-1.9.8.4-libdir.patch 1047 BLAKE2B a3f7e91d91c723946139ddcaf8225b7f209125c6184df32a099dd54a43915d3206b3c8b7d64f9a225796307d1d9ca67c7e1d3de268a79d4c70cb4834b9bf26de SHA512 75218aab7d67233775f31d3436519f3cdfddc26f65ef83cb5cc5f9dcd0e66269747302e3765595e2469f900aa9572f1850077f3ade6efb89a442c30b4c1d7d85
 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
 EBUILD libcli-1.9.7.ebuild 761 BLAKE2B ae7b7943999cd44183fdfc846592aadb8a32aa08bb698f255445288ae56f68c9dc378c069145c5e506aacf2b913f7b3b98b04aa4f9287500189200f6e0a4e41e SHA512 f29e833b83a79a909d0a3714f73200420ca7a2df20ce694bea7170c724dc8f38e6acf2fbed7702c0a009c076bff2972c0f7c8666bbc697aeef3a405977681d86
+EBUILD libcli-1.9.8.4.ebuild 893 BLAKE2B 08c5ceafd42af6217b592632d96709bebfbb798050c1df3b2855fc15e154a869e087116c2d3ecb9deaa851a3d8f551e124736e6eb15d4e5edb5c1b3b1501281f SHA512 52ee7085e7f0eb50d78fda1fee2261bddc9d1ffa76905c110378203ec803bd538d82ec456ab7d4345a00e0b371856a5b56a71d4e16db93d35c245c7364cd731b
 MISC metadata.xml 538 BLAKE2B a8407bbf3dcbe24ea08f1d590a0929caec1de6463afabb68c6cf96a75b72a54605ad390c79cd6ad2508cc9a7f9de9e2920ec760dc7757249dd9240235239a722 SHA512 e96312c4c077df84c2f183b1e833cb53aa6134be66d1f0dc7a6c9ca495f354c5da7e28a1f4524670bb9f11e7d3ae093463ae6177837c7791b13e5f3c3d23130c
diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
index 0dd8e13d67fc..4b78c0ddb287 100644
--- a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
+++ b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile~	2008-07-28 03:13:16.000000000 +0200
-+++ Makefile	2010-09-12 15:39:05.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -28,7 +28,7 @@
  libcli.o: libcli.h
  
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
new file mode 100644
index 000000000000..31c5024cb7bf
--- /dev/null
+++ b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
@@ -0,0 +1,29 @@
+--- 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.8.4.ebuild b/dev-libs/libcli/libcli-1.9.8.4.ebuild
new file mode 100644
index 000000000000..dd838091cecd
--- /dev/null
+++ b/dev-libs/libcli/libcli-1.9.8.4.ebuild
@@ -0,0 +1,45 @@
+# 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
+}