1 |
commit: b8daa77e734102820c691daaab5a82ddabd17b5d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 19:16:02 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 19:16:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8daa77e |
7 |
|
8 |
sci-misc/oww: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/712476 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
sci-misc/oww/files/oww-0.86.5-musl.patch | 20 +++++++++++++++++++ |
15 |
sci-misc/oww/oww-0.86.5.ebuild | 33 +++++++++++++++++--------------- |
16 |
2 files changed, 38 insertions(+), 15 deletions(-) |
17 |
|
18 |
diff --git a/sci-misc/oww/files/oww-0.86.5-musl.patch b/sci-misc/oww/files/oww-0.86.5-musl.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..2d863a53164 |
21 |
--- /dev/null |
22 |
+++ b/sci-misc/oww/files/oww-0.86.5-musl.patch |
23 |
@@ -0,0 +1,20 @@ |
24 |
+--- a/src/applctn.h |
25 |
++++ b/src/applctn.h |
26 |
+@@ -1,3 +1,5 @@ |
27 |
++#include <stdint.h> |
28 |
++ |
29 |
+ void applctn_pre_init(int *argc, char ***argv) ; |
30 |
+ void applctn_init(int *argc, char ***argv) ; |
31 |
+ int applctn_startup_finished(void) ; /* Function to call in state_startup */ |
32 |
+--- a/src/ownet.h |
33 |
++++ b/src/ownet.h |
34 |
+@@ -42,9 +42,7 @@ |
35 |
+ //--------------------------------------------------------------// |
36 |
+ #include <stdlib.h> |
37 |
+ #include <stdio.h> |
38 |
+-#ifdef __FreeBSD__ |
39 |
+ #include <sys/types.h> |
40 |
+-#endif |
41 |
+ //#include <windows.h> |
42 |
+ |
43 |
+ //--------------------------------------------------------------// |
44 |
|
45 |
diff --git a/sci-misc/oww/oww-0.86.5.ebuild b/sci-misc/oww/oww-0.86.5.ebuild |
46 |
index 83eafaaa6ac..f274c467b34 100644 |
47 |
--- a/sci-misc/oww/oww-0.86.5.ebuild |
48 |
+++ b/sci-misc/oww/oww-0.86.5.ebuild |
49 |
@@ -1,38 +1,41 @@ |
50 |
-# Copyright 1999-2015 Gentoo Foundation |
51 |
+# Copyright 1999-2021 Gentoo Authors |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
|
54 |
-EAPI=5 |
55 |
+EAPI=7 |
56 |
|
57 |
-AUTOTOOLS_AUTORECONF=true |
58 |
- |
59 |
-inherit autotools-utils |
60 |
+inherit autotools |
61 |
|
62 |
DESCRIPTION="A one-wire weather station for Dallas Semiconductor" |
63 |
HOMEPAGE="http://oww.sourceforge.net/" |
64 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
65 |
|
66 |
-SLOT="0" |
67 |
LICENSE="Artistic" |
68 |
+SLOT="0" |
69 |
KEYWORDS="~amd64 ~x86" |
70 |
IUSE="gtk nls usb" |
71 |
|
72 |
RDEPEND=" |
73 |
net-misc/curl |
74 |
gtk? ( x11-libs/gtk+:2 )" |
75 |
-DEPEND="${RDEPEND} |
76 |
- virtual/pkgconfig" |
77 |
+DEPEND="${RDEPEND}" |
78 |
+BDEPEND="virtual/pkgconfig" |
79 |
|
80 |
PATCHES=( |
81 |
"${FILESDIR}"/${PN}-0.86.4-build.patch |
82 |
"${FILESDIR}"/${P}-format-security.patch |
83 |
- ) |
84 |
+ "${FILESDIR}"/${P}-musl.patch |
85 |
+) |
86 |
+ |
87 |
+src_prepare() { |
88 |
+ default |
89 |
+ mv configure.{in,ac} || die |
90 |
+ eautoreconf |
91 |
+} |
92 |
|
93 |
src_configure() { |
94 |
- local myeconfargs=( |
95 |
- --enable-interactive |
96 |
- $(use_enable nls) |
97 |
- $(use_enable gtk gui) |
98 |
+ econf \ |
99 |
+ --enable-interactive \ |
100 |
+ $(use_enable nls) \ |
101 |
+ $(use_enable gtk gui) \ |
102 |
$(use_with usb) |
103 |
- ) |
104 |
- autotools-utils_src_configure |
105 |
} |