Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librelp/, dev-libs/librelp/files/
Date: Tue, 11 Dec 2018 16:42:28
Message-Id: 1544545935.2bbab8936408075202f6d7028b9903dd25722492.whissi@gentoo
1 commit: 2bbab8936408075202f6d7028b9903dd25722492
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 16:05:42 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 16:32:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbab893
7
8 dev-libs/librelp: bump to v1.3.0
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-libs/librelp/Manifest | 1 +
14 ...lp-1.3.0-dummyclient.py-Py3-compatibility.patch | 24 ++++++
15 dev-libs/librelp/librelp-1.3.0.ebuild | 85 ++++++++++++++++++++++
16 3 files changed, 110 insertions(+)
17
18 diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
19 index 487a22d06de..ad864b14fd9 100644
20 --- a/dev-libs/librelp/Manifest
21 +++ b/dev-libs/librelp/Manifest
22 @@ -1,3 +1,4 @@
23 DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
24 DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e07f62d6a870bf93e435c4b2d100a3cc9e4ab711233e9c1f73aedd8771e116b7c7139d2ad6d1baa7c483b2867a1 SHA512 4f69d3e4bc3052c0488a01def49dab16b54fc4a092e06f8776415cb1eca2282702a37497e43baf98fc038853d373116d6b58515c9ad91fae91fb3eb84706890f
25 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
26 +DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
27
28 diff --git a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
29 new file mode 100644
30 index 00000000000..99ac9887f73
31 --- /dev/null
32 +++ b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
33 @@ -0,0 +1,24 @@
34 +From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
35 +From: Thomas Deutschmann <whissi@××××××.de>
36 +Date: Tue, 11 Dec 2018 16:50:12 +0100
37 +Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
38 + Python3
39 +
40 +Closes: https://github.com/rsyslog/librelp/issues/163
41 +---
42 + tests/dummyclient.py | 2 +-
43 + 1 file changed, 1 insertion(+), 1 deletion(-)
44 +
45 +diff --git a/tests/dummyclient.py b/tests/dummyclient.py
46 +index 6f99c79..8b0041e 100755
47 +--- a/tests/dummyclient.py
48 ++++ b/tests/dummyclient.py
49 +@@ -4,7 +4,7 @@
50 + import os
51 +
52 + port = int(os.environ['TESTPORT'])
53 +-print "dummyclient info: opening and closing port " + str(port) + " without sending data"
54 ++print("dummyclient info: opening and closing port " + str(port) + " without sending data")
55 + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
56 + s.connect(("127.0.0.1", port))
57 + s.close()
58
59 diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
60 new file mode 100644
61 index 00000000000..4024aa27d04
62 --- /dev/null
63 +++ b/dev-libs/librelp/librelp-1.3.0.ebuild
64 @@ -0,0 +1,85 @@
65 +# Copyright 1999-2018 Gentoo Authors
66 +# Distributed under the terms of the GNU General Public License v2
67 +
68 +EAPI="7"
69 +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
70 +
71 +inherit autotools python-any-r1
72 +
73 +DESCRIPTION="An easy to use library for the RELP protocol"
74 +HOMEPAGE="http://www.librelp.com/"
75 +SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
76 +
77 +LICENSE="GPL-3+ doc? ( FDL-1.3 )"
78 +
79 +# subslot = soname version
80 +SLOT="0/0.4.0"
81 +
82 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
83 +IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
84 +REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
85 + gnutls? ( ssl )
86 + openssl? ( ssl )
87 + libressl? ( openssl )"
88 +
89 +RDEPEND="ssl? (
90 + gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
91 + openssl? (
92 + !libressl? ( dev-libs/openssl:0= )
93 + libressl? ( dev-libs/libressl:0= )
94 + )
95 + )"
96 +
97 +DEPEND="ssl? (
98 + gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
99 + openssl? (
100 + !libressl? ( dev-libs/openssl:0= )
101 + libressl? ( dev-libs/libressl:0= )
102 + )
103 + )
104 + test? ( ${PYTHON_DEPS} )
105 + virtual/pkgconfig"
106 +
107 +RESTRICT="!test? ( test )"
108 +
109 +PATCHES=( "${FILESDIR}"/${P}-dummyclient.py-Py3-compatibility.patch )
110 +
111 +pkg_setup() {
112 + use test && python-any-r1_pkg_setup
113 +}
114 +
115 +src_prepare() {
116 + sed -i \
117 + -e 's/ -g"/"/g' \
118 + configure.ac || die "sed failed"
119 +
120 + default
121 +
122 + eautoreconf
123 +}
124 +
125 +src_configure() {
126 + local myeconfargs=(
127 + --disable-valgrind
128 + $(use_enable debug)
129 + $(use_enable gnutls tls)
130 + $(use_enable openssl tls-openssl)
131 + $(use_enable static-libs static)
132 + )
133 +
134 + econf "${myeconfargs[@]}"
135 +}
136 +
137 +src_test() {
138 + emake -j1 check
139 +}
140 +
141 +src_install() {
142 + local DOCS=( ChangeLog )
143 + use doc && local HTML_DOCS=( doc/relp.html )
144 + default
145 +
146 + if ! use static-libs; then
147 + find "${ED%/}"/usr/lib* -name '*.la' -delete || die
148 + fi
149 +}