gentoo resync : 25.08.2020

4 files changed, 117 insertions, 6 deletions

diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 35b33ceef27a..dd5c51c29101 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,4 +1,5 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
-EBUILD emelfm2-0.9.1-r1.ebuild 1954 BLAKE2B 39a847806bac8df2b603115cdf65a2890e019b0216a0b4634c3554726c2ba36e7c0037016270dda1f5c3d0113bb622c8b2fff953b42f5752db289e2d4ac70763 SHA512 6047de99b1c4241832c7cea848e4b0a013054443fe7797bfc55a5a58ddc8082648209add04c725bc84ecacbb4a42c13bb15fdf096b483de5da4d19406f8ea553
-EBUILD emelfm2-0.9.1-r2.ebuild 2002 BLAKE2B 2f39393f1578d781777d843ff0c7dca35c9e0baa3d0ddcb4917bb08feeb0939f1349bfc87d49fc44d279a36cdd8f35b85baeb069bfef269b14a4d7c1635ca5de SHA512 b4302df6e0610e4c71d9faa1593ce7b3542db1d509820065da5a31ed11af72416549823fdb86a15c2fa872490fa656bdcca2ac65794d265fe25fb57b45d27389
+EBUILD emelfm2-0.9.1-r1.ebuild 1988 BLAKE2B ac7a1ad1c066a94c8570461ff7e9c8c4e8e35ea265de56777a64144116ba179d83963b2d89ca9425fc6e3d04343ed78035f1dd7f57e4efc55d9d77fd77fcc4b3 SHA512 9a1375896d3f337eb332c1456d54a259e35f91ee5a8b56cd8e3a6a41fd7c15acfac6c3bc9984dbddc85b01657a9707892b5e5e69a9a1deae63d1dc8e02b9cf83
+EBUILD emelfm2-0.9.1-r2.ebuild 2036 BLAKE2B 938c964ce1522a4a830cf754ed94578d228d8aa65be953f1cb7b1600412ac2f36c9ba102cfdb67e52213637af2d9bd8f51984cd66036d661ad66985a3e938436 SHA512 ce9d208a29415e801167cc97f638e73ad4d0ef3a4a7ab0e56e28873b893e602ccda5125a042179a4a837d898d14e235b3a3ce3341656a42ca384c4b5a97e2f97
+EBUILD emelfm2-0.9.1-r3.ebuild 2348 BLAKE2B e6d7c6d3ebd55131e4b8052552b417f249aace60d08158ad7357881594a56eb003d12f97d18d666a20901f3375b1eedb161e7ab801e02bace351f059dbb5d4bf SHA512 f2c1cae27cedfe51165644eb017fe3b4516914c8869c66672395bc97aa2e40aefaa8e5d8638bf3454dcc36d2f67af3f54b0ccff6f620e09e3fa34d4e5dacaab8
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
index fdc2b9bb3424..bfc29fa412af 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,9 @@ DEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
 RESTRICT="test"
 
 src_prepare() {
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
index b4d937e4bc69..1679c68b7eb3 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,9 @@ DEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
 RESTRICT="test"
 
 src_prepare() {
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..280416063e84
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic multilib toolchain-funcs xdg
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="https://github.com/tom2tom/emelfm2"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl ansi gimp +gtk3 kernel_linux nls policykit spell udisks"
+
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
+	acl? ( sys-apps/acl )
+	gimp? ( media-gfx/gimp )
+	gtk3? ( x11-libs/gtk+:3 )
+	policykit? ( sys-auth/polkit )
+	spell? ( >=app-text/gtkspell-2.0.14:2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="
+	spell? ( !gtk3 )
+"
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
+		-e 's:@$(CC):$(CC):g' \
+		-e 's:dbus-glib-1::' \
+		Makefile || die
+
+	local lingua
+	for lingua in ${EMELFM2_LINGUAS[@]}; do
+		has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
+	done
+}
+
+src_configure() {
+	append-cflags -fcommon
+
+	myemelconf=(
+		$(usex acl WITH_ACL=1 WITH_ACL=0)
+		$(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
+		$(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
+		$(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
+		$(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
+		$(usex nls I18N=1 I18N=0)
+		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
+		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
+		$(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
+		DOC_DIR="${EROOT}/usr/share/doc/${PF}"
+		DOCS_VERSION=1
+		STRIP=0
+		WITH_TRANSPARENCY=1
+	)
+}
+
+src_compile() {
+	tc-export CC
+
+	emake \
+		${myemelconf[@]} \
+		LIB_DIR="/usr/$(get_libdir)" \
+		PREFIX="/usr"
+}
+
+src_install() {
+	mkdir -p "${ED}/${DOC_DIR}" || die
+
+	emake \
+		${myemelconf[@]} \
+		LIB_DIR="${D}/usr/$(get_libdir)" \
+		PREFIX="${D}/usr" \
+		XDG_DESKTOP_DIR="${D}/usr/share/applications" \
+		DOC_DIR="${D}/usr/share/doc/${PF}" \
+		install $(usex nls install_i18n '')
+
+	newicon icons/${PN}_48.png ${PN}.png
+
+	rm "${ED}"/usr/share/doc/${PF}/LGPL || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}