1 |
commit: 164ff1b9911d4fbc62980e2d6bdf65399d1619fa |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 1 07:22:24 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 1 08:05:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164ff1b9 |
7 |
|
8 |
sci-calculators/units: Version 2.20 |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
sci-calculators/units/Manifest | 1 + |
14 |
sci-calculators/units/files/units-2.20-WIN32.patch | 24 ++++++++ |
15 |
.../units/files/units-2.20-readerror.patch | 11 ++++ |
16 |
sci-calculators/units/units-2.20.ebuild | 68 ++++++++++++++++++++++ |
17 |
4 files changed, 104 insertions(+) |
18 |
|
19 |
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest |
20 |
index 0265ac77011..ba47bcea8d7 100644 |
21 |
--- a/sci-calculators/units/Manifest |
22 |
+++ b/sci-calculators/units/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 |
25 |
DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 |
26 |
DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 |
27 |
+DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d |
28 |
|
29 |
diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..fbe7599831c |
32 |
--- /dev/null |
33 |
+++ b/sci-calculators/units/files/units-2.20-WIN32.patch |
34 |
@@ -0,0 +1,24 @@ |
35 |
+--- a/units.c |
36 |
++++ b/units.c |
37 |
+@@ -4087,7 +4087,9 @@ |
38 |
+ checkcwd (char *file) |
39 |
+ { |
40 |
+ FILE *fp; |
41 |
++#ifdef _WIN32 |
42 |
+ char *p; |
43 |
++#endif |
44 |
+ |
45 |
+ fp = fopen(file, "r"); |
46 |
+ if (fp){ |
47 |
+@@ -4630,7 +4630,10 @@ |
48 |
+ printversion() |
49 |
+ { |
50 |
+ int exists; |
51 |
+- char *unitsfile, *localemap; |
52 |
++ char *unitsfile; |
53 |
++#ifdef _WIN32 |
54 |
++ char *localemap; |
55 |
++#endif |
56 |
+ |
57 |
+ if (flags.verbose == 0) { |
58 |
+ printf("GNU Units version %s\n", VERSION); |
59 |
|
60 |
diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch |
61 |
new file mode 100644 |
62 |
index 00000000000..ccb12c68153 |
63 |
--- /dev/null |
64 |
+++ b/sci-calculators/units/files/units-2.20-readerror.patch |
65 |
@@ -0,0 +1,11 @@ |
66 |
+--- a/units.c |
67 |
++++ b/units.c |
68 |
+@@ -761,7 +761,7 @@ |
69 |
+ } |
70 |
+ |
71 |
+ |
72 |
+-#define readerror (goterr=1) && errfile && fprintf |
73 |
++#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0) |
74 |
+ |
75 |
+ #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \ |
76 |
+ progname, file, linenum |
77 |
|
78 |
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild |
79 |
new file mode 100644 |
80 |
index 00000000000..2e744c5f60c |
81 |
--- /dev/null |
82 |
+++ b/sci-calculators/units/units-2.20.ebuild |
83 |
@@ -0,0 +1,68 @@ |
84 |
+# Copyright 1999-2020 Gentoo Authors |
85 |
+# Distributed under the terms of the GNU General Public License v2 |
86 |
+ |
87 |
+EAPI=7 |
88 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
89 |
+inherit python-single-r1 |
90 |
+ |
91 |
+DESCRIPTION="Unit conversion program" |
92 |
+HOMEPAGE="https://www.gnu.org/software/units/units.html" |
93 |
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
94 |
+ |
95 |
+LICENSE="FDL-1.3 GPL-3" |
96 |
+SLOT="0" |
97 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
98 |
+IUSE="+units--cur" |
99 |
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" |
100 |
+ |
101 |
+RDEPEND=" |
102 |
+ sys-libs/readline:= |
103 |
+ units--cur? ( |
104 |
+ ${PYTHON_DEPS} |
105 |
+ $(python_gen_cond_dep ' |
106 |
+ dev-python/future[${PYTHON_MULTI_USEDEP}] |
107 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
108 |
+ ') |
109 |
+ ) |
110 |
+" |
111 |
+DEPEND=" |
112 |
+ ${RDEPEND} |
113 |
+" |
114 |
+PATCHES=( |
115 |
+ "${FILESDIR}"/${PN}-2.17-network-sandbox.patch |
116 |
+ "${FILESDIR}"/${PN}-2.20-WIN32.patch |
117 |
+ "${FILESDIR}"/${PN}-2.20-readerror.patch |
118 |
+) |
119 |
+DOCS=( |
120 |
+ ChangeLog NEWS README |
121 |
+) |
122 |
+ |
123 |
+pkg_setup() { |
124 |
+ use units--cur && python-single-r1_pkg_setup |
125 |
+} |
126 |
+ |
127 |
+src_configure() { |
128 |
+ econf \ |
129 |
+ --sharedstatedir="${EROOT}/var/lib" \ |
130 |
+ ac_cv_path_PYTHON=no |
131 |
+} |
132 |
+ |
133 |
+src_compile() { |
134 |
+ emake ${PN} |
135 |
+} |
136 |
+ |
137 |
+src_install() { |
138 |
+ default |
139 |
+ |
140 |
+ # we're intentionally delaying this since 'make install' would |
141 |
+ # get confused if we shove 'units_cur' there, and there is no real |
142 |
+ # need to add more complexity for it |
143 |
+ if use units--cur; then |
144 |
+ sed \ |
145 |
+ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ |
146 |
+ -e 's|^#!|&/usr/bin/python|g' \ |
147 |
+ units_cur_inst > units_cur || die |
148 |
+ python_fix_shebang units_cur |
149 |
+ python_doscript units_cur |
150 |
+ fi |
151 |
+} |