gentoo resync : 14.07.2018

6 files changed, 138 insertions, 0 deletions

diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
new file mode 100644
index 000000000000..655f9162e5a1
--- /dev/null
+++ b/dev-libs/libcli/Manifest
@@ -0,0 +1,7 @@
+AUX libcli-1.9.4-ldflags.patch 367 BLAKE2B 9b7100376810125f09fdc67d9a29498bf9569a12c361119eb13dbe80ed0c9837f328944055c1723574cab3f9046173894c26eabf6ced1c40313acfe494960ae7 SHA512 bc1848fe5ae0f913aa4063e4efacf87bce9010255efb8f1b6b7c2acce79d45af50860d6040405ba8d6e2e5239a0075059070be719a6607a937180fce1930a4cf
+AUX libcli-1.9.7-libdir.patch 814 BLAKE2B 587c571b61da391899a41c27e6805936f69f5e50d9220cade7f05bd4e565199424efcd5c5c7bac1ffe5b020281aa6d566bd7da510f59dbb12f4b9e59429809ba SHA512 2056600d5560196119bc690fc5c02151e7376608408c5b7205eadf7e69f4138758738c34203b93b2ceaa938de58d1b81e9050d259245e9e739ae3bc385a9a2a6
+DIST libcli-1.9.4.tar.gz 27960 BLAKE2B 1a58dc2ebc7174c9bb790f73ad10bb4aef2cb6bf09c89ab5314d83af758a5aeda46f44161cea50a6134bfbb391a2a060b24348c9f945b5f018f9b053eb6ac36d SHA512 51de601733029f696cbfa435639addeef33ec52c390352164db96f1c14a375eca90e890134958178aaf77e57eaf05dda8bdbbc08df637767e820bfc65360b747
+DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f
+EBUILD libcli-1.9.4-r1.ebuild 904 BLAKE2B 21ff7a20ee94c700d38a629559b02c5019aaf4a0222da3f542e87ef48e08de0593814c487dd02a0b3453a9bfcee73a34de1d68dbfa8253674930d7bdd50a31f9 SHA512 a8f74e3aa4a3d451bb8e960d225ef418fb679527784cc5cb916680648d4272c1f9abaf9e07df2a3a147a0f2743c2e2d5b2772ecf9a0866c32bb8636b72000e44
+EBUILD libcli-1.9.7.ebuild 761 BLAKE2B ae7b7943999cd44183fdfc846592aadb8a32aa08bb698f255445288ae56f68c9dc378c069145c5e506aacf2b913f7b3b98b04aa4f9287500189200f6e0a4e41e SHA512 f29e833b83a79a909d0a3714f73200420ca7a2df20ce694bea7170c724dc8f38e6acf2fbed7702c0a009c076bff2972c0f7c8666bbc697aeef3a405977681d86
+MISC metadata.xml 614 BLAKE2B ccc45c5ce653762acf53a66db26371efb30c2911efc5ee2e20f1d5567428a00a124e74ddd7d6adbf89556d3ef6f1e4632bd5ad957dd3c47ba6bebb23c2ce22f7 SHA512 570f4816b7997fa5d75cad35999de186c9d97c3b8e2e69708b5a1f6695aa1b89ef28586be2bfaa8c8aaea60eeee8b4a698528c50d57c25806553572db8443037
diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
new file mode 100644
index 000000000000..0dd8e13d67fc
--- /dev/null
+++ b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile~	2008-07-28 03:13:16.000000000 +0200
++++ Makefile	2010-09-12 15:39:05.000000000 +0200
+@@ -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
new file mode 100644
index 000000000000..99f817095adc
--- /dev/null
+++ b/dev-libs/libcli/files/libcli-1.9.7-libdir.patch
@@ -0,0 +1,24 @@
+--- 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/libcli-1.9.4-r1.ebuild b/dev-libs/libcli/libcli-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..3bf0b58f91f8
--- /dev/null
+++ b/dev-libs/libcli/libcli-1.9.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Cisco-style (telnet) command-line interface library"
+
+HOMEPAGE="http://sites.dparrish.com/libcli"
+SRC_URI="https://libcli.googlecode.com/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# Support /lib{32,64}
+	sed -i 's:$(PREFIX)/lib:$(libdir):g' Makefile || die
+	sed -i 's:PREFIX = /usr/local:&\nlibdir = $(PREFIX)/lib:' Makefile || die
+
+	# Make this respect LDFLAGS, bug #334913
+	epatch "${FILESDIR}/${PN}-1.9.4-ldflags.patch"
+}
+
+src_compile() {
+	emake OPTIM="" DEBUG="" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		PREFIX="/usr" \
+		OPTIM="" \
+		DEBUG="" \
+		libdir="/usr/$(get_libdir)" \
+		install
+
+	dobin clitest
+	dodoc README
+}
diff --git a/dev-libs/libcli/libcli-1.9.7.ebuild b/dev-libs/libcli/libcli-1.9.7.ebuild
new file mode 100644
index 000000000000..36ea4dee1e22
--- /dev/null
+++ b/dev-libs/libcli/libcli-1.9.7.ebuild
@@ -0,0 +1,37 @@
+# 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/metadata.xml b/dev-libs/libcli/metadata.xml
new file mode 100644
index 000000000000..121529505d15
--- /dev/null
+++ b/dev-libs/libcli/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<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>