Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/libssh: ChangeLog libssh-0.6.0.ebuild metadata.xml libssh-0.6.1.ebuild
Date: Tue, 11 Feb 2014 10:23:24
Message-Id: 20140211102321.000A82004C@flycatcher.gentoo.org
1 polynomial-c 14/02/11 10:23:20
2
3 Modified: ChangeLog libssh-0.6.0.ebuild metadata.xml
4 Added: libssh-0.6.1.ebuild
5 Log:
6 Version bump. Fixed gssapi switch
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
9
10 Revision Changes Path
11 1.98 net-libs/libssh/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.98&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.98&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?r1=1.97&r2=1.98
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v
20 retrieving revision 1.97
21 retrieving revision 1.98
22 diff -u -r1.97 -r1.98
23 --- ChangeLog 9 Jan 2014 07:56:12 -0000 1.97
24 +++ ChangeLog 11 Feb 2014 10:23:20 -0000 1.98
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-libs/libssh
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.97 2014/01/09 07:56:12 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.98 2014/02/11 10:23:20 polynomial-c Exp $
30 +
31 +*libssh-0.6.1 (11 Feb 2014)
32 +
33 + 11 Feb 2014; Lars Wendler <polynomial-c@g.o> libssh-0.6.0.ebuild,
34 + +libssh-0.6.1.ebuild, metadata.xml:
35 + Version bump. Fixed gssapi switch.
36
37 09 Jan 2014; Lars Wendler <polynomial-c@g.o>
38 -libssh-0.6.0_rc3-r1.ebuild, libssh-0.6.0.ebuild,
39
40
41
42 1.3 net-libs/libssh/libssh-0.6.0.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?rev=1.3&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?rev=1.3&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild?r1=1.2&r2=1.3
47
48 Index: libssh-0.6.0.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v
51 retrieving revision 1.2
52 retrieving revision 1.3
53 diff -u -r1.2 -r1.3
54 --- libssh-0.6.0.ebuild 9 Jan 2014 07:56:12 -0000 1.2
55 +++ libssh-0.6.0.ebuild 11 Feb 2014 10:23:20 -0000 1.3
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2014 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.2 2014/01/09 07:56:12 polynomial-c Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.3 2014/02/11 10:23:20 polynomial-c Exp $
61
62 EAPI=5
63
64 @@ -14,14 +14,14 @@
65 LICENSE="LGPL-2.1"
66 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
67 SLOT="0/4" # subslot = soname major version
68 -IUSE="debug doc examples gcrypt kerberos pcap +sftp ssh1 server static-libs test zlib"
69 +IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
70 # Maintainer: check IUSE-defaults at DefineOptions.cmake
71
72 RDEPEND="
73 zlib? ( >=sys-libs/zlib-1.2 )
74 !gcrypt? ( >=dev-libs/openssl-0.9.8 )
75 gcrypt? ( >=dev-libs/libgcrypt-1.5 )
76 - kerberos? ( virtual/krb5 )
77 + gssapi? ( virtual/krb5 )
78 "
79 DEPEND="${RDEPEND}
80 doc? ( app-doc/doxygen )
81 @@ -51,7 +51,7 @@
82 $(cmake-utils_use_with debug DEBUG_CALLTRACE)
83 $(cmake-utils_use_with debug DEBUG_CRYPTO)
84 $(cmake-utils_use_with gcrypt)
85 - $(cmake-utils_use_with kerberos gssapi)
86 + $(cmake-utils_use_with gssapi)
87 $(cmake-utils_use_with pcap)
88 $(cmake-utils_use_with server)
89 $(cmake-utils_use_with sftp)
90
91
92
93 1.9 net-libs/libssh/metadata.xml
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?rev=1.9&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?rev=1.9&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/metadata.xml?r1=1.8&r2=1.9
98
99 Index: metadata.xml
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/metadata.xml,v
102 retrieving revision 1.8
103 retrieving revision 1.9
104 diff -u -r1.8 -r1.9
105 --- metadata.xml 9 Jan 2014 07:56:12 -0000 1.8
106 +++ metadata.xml 11 Feb 2014 10:23:20 -0000 1.9
107 @@ -7,6 +7,7 @@
108 <use>
109 <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
110 <pkg>dev-libs/openssl</pkg> for encryption</flag>
111 + <flag name='gssapi'>Enable gssapi support</flag>
112 <flag name='pcap'>Build with PCAP output support</flag>
113 <flag name='sftp'>Build with SFTP support</flag>
114 <flag name='ssh1'>Build with SSH1 support</flag>
115
116
117
118 1.1 net-libs/libssh/libssh-0.6.1.ebuild
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.1.ebuild?rev=1.1&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-0.6.1.ebuild?rev=1.1&content-type=text/plain
122
123 Index: libssh-0.6.1.ebuild
124 ===================================================================
125 # Copyright 1999-2014 Gentoo Foundation
126 # Distributed under the terms of the GNU General Public License v2
127 # $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.1.ebuild,v 1.1 2014/02/11 10:23:20 polynomial-c Exp $
128
129 EAPI=5
130
131 MY_P=${PN}-${PV/_rc/rc}
132 inherit eutils cmake-utils multilib
133
134 DESCRIPTION="Access a working SSH implementation by means of a library"
135 HOMEPAGE="http://www.libssh.org/"
136 SRC_URI="https://red.libssh.org/attachments/download/81/${MY_P}.tar.xz -> ${P}.tar.xz"
137
138 LICENSE="LGPL-2.1"
139 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
140 SLOT="0/4" # subslot = soname major version
141 IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
142 # Maintainer: check IUSE-defaults at DefineOptions.cmake
143
144 RDEPEND="
145 zlib? ( >=sys-libs/zlib-1.2 )
146 !gcrypt? ( >=dev-libs/openssl-0.9.8 )
147 gcrypt? ( >=dev-libs/libgcrypt-1.5 )
148 gssapi? ( virtual/krb5 )
149 "
150 DEPEND="${RDEPEND}
151 doc? ( app-doc/doxygen )
152 test? ( dev-util/cmocka )
153 "
154
155 DOCS=( AUTHORS README ChangeLog )
156
157 S=${WORKDIR}/${MY_P}
158
159 PATCHES=(
160 "${FILESDIR}/${PN}-0.5.0-tests.patch"
161 )
162
163 src_prepare() {
164 # just install the examples do not compile them
165 sed -i \
166 -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
167 CMakeLists.txt || die
168
169 cmake-utils_src_prepare
170 }
171
172 src_configure() {
173 local mycmakeargs=(
174 $(cmake-utils_use_with debug DEBUG_CALLTRACE)
175 $(cmake-utils_use_with debug DEBUG_CRYPTO)
176 $(cmake-utils_use_with gcrypt)
177 $(cmake-utils_use_with gssapi)
178 $(cmake-utils_use_with pcap)
179 $(cmake-utils_use_with server)
180 $(cmake-utils_use_with sftp)
181 $(cmake-utils_use_with ssh1)
182 $(cmake-utils_use_with static-libs STATIC_LIB)
183 $(cmake-utils_use_with test STATIC_LIB)
184 $(cmake-utils_use_with test TESTING)
185 $(cmake-utils_use_with zlib)
186 )
187
188 cmake-utils_src_configure
189 }
190
191 src_compile() {
192 cmake-utils_src_compile
193 use doc && cmake-utils_src_compile doc
194 }
195
196 src_install() {
197 cmake-utils_src_install
198
199 use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
200
201 use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
202
203 if use examples; then
204 docinto examples
205 dodoc examples/*.{c,h,cpp}
206 fi
207 }