gentoo resync : 02.08.2019

6 files changed, 2 insertions, 96 deletions

diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 18bf36cb4146..11ecd6942f6b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,8 +1,3 @@
-AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d37ae1aedaf62b0aed499303f60585ed1e3bebf9ca93abe64c8556cff9a96b4591537da02626eef81590968bc4fd35bb9 SHA512 53680a5ffe7ec0892d3e39414ebdffe466c3a98494b164efa5b21939e9e981abea16929da249c6c3a72315ebc3ad297352cc74877d0610d2dd5537f324f0827b
-AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
-AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
-DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
-EBUILD libX11-1.6.7.ebuild 1287 BLAKE2B 82da20e7f5c237b6b98dbac3075ed9aaa57ff094adfe0fc35ab6f8dafad0a97885869525c45884958d1cd0891b4afaad3aa3c921374533a1bca3319cf0caeac5 SHA512 6f8f758a1f1b01d7b1858a19c17647805f9c67c453def0c1e3d1a108a9b070c3397a442a9616447701a5933685d9efcbb4a04e4d78faa86708f30089c40c8396
-EBUILD libX11-1.6.8.ebuild 662 BLAKE2B 77d6e70327ec63320be890670c68d3430c6054efa3d333822df82a5382ed79cbe6ac218c4124743263544e84dd6834b78980bddb145b24700d81fb392d36aa27 SHA512 b08048aa0b31e67127b83b84f4cf9ec4ded5a9f7d96ba93a64aa132fe080b1eb596ce73547024fa3511c4439c202fa35e015bbffb53b8d98bfc5b01b92684e78
+EBUILD libX11-1.6.8.ebuild 660 BLAKE2B c7aeec4439b9e54ee7ac99849c2337cabf7b2ce8b83738f6925b22c3f98e3d7b33af0ea883c337302743204a8d3198837530a72e6858d2482356f33627c36a9a SHA512 078bf5aa6955f5e10be5ef7bd86ba87dd0c6cc23c02358e9ff8705f2f56e05571dc79ba154f350b13a614793c7a4dcde4ae4754d7226de5b840d5a4a2126d4ab
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
deleted file mode 100644
index c854e0b4080d..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-07-21 15:48:33 +0200
-+++ configure.ac	2008-07-21 15:49:23 +0200
-@@ -198,6 +198,8 @@
-         XTHREADLIB="-pthread" ;;
-     solaris*)
- 	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-+    aix*)
-+	XTHREAD_CFLAGS="-pthread" ;;
-     esac
- fi
- AC_SUBST(XTHREADLIB)
diff --git a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
deleted file mode 100644
index a7926a53d78b..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-wchar_t is defined in /usr/include/stddef.h on Solaris
-
---- include/X11/Xlib.h
-+++ include/X11/Xlib.h
-@@ -71,7 +71,7 @@
- #endif
- #endif
- 
--#ifndef X_WCHAR
-+#if !defined(X_WCHAR) || defined(__sun__)
- #include <stddef.h>
- #else
- #ifdef __UNIXOS2__
diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
deleted file mode 100644
index 4539f111faf1..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h
---- libX11-1.1.5/src/xlibi18n/Ximint.h	2009-01-16 10:14:37 +0100
-+++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h	2009-01-16 09:39:48 +0100
-@@ -37,6 +37,9 @@
- 
- #include <stdio.h>
- #include <X11/Xutil.h>
-+#ifdef WIN32
-+# include <X11/Xwindows.h>
-+#endif
- 
- #define Public /**/
- #define Private static
diff --git a/x11-libs/libX11/libX11-1.6.7.ebuild b/x11-libs/libX11/libX11-1.6.7.ebuild
deleted file mode 100644
index 583aef14eef0..000000000000
--- a/x11-libs/libX11/libX11-1.6.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
-	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
-	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
-	xorg-2_src_configure
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		# Make sure the build-time tool "makekeys" uses build settings.
-		tc-export_build_env BUILD_CC
-		emake -C src/util \
-			CC="${BUILD_CC}" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			clean all
-	fi
-
-	default
-}
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
index 2826e685814a..378e2f72aa92 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"