gentoo resync : 21.05.2019

3 files changed, 80 insertions, 9 deletions

diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 5d0b152e6a6e..50bfee411e4f 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,4 +1,6 @@
 DIST android-file-transfer-linux-3.6.tar.gz 779459 BLAKE2B f71e7f3313a60cf12179908ed539e6b728e64c0b4e3b6b39dafd9926b27b96b54d31abac9da704111b2ab42867b1c58aac51ff547553cd5ad96dd8c00a5f670a SHA512 bcbc2f8bd39d093677b1c2dcb3d981293a8e79487884fcbe3450864dad9beff381fe966a2a42faf0af75a96753e4f139c95de7ed9175d7cb350055a35f7be4bc
+DIST android-file-transfer-linux-3.8.tar.gz 780911 BLAKE2B 07b4e7670125b1ff382e7c6b1e36427fe0c1fd9665106d73144de5ca68692ae390496985fe83550ec90a64a83fa45b27e4e6d6738e4590ca8c5078a4814ac141 SHA512 b311b76658b57d16cd11c8f5bf03630adc6e0f1939d985a75e7effab584c93dbb82e65fb4cf84a9ef453c901c7f7d3100b96737de20577235fae6fd156a03da1
 EBUILD android-file-transfer-linux-3.6.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
-EBUILD android-file-transfer-linux-9999.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
+EBUILD android-file-transfer-linux-3.8.ebuild 1212 BLAKE2B 5f5d6b810c630b6376306834226be2537cb7bcf2705ef3c69b272c77e08181e9539d7a7a2f69e7068bddfbd6c83e63e5a799f314ab6800e29f31c1017673410e SHA512 1ffb129dd108c2c917fadfd9f5d99095a0bb67c845eb69e51835a06a0a2296501fe446ee0a0c95bddf60af7e3f938a75cfd1e610543070df0c226c4198859ee6
+EBUILD android-file-transfer-linux-9999.ebuild 1212 BLAKE2B 5f5d6b810c630b6376306834226be2537cb7bcf2705ef3c69b272c77e08181e9539d7a7a2f69e7068bddfbd6c83e63e5a799f314ab6800e29f31c1017673410e SHA512 1ffb129dd108c2c917fadfd9f5d99095a0bb67c845eb69e51835a06a0a2296501fe446ee0a0c95bddf60af7e3f938a75cfd1e610543070df0c226c4198859ee6
 MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
new file mode 100644
index 000000000000..dbd8f4ce067c
--- /dev/null
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Android File Transfer for Linux"
+HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
+
+if [[ "${PV}" = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
+else
+	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="fuse qt5"
+
+RDEPEND="
+	sys-apps/file
+	sys-libs/readline:0=
+	fuse? ( sys-fs/fuse:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+# required to override src_prepare from xdg eclass
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FUSE="$(usex fuse)"
+		-DBUILD_QT_UI="$(usex qt5)"
+		-DBUILD_SHARED_LIB="ON"
+		# Upstream recommends to keep this off as libusb is broken
+		-DUSB_BACKEND_LIBUSB="OFF"
+		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
index de7813d30653..dbd8f4ce067c 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -34,6 +34,11 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
+# required to override src_prepare from xdg eclass
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_FUSE="$(usex fuse)"
@@ -46,14 +51,14 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-pkg_preinst() { gnome2_icon_savelist ; }
+pkg_preinst() {
+	xdg_pkg_preinst
+}
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }