Taking maint, update upstream, version bump.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 72 insertions, 4 deletions

diff --git a/dev-libs/libcli/ChangeLog b/dev-libs/libcli/ChangeLog
index 03d5327671e4..232105fb5bf0 100644
--- a/dev-libs/libcli/ChangeLog
+++ b/dev-libs/libcli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libcli
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/ChangeLog,v 1.10 2013/07/09 18:56:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/ChangeLog,v 1.11 2013/08/05 06:40:52 xmw Exp $
+
+*libcli-1.9.7 (05 Aug 2013)
+
+  05 Aug 2013; Michael Weber <xmw@gentoo.org> +files/libcli-1.9.7-libdir.patch,
+  +libcli-1.9.7.ebuild, metadata.xml:
+  Taking maint, update upstream, version bump.
 
   09 Jul 2013; Michael Palimaka <kensington@gentoo.org> -libcli-1.9.4.ebuild:
   Remove old.
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.7.ebuild b/dev-libs/libcli/libcli-1.9.7.ebuild
new file mode 100644
index 000000000000..3f3c78c7dbbf
--- /dev/null
+++ b/dev-libs/libcli/libcli-1.9.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/libcli-1.9.7.ebuild,v 1.1 2013/08/05 06:40:52 xmw Exp $
+
+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
index e37d4bb7c79a..a094f1afe782 100644
--- a/dev-libs/libcli/metadata.xml
+++ b/dev-libs/libcli/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<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="google-code">libcli</remote-id>
+		<remote-id type="github">dparrish/libcli</remote-id>
 	</upstream>
 </pkgmetadata>