gentoo resync : 06.08.2019

6 files changed, 9 insertions, 212 deletions

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index dd8f813de976..e2076ef794e2 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
-AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
-DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-DIST icewm-1.5.4.tar.xz 1689668 BLAKE2B 19779e0b80da89ca5cdce3525a0f612b126e0e3d4c7569fe249ca78af7cc8ad16162361699d0a068f3394a2105f2afc1f7f644a02c7ad883469a9fa8c1fbf416 SHA512 7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
-EBUILD icewm-1.5.4.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
-EBUILD icewm-1.5.5.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
+DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
+EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
+EBUILD icewm-1.6.1.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
 MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
deleted file mode 100644
index 721a15d25ee3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.10-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- icewm-1.3.10/lib/menu.in
-+++ icewm-1.3.10/lib/menu.in
-@@ -4,14 +4,9 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog xterm xterm xterm
--prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
--prog fte fte fte
--prog NEdit nedit nedit
--prog Mozilla mozilla mozilla
--prog XChat xchat xchat
--prog Gimp gimp gimp
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
- separator
--menuprog "Desktop Apps" folder icewm-menu-fdo
--menufile Programs folder programs
--menufile Tool_bar folder toolbar
-+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
-+separator
-+menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
deleted file mode 100644
index e790842faed8..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
---- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
-+++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
-@@ -113,6 +113,7 @@
- AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
- AC_CHECK_HEADERS(machine/apmvar.h)
- AC_CHECK_HEADERS(machine/apm_bios.h)
-+AC_CHECK_HEADERS(execinfo.h)
- 
- AC_CHECK_HEADERS(kstat.h,
-   [ CORE_LIBS="${CORE_LIBS} -lkstat"
-diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
---- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
- 
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
---- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
- 
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
- 
-@@ -503,7 +503,7 @@
- }
- 
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
-     const char head[] = "\nbacktrace:\n";
-     const char tail[] = "end\n";
-     void *array[20];
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
deleted file mode 100644
index e3ae5642b7ff..000000000000
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#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/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" 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 BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.5.5.ebuild b/x11-wm/icewm/icewm-1.5.5.ebuild
index 1fb78abeecfd..d38893669b3f 100644
--- a/x11-wm/icewm/icewm-1.5.5.ebuild
+++ b/x11-wm/icewm/icewm-1.5.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.5.4.ebuild b/x11-wm/icewm/icewm-1.6.1.ebuild
index 1fb78abeecfd..869277de7f94 100644
--- a/x11-wm/icewm/icewm-1.5.4.ebuild
+++ b/x11-wm/icewm/icewm-1.6.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit autotools
+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.xz"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	$(unpacker_src_uri_depends)
 	gnome-base/librsvg
 	x11-base/xorg-proto
 	truetype? ( >=media-libs/freetype-2.0.9 )
@@ -52,6 +53,7 @@ DEPEND="
 
 BDEPEND="
 	app-text/asciidoc
+	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.19.6 )
 "
 
@@ -77,7 +79,6 @@ src_configure() {
 		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
-		--enable-xrender
 		--with-cfgdir=/etc/icewm
 		--with-docdir=/usr/share/doc/${PF}/html
 		--with-icesound="${icesound}"
@@ -99,7 +100,7 @@ src_configure() {
 		)
 	fi
 
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
+	econf "${myconf[@]}"
 
 	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
 	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"