gentoo resync : 05.04.2018

8 files changed, 174 insertions, 2 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c9dfc155bfee..3511153d33c0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index d1ff8d32faf3..265103b087ec 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -5,7 +5,7 @@ DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
 EBUILD libdrm-2.4.88.ebuild 2039 BLAKE2B a7484a4d636199aab21579b20951cd01be4bd9fe16d3299cb6304b3dadff5225e180e167b606c29acc67c8788e556bb47173cd7a5c599d68e0b74ab34c911444 SHA512 0627dc93340ae2f50cb1c89d345364a947203c8d4d200a9bc507ed95829959fe9aa54b2a946f47028b4c8fd1b81aa6ede031ed79afbffaa4baf48432f3e49cc8
-EBUILD libdrm-2.4.89.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+EBUILD libdrm-2.4.89.ebuild 2047 BLAKE2B 9c62d4dcf5fb6199e9d67b995e865de819ba7e11aa68ac6703a6a555894cf4c8f1472b9adbdf0b72c3a10eb6d15f62d246d11d0dd96ee7ee4be0b1525bfc19ba SHA512 fdb4c5690eafc65b77c8a352eabcaff208a3e0258f762b075920c3059d5df863e4de764d6050adadd80d958d8cee15c3586dc50c6a57ce854ad84c4ed44d88e3
 EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.91.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 EBUILD libdrm-9999.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index f9f91008a7ac..04f61bbb0beb 100644
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index efb28230df29..d41f82d41d72 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -1,4 +1,5 @@
 AUX libgksu-2.0.0-fbsd.patch 2847 BLAKE2B fd7d41e5ff64164bb3954e3ddca9af47477e9bb9dff67c8c5e8649b39b1d372ef50a86b79c2c92f616d786b6585fff36b5ef467ed2cd128ea43981bcc45ae687 SHA512 8c99781e617b7fa96d9ff019a42b362c18f107bf335fbd591c23ac49d9f8ab4ee15a633968a60ba3ae92fe2004f4cdbd4d69b7f7c60c8d5abbd3db90c632c9be
+AUX libgksu-2.0.12-automake-1.11.2-v2.patch 2074 BLAKE2B 15cf831d6646de360579efb651238a628c9cede514532c6fe662d050e41e36cfae98179e9b544f7e6a4fa424793626852e18224db0ef1f9521e968a5911630bb SHA512 b7b09e23e2f947b37cdf5f8a299e7f2f7e6f64b387b1b388c36d29d8e44872dc0d44e0457485597e1cb4da6713d45495cf8a4da5b0942b768dc5434cf462ccf4
 AUX libgksu-2.0.12-automake-1.11.2.patch 836 BLAKE2B 39737f6783e1b2b08952796cbc7658c44db5e5260d7cb66e0a32be43b564718e93107afdc0f4762ee5463af95af810884849c6df05b38e8dc706493fea5bd1ea SHA512 f4509984cfcd2de42a786cd111c980a985fac21956042a4d68431503f5d2f7fb28850052d876545be538a8bdeaf7a0cd9f7df823ee3011149c6f819e612fec8e
 AUX libgksu-2.0.12-correct_colormap_get.patch 507 BLAKE2B 11b70cadf9835b7f995e7babaa192dbf53833d592661dc676ec93f41022b94a4194dbb03dd35707087305d59b09f07a65fbc6312e045638bf04d0bc16c2a9d4f SHA512 14da334403bcd48bf0e697eba115e2533cb0dd188ea69535d24401a71e40004c474f0c889d3b1096e2d47880fab9b12bd6c814abbb0bfed80275825f05912bbf
 AUX libgksu-2.0.12-desktop-validation.patch 507 BLAKE2B 885bae4c59ec44900707be8e4a0e1de2e79133c8617ac815e22019238ab62da17c99578308b49d268ab42da4829775468b7ab802dc71dc6dfbb474b5e603b4ef SHA512 768a6ce966eec9f55f70e87122d557fe861545b120c990835386e17e24b2f3ebab744d5bb945fadb92513f70920cfbb4de6060f76f1a0cdf2e08fbe52cb327a7
@@ -13,4 +14,5 @@ AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f
 AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103
 DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
 EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089
+EBUILD libgksu-2.0.12-r4.ebuild 2081 BLAKE2B 601ad593462289fab04e47259b22a1524896d8d2d25559694d3f29306ed5e852403879a7fcae47446960840cfcedad1236a9dadb0bdffb407afabf3eab5246a4 SHA512 0559ac5132c72bb84427548f922bc70ef2bad19a440b67d4087f031936c0b540161e91d50c0af1d5517e537904d7c5fe0783ca5d99dd06b4392b5f994f793d69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
new file mode 100644
index 000000000000..cd24235a05e7
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
@@ -0,0 +1,61 @@
+From 8137cbfa13954b10cf349eb392166c677cb78ff6 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 2 Apr 2018 18:27:33 +0200
+Subject: [PATCH] Fix build with automake 1.11+
+
+Initial patch from AlphatPC at gmail dot com.
+
+Due to a change in automake [1], pkglib_PROGRAMS is invalid and we must now
+use pkglibexec_PROGRAMS. Fix hardcoded location to gksu-run-helper to reflect
+this.
+
+[1] http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+Gentoo-Bug-URL: https://bugs.gentoo.org/397411
+Gentoo-Bug-URL: https://bugs.gentoo.org/640772
+Project-Bug-URL: https://savannah.nongnu.org/bugs/index.php?35241
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+
+---
+ libgksu/Makefile.am | 5 ++---
+ libgksu/libgksu.c   | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
+index 4a37305..3ddde5b 100644
+--- a/libgksu/Makefile.am
++++ b/libgksu/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${LIBGKSU_CFLAGS}
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
++AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
+ 
+ lib_LTLIBRARIES = libgksu2.la
+ libgksu2_la_SOURCES = libgksu.c libgksu.h
+@@ -22,8 +22,7 @@ includedir = ${prefix}/include/${PACKAGE}
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = libgksu2.pc
+ 
+-pkglibdir = ${libdir}/${PACKAGE}
+-pkglib_PROGRAMS = gksu-run-helper
++pkglibexec_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDADD = ${GLIB_LIBS} 
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+diff --git a/libgksu/libgksu.c b/libgksu/libgksu.c
+index 7203549..612e712 100644
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -1937,7 +1937,7 @@ gksu_su_fuller (GksuContext *context,
+   GQuark gksu_quark;
+   int i = 0;
+ 
+-  gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
++  gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
+ 
+   int fdpty;
+   pid_t pid;
+-- 
+2.16.2
+
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
new file mode 100644
index 000000000000..d143ddc533c2
--- /dev/null
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library for integration of su into applications"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static-libs"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/libX11
+	>=gnome-base/gconf-2
+	gnome-base/libgnome-keyring
+	x11-libs/startup-notification
+	>=gnome-base/libgtop-2:2=
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+"
+
+PATCHES=(
+	# Fix compilation on bsd
+	"${FILESDIR}"/${PN}-2.0.0-fbsd.patch
+
+	# Fix wrong usage of LDFLAGS, bug #226837
+	"${FILESDIR}"/${PN}-2.0.7-libs.patch
+
+	# Use po/LINGUAS
+	"${FILESDIR}"/${PN}-2.0.7-polinguas.patch
+
+	# Don't forkpty; bug #298289
+	"${FILESDIR}"/${P}-revert-forkpty.patch
+
+	# Make this gmake-3.82 compliant, bug #333961
+	"${FILESDIR}"/${P}-fix-make-3.82.patch
+
+	# Do not build test programs that are never executed; also fixes bug
+	# #367397 (underlinking issues).
+	"${FILESDIR}"/${P}-notests.patch
+
+	# Fix automake-1.11.2 compatibility, bug #397411
+	# Fix gksu-run-helper path, bug #640772
+	"${FILESDIR}"/${P}-automake-1.11.2-v2.patch
+	"${FILESDIR}"/${P}-missing-libs.patch
+
+	# Fix build with format-security, bug #517614
+	"${FILESDIR}"/${P}-format_security.patch
+
+	# Fix .desktop file validation, bug #512364
+	"${FILESDIR}"/${P}-desktop-validation.patch
+
+	# Collection of patches from Debian
+	"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
+	"${FILESDIR}"/${P}-sudo_keep_env.patch
+	"${FILESDIR}"/${P}-correct_colormap_get.patch
+)
+
+src_prepare() {
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index 528b05fbfea2..3bcf4643ec4d 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,5 +1,7 @@
 DIST xcb-util-xrm-1.0.tar.bz2 327196 BLAKE2B 6bba57de372371ca7829a477ddc57f86e1faa86829c7f32e46eb5667505c6b3fd0b5acd2dd74f4f1223bbbba678234948bf5d499019b089e3abe23ffb5631843 SHA512 b49d97b018a231b5642bb05a287eb7720d9e1ffe15024d46a4c7ebf2f9cc37a0a4a3262d9aa963fe9554ca801ba013ad6cb5d3f87b67daf4d69efd180d7ba8fd
 DIST xcb-util-xrm-1.2.tar.bz2 324708 BLAKE2B ca5176fb848735b856541930f37e46ec093df6d86a981c87c910bfd64e1a8d5a7e2e20405994dd2a8b9c1200dae48bec0df3a6546be984e3ff316a271b0d84eb SHA512 c6031844d3a197b234cb1b22166c02fe8d03f8a8def836b8c974324a0b6b453889680011406c7940bd04fde1389c5a2ff508f84b080f811ca69cbdb0334994e8
+DIST xcb-util-xrm-1.3.tar.bz2 327586 BLAKE2B 06ba03ba22c9a51cad5045024b63d48f32e5ad38d2cf03035bd1132a04ef4906a71d89030141b407329bd8ec04cb131846be2cb3a95e755a57c2841a45b58fa4 SHA512 ebca5d92c9e2363f58485970a0c3a948b13652ce7acdd51dff918fc2e8bc7fcb69892eb3fc8b5f7eaf721ccd8dc2db42727d206bc5155481ec5e7e41d0c7f304
 EBUILD xcb-util-xrm-1.0.ebuild 616 BLAKE2B 2d4b35ef4ddd4a6b7133a5fc69758b9053d5399868d2ae3cc20cee62204d924487d63ab108c93635126ed03dc9d976ea301f70731443a2489c4bc9c5379d271a SHA512 e9f2431c09ffc6eaf1c581730be68497503e192240714c2ea7b21aa38a34ba26f27a8eadc441a6fcd5954684f01d5f641076297c5225080d1e317dab6408642c
 EBUILD xcb-util-xrm-1.2.ebuild 635 BLAKE2B bd63f4b129d9ce086512ca654ad90e59891398436027f6ff0dbd4776c037363c1ecda07ccdb4f2b4753ba914e57524c24e787e58dcde62512bf739d027faadd4 SHA512 07f558e9d8f186da44e75d434e4cd803ae5322a1312df263b6be14db3b3f17a765b07ead11913fa7528a90e1aa1309284242ae550bd89b427d9f410ea3e0a487
+EBUILD xcb-util-xrm-1.3.ebuild 674 BLAKE2B fd590844c96b52ce613bfa2a1b2be0a9c14ae5f91348ce2f7b9ccce921b30c6ec89121ed178bbb697ca08ffa7a857578dfef3c516b792c5f8ca019dac428dfa4 SHA512 46843646ce8e06ff9685c64cbe61cebf41da435af455a443606d003a08a9e0bceca7046f1cd47db0b714eabce1991b288d765b8a2b722040e1e5274cf949a768
 MISC metadata.xml 784 BLAKE2B 802cbe25eb9804eb0fcf6332867c9028695327fc96577ecd6bb608a125fa2f47d90a0afe9f634878e7deae7362e83fb95c753138c28ab733e1b8b743ccd77bc3 SHA512 c9c5f617e17bd3d25005a5ebf3c394939055f0376ef0e4e68be19fdffa9716fe2bd57a4d5b912cbc4d908b0498e189d484266872dd7afa41e5dfa54570b75509
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
new file mode 100644
index 000000000000..1390d9435c5f
--- /dev/null
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_BASE_INDIVIDUAL_URI=""
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/"
+SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it
+
+src_configure() {
+	xorg-2_src_configure
+}