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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 75 insertions, 99 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/Manifest b/dev-libs/libcli/Manifest
index 7437fceadc29..b2deb8c29c72 100644
--- a/dev-libs/libcli/Manifest
+++ b/dev-libs/libcli/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libcli-1.8.6.tar.gz 29473 RMD160 b1885e1b69ffe457f6f7ce3c1c7be64529824bd5 SHA1 e7e7842de6955e90208c0bc03626db62427507f8 SHA256 77ed7dfbcb6e4403526087c813cd1a4463dfb2528840ce2bc4f9e904cc21e8ff
-DIST libcli-1.9.0.tar.gz 31454 RMD160 5e2dae0ff98d99e81860a8393c4bd13699921bb3 SHA1 894cba27744ab37cd0ec821dddf9aeb54e2b50cc SHA256 0022e52f68145bead6d96e6ab11cff9b483eed1409ef9e0063800cbf4c9cd191
-EBUILD libcli-1.8.6.ebuild 968 RMD160 e1cc6171bed9357254137f8aeea93c90693f8ec1 SHA1 448b6156cd20fef5b147b5d507953a6989b9fb2f SHA256 b8dbc104831290a0812fdc209cadcfdf988c0106889af2625e8b87aa32c5e8bf
-EBUILD libcli-1.9.0.ebuild 968 RMD160 483f924b5b0e095a3a6b513a064b2615adad2749 SHA1 67e5dedf05c9f2ca27ae73bb18a5ec9c368aa700 SHA256 a9544a768392352fcc4a792b16bde06b2b276b6c1dce479727af8489f7a0ee88
-MISC ChangeLog 655 RMD160 340ef792f85cf809643bc74d26a8555a8b13940d SHA1 a89016e44d7f05393f475172aa7c066f3691e0fb SHA256 1ecc18b4aa4cebf2e291c5f1fc09cfef7151beb9a0770cb4304a26a1ef1f562e
+AUX libcli-1.9.4-ldflags.patch 367 RMD160 05b5abd5b6e0b50415db119c3adf8d9a5b1b4577 SHA1 8a6402870873d0624b5726ae8c5f5b824f476487 SHA256 92fb06ab3b1ebd520927e7f689cb44d36f24fa69a1ccf9d255a2d3acfd3c8e23
+DIST libcli-1.9.4.tar.gz 27960 RMD160 cc4a08ecbeff9cbc46d1548fd09dc62e2f4dc8ff SHA1 1a6b18f568af3e53a29a2673423e25d1a0f06ce0 SHA256 c1e56ff2e55a879b7c89b5808aea76063512d9a24cffd601aa3d9a84cd6a7928
+EBUILD libcli-1.9.4.ebuild 1064 RMD160 ddc50caeb34ffe81ba0df36ad40c1c17ad7f6784 SHA1 63514125d969cbb3b52576e1abb632d532df779d SHA256 e4b4a328311e20e54ea84381ce1e19518265b56623787df747472021f13f29e3
+MISC ChangeLog 990 RMD160 d70074593469b3728b224919db3d0319e058fe7a SHA1 75f4ad0eb8dfdfc3711d28d69f387f85b4d26e58 SHA256 b22cc1f05a14e33ae602484ee78217ae01007dd042d48f4c68c2990602ac4747
 MISC metadata.xml 586 RMD160 b6ea29efa73320b6973407cf84a4e8df033ece5d SHA1 1e9503750c1a932b0812822df0952852cbc26e66 SHA256 cbcafd673c5f742edf3449bb8be1e875fd2c7118980256619bab5d7a63eccaf2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkg9qTsACgkQyuNVb5qfaOYo6ACZAYU+LXWRQ/RasRXBgcTUW4df
-8K4AoIfss24Am4N+k9ITvqP/9O7v5sWM
-=56+8
+iEYEARECAAYFAkyM4MwACgkQCaWpQKGI+9SluwCfYgIfUdWUZ8a01q/j+qh3a/ZC
+RPwAmgN9uPN5NXN1veeFHEPPU72rUYR1
+=tYwD
 -----END PGP SIGNATURE-----
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
+}