Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/obexftp/, app-mobilephone/obexftp/files/
Date: Fri, 17 Aug 2018 08:12:37
Message-Id: 1534493536.720f7e0194680ad6550279e8037eaa1a611b9f60.asturm@gentoo
1 commit: 720f7e0194680ad6550279e8037eaa1a611b9f60
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 17 08:11:27 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 17 08:12:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720f7e01
7
8 app-mobilephone/obexftp: Drop old
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 app-mobilephone/obexftp/Manifest | 1 -
13 .../obexftp/files/obexftp-0.24-fuse.patch | 35 -----------
14 .../files/obexftp-0.24-pkgconfig_requires.patch | 11 ----
15 app-mobilephone/obexftp/obexftp-0.24-r1.ebuild | 73 ----------------------
16 4 files changed, 120 deletions(-)
17
18 diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
19 index 393c440c6ca..11897f33a5e 100644
20 --- a/app-mobilephone/obexftp/Manifest
21 +++ b/app-mobilephone/obexftp/Manifest
22 @@ -1,2 +1 @@
23 -DIST obexftp-0.24-Source.tar.gz 88154 BLAKE2B 6124a59e8e8af555256fb910b1efd3ae630e97e71559fa3d5e488e911251d98f3f4ba543cb88723f0bc561b4753afc9b613410da51d7d8695182cdfb9cbaf7ab SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9
24 DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
25
26 diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch b/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch
27 deleted file mode 100644
28 index 260cfc2d9a5..00000000000
29 --- a/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch
30 +++ /dev/null
31 @@ -1,35 +0,0 @@
32 -From 2cc82e0ab5a30eaab5461dcc4eed41b095edba3f Mon Sep 17 00:00:00 2001
33 -From: Hendrik Sattler <post@×××××××××××××××.de>
34 -Date: Sun, 11 Aug 2013 20:27:29 +0200
35 -Subject: [PATCH] Install fuse apps
36 -
37 ----
38 - fuse/CMakeLists.txt | 7 ++++++-
39 - 1 files changed, 6 insertions(+), 1 deletions(-)
40 -
41 -diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
42 -index c31a5fc..7d5f7ea 100644
43 ---- a/fuse/CMakeLists.txt
44 -+++ b/fuse/CMakeLists.txt
45 -@@ -14,7 +14,6 @@ if ( Fuse_FOUND )
46 - ${Fuse_LIBRARIES}
47 - )
48 -
49 --
50 - add_executable ( obexautofs
51 - obexautofs.c
52 - )
53 -@@ -23,4 +22,10 @@ if ( Fuse_FOUND )
54 - obexftp
55 - ${Fuse_LIBRARIES}
56 - )
57 -+
58 -+ install ( TARGETS obexfs obexautofs
59 -+ RUNTIME
60 -+ DESTINATION ${CMAKE_INSTALL_BINDIR}
61 -+ COMPONENT applications
62 -+ )
63 - endif ( Fuse_FOUND )
64 ---
65 -1.7.1
66 -
67
68 diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch b/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch
69 deleted file mode 100644
70 index ded4a583330..00000000000
71 --- a/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch
72 +++ /dev/null
73 @@ -1,11 +0,0 @@
74 ---- a/CMakeLists.txt
75 -+++ b/CMakeLists.txt
76 -@@ -71,7 +71,7 @@
77 - set ( exec_prefix "\${prefix}" )
78 - set ( libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}" )
79 - set ( includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" )
80 --set ( REQUIRES "bluetooth openobex" )
81 -+set ( REQUIRES "bluez openobex" )
82 - configure_file (
83 - ${CMAKE_CURRENT_SOURCE_DIR}/obexftp.pc.in
84 - ${CMAKE_CURRENT_BINARY_DIR}/obexftp.pc
85
86 diff --git a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
87 deleted file mode 100644
88 index 88e346c5750..00000000000
89 --- a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
90 +++ /dev/null
91 @@ -1,73 +0,0 @@
92 -# Copyright 1999-2018 Gentoo Foundation
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=5
96 -
97 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
98 -USE_RUBY="ruby23 ruby24 ruby25"
99 -
100 -inherit cmake-utils python-single-r1 python-utils-r1 ruby-single eutils multilib
101 -
102 -DESCRIPTION="File transfer over OBEX for mobile phones"
103 -HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
104 -SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
105 -SLOT="0"
106 -
107 -LICENSE="GPL-2"
108 -KEYWORDS="amd64 hppa ppc x86"
109 -
110 -# bluetooth support is not really optional, bug #529068
111 -IUSE="perl python ruby tcl" #bluetooth
112 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
113 -
114 -RDEPEND="
115 - >=dev-libs/openobex-1.7
116 - net-wireless/bluez
117 - perl? ( dev-lang/perl:= )
118 - python? ( ${PYTHON_DEPS} )
119 - ruby? ( ${RUBY_DEPS} )
120 - tcl? ( dev-lang/tcl:0= )
121 -"
122 -DEPEND="
123 - ${RDEPEND}
124 - perl? ( dev-lang/swig )
125 - python? ( dev-lang/swig )
126 - ruby? ( dev-lang/swig )
127 - tcl? ( dev-lang/swig )
128 - virtual/pkgconfig
129 -"
130 -
131 -S=${WORKDIR}/${P}-Source
132 -
133 -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
134 -
135 -PATCHES=(
136 - "${FILESDIR}"/${PN}-0.23-gentoo.patch
137 - "${FILESDIR}"/${PN}-0.24-config.patch
138 - "${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
139 - "${FILESDIR}"/${PN}-0.24-python_sitedir.patch
140 - "${FILESDIR}"/${PN}-0.24-norpath.patch
141 - "${FILESDIR}"/${PN}-0.24-fuse.patch
142 - "${FILESDIR}"/${PN}-0.24-pkgconfig_requires.patch
143 -)
144 -
145 -src_configure() {
146 -# -DENABLE_BLUETOOTH=$(usex bluetooth)
147 - local mycmakeargs=(
148 - -DCMAKE_BUILD_TYPE=Release
149 - -DCMAKE_SKIP_RPATH=ON
150 - -DENABLE_PERL=$(usex perl)
151 - -DENABLE_BLUETOOTH=yes
152 - -DENABLE_PYTHON=$(usex python)
153 - $(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
154 - -DENABLE_RUBY=$(usex ruby)
155 - -DENABLE_TCL=$(usex tcl)
156 - )
157 -
158 - cmake-utils_src_configure
159 -}
160 -
161 -src_install() {
162 - cmake-utils_src_install
163 - rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
164 -}