gentoo resync : 28.09.2019

8 files changed, 244 insertions, 6 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a7a70ea039e5..3991ff471792 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 5a6fb40bdb1b..e140a8aa7768 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -2,6 +2,8 @@ AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f2713db26eef36ac204f666dded8a07e91edd260192d413b88e82609c700a71a3459defe8dcae6b778601473c32565799c15c8 SHA512 e49ed9d1d1725cbfd488eb654c3fbe60700382e26136d568b23452cff0112c49953633fd7ac9df7b64f910d37679681b2b9b417d710f46608e97c4060362c7d8
+DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
 EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
 EBUILD enlightenment-0.23.0.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
+EBUILD enlightenment-0.23.1.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
new file mode 100644
index 000000000000..f919e54034ab
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND="
+	>=dev-libs/efl-1.22.3[eet,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	geolocation? ( app-misc/geoclue:2.0 )
+	packagekit? ( app-admin/packagekit-base )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		>=dev-libs/efl-1.22.0[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xorg-server[wayland]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-enlightenment-menu=true
+
+		-D bluez4=false
+		-D install-sysactions=false
+		-D mount-eeze=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use packagekit)
+		$(meson_use pam)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	einfo "Additional programs to complete full EFL suite: "
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index e2076ef794e2..42493734eaaf 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,6 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
 DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
+DIST icewm-1.6.2.tar.lz 1673647 BLAKE2B 006424aa005483b85ca36bd4447ce814ca81cd7243fc8045242a02355c2b35e9cbf6de0f1225d9b5e7685aca2961a731f060f7442250ef4f1527594233e8eac8 SHA512 0da78b9caf5cbbd8f944b4c89a15cb8b0e998de2075b09f65338d23027cbf024bbb9cfe9fffbe5d9606f11832090cb6552be2693cca5a62c011024f36ec1a0f9
 EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
 EBUILD icewm-1.6.1.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
+EBUILD icewm-1.6.2.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
 MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/icewm-1.6.2.ebuild b/x11-wm/icewm/icewm-1.6.2.ebuild
new file mode 100644
index 000000000000..869277de7f94
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.6.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools unpacker
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+REQUIRED_USE="|| ( alsa ao )"
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsndfile[alsa]
+	)
+	ao? (
+		media-libs/libao
+		media-libs/libsndfile
+	)
+	bidi? ( dev-libs/fribidi )
+	truetype? ( x11-libs/libXext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+	gnome-base/librsvg
+	x11-base/xorg-proto
+	truetype? ( >=media-libs/freetype-2.0.9 )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
+src_prepare() {
+	# Fix bug #486710 - TODO: Still needed?
+	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local icesound
+	if use alsa && use ao ; then
+		icesound="alsa,ao"
+	elif use alsa ; then
+		icesound="alsa"
+	elif use ao ; then
+		icesound="ao"
+	fi
+
+	local myconf=(
+		--enable-gdk-pixbuf
+		--enable-logevents
+		--enable-xrandr
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		--with-icesound="${icesound}"
+		--with-libdir=/usr/share/icewm
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-shape
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+		)
+	fi
+
+	econf "${myconf[@]}"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
+
+	default
+
+	docinto html
+	dodoc doc/icewm.html
+	dodoc man/*.html
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index a6420d52cd40..556ec7833bf7 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,4 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
-EBUILD subtle-0.11.3244.ebuild 2041 BLAKE2B 8aa83cd08a267f087a445cb819f0fed42212b40268eae32c5503756e54ee587cd987d175830c57d0ca09f8a9459bb9a0701541401f1f74152640428417f3d5e1 SHA512 94e34ae59d9fcce5d816d72dbc763a354ca0121738b0f8111f519aa4d492b18c905d2713c7a40a3115392bbd3c1294b34ccc4995e1f064754750f8b36aa96338
-EBUILD subtle-9999.ebuild 2041 BLAKE2B 8aa83cd08a267f087a445cb819f0fed42212b40268eae32c5503756e54ee587cd987d175830c57d0ca09f8a9459bb9a0701541401f1f74152640428417f3d5e1 SHA512 94e34ae59d9fcce5d816d72dbc763a354ca0121738b0f8111f519aa4d492b18c905d2713c7a40a3115392bbd3c1294b34ccc4995e1f064754750f8b36aa96338
+EBUILD subtle-0.11.3244.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
+EBUILD subtle-9999.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
 MISC metadata.xml 1150 BLAKE2B ddf49036e8ab76460cada5ea521f81cb16be0eb12af31f868493274b82a9513a9650ff61d22c3ff38279f0a3dfd641a476212e63e84d2d1b25e4e641b5fa2c64 SHA512 842ba7afc25372e9bb6a5bef00c0ddc99acda3d8ac0d40b15a2b40f1bb9a32eaf77f2515a32090ed7468e8830ae67e34649e8f30b024278d29d4ac1446678637
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
index e0a5b55666b7..ef71c3fce45f 100644
--- a/x11-wm/subtle/subtle-0.11.3244.ebuild
+++ b/x11-wm/subtle/subtle-0.11.3244.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26"
 inherit ruby-ng toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_REPO_URI="https://hg.subforge.org/subtle"
 	EHG_CHECKOUT_DIR=${S}/all
 	inherit mercurial
 else
@@ -16,11 +16,12 @@ else
 fi
 
 DESCRIPTION="A manual tiling window manager"
-HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+HOMEPAGE="https://subforge.org/projects/subtle/wiki"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+RESTRICT="!test? ( test )"
 
 RDEPEND="x11-libs/libX11
 	xft? ( x11-libs/libXft )
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-9999.ebuild
index e0a5b55666b7..ef71c3fce45f 100644
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ b/x11-wm/subtle/subtle-9999.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26"
 inherit ruby-ng toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="http://hg.subforge.org/subtle"
+	EHG_REPO_URI="https://hg.subforge.org/subtle"
 	EHG_CHECKOUT_DIR=${S}/all
 	inherit mercurial
 else
@@ -16,11 +16,12 @@ else
 fi
 
 DESCRIPTION="A manual tiling window manager"
-HOMEPAGE="http://subforge.org/projects/subtle/wiki"
+HOMEPAGE="https://subforge.org/projects/subtle/wiki"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
+RESTRICT="!test? ( test )"
 
 RDEPEND="x11-libs/libX11
 	xft? ( x11-libs/libXft )