Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdaemon/files/, dev-libs/libdaemon/
Date: Mon, 02 Apr 2018 14:33:05
Message-Id: 1522679575.a33f4ce9af5554d10b29a60a73f679bb2b2dc977.eva@gentoo
1 commit: a33f4ce9af5554d10b29a60a73f679bb2b2dc977
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 14:30:32 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 14:32:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33f4ce9
7
8 dev-libs/libdaemon: drop weird generated man page
9
10 Introduced by recent Doxygen releases. Apply the same fix found in Debian, etc.
11 Bump to EAPI=6, drop unused eclasses. Add Debian patch fixing typo that appears
12 in man page.
13
14 Package-Manager: Portage-2.3.27, Repoman-2.3.9
15
16 .../libdaemon/files/0.14-man-page-typo-fix.patch | 38 ++++++++++++
17 dev-libs/libdaemon/libdaemon-0.14-r3.ebuild | 67 ++++++++++++++++++++++
18 2 files changed, 105 insertions(+)
19
20 diff --git a/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch b/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch
21 new file mode 100644
22 index 00000000000..70a6a0eb931
23 --- /dev/null
24 +++ b/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch
25 @@ -0,0 +1,38 @@
26 +Patch from Debian fixing typo that appears in man page.
27 +
28 +
29 +diff --git a/examples/testd.c b/examples/testd.c
30 +index 6557dff..f734173 100644
31 +--- a/examples/testd.c
32 ++++ b/examples/testd.c
33 +@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
34 +
35 + /* Wait for 20 seconds for the return value passed from the daemon process */
36 + if ((ret = daemon_retval_wait(20)) < 0) {
37 +- daemon_log(LOG_ERR, "Could not recieve return value from daemon process: %s", strerror(errno));
38 ++ daemon_log(LOG_ERR, "Could not receive return value from daemon process: %s", strerror(errno));
39 + return 255;
40 + }
41 +
42 +diff --git a/libdaemon/dsignal.h b/libdaemon/dsignal.h
43 +index 1719784..4030e41 100644
44 +--- a/libdaemon/dsignal.h
45 ++++ b/libdaemon/dsignal.h
46 +@@ -34,7 +34,7 @@ extern "C" {
47 + * wish to handle with select() in your main loop with
48 + * daemon_signal_init() or daemon_signal_install(). After that you
49 + * should sleep on the file descriptor returned by daemon_signal_fd()
50 +- * and get the next signal recieved with daemon_signal_next(). You
51 ++ * and get the next signal received with daemon_signal_next(). You
52 + * should call daemon_signal_done() before exiting.
53 + */
54 +
55 +@@ -54,7 +54,7 @@ int daemon_signal_install(int s);
56 + */
57 + void daemon_signal_done(void);
58 +
59 +-/** Return the next signal recieved. This function will not
60 ++/** Return the next signal received. This function will not
61 + * block. Instead it returns 0 if no signal is queued.
62 + * @return The next queued signal if one is queued, zero if none is
63 + * queued, negative on failure.
64
65 diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
66 new file mode 100644
67 index 00000000000..a0be14f7644
68 --- /dev/null
69 +++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
70 @@ -0,0 +1,67 @@
71 +# Copyright 1999-2018 Gentoo Foundation
72 +# Distributed under the terms of the GNU General Public License v2
73 +
74 +EAPI=6
75 +
76 +inherit multilib-minimal
77 +
78 +DESCRIPTION="Simple library for creating daemon processes in C"
79 +HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
80 +SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
81 +
82 +LICENSE="LGPL-2.1"
83 +SLOT="0/5"
84 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
85 +IUSE="doc examples static-libs"
86 +
87 +RDEPEND=""
88 +DEPEND="doc? ( app-doc/doxygen )"
89 +
90 +PATCHES=(
91 + "${FILESDIR}"/${PV}-man-page-typo-fix.patch
92 +)
93 +
94 +src_prepare() {
95 + default
96 +
97 + # doxygen is broken with out-of-source builds
98 + multilib_copy_sources
99 +}
100 +
101 +multilib_src_configure() {
102 + econf \
103 + --docdir="${EPREFIX}/usr/share/doc/${PF}" \
104 + --localstatedir=/var \
105 + --disable-examples \
106 + --disable-lynx \
107 + $(use_enable static-libs static)
108 +}
109 +
110 +multilib_src_compile() {
111 + emake
112 +
113 + if multilib_is_native_abi && use doc; then
114 + einfo "Building documentation"
115 + emake doxygen
116 + fi
117 +}
118 +
119 +multilib_src_install() {
120 + emake DESTDIR="${D}" install
121 +
122 + if multilib_is_native_abi && use doc; then
123 + docinto html
124 + dodoc -r doc/README.html doc/style.css doc/reference/html/*
125 + doman doc/reference/man/man3/*.h.3
126 + fi
127 +}
128 +
129 +multilib_src_install_all() {
130 + einstalldocs
131 + find "${D}" -name '*.la' -delete || die
132 +
133 + if use examples; then
134 + docinto examples
135 + dodoc examples/testd.c
136 + fi
137 +}