Version bump, update HOMEPAGE and SRC_URI, use EAPI 2, make this respect LDFLAGS (bug #334913 by Flameeyes), add missing die statements. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 67 insertions, 90 deletions

diff --git a/dev-libs/libcli/ChangeLog b/dev-libs/libcli/ChangeLog
index 6a6a719c4b50..3c6fb9d7c456 100644
--- a/dev-libs/libcli/ChangeLog
+++ b/dev-libs/libcli/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libcli
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/ChangeLog,v 1.3 2008/05/28 18:49:26 phreak Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/ChangeLog,v 1.4 2010/09/12 14:16:36 pacho Exp $
+
+*libcli-1.9.4 (12 Sep 2010)
+
+  12 Sep 2010; Pacho Ramos <pacho@gentoo.org> -libcli-1.8.6.ebuild,
+  -libcli-1.9.0.ebuild, +libcli-1.9.4.ebuild,
+  +files/libcli-1.9.4-ldflags.patch:
+  Version bump, update HOMEPAGE and SRC_URI, use EAPI 2, make this respect
+  LDFLAGS (bug #334913 by Flameeyes), add missing die statements. Remove
+  old.
 
   28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andrew Ross (aross) from metadata.xml (as per #139633). Assigning
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/libcli-1.8.6.ebuild b/dev-libs/libcli/libcli-1.8.6.ebuild
deleted file mode 100644
index 9dd01eaac88e..000000000000
--- a/dev-libs/libcli/libcli-1.8.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/libcli-1.8.6.ebuild,v 1.1 2006/10/30 12:46:43 aross Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="http://sourceforge.net/projects/libcli"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Support /lib{32,64}
-	sed -i 's:$(PREFIX)/lib:$(libdir):g' "${S}"/Makefile
-	sed -i 's:PREFIX = /usr/local:&\nlibdir = $(PREFIX)/lib:' "${S}"/Makefile
-}
-
-src_compile() {
-	emake OPTIM="" DEBUG="" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX=/usr \
-		OPTIM="" \
-		DEBUG="" \
-		libdir="/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dobin clitest
-
-	dohtml Doc/*
-	dodoc README
-}
diff --git a/dev-libs/libcli/libcli-1.9.0.ebuild b/dev-libs/libcli/libcli-1.9.0.ebuild
deleted file mode 100644
index 6decda216786..000000000000
--- a/dev-libs/libcli/libcli-1.9.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/libcli-1.9.0.ebuild,v 1.1 2007/09/22 00:14:13 aross Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="http://sourceforge.net/projects/libcli"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Support /lib{32,64}
-	sed -i 's:$(PREFIX)/lib:$(libdir):g' "${S}"/Makefile
-	sed -i 's:PREFIX = /usr/local:&\nlibdir = $(PREFIX)/lib:' "${S}"/Makefile
-}
-
-src_compile() {
-	emake OPTIM="" DEBUG="" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX=/usr \
-		OPTIM="" \
-		DEBUG="" \
-		libdir="/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dobin clitest
-
-	dohtml Doc/*
-	dodoc README
-}
diff --git a/dev-libs/libcli/libcli-1.9.4.ebuild b/dev-libs/libcli/libcli-1.9.4.ebuild
new file mode 100644
index 000000000000..e2561af79f85
--- /dev/null
+++ b/dev-libs/libcli/libcli-1.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcli/libcli-1.9.4.ebuild,v 1.1 2010/09/12 14:16:36 pacho Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Cisco-style (telnet) command-line interface library"
+
+HOMEPAGE="http://sites.dparrish.com/libcli"
+SRC_URI="http://libcli.googlecode.com/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+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)" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX=/usr \
+		OPTIM="" \
+		DEBUG="" \
+		libdir="/usr/$(get_libdir)" \
+		install || die "emake install failed"
+
+	dobin clitest || die
+
+	dodoc README || die
+}