gentoo resync : 18.05.2019

4 files changed, 137 insertions, 6 deletions

diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 1a0448de19e9..4271a20089b6 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,5 +1,7 @@
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
-EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
+DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
+EBUILD libfm-1.2.5.ebuild 3719 BLAKE2B f117cd5f6312e2734ae70e0ef7046143b6768f3174d4a506f374cbca29d049b6b5fcafd21d4ba4714076adbcbcfa096b0ab22bf8471de31c9f79ba1f9b86a32f SHA512 9d873ec7eb023f3e41c9d43b68415b270c871b0b46aeeecd62c8bd7ab0a6c07519cbd777b46eb11cfb211ecd510afac13f9349c4600b2f8100e8f4499cc7b160
+EBUILD libfm-1.3.1.ebuild 3625 BLAKE2B 1b0b71cbbc5242e07e80845dd7fcb1b9be5f28d246bf778d071a980b4eacf5012d2bc2f3d66a04a03523a776c605b0caef44bb0fceb2a07c2e6d6a43387eb3a1 SHA512 c792e2074bae2a039b7a19646484bcfb6d43f1c0135bb2823e1385a9d5606a109ad2a9e3c35f7f8a1a84dab42abc102047f25737cfac6ec8a38d2f0c1f535ee5
+EBUILD libfm-9999.ebuild 3431 BLAKE2B 2f0c94b93a17784f26b4ef81171a41fdbb07b0d57490d5b9afb725874a5a05d912edf3d35806dfb58bb8c1949d1f035fe2be81468ea09fd9081cfcfe03ede4a8 SHA512 8073f7d92c8547fa3998d17057d9d22348e2fb6c57c84a332477e18b7a12d35118661792eeda254fd9a9fe09ff4102c3c3256a5ebaa62fd8ba8a96ab805c32ec
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
index 1a0ea5310742..e83944fa6bf8 100644
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ b/x11-libs/libfm/libfm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit autotools multilib vala xdg-utils
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild
new file mode 100644
index 000000000000..55117ef17be9
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.3.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib vala xdg-utils
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	~x11-libs/libfm-extra-${PV}
+	udisks? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala old-actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 75b2ae42c535..6aed4f9e783e 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/lxde/${PN}"
 inherit autotools git-r3 vala xdg-utils
 
 DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 
 LICENSE="GPL-2"
 SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly