gentoo resync : 30.06.2018

5 files changed, 128 insertions, 3 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d8ddb688fa02..651fd09ada7d 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 46cafc8473d9..9e2f45e8e59a 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -5,6 +5,9 @@ AUX obexftp-0.24-fuse.patch 786 BLAKE2B 77153b0773be2c11c6a63a0c77daaf67a66fbaa4
 AUX obexftp-0.24-norpath.patch 641 BLAKE2B ba8de051365bc6417a6421cde50399a92754aa7c2b5523888580cf5d58e2d41f1393b21bf74ce38ecf1f292cca512dd929407443ba50dba65d53204654b38de3 SHA512 876502ac2325e0969e9e8bcdb59325e6dce07468fc106b7fb44befcf6e45d766e7e333d58a5392e376d70baa1532fe5f93cfc7d6a8125735df54a09849e68203
 AUX obexftp-0.24-pkgconfig_requires.patch 399 BLAKE2B 56e8debd7f0a4231acb27423284c18a365df9a6c0f04efbc7c3da05210021770da8de5b4676455bd962031726874bad60a1b3bbc14769aeda095080720adb82d SHA512 ade75cf148d50223d30bd0a075303c8ca686dbf7f1e099c317e7a5d9d2b929743f5fd613b29a4c6af46b48e8a3dd74cd0db8d08df9823699dce6da9e84222749
 AUX obexftp-0.24-python_sitedir.patch 544 BLAKE2B d86883dca5cc9795a07a0a306692cfe63774054d7f6358a3c2a581e2a77f85fef2c3e9fbaff8d8d21d860ced636159532d2fede546ff28146c452e0a2ea33910 SHA512 519e77d8a3ff4b7a9779e350191b8389c27f7bf42abd44704508341d9fdabb0bf9b456fc4cccd93779fc4b54ddcf3cabb38e55f2ea3389b90a85e27de18e0b6a
+AUX obexftp-0.24.2-parallel-build.patch 1251 BLAKE2B 538d82b8e14ec874323d1578c6ccd10d3418cd0efda61bf3752aaea04b22ac357b2792783cf3a86d6c7ec2aa33bd0bbacdf9b99f2082b427fc56d241b2a57849 SHA512 0f7bf40bde282faa6e6c5fc9bab4d5f4d95c9c09581b2e5bfa2f7490714da09c41c3b02789c3ddd7bb2be5d5960aa59587796685a4a250b7f60095237ce77eba
 DIST obexftp-0.24-Source.tar.gz 88154 BLAKE2B 6124a59e8e8af555256fb910b1efd3ae630e97e71559fa3d5e488e911251d98f3f4ba543cb88723f0bc561b4753afc9b613410da51d7d8695182cdfb9cbaf7ab SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9
-EBUILD obexftp-0.24-r1.ebuild 1807 BLAKE2B e321e47aae97d47fcd8cc04f3ebf10e55b53422e2faf87b801de805fb0e181cdf4c60f1898221d434386a69bbfa4d8e2e2f5eef1aba6f2cf32dfcc6a46953d5f SHA512 6823c08702627da889216c0f93b400533d0772d5e6f3ce6f587db940c970e7c7ce83fa7aca2dca0bcca3b36ec27c6a29a54cd89a93ca34a7ce8f2ce23f6c79d2
+DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
+EBUILD obexftp-0.24-r1.ebuild 1818 BLAKE2B 70751aa65c9eaf57b53e832981ccfeaca312d9b2ae444d9ae3c223ce51276def863968d1ad2db3a360f4aa5335098a7d3209de1533bb07a5fb2453ea165f9f93 SHA512 52c97c1785a9524f3ff9d17f6198248f5459312fa21600a5bf04a6466e06c9bcc2d3f662414a20f205d9de4b3c4cbabb0105edc113d5425681805da0d259fc66
+EBUILD obexftp-0.24.2.ebuild 1674 BLAKE2B 250925656ecc33b16c59f0b37e098958f86ca77836e391b7b9ac805efb900cee624204c02425a0dc2feb4d97baba4d9137f07c9a2885003b4149dacba0296487 SHA512 d495aa0502def2c9a4cc6c9f660f7b73a4791f4ba96f2add74d6cedf3f63d75fcec4025056eab682e6d0b7351611b5c3a1beeb8b0786b0eb970c2cdef63f12a5
 MISC metadata.xml 245 BLAKE2B e86e15e6196c5caa30c4dbbcc46d970e3d1fc51b5986c9c5855da2914e104cdc3abe7d23eae94b143047e21603bbd49c23684cca7eed166d90579ccc9dcc742e SHA512 f2f864248cda1ce42c75a7d993ea9d80592f4b5bf957ba7d10e3a26d55429720530c96974403e9d732e2ca67724645f7dfb8b880617a3cc6a3b9d36dd201f433
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
new file mode 100644
index 000000000000..78a8a7426320
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
@@ -0,0 +1,53 @@
+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/obexftp-0.24-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
index d5746a637f68..88e346c57503 100644
--- a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-USE_RUBY="ruby22 ruby23"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit cmake-utils python-single-r1 python-utils-r1 ruby-single eutils multilib
 
diff --git a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
new file mode 100644
index 000000000000..3527d2552090
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+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
+}