1 |
commit: b76232050481bac15da359169021b7fb8475321c |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 2 11:14:40 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 2 11:15:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7623205 |
7 |
|
8 |
net-libs/libtelnet: Various ebuild improvements |
9 |
|
10 |
- Add missing dependency on zlib, and missing BDEPEND on doxygen and |
11 |
pkgconfig |
12 |
- Unify release and 9999 ebuild skeletons |
13 |
- Update EAPI to 8, which also automatically passes --disable-static to |
14 |
econf so we don't need to manually remove static libraries in 0.23 |
15 |
anymore |
16 |
|
17 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
18 |
|
19 |
...telnet-9999.ebuild => libtelnet-0.23-r1.ebuild} | 28 ++++++++++++++-------- |
20 |
net-libs/libtelnet/libtelnet-0.23.ebuild | 24 ------------------- |
21 |
net-libs/libtelnet/libtelnet-9999.ebuild | 28 ++++++++++++++-------- |
22 |
3 files changed, 36 insertions(+), 44 deletions(-) |
23 |
|
24 |
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild |
25 |
similarity index 63% |
26 |
copy from net-libs/libtelnet/libtelnet-9999.ebuild |
27 |
copy to net-libs/libtelnet/libtelnet-0.23-r1.ebuild |
28 |
index 9edf0466d6a..bf00b8db2d1 100644 |
29 |
--- a/net-libs/libtelnet/libtelnet-9999.ebuild |
30 |
+++ b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild |
31 |
@@ -1,14 +1,13 @@ |
32 |
# Copyright 1999-2021 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit cmake |
38 |
+EAPI=8 |
39 |
|
40 |
if [[ ${PV} == *9999 ]]; then |
41 |
- inherit git-r3 |
42 |
EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git" |
43 |
+ inherit git-r3 cmake |
44 |
else |
45 |
+ inherit autotools |
46 |
SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
KEYWORDS="~amd64 ~x86" |
48 |
fi |
49 |
@@ -19,10 +18,19 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" |
50 |
LICENSE="public-domain" |
51 |
SLOT="0" |
52 |
|
53 |
-# needed unconditionally for man pages |
54 |
-BDEPEND="app-doc/doxygen" |
55 |
+RDEPEND="sys-libs/zlib" |
56 |
+DEPEND="${RDEPEND}" |
57 |
+BDEPEND=" |
58 |
+ app-doc/doxygen |
59 |
+ virtual/pkgconfig |
60 |
+" |
61 |
|
62 |
-PATCHES=( |
63 |
- # https://bugs.gentoo.org/737886 |
64 |
- "${FILESDIR}/${P}-doc.patch" |
65 |
-) |
66 |
+src_prepare() { |
67 |
+ default |
68 |
+ if [[ ${PV} = *9999 ]]; then |
69 |
+ eapply "${FILESDIR}"/${P}-doc.patch |
70 |
+ cmake_src_prepare |
71 |
+ else |
72 |
+ eautoreconf |
73 |
+ fi |
74 |
+} |
75 |
|
76 |
diff --git a/net-libs/libtelnet/libtelnet-0.23.ebuild b/net-libs/libtelnet/libtelnet-0.23.ebuild |
77 |
deleted file mode 100644 |
78 |
index 9577f3cce08..00000000000 |
79 |
--- a/net-libs/libtelnet/libtelnet-0.23.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,24 +0,0 @@ |
82 |
-# Copyright 1999-2021 Gentoo Authors |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=7 |
86 |
- |
87 |
-inherit autotools |
88 |
- |
89 |
-DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library" |
90 |
-HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" |
91 |
-SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" |
92 |
- |
93 |
-LICENSE="public-domain" |
94 |
-SLOT="0" |
95 |
-KEYWORDS="~amd64 ~x86" |
96 |
- |
97 |
-src_prepare() { |
98 |
- default |
99 |
- eautoreconf |
100 |
-} |
101 |
- |
102 |
-src_install() { |
103 |
- default |
104 |
- find "${D}" -type f -name '*.a' -delete || die |
105 |
-} |
106 |
|
107 |
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild |
108 |
index 9edf0466d6a..bf00b8db2d1 100644 |
109 |
--- a/net-libs/libtelnet/libtelnet-9999.ebuild |
110 |
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild |
111 |
@@ -1,14 +1,13 @@ |
112 |
# Copyright 1999-2021 Gentoo Authors |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
|
115 |
-EAPI=7 |
116 |
- |
117 |
-inherit cmake |
118 |
+EAPI=8 |
119 |
|
120 |
if [[ ${PV} == *9999 ]]; then |
121 |
- inherit git-r3 |
122 |
EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git" |
123 |
+ inherit git-r3 cmake |
124 |
else |
125 |
+ inherit autotools |
126 |
SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz" |
127 |
KEYWORDS="~amd64 ~x86" |
128 |
fi |
129 |
@@ -19,10 +18,19 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" |
130 |
LICENSE="public-domain" |
131 |
SLOT="0" |
132 |
|
133 |
-# needed unconditionally for man pages |
134 |
-BDEPEND="app-doc/doxygen" |
135 |
+RDEPEND="sys-libs/zlib" |
136 |
+DEPEND="${RDEPEND}" |
137 |
+BDEPEND=" |
138 |
+ app-doc/doxygen |
139 |
+ virtual/pkgconfig |
140 |
+" |
141 |
|
142 |
-PATCHES=( |
143 |
- # https://bugs.gentoo.org/737886 |
144 |
- "${FILESDIR}/${P}-doc.patch" |
145 |
-) |
146 |
+src_prepare() { |
147 |
+ default |
148 |
+ if [[ ${PV} = *9999 ]]; then |
149 |
+ eapply "${FILESDIR}"/${P}-doc.patch |
150 |
+ cmake_src_prepare |
151 |
+ else |
152 |
+ eautoreconf |
153 |
+ fi |
154 |
+} |