1 |
commit: 1f2084670dbab8c2e4c2795b5c0ea9ce6d13e3b8 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 2 08:13:31 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 2 08:14:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f208467 |
7 |
|
8 |
app-mobilephone/obexftp: Remove last-rited pkg |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-mobilephone/obexftp/Manifest | 1 - |
13 |
.../obexftp/files/obexftp-0.23-gentoo.patch | 22 ------- |
14 |
.../obexftp/files/obexftp-0.24-config.patch | 11 ---- |
15 |
.../files/obexftp-0.24-enable_bluetooth.patch | 16 ----- |
16 |
.../obexftp/files/obexftp-0.24-norpath.patch | 11 ---- |
17 |
.../files/obexftp-0.24-python_sitedir.patch | 16 ----- |
18 |
.../files/obexftp-0.24.2-parallel-build.patch | 53 ----------------- |
19 |
app-mobilephone/obexftp/metadata.xml | 8 --- |
20 |
app-mobilephone/obexftp/obexftp-0.24.2.ebuild | 69 ---------------------- |
21 |
profiles/package.mask | 6 -- |
22 |
10 files changed, 213 deletions(-) |
23 |
|
24 |
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest |
25 |
deleted file mode 100644 |
26 |
index 11897f33a5e..00000000000 |
27 |
--- a/app-mobilephone/obexftp/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1 +0,0 @@ |
30 |
-DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2 |
31 |
|
32 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch |
33 |
deleted file mode 100644 |
34 |
index caf0611ff07..00000000000 |
35 |
--- a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch |
36 |
+++ /dev/null |
37 |
@@ -1,22 +0,0 @@ |
38 |
---- a/obexftp/client.c |
39 |
-+++ b/obexftp/client.c |
40 |
-@@ -51,8 +51,6 @@ |
41 |
- |
42 |
- #ifdef HAVE_BLUETOOTH |
43 |
- #include "bt_kit.h" |
44 |
--#else |
45 |
--#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT |
46 |
- #endif /* HAVE_BLUETOOTH */ |
47 |
- |
48 |
- #include <openobex/obex.h> |
49 |
---- a/apps/obexftp.c |
50 |
-+++ b/apps/obexftp.c |
51 |
-@@ -29,6 +29,8 @@ |
52 |
- |
53 |
- #include <sys/types.h> |
54 |
- |
55 |
-+#include <config.h> |
56 |
-+ |
57 |
- #ifdef HAVE_SYS_TIMES_H |
58 |
- #include <sys/times.h> |
59 |
- #endif |
60 |
|
61 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch |
62 |
deleted file mode 100644 |
63 |
index f923a4b0ed2..00000000000 |
64 |
--- a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch |
65 |
+++ /dev/null |
66 |
@@ -1,11 +0,0 @@ |
67 |
---- a/apps/obexftp.c |
68 |
-+++ b/apps/obexftp.c |
69 |
-@@ -43,8 +43,6 @@ |
70 |
- |
71 |
- #include <common.h> |
72 |
- |
73 |
--#include <config.h> |
74 |
-- |
75 |
- #ifdef HAVE_SYS_TIMES_H |
76 |
- #include <sys/times.h> |
77 |
- #endif |
78 |
|
79 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch |
80 |
deleted file mode 100644 |
81 |
index ff72fff17e7..00000000000 |
82 |
--- a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch |
83 |
+++ /dev/null |
84 |
@@ -1,16 +0,0 @@ |
85 |
---- a/CMakeLists.txt |
86 |
-+++ b/CMakeLists.txt |
87 |
-@@ -52,11 +52,13 @@ |
88 |
- # |
89 |
- # some code is only included if bluetooth is available |
90 |
- # |
91 |
-+if ( ENABLE_BLUETOOTH ) |
92 |
- find_package ( Bluetooth ) |
93 |
- if ( Bluetooth_FOUND ) |
94 |
- include_directories ( ${Bluetooth_INCLUDE_DIRS} ) |
95 |
- add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP ) |
96 |
- endif ( Bluetooth_FOUND ) |
97 |
-+endif ( ENABLE_BLUETOOTH ) |
98 |
- |
99 |
- add_subdirectory ( bfb ) |
100 |
- add_subdirectory ( multicobex ) |
101 |
|
102 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch |
103 |
deleted file mode 100644 |
104 |
index 75a24017718..00000000000 |
105 |
--- a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch |
106 |
+++ /dev/null |
107 |
@@ -1,11 +0,0 @@ |
108 |
---- obexftp-0.22/swig/perl/Makefile.PL.in.norpath 2007-07-11 21:22:30.000000000 +0200 |
109 |
-+++ obexftp-0.22/swig/perl/Makefile.PL.in 2007-08-06 20:17:39.000000000 +0200 |
110 |
-@@ -11,7 +11,7 @@ WriteMakefile( |
111 |
- 'INC' => q[-I@top_srcdir@ @CPPFLAGS@], |
112 |
- # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib" |
113 |
- # but we want rpath to be @libdir@ or @exec_prefix@/lib |
114 |
-- 'LDDLFLAGS' => q[-shared -Wl,-rpath=@prefix@/lib], |
115 |
-+ 'LDDLFLAGS' => q[-shared], |
116 |
- 'LIBS' => q[-L@top_builddir@/obexftp/.libs -lobexftp |
117 |
- -L@top_builddir@/multicobex/.libs -lmulticobex |
118 |
- -L@top_builddir@/bfb/.libs -lbfb |
119 |
|
120 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch |
121 |
deleted file mode 100644 |
122 |
index 24cc46050ab..00000000000 |
123 |
--- a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch |
124 |
+++ /dev/null |
125 |
@@ -1,16 +0,0 @@ |
126 |
---- a/swig/python/CMakeLists.txt |
127 |
-+++ b/swig/python/CMakeLists.txt |
128 |
-@@ -40,11 +40,13 @@ |
129 |
- OUTPUT_VARIABLE PYTHON_PREFIX |
130 |
- ) |
131 |
- file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX ) |
132 |
-+if ( NOT PYTHON_SITE_DIR ) |
133 |
- execute_process ( |
134 |
- COMMAND ${PYTHON_EXECUTABLE} -c |
135 |
- "import site, sys; sys.stdout.write(site.getsitepackages()[-1])" |
136 |
- OUTPUT_VARIABLE PYTHON_SITE_DIR |
137 |
- ) |
138 |
-+endif ( PYTHON_SITE_DIR ) |
139 |
- file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR ) |
140 |
- string ( REGEX REPLACE "^${PYTHON_PREFIX}/" "" |
141 |
- PYTHON_SITE_DIR "${PYTHON_SITE_DIR}" |
142 |
|
143 |
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch b/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch |
144 |
deleted file mode 100644 |
145 |
index 78a8a742632..00000000000 |
146 |
--- a/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch |
147 |
+++ /dev/null |
148 |
@@ -1,53 +0,0 @@ |
149 |
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt |
150 |
-index b5c84e4..63af134 100644 |
151 |
---- a/apps/CMakeLists.txt |
152 |
-+++ b/apps/CMakeLists.txt |
153 |
-@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" ) |
154 |
- add_definitions ( -DHAVE_USB ) |
155 |
- |
156 |
- add_executable ( obexftp_app obexftp.c ) |
157 |
--target_link_libraries ( obexftp_app obexftp ) |
158 |
-+target_link_libraries ( obexftp_app |
159 |
-+ PRIVATE multicobex |
160 |
-+ PRIVATE bfb |
161 |
-+ obexftp |
162 |
-+) |
163 |
- set_target_properties ( obexftp_app PROPERTIES |
164 |
- OUTPUT_NAME obexftp |
165 |
- ) |
166 |
- |
167 |
- |
168 |
- add_executable ( obexftpd_app obexftpd.c ) |
169 |
--target_link_libraries ( obexftpd_app obexftp openobex ) |
170 |
-+target_link_libraries ( obexftpd_app |
171 |
-+ PRIVATE multicobex |
172 |
-+ PRIVATE bfb |
173 |
-+ obexftp |
174 |
-+ openobex |
175 |
-+) |
176 |
- set_target_properties ( obexftpd_app PROPERTIES |
177 |
- OUTPUT_NAME obexftpd |
178 |
- ) |
179 |
-diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt |
180 |
-index 0c80d3d..ff5e3cd 100644 |
181 |
---- a/fuse/CMakeLists.txt |
182 |
-+++ b/fuse/CMakeLists.txt |
183 |
-@@ -13,6 +13,8 @@ if ( Fuse_FOUND ) |
184 |
- ) |
185 |
- |
186 |
- target_link_libraries ( obexfs |
187 |
-+ PRIVATE multicobex |
188 |
-+ PRIVATE bfb |
189 |
- obexftp |
190 |
- ${Fuse_LIBRARIES} |
191 |
- ${EXPAT_LIBRARIES} |
192 |
-@@ -23,6 +25,8 @@ if ( Fuse_FOUND ) |
193 |
- ) |
194 |
- |
195 |
- target_link_libraries ( obexautofs |
196 |
-+ PRIVATE multicobex |
197 |
-+ PRIVATE bfb |
198 |
- obexftp |
199 |
- ${Fuse_LIBRARIES} |
200 |
- ) |
201 |
- |
202 |
|
203 |
diff --git a/app-mobilephone/obexftp/metadata.xml b/app-mobilephone/obexftp/metadata.xml |
204 |
deleted file mode 100644 |
205 |
index 1b474448ed2..00000000000 |
206 |
--- a/app-mobilephone/obexftp/metadata.xml |
207 |
+++ /dev/null |
208 |
@@ -1,8 +0,0 @@ |
209 |
-<?xml version="1.0" encoding="UTF-8"?> |
210 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
211 |
-<pkgmetadata> |
212 |
- <!-- maintainer-needed --> |
213 |
- <upstream> |
214 |
- <remote-id type="sourceforge">openobex</remote-id> |
215 |
- </upstream> |
216 |
-</pkgmetadata> |
217 |
|
218 |
diff --git a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild |
219 |
deleted file mode 100644 |
220 |
index 21ac5cf855e..00000000000 |
221 |
--- a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild |
222 |
+++ /dev/null |
223 |
@@ -1,69 +0,0 @@ |
224 |
-# Copyright 1999-2020 Gentoo Authors |
225 |
-# Distributed under the terms of the GNU General Public License v2 |
226 |
- |
227 |
-EAPI=6 |
228 |
- |
229 |
-PYTHON_COMPAT=( python3_6 ) |
230 |
-USE_RUBY="ruby24 ruby25 ruby26" |
231 |
- |
232 |
-inherit cmake-utils python-single-r1 ruby-single |
233 |
- |
234 |
-DESCRIPTION="File transfer over OBEX for mobile phones" |
235 |
-HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" |
236 |
-SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz" |
237 |
-SLOT="0" |
238 |
- |
239 |
-LICENSE="GPL-2" |
240 |
-KEYWORDS="amd64 ~hppa ppc x86" |
241 |
- |
242 |
-# bluetooth support is not really optional, bug #529068 |
243 |
-IUSE="perl python ruby tcl" |
244 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
245 |
- |
246 |
-RDEPEND=" |
247 |
- >=dev-libs/openobex-1.7 |
248 |
- net-wireless/bluez |
249 |
- perl? ( dev-lang/perl:= ) |
250 |
- python? ( ${PYTHON_DEPS} ) |
251 |
- ruby? ( ${RUBY_DEPS} ) |
252 |
- tcl? ( dev-lang/tcl:0= ) |
253 |
-" |
254 |
-DEPEND="${RDEPEND} |
255 |
- perl? ( dev-lang/swig ) |
256 |
- python? ( dev-lang/swig ) |
257 |
- ruby? ( dev-lang/swig ) |
258 |
- tcl? ( dev-lang/swig ) |
259 |
- virtual/pkgconfig |
260 |
-" |
261 |
- |
262 |
-S=${WORKDIR}/${P}-Source |
263 |
- |
264 |
-PATCHES=( |
265 |
- "${FILESDIR}"/${PN}-0.23-gentoo.patch |
266 |
- "${FILESDIR}"/${PN}-0.24-config.patch |
267 |
- "${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch |
268 |
- "${FILESDIR}"/${PN}-0.24-python_sitedir.patch |
269 |
- "${FILESDIR}"/${PN}-0.24-norpath.patch |
270 |
- "${FILESDIR}"/${P}-parallel-build.patch |
271 |
-) |
272 |
- |
273 |
-src_configure() { |
274 |
-# -DENABLE_BLUETOOTH=$(usex bluetooth) |
275 |
- local mycmakeargs=( |
276 |
- -DCMAKE_BUILD_TYPE=Release |
277 |
- -DCMAKE_SKIP_RPATH=ON |
278 |
- -DENABLE_PERL=$(usex perl) |
279 |
- -DENABLE_BLUETOOTH=yes |
280 |
- -DENABLE_PYTHON=$(usex python) |
281 |
- $(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '') |
282 |
- -DENABLE_RUBY=$(usex ruby) |
283 |
- -DENABLE_TCL=$(usex tcl) |
284 |
- ) |
285 |
- |
286 |
- cmake-utils_src_configure |
287 |
-} |
288 |
- |
289 |
-src_install() { |
290 |
- cmake-utils_src_install |
291 |
- rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866 |
292 |
-} |
293 |
|
294 |
diff --git a/profiles/package.mask b/profiles/package.mask |
295 |
index 6e92535d564..5b6c21a34b6 100644 |
296 |
--- a/profiles/package.mask |
297 |
+++ b/profiles/package.mask |
298 |
@@ -667,12 +667,6 @@ net-wireless/pyrit |
299 |
# Removal in 30 days |
300 |
www-misc/nx_util |
301 |
|
302 |
-# Aaron Bauman <bman@g.o> (2020-08-02) |
303 |
-# Dead upstream. Py3.6 only. Build issues. |
304 |
-# Removal in 30 days. Bug #677900,#716384 |
305 |
-# #722408,723344 |
306 |
-app-mobilephone/obexftp |
307 |
- |
308 |
# Mikle Kolyada <zlogene@g.o> (2020-08-02) |
309 |
# consolekit is abandoned upstream. |
310 |
# People are encouraged to switch to any logind |