#copyright 2019 Jack Brown
#libfm-1.31.ebuild.patch
diff --git a/libfm-1.3.1.ebuild b/libfm-1.3.1.ebuild
index 74caf03..977e81d 100644
--- a/libfm-1.3.1.ebuild
+++ b/libfm-1.3.1.ebuild
@@ -14,13 +14,20 @@ SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~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"
+IUSE="+automount debug doc examples exif gtk gtk3 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 )"
+	udisks? ( dev-libs/dbus-glib )
+
+	gtk? (
+		gtk3? ( >=x11-libs/gtk+-3.24.1 )
+
+		!gtk3? ( >=x11-libs/gtk+-2.16:2 )
+	)
+"
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxshortcut
 	x11-misc/shared-mime-info
@@ -42,7 +49,7 @@ DEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk ) gtk3? ( gtk )"
 
 src_prepare() {
 	if ! use doc; then
@@ -80,6 +87,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if use gtk3;
+	then
+		local CFG_STR="--with-gtk=3"
+	fi
+
 	econf \
 		--sysconfdir="${EPREFIX}/etc" \
 		--disable-dependency-tracking \
@@ -91,7 +103,8 @@ src_configure() {
 		$(use_enable vala old-actions) \
 		$(use_with gtk) \
 		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
+		--with-html-dir=/usr/share/doc/${PF}/html \
+		$CFG_STR
 }
 
 src_install() {

##################################################################
# Copyright 2019 Jack Brown
# pcmanfm-1.3.1.ebuid.patch

diff --git a/pcmanfm-1.3.1.ebuild b/pcmanfm-1.3.1.ebuild
index dfb4fe9..2937d91 100644
--- a/pcmanfm-1.3.1.ebuild
+++ b/pcmanfm-1.3.1.ebuild
@@ -20,15 +20,32 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-IUSE="debug"
+IUSE="debug gtk3 wayland"
 
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
+REQUIRED_USE="
+	wayland? ( gtk3 )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.18:2
+	virtual/eject
+	virtual/freedesktop-icon-theme
 	>=lxde-base/menu-cache-0.3.2
 	x11-misc/shared-mime-info
-	>=x11-libs/libfm-${PV}:=[gtk(+)]
-	virtual/eject
-	virtual/freedesktop-icon-theme"
+
+	gtk3? (
+		>=x11-libs/gtk+-3.24.1
+		>=x11-libs/libfm-${PV}:=[gtk3(+)]
+	)
+
+	!gtk3? (
+		>=x11-libs/libfm-${PV}:=[gtk(+)]
+		>=x11-libs/gtk+-2.16:2
+	)
+"
+
+
+
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	>=dev-util/intltool-0.40
@@ -45,9 +62,16 @@ src_prepare() {
 }
 
 src_configure() {
+	if use gtk3;
+	then
+		local CFG_STR="--with-gtk=3"
+	fi
+
 	econf \
 		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug)
+		$(use_enable debug) \
+		$CFG_STR
+
 }
 
 src_install() {


###################################3
# emerge --info


Portage 2.3.69 (python 3.6.5-final-0, !../../var/db/repos/gentoo/profiles/default/linux/amd64/17.1/no-multilib, gcc-8.3.0, glibc-2.29-r2, 4.19.57-gentoo x86_64)
=================================================================
System uname: Linux-4.19.57-gentoo-x86_64-Intel-R-_Core-TM-_i5-3320M_CPU_@_2.60GHz-with-gentoo-2.6
KiB Mem:    16237904 total,  10572500 free
KiB Swap:    3906556 total,   3906556 free
Timestamp of repository eroen: Wed, 31 Jul 2019 20:26:58 +0000
Timestamp of repository gentoo: Fri, 02 Aug 2019 00:45:01 +0000
Head commit of repository gentoo: b0cda654a71cbe0bfbec54030c5e7f830c7e4ab9
sh dash 0.5.9.1-r3
ld GNU ld (Gentoo 2.32 p2) 2.32.0
distcc 3.3.2 x86_64-pc-linux-gnu [disabled]
ccache version 3.7.1 [enabled]
dev-lang/python:          2.7.15::gentoo, 3.6.5::gentoo
sys-devel/autoconf:       2.13-r1::gentoo, 2.69-r4::gentoo
sys-devel/automake:       1.16.1-r1::gentoo
sys-devel/binutils:       2.32-r1::gentoo
sys-devel/libtool:        2.4.6-r3::gentoo
sys-kernel/linux-headers: 4.19::gentoo (virtual/os-headers)
Repositories:

jack
    location: /var/db/repos/jack
    masters: gentoo
    priority: -1000

eroen
    location: /var/db/repos/eroen
    masters: gentoo

gentoo
    location: /var/db/repos/gentoo
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    sync-rsync-extra-opts: 
    sync-rsync-verify-max-age: 24
    sync-rsync-verify-jobs: 1
    sync-rsync-verify-metamanifest: yes

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE"
CFLAGS="-march=ivybridge -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=ivybridge -O2 -pipe"
DISTDIR="/var/cache/distfiles"
ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
PKGDIR="/var/cache/binpkgs"
PORTAGE_TMPDIR="/var/tmp"
USE="acl acpi alsa amd64 battery berkdb bzip2 cli crypt cxx dri egl ffmpeg flac fortran gbm gdbm gtk3 hwaccel iconv ipv6 jit jpeg libtirpc minimal ncurses nls nptl opengl openmp pam pcre pdf png posix readline seccomp smp sound split-usr ssl syslog tcpd threads truetype unicode vaapi wayland xattr zlib" ABI_X86="64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="avx aes pclmul popcnt mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 f16c" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput keyboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" RUBY_TARGETS="ruby24" USERLAND="GNU" VIDEO_CARDS="intel i965" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  EMERGE_DEFAULT_OPTS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND