gentoo resync : 15.12.2019

4 files changed, 57 insertions, 20 deletions

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 42493734eaaf..ec7a87a1c0c3 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +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
+DIST icewm-1.6.3.tar.lz 1678149 BLAKE2B cfb41b104f0e64172b1aa983b542dc42b6369061ad4365547b14f4f96bccba6610c9b4324ccdc691421354c387c37fa80e525658139ba4213b6ea8d86448e3cf SHA512 18d77695c22131fac98172c09e27c014c10e908f4fc0cbeeb376b9308a659f0a51b466c80fc39875d8e0cf52fd6b385e636faf96c55fcb80b2cb9c1d0eb57e41
 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
+EBUILD icewm-1.6.2-r1.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
+EBUILD icewm-1.6.3.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
+MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.6.1.ebuild b/x11-wm/icewm/icewm-1.6.2-r1.ebuild
index 869277de7f94..4c87bc3f6120 100644
--- a/x11-wm/icewm/icewm-1.6.1.ebuild
+++ b/x11-wm/icewm/icewm-1.6.2-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
@@ -22,15 +22,25 @@ REQUIRED_USE="|| ( alsa ao )"
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
 
-RDEPEND="
+# These are the core dependencies of icewm.
+# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
+CORE_DEPEND="
 	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+"
+
+RDEPEND="
+	${CORE_DEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libX11
 	x11-libs/libXft
+	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXrender
 	alsa? (
 		media-libs/alsa-lib
 		media-libs/libsndfile[alsa]
@@ -40,15 +50,22 @@ RDEPEND="
 		media-libs/libsndfile
 	)
 	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf:2[X]
+	)
+	!gdk-pixbuf? (
+		media-libs/libpng:0=
+		virtual/jpeg
+	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
+	dev-libs/glib:2
 	gnome-base/librsvg
 	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
+	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
 
 BDEPEND="
@@ -76,7 +93,6 @@ src_configure() {
 	fi
 
 	local myconf=(
-		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
 		--with-cfgdir=/etc/icewm
@@ -85,6 +101,7 @@ src_configure() {
 		--with-libdir=/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
diff --git a/x11-wm/icewm/icewm-1.6.2.ebuild b/x11-wm/icewm/icewm-1.6.3.ebuild
index 869277de7f94..4c87bc3f6120 100644
--- a/x11-wm/icewm/icewm-1.6.2.ebuild
+++ b/x11-wm/icewm/icewm-1.6.3.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
@@ -22,15 +22,25 @@ REQUIRED_USE="|| ( alsa ao )"
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
 
-RDEPEND="
+# These are the core dependencies of icewm.
+# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
+CORE_DEPEND="
 	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+"
+
+RDEPEND="
+	${CORE_DEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
-	x11-libs/libX11
 	x11-libs/libXft
+	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXrender
 	alsa? (
 		media-libs/alsa-lib
 		media-libs/libsndfile[alsa]
@@ -40,15 +50,22 @@ RDEPEND="
 		media-libs/libsndfile
 	)
 	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf:2[X]
+	)
+	!gdk-pixbuf? (
+		media-libs/libpng:0=
+		virtual/jpeg
+	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
+	dev-libs/glib:2
 	gnome-base/librsvg
 	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
+	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
 
 BDEPEND="
@@ -76,7 +93,6 @@ src_configure() {
 	fi
 
 	local myconf=(
-		--enable-gdk-pixbuf
 		--enable-logevents
 		--enable-xrandr
 		--with-cfgdir=/etc/icewm
@@ -85,6 +101,7 @@ src_configure() {
 		--with-libdir=/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable gdk-pixbuf)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index 43abc08bd4b1..7b0cfd7e0829 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -5,6 +5,9 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<use>
+		<flag name="gdk-pixbuf">Enable gdk-pixbuf rendering</flag>
+	</use>
 	<longdescription>
 		IceWM is a window manager designed for speed, usability, and consistency.
 		It is able to emulate the looks of Motif, OS/2, and Windows, and allows you