gentoo resync : 25.11.2020

6 files changed, 33 insertions, 203 deletions

diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 2d7784ec9ca7..433ee97cc3c0 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,8 +1,4 @@
+AUX lxpanel-remove-gdk-pixbuf-xlib.patch 845 BLAKE2B 8dc597f7538134a5e7b04f61d415f90808dd7f9d19cc6cd2cef998d452a828158032e05041eb038643650de07fd3c89ea680e0f9f6d3e9bb427d9ad2717264d9 SHA512 73316023668d65286433297e7ebf82a21973af398177a4abcb755d09c8aa201c2c70932fe24b642092d3157a3fdf97a1c9746a47d719aeb0f2324751c4fd5220
 DIST lxpanel-0.10.0.tar.xz 1544700 BLAKE2B ea210feee23b2da1c9f6199bfc274c46e1142d6397ca0d1d8359329068ed6e46eaebff90fb220ce14121ed19cb5c60014230c7a7e42867318317845751418a7b SHA512 3e664eef3cf0f37cf4609f53f1f40f5d50e94ae088c497be0439851ea8f1426ef6ec1373d146e2e0ef1b9f51f557ae19eb5fb1059b0e5fcd5b1c49fd76207a59
-DIST lxpanel-0.9.2.tar.xz 1514748 BLAKE2B 31b0f949b7023364df3eb00b2386c505e14146c2b818407326347baf1dfa09b3e2e0c30c38416430c7dccad04f1fd5731a6ff80b21ea87a930492399027a056f SHA512 d7b5733345233a44466b6786133b8c3f3c9217a5195654b8dde3447a0dfc198082d991b2bc0cc60ddf200ebb95d636885b36d5642c11f4cd913f66228c12bd3a
-DIST lxpanel-0.9.3.tar.xz 1515144 BLAKE2B f069a519d0e4bd611d57a956ba585b8dde953174198d01dc264e2b111df17e2925c79bd85dc8549d7b2098147122c04ace6ed775d0a3ea7594b0b39c1f9045c0 SHA512 c6aea97f66ee1d576822fda0bf1aed3849b3c74bab856816b7d23331e48b26005f1ba12eddcc0abbf5a6f08add3cb4a0674ccd13f118cec0b6294edd6f1b2343
-EBUILD lxpanel-0.10.0.ebuild 1872 BLAKE2B 34097a734c7b0c47f90cce41011d1d2a6c8e0f4f0c1d1aa1c7a644d7659fc9f26abed24ed41bc6005d5721b686696149584f3f9c397ab1079ab2c654a9be3ee8 SHA512 78d6811d5661bdb861132188ab49e8b41de84b84b620d19e3c7d1daa5165c9eafdfc44238cc62ccc08c9d28ff591a3818d65fe32d281e6c4f171d80418748af4
-EBUILD lxpanel-0.9.2.ebuild 1499 BLAKE2B f4597c338ea787d307b14de81c949c4f4b1716c583a95187e24066657d46b0b01766e559e6e783e7c94954636d7a48cc23d906007fdec87f970fdfc4d6b7bbdd SHA512 3aa654c62e3fb83c1062135dad18c68047effca016c01fcd85886e664daef03477295901c79ed251b74488431e6e63fd745f8f691c2e733f517e1fa235e4112b
-EBUILD lxpanel-0.9.3-r1.ebuild 1872 BLAKE2B 34097a734c7b0c47f90cce41011d1d2a6c8e0f4f0c1d1aa1c7a644d7659fc9f26abed24ed41bc6005d5721b686696149584f3f9c397ab1079ab2c654a9be3ee8 SHA512 78d6811d5661bdb861132188ab49e8b41de84b84b620d19e3c7d1daa5165c9eafdfc44238cc62ccc08c9d28ff591a3818d65fe32d281e6c4f171d80418748af4
-EBUILD lxpanel-0.9.3.ebuild 1495 BLAKE2B 68b99a73898314fcf7b9e9c652ce84ff7b94e9a34427e3ccd9491fe5f525ae110935afbad3926f05bd90caa8ae85449d85b163719372dcad6f1988bc5fdf520b SHA512 c0a88c33b17584712771b36b796fc301506478ae17d30b68a639871c554e016ebce9035e12a899633c3724da63e45efb5f38dae2d2ed654851a7d0782baa68d0
+EBUILD lxpanel-0.10.0-r1.ebuild 1932 BLAKE2B 0a8962de51e42684627cbe3c43cb0b90f568cdbaa3fb4f6d9b4ee7ac42186f43f7ae1272c24af93b9639e8517507f01f40304225a5bbd8d60e557848908efbdf SHA512 6a434b038998c7c6103347d57d3f5ca1e2841cc7864949c7eb44d89ef0bdf76e6774541fa4b76ac3567be48944cb6dfc1a70435c4d42667a690ce555a91bee22
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch b/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
new file mode 100644
index 000000000000..7f52fb022e14
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/753923
+
+--- a/plugins/launchtaskbar.c	2019-01-13 16:35:07.000000000 -0500
++++ b/plugins/launchtaskbar.c	2020-11-10 14:25:51.550180345 -0500
+@@ -69,5 +69,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ #include <glib/gi18n.h>
+--- a/plugins/task-button.c	2019-02-26 16:45:49.000000000 -0500
++++ b/plugins/task-button.c	2020-11-10 14:25:44.858209009 -0500
+@@ -44,5 +44,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ #include <glib/gi18n.h>
+--- a/src/plugin.c	2019-01-13 16:35:07.000000000 -0500
++++ b/src/plugin.c	2020-11-10 14:25:38.820234868 -0500
+@@ -30,5 +30,4 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
diff --git a/lxde-base/lxpanel/lxpanel-0.10.0.ebuild b/lxde-base/lxpanel/lxpanel-0.10.0-r1.ebuild
index 83229b7c08a9..c9871a21da53 100644
--- a/lxde-base/lxpanel/lxpanel-0.10.0.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.10.0-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="dev-libs/keybinder:0=
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf[X]
+	x11-libs/gdk-pixbuf
 	x11-libs/libX11
 	lxde-base/lxmenu-data
 	lxde-base/menu-cache
@@ -41,6 +41,10 @@ DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
 you will have to configure panel settings via its menu.
 This will not be an issue with first time installations."
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-remove-gdk-pixbuf-xlib.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/lxde-base/lxpanel/lxpanel-0.9.2.ebuild b/lxde-base/lxpanel/lxpanel-0.9.2.ebuild
deleted file mode 100644
index f7041b905496..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa wifi"
-
-RDEPEND="dev-libs/keybinder:0=
-	x11-libs/gtk+:2
-	>=x11-libs/libfm-1.2.0[gtk]
-	x11-libs/libwnck:1
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-src_configure() {
-	local plugins="netstatus,volume,cpu,deskno,batt, \
-		kbled,xkb,thermal,cpufreq,monitors"
-
-	use wifi && plugins+=",netstat"
-	use alsa && plugins+=",volumealsa"
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install() {
-	default
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild
deleted file mode 100644
index 83229b7c08a9..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr frp
-gl he hr hu id is it ja kk km ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt ro
-ru sk sl sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_HK zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n readme.gentoo-r1
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa wifi"
-
-RDEPEND="dev-libs/keybinder:0=
-	x11-libs/gtk+:2
-	>=x11-libs/libfm-1.2.0[gtk]
-	x11-libs/libwnck:1
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf[X]
-	x11-libs/libX11
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	local plugins="netstatus,volume,cpu,deskno,batt, \
-		kbled,xkb,thermal,cpufreq,monitors"
-
-	use wifi && plugins+=",netstat"
-	use alsa && plugins+=",volumealsa"
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install() {
-	default
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild b/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
deleted file mode 100644
index 5ea3cc8359e6..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa wifi"
-
-RDEPEND="dev-libs/keybinder:0=
-	x11-libs/gtk+:2
-	>=x11-libs/libfm-1.2.0[gtk]
-	x11-libs/libwnck:1
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-src_configure() {
-	local plugins="netstatus,volume,cpu,deskno,batt, \
-		kbled,xkb,thermal,cpufreq,monitors"
-
-	use wifi && plugins+=",netstat"
-	use alsa && plugins+=",volumealsa"
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install() {
-	default
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}