1 |
commit: 75ba31febe3ad06e585ca7cf3d5b0eaf48c8ee48 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 3 13:39:01 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 13:39:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ba31fe |
7 |
|
8 |
app-pda/pilot-link: update EAPI 6 -> 8 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/23943 |
11 |
Closes: https://bugs.gentoo.org/744046 |
12 |
Closes: https://bugs.gentoo.org/750203 |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
app-pda/pilot-link/Manifest | 2 +- |
16 |
.../files/pilot-link-0.12.5-Werror-args.patch | 18 ---- |
17 |
app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild | 105 --------------------- |
18 |
app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild | 90 ++++++++++++++++++ |
19 |
4 files changed, 91 insertions(+), 124 deletions(-) |
20 |
|
21 |
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest |
22 |
index 2fefa7bae9e2..5960e2a65f9c 100644 |
23 |
--- a/app-pda/pilot-link/Manifest |
24 |
+++ b/app-pda/pilot-link/Manifest |
25 |
@@ -1,2 +1,2 @@ |
26 |
-DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d |
27 |
+DIST pilot-link-0.12.5-gentoo-patchset-r1.tar.xz 8696 BLAKE2B 1dd2015a4e77a2c93bb5bede88ed753aa0c8bd175744ee3cf49c9779312c3d99fa578ab307cd96af51f736a9fd44135628cef73c9041e5b4230c7a8c6c9d6b53 SHA512 ecbd9c14ebf1fc5c129a93a4cc6f3c0f7da1f47e9c02fbc7ce908a2462b26c68a3b0d28b21e633b4703bd0c1889d84820b5bd3eee3cb9dfaa2eab1651414bc73 |
28 |
DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868 |
29 |
|
30 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch b/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch |
31 |
deleted file mode 100644 |
32 |
index 5e6b939d0100..000000000000 |
33 |
--- a/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch |
34 |
+++ /dev/null |
35 |
@@ -1,18 +0,0 @@ |
36 |
--Werror can have args now, but didn't when this code was originally written. |
37 |
- |
38 |
-Closes: https://bugs.gentoo.org/show_bug.cgi?id=714828 |
39 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
40 |
- |
41 |
---- pilot-link-0.12.5.orig/configure.ac 2020-08-02 21:58:12.481559328 -0700 |
42 |
-+++ pilot-link-0.12.5/configure.ac 2020-08-02 22:02:49.641291824 -0700 |
43 |
-@@ -63,8 +63,8 @@ |
44 |
- dnl Eat -Werror so configure will run properly, if the user provided it |
45 |
- enable_werror=no |
46 |
- save_CFLAGS="$CFLAGS" |
47 |
--CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` |
48 |
--CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` |
49 |
-+CFLAGS=`echo $save_CFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'` |
50 |
-+CXXFLAGS=`echo $save_CXXFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'` |
51 |
- if test "x$CFLAGS" != "x$save_CFLAGS"; then |
52 |
- dnl -Werror was set; treat it as implicit --enable-werror below |
53 |
- enable_werror="yes" |
54 |
|
55 |
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild |
56 |
deleted file mode 100644 |
57 |
index 61b734b732d0..000000000000 |
58 |
--- a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,105 +0,0 @@ |
61 |
-# Copyright 1999-2020 Gentoo Authors |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-EAPI=6 |
65 |
- |
66 |
-inherit autotools perl-module |
67 |
- |
68 |
-DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop" |
69 |
-# this is a new mirror; the distfile has the same content inside the tarball, |
70 |
-# but the tarball itself doesn't match due to recompression and Git |
71 |
-# indirection. |
72 |
-HOMEPAGE="https://github.com/jichu4n/pilot-link" |
73 |
-SRC_URI="mirror://gentoo/${P}.tar.bz2 |
74 |
- https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" |
75 |
- |
76 |
-LICENSE="|| ( GPL-2 LGPL-2 )" |
77 |
-SLOT="0" |
78 |
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
79 |
-IUSE="bluetooth debug perl png static-libs threads usb" |
80 |
- |
81 |
-COMMON_DEPEND=" |
82 |
- dev-libs/popt |
83 |
- >=sys-libs/ncurses-5.7-r7:0= |
84 |
- >=sys-libs/readline-6:0= |
85 |
- virtual/libiconv |
86 |
- bluetooth? ( net-wireless/bluez ) |
87 |
- perl? ( >=dev-lang/perl-5.12 ) |
88 |
- png? ( media-libs/libpng:0= ) |
89 |
- usb? ( virtual/libusb:0 ) |
90 |
-" |
91 |
-DEPEND="${COMMON_DEPEND}" |
92 |
-RDEPEND="${COMMON_DEPEND}" |
93 |
- |
94 |
-RESTRICT="test" #672872 |
95 |
- |
96 |
-src_prepare() { |
97 |
- default |
98 |
- |
99 |
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch |
100 |
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch |
101 |
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch |
102 |
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch |
103 |
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch |
104 |
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch |
105 |
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch |
106 |
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch |
107 |
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch |
108 |
- eapply -p1 "${FILESDIR}"/${PN}-0.12.5-Werror-args.patch |
109 |
- |
110 |
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600 |
111 |
- |
112 |
- AT_M4DIR="m4" eautoreconf |
113 |
- |
114 |
-} |
115 |
- |
116 |
-src_configure() { |
117 |
- # tcl/tk support is disabled as per upstream request. |
118 |
- # readline is not really optional, bug #626504 |
119 |
- # Does not build with Java 8 |
120 |
- # Does not build with Python 3, bug 735238 |
121 |
- econf \ |
122 |
- --includedir="${EPREFIX}"/usr/include/libpisock \ |
123 |
- $(use_enable static-libs static) \ |
124 |
- --enable-conduits \ |
125 |
- --with-readline \ |
126 |
- $(use_enable threads) \ |
127 |
- $(use_enable usb libusb) \ |
128 |
- $(use_enable debug) \ |
129 |
- $(use_with png libpng) \ |
130 |
- $(use_with bluetooth bluez) \ |
131 |
- $(use_with perl) \ |
132 |
- --without-java \ |
133 |
- --without-tcl \ |
134 |
- --without-python |
135 |
-} |
136 |
- |
137 |
-src_compile() { |
138 |
- emake |
139 |
- |
140 |
- if use perl; then |
141 |
- cd "${S}"/bindings/Perl |
142 |
- perl-module_src_configure |
143 |
- local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629 |
144 |
- perl-module_src_compile |
145 |
- fi |
146 |
- |
147 |
- # Python 2.0 only; not enabled anymore |
148 |
- # bug 735238 |
149 |
-} |
150 |
- |
151 |
-src_install() { |
152 |
- emake DESTDIR="${D}" install |
153 |
- dodoc ChangeLog NEWS README doc/{README*,TODO} |
154 |
- |
155 |
- if use perl; then |
156 |
- cd "${S}"/bindings/Perl |
157 |
- perl-module_src_install |
158 |
- fi |
159 |
- |
160 |
- find "${D}" -name '*.la' -delete || die |
161 |
-} |
162 |
- |
163 |
-pkg_preinst() { |
164 |
- perl_set_version |
165 |
-} |
166 |
|
167 |
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild |
168 |
new file mode 100644 |
169 |
index 000000000000..455a7e5c39ed |
170 |
--- /dev/null |
171 |
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild |
172 |
@@ -0,0 +1,90 @@ |
173 |
+# Copyright 1999-2022 Gentoo Authors |
174 |
+# Distributed under the terms of the GNU General Public License v2 |
175 |
+ |
176 |
+EAPI=8 |
177 |
+ |
178 |
+inherit autotools perl-module |
179 |
+ |
180 |
+DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop" |
181 |
+# this is a new mirror; the distfile has the same content inside the tarball, |
182 |
+# but the tarball itself doesn't match due to recompression and Git |
183 |
+# indirection. |
184 |
+HOMEPAGE="https://github.com/jichu4n/pilot-link" |
185 |
+SRC_URI=" |
186 |
+ mirror://gentoo/${P}.tar.bz2 |
187 |
+ https://dev.gentoo.org/~soap/distfiles/${P}-gentoo-patchset-r1.tar.xz" |
188 |
+ |
189 |
+LICENSE="|| ( GPL-2 LGPL-2 )" |
190 |
+SLOT="0" |
191 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
192 |
+IUSE="bluetooth perl png threads usb" |
193 |
+RESTRICT="test" #672872 |
194 |
+ |
195 |
+RDEPEND=" |
196 |
+ dev-libs/popt |
197 |
+ sys-libs/ncurses:= |
198 |
+ sys-libs/readline:= |
199 |
+ virtual/libiconv |
200 |
+ bluetooth? ( net-wireless/bluez ) |
201 |
+ perl? ( dev-lang/perl:= ) |
202 |
+ png? ( media-libs/libpng:= ) |
203 |
+ usb? ( virtual/libusb:0 )" |
204 |
+DEPEND="${RDEPEND}" |
205 |
+BDEPEND=" |
206 |
+ virtual/pkgconfig |
207 |
+ perl? ( dev-lang/perl )" |
208 |
+ |
209 |
+PATCHES=( "${WORKDIR}/${P}-gentoo-patchset"/ ) |
210 |
+ |
211 |
+src_prepare() { |
212 |
+ default |
213 |
+ eautoreconf |
214 |
+} |
215 |
+ |
216 |
+src_configure() { |
217 |
+ # tcl/tk support is disabled as per upstream request. |
218 |
+ # readline is not really optional, bug #626504 |
219 |
+ # Does not build with Java 8 |
220 |
+ # Does not build with Python 3, bug #735238 |
221 |
+ econf \ |
222 |
+ --includedir="${EPREFIX}"/usr/include/libpisock \ |
223 |
+ --enable-conduits \ |
224 |
+ --with-readline \ |
225 |
+ $(use_enable threads) \ |
226 |
+ $(use_enable usb libusb) \ |
227 |
+ $(use_with png libpng) \ |
228 |
+ $(use_with bluetooth bluez) \ |
229 |
+ $(use_with perl) \ |
230 |
+ --without-java \ |
231 |
+ --without-tcl \ |
232 |
+ --without-python |
233 |
+ |
234 |
+ if use perl; then |
235 |
+ perl_set_version |
236 |
+ |
237 |
+ cd bindings/Perl || die |
238 |
+ perl-module_src_configure |
239 |
+ fi |
240 |
+} |
241 |
+ |
242 |
+src_compile() { |
243 |
+ emake |
244 |
+ |
245 |
+ if use perl; then |
246 |
+ cd bindings/Perl || die |
247 |
+ local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629 |
248 |
+ perl-module_src_compile |
249 |
+ fi |
250 |
+} |
251 |
+ |
252 |
+src_install() { |
253 |
+ default |
254 |
+ dodoc doc/{README*,TODO} |
255 |
+ |
256 |
+ if use perl; then |
257 |
+ cd bindings/Perl || die |
258 |
+ perl-module_src_install |
259 |
+ fi |
260 |
+ |
261 |
+ find "${ED}" -name '*.la' -delete || die |
262 |
+} |