1 |
commit: a239f3e794eedb568c7559a44fa6ffd81d76f7bf |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 10 14:01:05 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 10 14:03:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a239f3e7 |
7 |
|
8 |
dev-libs/libcli: Bump to version 1.9.8.4 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/569848 |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
dev-libs/libcli/Manifest | 1 + |
15 |
dev-libs/libcli/files/libcli-1.9.4-ldflags.patch | 4 +- |
16 |
dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch | 29 +++++++++++++++ |
17 |
dev-libs/libcli/libcli-1.9.8.4.ebuild | 45 +++++++++++++++++++++++ |
18 |
4 files changed, 77 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest |
21 |
index 1d8794a7dfe..e150549bc70 100644 |
22 |
--- a/dev-libs/libcli/Manifest |
23 |
+++ b/dev-libs/libcli/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f |
26 |
+DIST libcli-1.9.8.4.tar.gz 29618 BLAKE2B cb901f5cd852449f3223f9b048fb483d2d4f5052dc29cb18714d7f5631be96b5ad99c61e09da778b4559760c5497bdaa61e9d68f75bb25e6c4c4475bdc4899e8 SHA512 731156f75b777be209d10db74e786af868c5e82ddfb7f882a07c1f385bae554a02897a53b4d5684e9f941b4ea72d465e3e8b32dda3cdf377ae728e4ac6eb5afb |
27 |
|
28 |
diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch |
29 |
index 0dd8e13d67f..4b78c0ddb28 100644 |
30 |
--- a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch |
31 |
+++ b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch |
32 |
@@ -1,5 +1,5 @@ |
33 |
---- Makefile~ 2008-07-28 03:13:16.000000000 +0200 |
34 |
-+++ Makefile 2010-09-12 15:39:05.000000000 +0200 |
35 |
+--- a/Makefile |
36 |
++++ b/Makefile |
37 |
@@ -28,7 +28,7 @@ |
38 |
libcli.o: libcli.h |
39 |
|
40 |
|
41 |
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 |
42 |
new file mode 100644 |
43 |
index 00000000000..31c5024cb7b |
44 |
--- /dev/null |
45 |
+++ b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch |
46 |
@@ -0,0 +1,29 @@ |
47 |
+--- libcli-1.9.8-4/Makefile |
48 |
++++ libcli-1.9.8-4/Makefile |
49 |
+@@ -8,6 +8,7 @@ |
50 |
+ UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not') |
51 |
+ DESTDIR = |
52 |
+ PREFIX = /usr/local |
53 |
++libdir = $(PREFIX)/lib |
54 |
+ |
55 |
+ MAJOR = 1 |
56 |
+ MINOR = 9 |
57 |
+@@ -64,14 +65,14 @@ |
58 |
+ rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz |
59 |
+ |
60 |
+ install: $(TARGET_LIBS) |
61 |
+- install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib |
62 |
++ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir) |
63 |
+ install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include |
64 |
+ ifeq (1,$(STATIC_LIB)) |
65 |
+- install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib |
66 |
++ install -m 0644 $(LIB_STATIC) $(DESTDIR)$(libdir) |
67 |
+ endif |
68 |
+ ifeq (1,$(DYNAMIC_LIB)) |
69 |
+- install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib |
70 |
+- cd $(DESTDIR)$(PREFIX)/lib && \ |
71 |
++ install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir) |
72 |
++ cd $(DESTDIR)$(libdir) && \ |
73 |
+ ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \ |
74 |
+ ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB) |
75 |
+ endif |
76 |
|
77 |
diff --git a/dev-libs/libcli/libcli-1.9.8.4.ebuild b/dev-libs/libcli/libcli-1.9.8.4.ebuild |
78 |
new file mode 100644 |
79 |
index 00000000000..dd838091cec |
80 |
--- /dev/null |
81 |
+++ b/dev-libs/libcli/libcli-1.9.8.4.ebuild |
82 |
@@ -0,0 +1,45 @@ |
83 |
+# Copyright 1999-2019 Gentoo Authors |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+ |
86 |
+EAPI=7 |
87 |
+ |
88 |
+inherit multilib toolchain-funcs |
89 |
+ |
90 |
+MY_PV="$(ver_rs 3 -)" |
91 |
+ |
92 |
+DESCRIPTION="Cisco-style (telnet) command-line interface library" |
93 |
+ |
94 |
+HOMEPAGE="https://github.com/dparrish/libcli" |
95 |
+SRC_URI="https://github.com/dparrish/libcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
96 |
+LICENSE="LGPL-2.1" |
97 |
+ |
98 |
+SLOT="0" |
99 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux" |
100 |
+IUSE="static-libs" |
101 |
+ |
102 |
+DEPEND="" |
103 |
+RDEPEND="" |
104 |
+ |
105 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
106 |
+ |
107 |
+PATCHES=( |
108 |
+ "${FILESDIR}/${PN}-1.9.4-ldflags.patch" |
109 |
+ "${FILESDIR}/${PN}-1.9.8.4-libdir.patch" |
110 |
+) |
111 |
+ |
112 |
+src_compile() { |
113 |
+ emake OPTIM="" DEBUG="" \ |
114 |
+ CC="$(tc-getCC)" AR="$(tc-getAR)" |
115 |
+} |
116 |
+ |
117 |
+src_install() { |
118 |
+ emake DESTDIR="${ED}" PREFIX="/usr" \ |
119 |
+ libdir="/usr/$(get_libdir)" install |
120 |
+ |
121 |
+ dobin clitest |
122 |
+ dodoc README |
123 |
+ |
124 |
+ if ! use static-libs ; then |
125 |
+ find "${ED}" -type f -name "*.a" -delete || die |
126 |
+ fi |
127 |
+} |