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

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

[Lars Wendler]

commit:     a239f3e794eedb568c7559a44fa6ffd81d76f7bf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 14:01:05 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 10 14:03:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a239f3e7

dev-libs/libcli: Bump to version 1.9.8.4

Closes: https://bugs.gentoo.org/569848
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libcli/Manifest                          |  1 +
 dev-libs/libcli/files/libcli-1.9.4-ldflags.patch  |  4 +-
 dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch | 29 +++++++++++++++
 dev-libs/libcli/libcli-1.9.8.4.ebuild             | 45 +++++++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
index 1d8794a7dfe..e150549bc70 100644
--- a/dev-libs/libcli/Manifest
+++ b/dev-libs/libcli/Manifest
@@ -1 +1,2 @@
 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
index 0dd8e13d67f..4b78c0ddb28 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 00000000000..31c5024cb7b
--- /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 00000000000..dd838091cec
--- /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
+}