gentoo resync : 22.10.2018

4 files changed, 3 insertions, 95 deletions

diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index da84c6adeb74..49e82924235a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,9 +1,6 @@
 AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d70abe1467df3b799602c3232af7a490481c1fb2c3dd5a68f4792dc45a251f1e5518df36604090d23a42c43d13051bd144b54eb15cb2a7c722c9283cbacf SHA512 cafb1b97a1f6faeb7e7e9da5fa7c323eea1754078d08e5e0ea4e437c29d7da371318ecc7b944c595ef60f3169697f35db9efbd2ee23282a2bd694fac19d2e634
 AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
 AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
-DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
-EBUILD libfm-qt-0.11.1.ebuild 905 BLAKE2B 617800ac0b96fb5ad880dddda765d1f66836871911c04f8a8b1388673bb3849edbd4ec242620f741e127fdf769d87e3bc20b16313ade87005cf7a80e28d76b16 SHA512 4d230db20a9c7aa842aa5b855080e7d01273f15eb2968d5a4de4211c1d9d5db5f7d3ebbc0db74b4dcf8b65744419552c04514ae51710532238c3e24db1b83ccc
-EBUILD libfm-qt-0.13.1-r1.ebuild 1099 BLAKE2B 16213a455bd0710d7171b6fe6e8161e466c06251985edff6fbf342a9f48677e6f19fdfb67abc81f25fabd07cf56aeb7f405987198771c6735167b3ac8d81e3aa SHA512 ad0560427f59782cf05974fd20598fe697f8f872506a59d87065c195e3fb3de255dfa62fb6749d0574711a5335a1b6ddbc6ba92615f04576c289280ca0a9beec
-EBUILD libfm-qt-0.13.1.ebuild 926 BLAKE2B 3f1262e5cc7c7c2113e50db9cf19327281b125820b03f5114eae2524f406ded9dd6697ec37b92eb7292a44fc19811e3505e39f880b4039616c0d6594ba101975 SHA512 0413552e13a4ea4e5b1ebe0cd2b6cc82b846fc0da0c58ecd21212583fcc9bcc76831c3c013c54bd7979896a5fbf3a6ea2f4e5e5be4ade801fea99688dc5fae0c
+EBUILD libfm-qt-0.13.1-r1.ebuild 1094 BLAKE2B eb12936a58ed4f3c8893fbecd0909cd58256d2b934cfd8301524e599cccef728ede24ef62c6a781bd88eab2d93a359bf816b2132163bb9aab2663d92d142743b SHA512 cf39485d2e53a40c43d61797915f0cdfe3cfcb94c1efeb18c17448a0f627927e8ca5925e29f513c3a355ae2ce21de42927f69514cdef0f891ed9f9a6e16ba957
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
deleted file mode 100644
index f377c3afce2f..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-0.4.1
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-	!<x11-misc/pcmanfm-qt-0.11.0
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	lxqt-base/liblxqt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
index 95dea87773b8..e41d449e1331 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild
deleted file mode 100644
index d3a2aa6d6bfa..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/5"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0
-	media-libs/libexif:=
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}