commit: 1f2084670dbab8c2e4c2795b5c0ea9ce6d13e3b8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 08:13:31 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 08:14:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f208467
app-mobilephone/obexftp: Remove last-rited pkg
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-mobilephone/obexftp/Manifest | 1 -
.../obexftp/files/obexftp-0.23-gentoo.patch | 22 -------
.../obexftp/files/obexftp-0.24-config.patch | 11 ----
.../files/obexftp-0.24-enable_bluetooth.patch | 16 -----
.../obexftp/files/obexftp-0.24-norpath.patch | 11 ----
.../files/obexftp-0.24-python_sitedir.patch | 16 -----
.../files/obexftp-0.24.2-parallel-build.patch | 53 -----------------
app-mobilephone/obexftp/metadata.xml | 8 ---
app-mobilephone/obexftp/obexftp-0.24.2.ebuild | 69 ----------------------
profiles/package.mask | 6 --
10 files changed, 213 deletions(-)
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
deleted file mode 100644
index 11897f33a5e..00000000000
--- a/app-mobilephone/obexftp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B
7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff
SHA512
91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
deleted file mode 100644
index caf0611ff07..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/obexftp/client.c
-+++ b/obexftp/client.c
-@@ -51,8 +51,6 @@
-
- #ifdef HAVE_BLUETOOTH
- #include "bt_kit.h"
--#else
--#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
- #endif /* HAVE_BLUETOOTH */
-
- #include <openobex/obex.h>
---- a/apps/obexftp.c
-+++ b/apps/obexftp.c
-@@ -29,6 +29,8 @@
-
- #include <sys/types.h>
-
-+#include <config.h>
-+
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #endif
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
deleted file mode 100644
index f923a4b0ed2..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/apps/obexftp.c
-+++ b/apps/obexftp.c
-@@ -43,8 +43,6 @@
-
- #include <common.h>
-
--#include <config.h>
--
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #endif
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
deleted file mode 100644
index ff72fff17e7..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,11 +52,13 @@
- #
- # some code is only included if bluetooth is available
- #
-+if ( ENABLE_BLUETOOTH )
- find_package ( Bluetooth )
- if ( Bluetooth_FOUND )
- include_directories ( ${Bluetooth_INCLUDE_DIRS} )
- add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP )
- endif ( Bluetooth_FOUND )
-+endif ( ENABLE_BLUETOOTH )
-
- add_subdirectory ( bfb )
- add_subdirectory ( multicobex )
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
deleted file mode 100644
index 75a24017718..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.22/swig/perl/Makefile.PL.in.norpath 2007-07-11
21:22:30.000000000 +0200
-+++ obexftp-0.22/swig/perl/Makefile.PL.in 2007-08-06 20:17:39.000000000
+0200
-@@ -11,7 +11,7 @@ WriteMakefile(
- 'INC' => q[-I@top_srcdir@ @CPPFLAGS@],
- # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib"
- # but we want rpath to be @libdir@ or @exec_prefix@/lib
-- 'LDDLFLAGS' => q[-shared -Wl,-rpath=@prefix@/lib],
-+ 'LDDLFLAGS' => q[-shared],
- 'LIBS' => q[-L@top_builddir@/obexftp/.libs -lobexftp
- -L@top_builddir@/multicobex/.libs -lmulticobex
- -L@top_builddir@/bfb/.libs -lbfb
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
deleted file mode 100644
index 24cc46050ab..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -40,11 +40,13 @@
- OUTPUT_VARIABLE PYTHON_PREFIX
- )
- file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
-+if ( NOT PYTHON_SITE_DIR )
- execute_process (
- COMMAND ${PYTHON_EXECUTABLE} -c
- "import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
- OUTPUT_VARIABLE PYTHON_SITE_DIR
- )
-+endif ( PYTHON_SITE_DIR )
- file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
- string ( REGEX REPLACE "^${PYTHON_PREFIX}/" ""
- PYTHON_SITE_DIR "${PYTHON_SITE_DIR}"
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
deleted file mode 100644
index 78a8a742632..00000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index b5c84e4..63af134 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
- add_definitions ( -DHAVE_USB )
-
- add_executable ( obexftp_app obexftp.c )
--target_link_libraries ( obexftp_app obexftp )
-+target_link_libraries ( obexftp_app
-+ PRIVATE multicobex
-+ PRIVATE bfb
-+ obexftp
-+)
- set_target_properties ( obexftp_app PROPERTIES
- OUTPUT_NAME obexftp
- )
-
-
- add_executable ( obexftpd_app obexftpd.c )
--target_link_libraries ( obexftpd_app obexftp openobex )
-+target_link_libraries ( obexftpd_app
-+ PRIVATE multicobex
-+ PRIVATE bfb
-+ obexftp
-+ openobex
-+)
- set_target_properties ( obexftpd_app PROPERTIES
- OUTPUT_NAME obexftpd
- )
-diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
-index 0c80d3d..ff5e3cd 100644
---- a/fuse/CMakeLists.txt
-+++ b/fuse/CMakeLists.txt
-@@ -13,6 +13,8 @@ if ( Fuse_FOUND )
- )
-
- target_link_libraries ( obexfs
-+ PRIVATE multicobex
-+ PRIVATE bfb
- obexftp
- ${Fuse_LIBRARIES}
- ${EXPAT_LIBRARIES}
-@@ -23,6 +25,8 @@ if ( Fuse_FOUND )
- )
-
- target_link_libraries ( obexautofs
-+ PRIVATE multicobex
-+ PRIVATE bfb
- obexftp
- ${Fuse_LIBRARIES}
- )
-
diff --git a/app-mobilephone/obexftp/metadata.xml
b/app-mobilephone/obexftp/metadata.xml
deleted file mode 100644
index 1b474448ed2..00000000000
--- a/app-mobilephone/obexftp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">openobex</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
deleted file mode 100644
index 21ac5cf855e..00000000000
--- a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils python-single-r1 ruby-single
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp";
-SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
-SLOT="0"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86"
-
-# bluetooth support is not really optional, bug #529068
-IUSE="perl python ruby tcl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/openobex-1.7
- net-wireless/bluez
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- ruby? ( ${RUBY_DEPS} )
- tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}-Source
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.23-gentoo.patch
- "${FILESDIR}"/${PN}-0.24-config.patch
- "${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
- "${FILESDIR}"/${PN}-0.24-python_sitedir.patch
- "${FILESDIR}"/${PN}-0.24-norpath.patch
- "${FILESDIR}"/${P}-parallel-build.patch
-)
-
-src_configure() {
-# -DENABLE_BLUETOOTH=$(usex bluetooth)
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_SKIP_RPATH=ON
- -DENABLE_PERL=$(usex perl)
- -DENABLE_BLUETOOTH=yes
- -DENABLE_PYTHON=$(usex python)
- $(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
- -DENABLE_RUBY=$(usex ruby)
- -DENABLE_TCL=$(usex tcl)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 6e92535d564..5b6c21a34b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -667,12 +667,6 @@ net-wireless/pyrit
# Removal in 30 days
www-misc/nx_util
-# Aaron Bauman <b...@gentoo.org> (2020-08-02)
-# Dead upstream. Py3.6 only. Build issues.
-# Removal in 30 days. Bug #677900,#716384
-# #722408,723344
-app-mobilephone/obexftp
-
# Mikle Kolyada <zlog...@gentoo.org> (2020-08-02)
# consolekit is abandoned upstream.
# People are encouraged to switch to any logind
