[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2022-07-18 Thread Anthony G. Basile 
commit: 21ad5b670f0f76feb708ca105e5e576e875e1bae
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Jul 19 01:02:53 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Jul 19 01:02:53 2022 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=21ad5b67

x11-base/xorg-server: in tree version 21.1.3-r3 works

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 x11-base/xorg-server/files/xdm-setup.initd-1   |  13 --
 x11-base/xorg-server/files/xdm.confd-4 |  10 -
 x11-base/xorg-server/files/xdm.initd-11| 230 
 .../files/xorg-server-1.12-unloadsubmodule.patch   |  45 
 ...rver-1.18-support-multiple-Files-sections.patch |  71 ---
 .../files/xorg-server-1.20.11-arm-musl.patch   |  26 ---
 .../xorg-server-1.20.11-fix-musl-input_event.patch |  58 -
 x11-base/xorg-server/files/xorg-sets.conf  |   6 -
 x11-base/xorg-server/metadata.xml  |  22 --
 x11-base/xorg-server/xorg-server-1.20.11.ebuild| 236 -
 11 files changed, 718 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
deleted file mode 100644
index fad12568..
--- a/x11-base/xorg-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 
71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef
 SHA512 
1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2

diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 
b/x11-base/xorg-server/files/xdm-setup.initd-1
deleted file mode 100644
index a9748a83..
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need localmount
-}
-
-start() {
-   if get_bootparam "nox" ; then
-   touch /etc/.noxdm
-   fi
-}

diff --git a/x11-base/xorg-server/files/xdm.confd-4 
b/x11-base/xorg-server/files/xdm.confd-4
deleted file mode 100644
index 880d4635..
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ /dev/null
@@ -1,10 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you haven't accidentally configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ?  [ xdm | gdm | sddm | gpe | lightdm | 
entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-DISPLAYMANAGER="xdm"

diff --git a/x11-base/xorg-server/files/xdm.initd-11 
b/x11-base/xorg-server/files/xdm.initd-11
deleted file mode 100644
index 34b22be5..
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-   need localmount xdm-setup
-
-   # this should start as early as possible
-   # we can't do 'before *' as that breaks it
-   # (#139824) Start after ypbind and autofs for network authentication
-   # (#145219 #180163) Could use lirc mouse as input device
-   # (#70689 comment #92) Start after consolefont to

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2021-05-25 Thread Jory Pratt 
commit: 9751a188fc793d0220452588427f93b362fec69d
Author: Jory Pratt  gentoo  org>
AuthorDate: Tue May 25 17:23:51 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Tue May 25 17:23:51 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9751a188

x11-base/xorg-server: remove libressl support

Package-Manager: Portage-3.0.19, Repoman-3.0.2
Signed-off-by: Jory Pratt  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.11.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index 8f4b9ac..d607955 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -14,13 +14,12 @@ if [[ ${PV} != * ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid 
systemd test +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test 
+udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
media-libs/libglvnd[X]
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/

2021-04-30 Thread Jory Pratt 
commit: 0949e42c092502f3df31219a4d35c1c2dc4c92de
Author: Jory Pratt  gentoo  org>
AuthorDate: Sat May  1 04:04:40 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sat May  1 04:04:40 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=0949e42c

x11-base/xorg-server: fix incorrectly named patch

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt  gentoo.org>

 ...l-input_event.patch => xorg-server-1.20.11-fix-musl-input_event.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch 
b/x11-base/xorg-server/files/xorg-server-1.20.11-fix-musl-input_event.patch
similarity index 100%
rename from 
x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
rename to 
x11-base/xorg-server/files/xorg-server-1.20.11-fix-musl-input_event.patch

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/

2021-04-30 Thread Jory Pratt 
commit: caced4d8e1d9db36c4892e12b1a2e57ff1702e80
Author: Jory Pratt  gentoo  org>
AuthorDate: Sat May  1 03:59:46 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sat May  1 03:59:46 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=caced4d8

x11-base/xorg-server: rebase patches so they will apply properly

Closes: https://github.com/gentoo/musl/issues/431
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt  gentoo.org>

 .../files/xorg-server-1.12-unloadsubmodule.patch   | 44 +++--
 ...rver-1.18-support-multiple-Files-sections.patch | 30 +---
 .../files/xorg-server-1.20.11-arm-musl.patch   | 22 +++--
 .../xorg-server-1.20.11.fix-musl-input_event.patch | 55 ++
 4 files changed, 95 insertions(+), 56 deletions(-)

diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch 
b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
index 57c7349..ab08df7 100644
--- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -1,29 +1,28 @@
-diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 
xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
 xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 
18:26:42.0 +0200
-+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 
18:28:54.0 +0200
-@@ -1109,39 +1109,38 @@
- static void
- RemoveChild(ModuleDescPtr child)
- {
- ModuleDescPtr mdp;
- ModuleDescPtr prevsib;
- ModuleDescPtr parent;
- 
- if (!child->parent)
- return;
- 
+From 4d5c555b05cf09e186cab9411aea3155018dab59 Mon Sep 17 00:00:00 2001
+From: 
+Date: Fri, 30 Apr 2021 22:50:01 -0500
+Subject: [PATCH 1/4] 
+
+---
+ hw/xfree86/loader/loadmod.c | 19 +--
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
+index a6356bd..a2130a0 100644
+--- a/hw/xfree86/loader/loadmod.c
 b/hw/xfree86/loader/loadmod.c
+@@ -892,19 +892,18 @@ RemoveChild(ModuleDescPtr child)
  parent = child->parent;
  if (parent->child == child) {
  parent->child = child->sib;
 -return;
--}
+ }
 -
 -prevsib = parent->child;
 -mdp = prevsib->sib;
 -while (mdp && mdp != child) {
 -prevsib = mdp;
 -mdp = mdp->sib;
-+}
 +else {
 +prevsib = parent->child;
 +mdp = prevsib->sib;
@@ -41,13 +40,6 @@ diff -u13 -r 
xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12
  }
  
  void
- LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
- {
- const char *msg;
- MessageType type = X_ERROR;
- 
- switch (errmaj) {
- case LDR_NOERROR:
- msg = "no error";
- break;
- case LDR_NOMEM:
+-- 
+2.26.3
+

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
 
b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
index 0a61145..3a58d71 100644
--- 
a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
+++ 
b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
@@ -1,10 +1,25 @@
-See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
+From 8fd90ff40ab7c59c7f0a6430737fbb31d0214e44 Mon Sep 17 00:00:00 2001
+From: Michał Górny 
+Date: Fri, 30 Apr 2021 22:51:14 -0500
+Subject: [PATCH 2/4] Support reading multiple 'Files' sections in
+ configuration, concatenating the resulting paths. This makes it possible to
+ add ModulePaths and FontPaths within xorg.conf.d/ files without interfering
+ with user-provided xorg.conf. Gentoo needs this to support using replacement
+ xorg modules provided by proprietary video drivers.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88003
+Signed-off-by: Michał Górny 
+---
+ hw/xfree86/parser/Files.c   | 8 ++--
+ hw/xfree86/parser/configProcs.h | 2 +-
+ hw/xfree86/parser/read.c| 2 +-
+ 3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
-index 849bf92..5cc3ec7 100644
+index c86ac7a..cad11cc 100644
 --- a/hw/xfree86/parser/Files.c
 +++ b/hw/xfree86/parser/Files.c
-@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = {
+@@ -76,14 +76,18 @@ static const xf86ConfigSymTabRec FilesTab[] = {
  #define CLEANUP xf86freeFiles
  
  XF86ConfFilesPtr
@@ -26,7 +41,7 @@ index 849bf92..5cc3ec7 100644
  while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
  switch (token) {
 diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
-index 171f8e8..e8199fe 100644
+index 7a46e01..0eccd14 100644
 --- a/hw/xfree86/parser/configProcs.h
 +++ b/hw/xfree86/parser/configProcs.h
 @@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
@@ -39,10

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2021-04-30 Thread Jory Pratt 
commit: 2809ff0d9c24bf2a2aece18c054a66e9bc275d95
Author: Jory Pratt  gentoo  org>
AuthorDate: Sat May  1 04:01:09 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sat May  1 04:01:09 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=2809ff0d

x11-base/xorg-server: Drop unsupported keywords from musl overlay

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index 26b1312..8f4b9ac 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -10,7 +10,7 @@ 
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2021-04-29 Thread Dave Hughes 
commit: d23d4ba813473c8388e1b7f8d5c443283653a934
Author: Dave Hughes  gmail  com>
AuthorDate: Thu Apr 29 19:23:13 2021 +
Commit: Dave Hughes  gmail  com>
CommitDate: Thu Apr 29 19:23:13 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d23d4ba8

x11-base/xorg-server: rebase patch for xorg-server on arm

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes  gmail.com>

 .../xorg-server/files/xorg-server-1.20.11-arm-musl.patch | 12 
 x11-base/xorg-server/xorg-server-1.20.11.ebuild  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch 
b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
new file mode 100644
index 000..541b5c7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
@@ -0,0 +1,12 @@
+diff -Naur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+--- a/hw/xfree86/common/compiler.h 2021-04-29 15:19:17.958218267 -0400
 b/hw/xfree86/common/compiler.h 2021-04-29 15:19:44.362218296 -0400
+@@ -518,7 +518,7 @@
+ barrier();
+ }
+ 
+-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
++#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
+ #if defined(__arm32__) || defined(__mips64)
+ #define PORT_SIZE long
+ #else

diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index a1a3a2f..26b1312 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -197,6 +197,7 @@ src_prepare() {
 
if use elibc_musl ; then
eapply 
"${FILESDIR}"/xorg-server-1.20.11-fix-musl-input_event.patch
+   eapply "${FILESDIR}"/xorg-server-1.20.11-arm-musl.patch
fi
 
eapply_user

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2021-04-29 Thread Dave Hughes 
commit: fb8397e1b09297f6255ae5d3867be60082317d3c
Author: Dave Hughes  gmail  com>
AuthorDate: Thu Apr 29 19:11:09 2021 +
Commit: Dave Hughes  gmail  com>
CommitDate: Thu Apr 29 19:11:09 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=fb8397e1

x11-base/xorg-server: sync with ::gentoo

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes  gmail.com>

 x11-base/xorg-server/Manifest  |   2 +-
 x11-base/xorg-server/files/xdm-setup.initd-1   |   3 +-
 x11-base/xorg-server/files/xdm.confd-4 |   2 +-
 x11-base/xorg-server/files/xdm.initd-11|   3 +-
 .../files/xorg-server-1.17.4-arm-musl.patch|  20 ---
 .../xorg-server-1.20.11.fix-musl-input_event.patch |  43 +
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 -
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 ---
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 -
 x11-base/xorg-server/metadata.xml  |   4 +-
 ...er-1.20.5.ebuild => xorg-server-1.20.11.ebuild} |  96 ++--
 11 files changed, 101 insertions(+), 407 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f978f86..fad1256 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
+DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 
71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef
 SHA512 
1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2

diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 
b/x11-base/xorg-server/files/xdm-setup.initd-1
index 917cd12..a9748a8 100644
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
need localmount

diff --git a/x11-base/xorg-server/files/xdm.confd-4 
b/x11-base/xorg-server/files/xdm.confd-4
index c82fece..880d463 100644
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,6 +5,6 @@
 # in your /etc/inittab file so that you don't get a dead keyboard.
 CHECKVT=7
 
-# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
+# What display manager do you use ?  [ xdm | gdm | sddm | gpe | lightdm | 
entrance ]
 # NOTE: If this is set in /etc/rc.conf, that setting will override this one.
 DISPLAYMANAGER="xdm"

diff --git a/x11-base/xorg-server/files/xdm.initd-11 
b/x11-base/xorg-server/files/xdm.initd-11
index ce76c56..34b22be 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
-# $Id$
 
 # This is here to serve as a note to myself, and future developers.
 #

diff --git a/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch 
b/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch
deleted file mode 100644
index e661ae1..000
--- a/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 ./hw/xfree86/common/compiler.h.orig
-+++ ./hw/xfree86/common/compiler.h
-@@ -721,7 +721,7 @@
-  :"r"(val), "r"(addr), "i"(ASI_PL));
- }
- 
--#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
- #if defined(__arm32__) || defined(__mips64)
- #define PORT_SIZE long
- #else
-@@ -996,7 +996,7 @@
- return xf86ReadMmio32Le((void *) ioBase, port);
- }
- 
--#elif defined(__arm__) && defined(__linux__)
-+#elif defined(__arm__) && defined(__GLIBC__)
- 
- /* for Linux on ARM, we use the LIBC inx/outx routines */
- /* note that the appropriate setup via "ioperm" needs to be done */

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch 
b/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
new file mode 100644
index 000..ec1ae8f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
@@ -0,0 +1,43 @@
+Source: @pullmoll
+Upstream: no
+Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
+
+--- hw/dmx/input/usb-keyboard.c

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2020-01-16 Thread Anthony G. Basile 
commit: 0671a09797e58cfe79df93de1ddde1dccf86b76a
Author: stefson  yahoo  de>
AuthorDate: Tue Jan 14 08:10:15 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jan 17 00:01:17 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=0671a097

Revert "x11-base/xorg-server: bump to v1.20.6"

This reverts commit c6cdc79a4c4289d8212269ba51ea0c79434fff3b.

the draft was accidently merged, this is unfinished and needs
to be re-evaluated.

Signed-off-by: Steffen Kuhn  yandex.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   2 +-
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 +
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 +++
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 +
 ...ver-1.20.6.ebuild => xorg-server-1.20.5.ebuild} |  35 +++--
 5 files changed, 354 insertions(+), 18 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6f02874..f978f86 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 
30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953
 SHA512 
9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
+DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
new file mode 100644
index 000..54ed629
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
@@ -0,0 +1,174 @@
+From 19f6cb570becbc4e355807199c6e251fc7935132 Mon Sep 17 00:00:00 2001
+From: Eric Anholt 
+Date: Wed, 19 Sep 2018 13:28:06 -0700
+Subject: [PATCH xserver] shm: Pick the shm dir at run time, not build time.
+
+Prodding the builder's filesystem for tmp dirs doesn't necessarily
+tell you anything about what the actual host's filesystem is going to
+look like, so we should just try the dirs at runtime.
+
+Signed-off-by: Eric Anholt 
+---
+ Xext/shm.c  | 48 +
+ configure.ac| 43 
+ include/dix-config.h.in |  3 ---
+ include/meson.build |  5 -
+ 4 files changed, 29 insertions(+), 70 deletions(-)
+
+diff --git a/Xext/shm.c b/Xext/shm.c
+index ed43b9202..2739a59e7 100644
+--- a/Xext/shm.c
 b/Xext/shm.c
+@@ -1194,36 +1194,46 @@ ProcShmAttachFd(ClientPtr client)
+ static int
+ shm_tmpfile(void)
+ {
+-#ifdef SHMDIR
++const char *shmdirs[] = {
++"/run/shm",
++"/var/tmp",
++"/tmp",
++};
+ int   fd;
+-char  template[] = SHMDIR "/shmfd-XX";
++
+ #ifdef O_TMPFILE
+-fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+-if (fd >= 0) {
+-DebugF ("Using O_TMPFILE\n");
+-return fd;
++for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
++fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
++if (fd >= 0) {
++DebugF ("Using O_TMPFILE\n");
++return fd;
++}
+ }
+ ErrorF ("Not using O_TMPFILE\n");
+ #endif
++
++for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
++char template[PATH_MAX];
++snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XX", 
shmdirs[i]);
+ #ifdef HAVE_MKOSTEMP
+-fd = mkostemp(template, O_CLOEXEC);
++fd = mkostemp(template, O_CLOEXEC);
+ #else
+-fd = mkstemp(template);
++fd = mkstemp(template);
+ #endif
+-if (fd < 0)
+-return -1;
+-unlink(template);
++if (fd < 0)
++continue;
++unlink(template);
+ #ifndef HAVE_MKOSTEMP
+-int flags = fcntl(fd, F_GETFD);
+-if (flags != -1) {
+-flags |= FD_CLOEXEC;
+-(void) fcntl(fd, F_SETFD, );
+-}
++int flags = fcntl(fd, F_GETFD);
++if (flags != -1) {
++flags |= FD_CLOEXEC;
++(void) fcntl(fd, F_SETFD, );
++}
+ #endif
+-return fd;
+-#else
++return fd;
++}
++
+ return -1;
+-#endif
+ }
+ 
+ static int
+diff --git a/configure.ac b/configure.ac
+index 359b62cb5..57a233102 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1115,49 +1115,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ esac
+ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+ 
+-dnl
+-dnl Locate a suitable tmp file system for creating shared

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2020-01-16 Thread Anthony G. Basile 
commit: 7764b1a89a9209e6c639fa3dd5a56b6fb7957e85
Author: stefson  yahoo  de>
AuthorDate: Tue Jan 14 08:09:56 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jan 17 00:01:11 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7764b1a8

Revert "x11-base/xorg-server: Fix metadata.xml for missing IUSE libglvnd"

This reverts commit c28c059b60a3e754888658e647841938be27fa72.

Signed-off-by: Steffen Kuhn  yandex.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/metadata.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x11-base/xorg-server/metadata.xml 
b/x11-base/xorg-server/metadata.xml
index 2e8d879..74e5219 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -7,13 +7,12 @@
 
 
Build the Distributed Multiheaded X server
-   Use elogind to get control over framebuffer when 
running as regular user
+   Enable Glamor OpenGL 2D acceleration
Build the kdrive X servers
-   Use libglvnd for dispatch.
Enable libunwind usage for backtraces
Build Security extension
-   Build the Xephyr server
Build the Xnest server
+   Build the Xephyr server
Build the Xorg X server (HIGHLY RECOMMENDED)
Build the Xvfb server

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2020-01-04 Thread Jory Pratt 
commit: c28c059b60a3e754888658e647841938be27fa72
Author: Jory Pratt  gentoo  org>
AuthorDate: Sat Jan  4 16:21:00 2020 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Sat Jan  4 16:21:00 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c28c059b

x11-base/xorg-server: Fix metadata.xml for missing IUSE libglvnd

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jory Pratt  gentoo.org>

 x11-base/xorg-server/metadata.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/metadata.xml 
b/x11-base/xorg-server/metadata.xml
index 74e5219..2e8d879 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -7,12 +7,13 @@
 
 
Build the Distributed Multiheaded X server
-   Enable Glamor OpenGL 2D acceleration
+   Use elogind to get control over framebuffer when 
running as regular user
Build the kdrive X servers
+   Use libglvnd for dispatch.
Enable libunwind usage for backtraces
Build Security extension
-   Build the Xnest server
Build the Xephyr server
+   Build the Xnest server
Build the Xorg X server (HIGHLY RECOMMENDED)
Build the Xvfb server

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2020-01-04 Thread Anthony G. Basile 
commit: c6cdc79a4c4289d8212269ba51ea0c79434fff3b
Author: stefson  yahoo  de>
AuthorDate: Sat Jan  4 11:17:13 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan  4 15:58:27 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c6cdc79a

x11-base/xorg-server: bump to v1.20.6

Signed-off-by: Steffen Kuhn  yandex.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   2 +-
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 -
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 ---
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 -
 ...ver-1.20.5.ebuild => xorg-server-1.20.6.ebuild} |  35 ++---
 5 files changed, 18 insertions(+), 354 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f978f86..6f02874 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
+DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 
30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953
 SHA512 
9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
deleted file mode 100644
index 54ed629..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 19f6cb570becbc4e355807199c6e251fc7935132 Mon Sep 17 00:00:00 2001
-From: Eric Anholt 
-Date: Wed, 19 Sep 2018 13:28:06 -0700
-Subject: [PATCH xserver] shm: Pick the shm dir at run time, not build time.
-
-Prodding the builder's filesystem for tmp dirs doesn't necessarily
-tell you anything about what the actual host's filesystem is going to
-look like, so we should just try the dirs at runtime.
-
-Signed-off-by: Eric Anholt 

- Xext/shm.c  | 48 +
- configure.ac| 43 
- include/dix-config.h.in |  3 ---
- include/meson.build |  5 -
- 4 files changed, 29 insertions(+), 70 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index ed43b9202..2739a59e7 100644
 a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -1194,36 +1194,46 @@ ProcShmAttachFd(ClientPtr client)
- static int
- shm_tmpfile(void)
- {
--#ifdef SHMDIR
-+const char *shmdirs[] = {
-+"/run/shm",
-+"/var/tmp",
-+"/tmp",
-+};
- int   fd;
--char  template[] = SHMDIR "/shmfd-XX";
-+
- #ifdef O_TMPFILE
--fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
--if (fd >= 0) {
--DebugF ("Using O_TMPFILE\n");
--return fd;
-+for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
-+fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
-+if (fd >= 0) {
-+DebugF ("Using O_TMPFILE\n");
-+return fd;
-+}
- }
- ErrorF ("Not using O_TMPFILE\n");
- #endif
-+
-+for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
-+char template[PATH_MAX];
-+snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XX", 
shmdirs[i]);
- #ifdef HAVE_MKOSTEMP
--fd = mkostemp(template, O_CLOEXEC);
-+fd = mkostemp(template, O_CLOEXEC);
- #else
--fd = mkstemp(template);
-+fd = mkstemp(template);
- #endif
--if (fd < 0)
--return -1;
--unlink(template);
-+if (fd < 0)
-+continue;
-+unlink(template);
- #ifndef HAVE_MKOSTEMP
--int flags = fcntl(fd, F_GETFD);
--if (flags != -1) {
--flags |= FD_CLOEXEC;
--(void) fcntl(fd, F_SETFD, );
--}
-+int flags = fcntl(fd, F_GETFD);
-+if (flags != -1) {
-+flags |= FD_CLOEXEC;
-+(void) fcntl(fd, F_SETFD, );
-+}
- #endif
--return fd;
--#else
-+return fd;
-+}
-+
- return -1;
--#endif
- }
- 
- static int
-diff --git a/configure.ac b/configure.ac
-index 359b62cb5..57a233102 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1115,49 +1115,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
- esac
- AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
- 
--dnl
--dnl Locate a suitable tmp file system for creating shared memeory files
--dnl
--
--AC_ARG_WITH(shared-memory-dir, 
AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a 
world-writable temporary

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2019-08-20 Thread Anthony G. Basile 
commit: 7b09219f15e8a105248b7ac1c07d8ab239ada118
Author: stefson  yahoo  de>
AuthorDate: Tue Jul 30 04:48:14 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Aug 20 20:43:12 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b09219f

x11-base/xorg-server: revbump to 1.20.5

Signed-off-by: Steffen Kuhn  yahoo.de>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest | 2 +-
 x11-base/xorg-server/files/xdm.initd-11   | 2 +-
 .../{xorg-server-1.20.4.ebuild => xorg-server-1.20.5.ebuild}  | 8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3dd24c9..f978f86 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 
224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d
 SHA512 
f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
+DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631

diff --git a/x11-base/xorg-server/files/xdm.initd-11 
b/x11-base/xorg-server/files/xdm.initd-11
index 70b81c0..ce76c56 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -208,7 +208,7 @@ stop() {
 
ebegin "Stopping ${myservice}"
 
-   if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+   if start-stop-daemon --quiet --test --stop --exec "${myexe}" 
2>/dev/null; then
start-stop-daemon --stop --exec "${myexe}" --retry 
TERM/5/TERM/5 \
${mypidfile:+--pidfile} ${mypidfile} \
${myname:+--name} ${myname}

diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
similarity index 95%
rename from x11-base/xorg-server/xorg-server-1.20.4.ebuild
rename to x11-base/xorg-server/xorg-server-1.20.5.ebuild
index ec78441..dfc7110 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -91,7 +91,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-base/xorg-proto-2018.3
+   >=x11-base/xorg-proto-2018.4
dmx? (
doc? (
|| (
@@ -119,9 +119,9 @@ REQUIRED_USE="!minimal? (
xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
-   
"${FILESDIR}"/${P}-shm-reindent-shm_tmpfile-to-follow-our-standards.patch
-   "${FILESDIR}"/${P}-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
-   "${FILESDIR}"/${P}-shm-Use-memfd_create-when-possible.patch
+   
"${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch
+   
"${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
+   "${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch
 )
 
 PATCHES=(

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2019-06-22 Thread Anthony G. Basile 
commit: a7a9cb57dfb1f89bb7406daaf264633f3c19b0b9
Author: stefson  yahoo  de>
AuthorDate: Tue Jun 18 19:50:54 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jun 22 13:01:34 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=a7a9cb57

x11-base/xorg-server: revbump to 1.20.4

Signed-off-by: Steffen Kuhn  yahoo.de>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   2 +-
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 +
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 +++
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 +
 ...ver-1.20.3.ebuild => xorg-server-1.20.4.ebuild} |  48 +++---
 5 files changed, 362 insertions(+), 23 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4dc1591..3dd24c9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
+DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 
224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d
 SHA512 
f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
new file mode 100644
index 000..54ed629
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
@@ -0,0 +1,174 @@
+From 19f6cb570becbc4e355807199c6e251fc7935132 Mon Sep 17 00:00:00 2001
+From: Eric Anholt 
+Date: Wed, 19 Sep 2018 13:28:06 -0700
+Subject: [PATCH xserver] shm: Pick the shm dir at run time, not build time.
+
+Prodding the builder's filesystem for tmp dirs doesn't necessarily
+tell you anything about what the actual host's filesystem is going to
+look like, so we should just try the dirs at runtime.
+
+Signed-off-by: Eric Anholt 
+---
+ Xext/shm.c  | 48 +
+ configure.ac| 43 
+ include/dix-config.h.in |  3 ---
+ include/meson.build |  5 -
+ 4 files changed, 29 insertions(+), 70 deletions(-)
+
+diff --git a/Xext/shm.c b/Xext/shm.c
+index ed43b9202..2739a59e7 100644
+--- a/Xext/shm.c
 b/Xext/shm.c
+@@ -1194,36 +1194,46 @@ ProcShmAttachFd(ClientPtr client)
+ static int
+ shm_tmpfile(void)
+ {
+-#ifdef SHMDIR
++const char *shmdirs[] = {
++"/run/shm",
++"/var/tmp",
++"/tmp",
++};
+ int   fd;
+-char  template[] = SHMDIR "/shmfd-XX";
++
+ #ifdef O_TMPFILE
+-fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+-if (fd >= 0) {
+-DebugF ("Using O_TMPFILE\n");
+-return fd;
++for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
++fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
++if (fd >= 0) {
++DebugF ("Using O_TMPFILE\n");
++return fd;
++}
+ }
+ ErrorF ("Not using O_TMPFILE\n");
+ #endif
++
++for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
++char template[PATH_MAX];
++snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XX", 
shmdirs[i]);
+ #ifdef HAVE_MKOSTEMP
+-fd = mkostemp(template, O_CLOEXEC);
++fd = mkostemp(template, O_CLOEXEC);
+ #else
+-fd = mkstemp(template);
++fd = mkstemp(template);
+ #endif
+-if (fd < 0)
+-return -1;
+-unlink(template);
++if (fd < 0)
++continue;
++unlink(template);
+ #ifndef HAVE_MKOSTEMP
+-int flags = fcntl(fd, F_GETFD);
+-if (flags != -1) {
+-flags |= FD_CLOEXEC;
+-(void) fcntl(fd, F_SETFD, );
+-}
++int flags = fcntl(fd, F_GETFD);
++if (flags != -1) {
++flags |= FD_CLOEXEC;
++(void) fcntl(fd, F_SETFD, );
++}
+ #endif
+-return fd;
+-#else
++return fd;
++}
++
+ return -1;
+-#endif
+ }
+ 
+ static int
+diff --git a/configure.ac b/configure.ac
+index 359b62cb5..57a233102 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1115,49 +1115,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ esac
+ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+ 
+-dnl
+-dnl Locate a suitable tmp file system for creating shared memeory files
+-dnl
+-
+-AC_ARG_WITH(shared-memory-dir, 
AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a 
world-writable temporary

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2019-01-23 Thread Anthony G. Basile 
commit: 9e44e2d61430671df85de58d6c0b60122a955bc9
Author: stefson  yahoo  de>
AuthorDate: Sat Jan 19 08:44:45 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jan 23 19:28:34 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9e44e2d6

x11-base/xorg-server: drop old

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 .../files/xorg-server-1.19.4-sysmacros.patch   |  36 
 ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch |  39 
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild  | 225 -
 4 files changed, 301 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3bc38c0..4dc1591 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1 @@
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
deleted file mode 100644
index 8a3cb76..000
--- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Wed, 11 Oct 2017 16:11:49 +0300
-Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor
- functions for new glibc
-
-Commits d732c36597fa and 84e3b96b5313 added the include to some files, but
-missed config/udev.c, where the major and minor functions are used as well.
-This should be Linux-only, so we don't need the sys/mkdev.h case here for
-Solaris.
-
-Signed-off-by: Mart Raudsepp 

-https://bugs.gentoo.org/633530
-https://patchwork.freedesktop.org/patch/181800/
-
- config/udev.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/config/udev.c b/config/udev.c
-index 932f230..b3b8d0f 100644
 a/config/udev.c
-+++ b/config/udev.c
-@@ -30,6 +30,9 @@
- #include 
- #include 
- #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include 
-+#endif
- 
- #include "input.h"
- #include "inputstr.h"
--- 
-2.10.2
-

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
deleted file mode 100644
index d7e5e51..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tapani=20P=C3=A4lli?= 
-Date: Tue, 28 Nov 2017 09:23:29 +0200
-Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes blending issues seen with kwin and gnome-shell when
-32bit visual has sRGB capability set.
-
-Reviewed-by: Adam Jackson 
-Signed-off-by: Tapani Pälli 
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655

- glx/glxscreens.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c
-index 73444152a..596d972e0 100644
 a/glx/glxscreens.c
-+++ b/glx/glxscreens.c
-@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
- /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
- if (visual->nplanes == 32 && config->rgbBits != 32)
- continue;
-+/* If it's the 32-bit RGBA visual, do not pick sRGB capable config.
-+ * This can cause issues with compositors that are not sRGB aware.
-+ */
-+if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE)
-+continue;
- /* Can't use the same FBconfig for multiple X visuals.  I think. */
- if (config->visualID != 0)
- continue;
--- 
-2.17.0
-

diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
deleted file mode 100644
index cac9ce7..000
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2019-01-23 Thread Anthony G. Basile 
commit: 2c7df62f64eaaa29b20b3b68d41eca93ec2134de
Author: stefson  yahoo  de>
AuthorDate: Sat Jan 19 08:47:12 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jan 23 19:28:39 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=2c7df62f

x11-base/xorg-server: sync with tree

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index a057e05..6018177 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -13,8 +13,8 @@ if [[ ${PV} != * ]]; then
KEYWORDS="arm"
 fi
 
-IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd 
+udev unwind xcsecurity"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid 
systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
@@ -106,6 +106,7 @@ PDEPEND="
 REQUIRED_USE="!minimal? (
|| ( ${IUSE_SERVERS} )
)
+   minimal? ( !glamor !wayland )
xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
@@ -162,8 +163,8 @@ src_configure() {
$(use_with doc xmlto)
$(use_with systemd systemd-daemon)
$(use_enable systemd systemd-logind)
-   $(use_enable systemd suid-wrapper)
-   $(use_enable suid install-setuid)
+   $(usex suid $(use_enable systemd suid-wrapper) 
'--disable-suid-wrapper')
+   $(usex suid $(use_enable !systemd install-setuid) 
'--disable-install-setuid')
--enable-libdrm
--sysconfdir="${EPREFIX}"/etc/X11
--localstatedir="${EPREFIX}"/var
@@ -198,7 +199,7 @@ src_install() {
insinto /usr/share/portage/config/sets
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
 
-   [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
+   find "${ED}"/var -type d -empty -delete || die
 }
 
 pkg_postinst() {

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2019-01-23 Thread Anthony G. Basile 
commit: c796acc66943f656fda5c075194ab10a6e53060f
Author: stefson  yahoo  de>
AuthorDate: Sat Jan 19 08:56:38 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jan 23 19:28:40 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c796acc6

x11-base/xorg-server: remove tslib from metadata

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-base/xorg-server/metadata.xml 
b/x11-base/xorg-server/metadata.xml
index 8c8c243..74e5219 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -9,7 +9,6 @@
Build the Distributed Multiheaded X server
Enable Glamor OpenGL 2D acceleration
Build the kdrive X servers
-   Build with tslib support for touchscreen 
devices
Enable libunwind usage for backtraces
Build Security extension
Build the Xnest server

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-11-10 Thread Anthony G. Basile 
commit: 3653821c91efd1dfdd86265196280fb9d5a97c92
Author: stefson  yahoo  de>
AuthorDate: Fri Nov  2 09:06:26 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3653821c

x11-base/xorg-server: sync KEYWORDS with tree

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index f448863..cb19b03 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -11,7 +11,7 @@ 
EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != * ]]; then
-   KEYWORDS="~arm"
+   KEYWORDS="arm"
 fi
 
 IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-11-10 Thread Anthony G. Basile 
commit: b043cc9bdc559ccef47e701f9f3ebb8fcee900d0
Author: stefson  yahoo  de>
AuthorDate: Sat Nov  3 09:46:55 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=b043cc9b

x11-base/xorg-server: Remove unnecessary XORG_EAUTORECONF=yes

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index cb19b03..a057e05 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=5
 
-XORG_EAUTORECONF=yes
 XORG_DOC=doc
 inherit xorg-2 multilib versionator flag-o-matic
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-11-10 Thread Anthony G. Basile 
commit: 1364e4e09223ae7591e212c7335ca99e5d342584
Author: stefson  yahoo  de>
AuthorDate: Fri Nov  2 09:02:58 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=1364e4e0

x11-base/xorg-serever: don't install empty directory, fixes #647302

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index 959b9ec..f448863 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -198,6 +198,8 @@ src_install() {
# install the @x11-module-rebuild set for Portage
insinto /usr/share/portage/config/sets
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+   [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
 }
 
 pkg_postinst() {

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/

2018-11-10 Thread Anthony G. Basile 
commit: eb638f9d691ce79637e502f3404a1275ab111374
Author: stefson  yahoo  de>
AuthorDate: Fri Nov  2 09:04:15 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=eb638f9d

x11-base/xorg-server: remove unreferenced patches

Signed-off-by: Anthony G. Basile  gentoo.org>

 .../files/xorg-server-1.19.6-fix-NULL-value-detection.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
deleted file mode 100644
index 94c319a..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/udev.c b/config/udev.c
-index e198e8609..3a73189e2 100644
 a/config/udev.c
-+++ b/config/udev.c
-@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
- #endif
- 
- value = udev_device_get_property_value(udev_device, "ID_INPUT");
--if (value && !strcmp(value, "0")) {
-+if (!value || !strcmp(value, "0")) {
- LogMessageVerb(X_INFO, 10,
-"config/udev: ignoring device %s without "
-"property ID_INPUT set\n", path);

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-11-10 Thread Anthony G. Basile 
commit: 9b1a250f3680457f4ec74d9b692446492c89754a
Author: stefson  yahoo  de>
AuthorDate: Fri Nov  2 09:01:32 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9b1a250f

x11-base/xorg-server: readd IUSE=suid, fixes #669648

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index 0c358b4..959b9ec 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != * ]]; then
KEYWORDS="~arm"
 fi
 
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd 
+udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
@@ -164,7 +164,7 @@ src_configure() {
$(use_with systemd systemd-daemon)
$(use_enable systemd systemd-logind)
$(use_enable systemd suid-wrapper)
-   $(use_enable !systemd install-setuid)
+   $(use_enable suid install-setuid)
--enable-libdrm
--sysconfdir="${EPREFIX}"/etc/X11
--localstatedir="${EPREFIX}"/var

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-11-10 Thread Anthony G. Basile 
commit: 9cb274e9eeb0c657914458456f33007a1a0c1352
Author: stefson  yahoo  de>
AuthorDate: Fri Nov  2 08:59:53 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 10 23:58:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9cb274e9

x11-base/xorg-server: remove old

Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest |   1 -
 x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild | 226 --
 2 files changed, 227 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9a42cef..3bc38c0 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

diff --git a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
deleted file mode 100644
index db4071c..000
--- a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="~arm"
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid 
systemd tslib +udev unwind xcsecurity"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=x11-apps/iceauth-1.0.2
-   >=x11-apps/rgb-1.0.3
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xkbcomp
-   >=x11-libs/libdrm-2.4.46
-   >=x11-libs/libpciaccess-0.12.901
-   >=x11-libs/libXau-1.0.4
-   >=x11-libs/libXdmcp-1.0.2
-   >=x11-libs/libXfont2-2.0.1
-   >=x11-libs/libxkbfile-1.0.4
-   >=x11-libs/libxshmfence-1.1
-   >=x11-libs/pixman-0.27.2
-   >=x11-libs/xtrans-1.3.5
-   >=x11-misc/xbitmaps-1.0.1
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   dmx? (
-   x11-libs/libXt
-   >=x11-libs/libdmx-1.0.99.1
-   >=x11-libs/libX11-1.1.5
-   >=x11-libs/libXaw-1.0.4
-   >=x11-libs/libXext-1.0.99.4
-   >=x11-libs/libXfixes-5.0
-   >=x11-libs/libXi-1.2.99.1
-   >=x11-libs/libXmu-1.0.3
-   x11-libs/libXrender
-   >=x11-libs/libXres-1.0.3
-   >=x11-libs/libXtst-1.0.99.2
-   )
-   glamor? (
-   media-libs/libepoxy[X]
-   >=media-libs/mesa-10.3.4-r1[egl,gbm]
-   !x11-libs/glamor
-   )
-   kdrive? (
-   >=x11-libs/libXext-1.0.5
-   x11-libs/libXv
-   )
-   xephyr? (
-   x11-libs/libxcb[xkb]
-   x11-libs/xcb-util
-   x11-libs/xcb-util-image
-   x11-libs/xcb-util-keysyms
-   x11-libs/xcb-util-renderutil
-   x11-libs/xcb-util-wm
-   )
-   !minimal? (
-   >=x11-libs/libX11-1.1.5
-   >=x11-libs/libXext-1.0.5
-   >=media-libs/mesa-10.3.4-r1
-   )
-   tslib? ( >=x11-libs/tslib-1.0 )
-   udev? ( >=virtual/udev-150 )
-   unwind? ( sys-libs/libunwind )
-   wayland? (
-   >=dev-libs/wayland-1.3.0
-   media-libs/libepoxy
-   >=dev-libs/wayland-protocols-1.1
-   )
-   >=x11-apps/xinit-1.3.3-r1
-   systemd? (
-   sys-apps/dbus
-   sys-apps/systemd
-   )"
-
-DEPEND="${CDEPEND}
-   sys-devel/flex
-   x11-base/xorg-proto
-   dmx? (
-   doc? (
-   || (
-   www-client/links
-   www-client/lynx
-   www-client/w3m
-   )
-   )
-   )"
-
-RDEPEND="${CDEPEND}
-   selinux? (

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-10-29 Thread Anthony G. Basile 
commit: 5407d80d6c8bd952ba8b68fd3cefe7e316b51dc6
Author: stefson  yahoo  de>
AuthorDate: Sat Oct 27 16:51:20 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Oct 29 11:38:04 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=5407d80d

x11-base/xorg-server: revbump

 x11-base/xorg-server/Manifest  | 2 +-
 .../{xorg-server-1.20.1.ebuild => xorg-server-1.20.3.ebuild}   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0c6e270..9a42cef 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
-DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B 
ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75
 SHA512 
ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
+DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
similarity index 98%
rename from x11-base/xorg-server/xorg-server-1.20.1.ebuild
rename to x11-base/xorg-server/xorg-server-1.20.3.ebuild
index 808bbfe..0c358b4 100644
--- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -151,6 +151,7 @@ src_configure() {
$(use_enable !minimal xfree86-utils)
$(use_enable !minimal dri)
$(use_enable !minimal dri2)
+   $(use_enable !minimal dri3)
$(use_enable !minimal glx)
$(use_enable xcsecurity)
$(use_enable xephyr)

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2018-08-18 Thread Anthony G. Basile 
commit: 794a47ca882aeed56c14ed92c01529f745658d5b
Author: stefson  yahoo  de>
AuthorDate: Thu Aug 16 11:48:21 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Aug 18 09:51:20 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=794a47ca

x11-base/xorg-server: revbump to point release

 x11-base/xorg-server/Manifest  |   2 +-
 ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 -
 ...ver-1.20.0.ebuild => xorg-server-1.20.1.ebuild} |   0
 3 files changed, 1 insertion(+), 225 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 94db573..0c6e270 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
+DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B 
ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75
 SHA512 
ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
deleted file mode 100644
index ebf677a..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001
-From: Matt Turner 
-Date: Tue, 22 May 2018 21:10:55 -0700
-Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on
- alpha
-
-In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
-somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
-function pointer indirection was intended to support dense vs sparse and
-sparse support is now gone, we can just make the functions static inline
-in compiler.h and avoid all of this.
-
-Bugzilla: https://bugs.gentoo.org/548906
-Tested-by: Christopher May-Townsend 
-Reviewed-by: Adam Jackson 
-Signed-off-by: Matt Turner 

- configure.ac|  4 --
- hw/xfree86/common/compiler.h| 67 -
- hw/xfree86/os-support/bsd/Makefile.am   |  3 +-
- hw/xfree86/os-support/linux/Makefile.am | 12 --
- hw/xfree86/os-support/linux/lnx_video.c | 27 -
- hw/xfree86/os-support/meson.build   |  1 -
- 6 files changed, 50 insertions(+), 64 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ddc47faa2..0075b6ace 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then
-   XORG_OS_SUBDIR="linux"
-   linux_acpi="no"
-   case $host_cpu in
--alpha*)
--  linux_alpha=yes
--  ;;
- i*86|amd64*|x86_64*|ia64*)
-   linux_acpi=$enable_linux_acpi
-   ;;
-@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
- AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
- AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
--AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
- AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
- AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
- AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index eea29dfb5..7144c6a27 100644
 a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port)
- #endif
- 
- #ifdef __alpha__
--/* entry points for Mmio memory access routines */
--extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
--extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-08-18 Thread Anthony G. Basile 
commit: 7041db21cab93cde4691d3e768ec9dd0b575a3c2
Author: stefson  yahoo  de>
AuthorDate: Sat Aug 18 06:09:12 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Aug 18 09:51:20 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7041db21

x11-base/xorg-server: sync with tree

 x11-base/xorg-server/xorg-server-1.20.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
index 3d090bf..808bbfe 100644
--- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
@@ -50,7 +50,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
)
glamor? (
media-libs/libepoxy[X]
-   >=media-libs/mesa-10.3.4-r1[egl,gbm]
+   >=media-libs/mesa-18[egl,gbm]
!x11-libs/glamor
)
kdrive? (
@@ -68,7 +68,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!minimal? (
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
-   >=media-libs/mesa-10.3.4-r1
+   >=media-libs/mesa-18
)
udev? ( virtual/libudev:= )
unwind? ( sys-libs/libunwind )
@@ -110,7 +110,6 @@ REQUIRED_USE="!minimal? (
xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
-   
"${FILESDIR}"/${P}-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
 )
 
 PATCHES=(

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-06-17 Thread Anthony G. Basile 
commit: 9915647a65aa7787956b5982f63e5563dea36f1a
Author: stefson  yahoo  de>
AuthorDate: Sun Jun 17 09:05:35 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Jun 17 09:37:31 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9915647a

x11-base/xorg-server: remove proto deps

 x11-base/xorg-server/files/dep-list   | 29 ---
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 33 ++---
 x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild | 35 +++
 3 files changed, 7 insertions(+), 90 deletions(-)

diff --git a/x11-base/xorg-server/files/dep-list 
b/x11-base/xorg-server/files/dep-list
deleted file mode 100644
index 3e064ba..000
--- a/x11-base/xorg-server/files/dep-list
+++ /dev/null
@@ -1,29 +0,0 @@
-=x11-base/xorg-server-1.19.99.901
-=x11-base/xorg-proto-2018.4
-=x11-proto/bigreqsproto-1.1.2-r1
-=x11-proto/compositeproto-0.4.2-r2
-=x11-proto/damageproto-1.2.1-r2
-=x11-proto/dri2proto-2.1.1-r2
-=x11-proto/dri3proto-1.0-r1
-=x11-proto/fixesproto-5.0-r2
-=x11-proto/fontsproto-2.1.3-r1
-=x11-proto/glproto-1.4.17-r2
-=x11-proto/inputproto-2.3.2-r1
-=x11-proto/kbproto-1.0.7-r1
-=x11-proto/presentproto-1.1-r1
-=x11-proto/randrproto-1.5.0-r1
-=x11-proto/recordproto-1.14.2-r2
-=x11-proto/renderproto-0.11.1-r2
-=x11-proto/resourceproto-1.2.0-r1
-=x11-proto/scrnsaverproto-1.2.2-r2
-=x11-proto/trapproto-3.4.3-r1
-=x11-proto/videoproto-2.3.3-r1
-=x11-proto/xcmiscproto-1.2.2-r1
-=x11-proto/xextproto-7.3.0-r1
-=x11-proto/xf86bigfontproto-1.2.0-r2
-=x11-proto/xf86dgaproto-2.1-r3
-=x11-proto/xf86driproto-2.1.1-r2
-=x11-proto/xf86vidmodeproto-2.3.1-r2
-=x11-proto/xineramaproto-1.2.1-r2
-=x11-proto/xproto-7.0.31-r1
-

diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
index c3cd8c9..cac9ce7 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal 
selinux +suid systemd
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl )
+   libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
@@ -83,32 +83,8 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-proto/bigreqsproto-1.1.0
-   >=x11-proto/compositeproto-0.4
-   >=x11-proto/damageproto-1.1
-   >=x11-proto/fixesproto-5.0
-   >=x11-proto/fontsproto-2.1.3
-   >=x11-proto/glproto-1.4.17-r1
-   >=x11-proto/inputproto-2.3
-   >=x11-proto/kbproto-1.0.3
-   >=x11-proto/randrproto-1.5.0
-   >=x11-proto/recordproto-1.13.99.1
-   >=x11-proto/renderproto-0.11
-   >=x11-proto/resourceproto-1.2.0
-   >=x11-proto/scrnsaverproto-1.1
-   >=x11-proto/trapproto-3.4.3
-   >=x11-proto/videoproto-2.2.2
-   >=x11-proto/xcmiscproto-1.2.0
-   >=x11-proto/xextproto-7.2.99.901
-   >=x11-proto/xf86dgaproto-2.0.99.1
-   >=x11-proto/xf86vidmodeproto-2.2.99.1
-   >=x11-proto/xineramaproto-1.1.3
-   >=x11-proto/xproto-7.0.31
-   >=x11-proto/presentproto-1.0
-   >=x11-proto/dri2proto-2.8
-   >=x11-proto/dri3proto-1.0
+   x11-base/xorg-proto
dmx? (
-   >=x11-proto/dmxproto-2.2.99.1
doc? (
|| (
www-client/links
@@ -116,9 +92,6 @@ DEPEND="${CDEPEND}
www-client/w3m
)
)
-   )
-   !minimal? (
-   >=x11-proto/xf86driproto-2.1.0
)"
 
 RDEPEND="${CDEPEND}

diff --git a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
index a56636b..db4071c 100644
--- a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal 
selinux +suid systemd
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl )
+   libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
@@ -83,32 +83,8 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-proto/bigreqsproto-1.1.0
-   >=x11-proto/compositeproto-0.4
-

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-06-16 Thread Anthony G. Basile 
commit: 00a6fc548bb56a80bb71a4300c0f55cbd0dbc500
Author: stefson  yahoo  de>
AuthorDate: Sat Jun 16 11:33:47 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jun 16 23:10:57 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=00a6fc54

x11-base/xorg-server: revbump

 x11-base/xorg-server/Manifest  |   2 +-
 ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 ++
 x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild  | 251 -
 19.99.901.ebuild => xorg-server-1.20.0.ebuild} |  16 +-
 4 files changed, 234 insertions(+), 259 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 843e283..94db573 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
-DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 
5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670
 SHA512 
c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
new file mode 100644
index 000..ebf677a
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
@@ -0,0 +1,224 @@
+From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Tue, 22 May 2018 21:10:55 -0700
+Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on
+ alpha
+
+In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
+somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
+function pointer indirection was intended to support dense vs sparse and
+sparse support is now gone, we can just make the functions static inline
+in compiler.h and avoid all of this.
+
+Bugzilla: https://bugs.gentoo.org/548906
+Tested-by: Christopher May-Townsend 
+Reviewed-by: Adam Jackson 
+Signed-off-by: Matt Turner 
+---
+ configure.ac|  4 --
+ hw/xfree86/common/compiler.h| 67 -
+ hw/xfree86/os-support/bsd/Makefile.am   |  3 +-
+ hw/xfree86/os-support/linux/Makefile.am | 12 --
+ hw/xfree86/os-support/linux/lnx_video.c | 27 -
+ hw/xfree86/os-support/meson.build   |  1 -
+ 6 files changed, 50 insertions(+), 64 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ddc47faa2..0075b6ace 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then
+   XORG_OS_SUBDIR="linux"
+   linux_acpi="no"
+   case $host_cpu in
+-alpha*)
+-  linux_alpha=yes
+-  ;;
+ i*86|amd64*|x86_64*|ia64*)
+   linux_acpi=$enable_linux_acpi
+   ;;
+@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
+ AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
+ AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
+ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
+-AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
+ AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
+ AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
+ AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index eea29dfb5..7144c6a27 100644
+--- a/hw/xfree86/common/compiler.h
 b/hw/xfree86/common/compiler.h
+@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port)
+ #endif
+ 
+ #ifdef __alpha__
+-/* entry points for Mmio memory access routines */
+-extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2018-05-08 Thread Jory Pratt 
commit: 962a0b3ad3c4fb54d425235eed441fe213436c38
Author: Jory A. Pratt  gentoo  org>
AuthorDate: Tue May  8 18:00:28 2018 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Tue May  8 18:00:28 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=962a0b3a

x11-base/xorg-server - bug #653688 patch inclusion

 ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch |  39 
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild  | 252 +
 2 files changed, 291 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
new file mode 100644
index 000..d7e5e51
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
@@ -0,0 +1,39 @@
+From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tapani=20P=C3=A4lli?= 
+Date: Tue, 28 Nov 2017 09:23:29 +0200
+Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes blending issues seen with kwin and gnome-shell when
+32bit visual has sRGB capability set.
+
+Reviewed-by: Adam Jackson 
+Signed-off-by: Tapani Pälli 
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655
+---
+ glx/glxscreens.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/glx/glxscreens.c b/glx/glxscreens.c
+index 73444152a..596d972e0 100644
+--- a/glx/glxscreens.c
 b/glx/glxscreens.c
+@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
+ /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
+ if (visual->nplanes == 32 && config->rgbBits != 32)
+ continue;
++/* If it's the 32-bit RGBA visual, do not pick sRGB capable config.
++ * This can cause issues with compositors that are not sRGB aware.
++ */
++if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE)
++continue;
+ /* Can't use the same FBconfig for multiple X visuals.  I think. */
+ if (config->visualID != 0)
+ continue;
+-- 
+2.17.0
+

diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
new file mode 100644
index 000..c3cd8c9
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="arm"
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid 
systemd tslib +udev unwind xcsecurity"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl )
+   >=x11-apps/iceauth-1.0.2
+   >=x11-apps/rgb-1.0.3
+   >=x11-apps/xauth-1.0.3
+   x11-apps/xkbcomp
+   >=x11-libs/libdrm-2.4.46
+   >=x11-libs/libpciaccess-0.12.901
+   >=x11-libs/libXau-1.0.4
+   >=x11-libs/libXdmcp-1.0.2
+   >=x11-libs/libXfont2-2.0.1
+   >=x11-libs/libxkbfile-1.0.4
+   >=x11-libs/libxshmfence-1.1
+   >=x11-libs/pixman-0.27.2
+   >=x11-libs/xtrans-1.3.5
+   >=x11-misc/xbitmaps-1.0.1
+   >=x11-misc/xkeyboard-config-2.4.1-r3
+   dmx? (
+   x11-libs/libXt
+   >=x11-libs/libdmx-1.0.99.1
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXaw-1.0.4
+   >=x11-libs/libXext-1.0.99.4
+   >=x11-libs/libXfixes-5.0
+   >=x11-libs/libXi-1.2.99.1
+   >=x11-libs/libXmu-1.0.3
+   x11-libs/libXrender
+   >=x11-libs/libXres-1.0.3
+   >=x11-libs/libXtst-1.0.99.2
+   )
+   glamor? (
+   media-libs/libepoxy[X]
+   >=media-libs/mesa-10.3.4-r1[egl,gbm]
+   !x11-libs/glamor
+   )
+   kdrive? (
+   >=x11-libs/libXext-1.0.5
+   x11-libs/libXv
+   )
+   xephyr? (
+   x11-libs/libxcb[xkb]
+   x11-libs/xcb-util
+   x11-libs/xcb-util-image
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-renderutil
+   x11-libs/xcb-util-wm
+   )
+   !minimal? (
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXext-1.0.5
+

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2018-03-04 Thread Anthony G. Basile 
commit: 2bb7220745904b11339c7ba76558fb835f9512b4
Author: stefson  yahoo  de>
AuthorDate: Sun Mar  4 13:46:56 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Mar  4 16:57:36 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=2bb72207

add xorg-server-1.20-pre for testing

 x11-base/xorg-server/Manifest  |   1 +
 x11-base/xorg-server/files/dep-list|  29 +++
 .../xorg-server/xorg-server-1.19.99.901.ebuild | 220 +
 3 files changed, 250 insertions(+)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6c5d01c..843e283 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1,3 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
+DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 
5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670
 SHA512 
c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5

diff --git a/x11-base/xorg-server/files/dep-list 
b/x11-base/xorg-server/files/dep-list
new file mode 100644
index 000..3e064ba
--- /dev/null
+++ b/x11-base/xorg-server/files/dep-list
@@ -0,0 +1,29 @@
+=x11-base/xorg-server-1.19.99.901
+=x11-base/xorg-proto-2018.4
+=x11-proto/bigreqsproto-1.1.2-r1
+=x11-proto/compositeproto-0.4.2-r2
+=x11-proto/damageproto-1.2.1-r2
+=x11-proto/dri2proto-2.1.1-r2
+=x11-proto/dri3proto-1.0-r1
+=x11-proto/fixesproto-5.0-r2
+=x11-proto/fontsproto-2.1.3-r1
+=x11-proto/glproto-1.4.17-r2
+=x11-proto/inputproto-2.3.2-r1
+=x11-proto/kbproto-1.0.7-r1
+=x11-proto/presentproto-1.1-r1
+=x11-proto/randrproto-1.5.0-r1
+=x11-proto/recordproto-1.14.2-r2
+=x11-proto/renderproto-0.11.1-r2
+=x11-proto/resourceproto-1.2.0-r1
+=x11-proto/scrnsaverproto-1.2.2-r2
+=x11-proto/trapproto-3.4.3-r1
+=x11-proto/videoproto-2.3.3-r1
+=x11-proto/xcmiscproto-1.2.2-r1
+=x11-proto/xextproto-7.3.0-r1
+=x11-proto/xf86bigfontproto-1.2.0-r2
+=x11-proto/xf86dgaproto-2.1-r3
+=x11-proto/xf86driproto-2.1.1-r2
+=x11-proto/xf86vidmodeproto-2.3.1-r2
+=x11-proto/xineramaproto-1.2.1-r2
+=x11-proto/xproto-7.0.31-r1
+

diff --git a/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild
new file mode 100644
index 000..cbef0e7
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.19.99.901.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != * ]]; then
+   KEYWORDS="~arm"
+fi
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd 
+udev unwind xcsecurity"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl )
+   >=x11-apps/iceauth-1.0.2
+   >=x11-apps/rgb-1.0.3
+   >=x11-apps/xauth-1.0.3
+   x11-apps/xkbcomp
+   >=x11-libs/libdrm-2.4.46
+   >=x11-libs/libpciaccess-0.12.901
+   >=x11-libs/libXau-1.0.4
+   >=x11-libs/libXdmcp-1.0.2
+   >=x11-libs/libXfont2-2.0.1
+   >=x11-libs/libxkbfile-1.0.4
+   >=x11-libs/libxshmfence-1.1
+   >=x11-libs/pixman-0.27.2
+   >=x11-libs/xtrans-1.3.5
+   >=x11-misc/xbitmaps-1.0.1
+   >=x11-misc/xkeyboard-config-2.4.1-r3
+   dmx? (
+   x11-libs/libXt
+   >=x11-libs/libdmx-1.0.99.1
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXaw-1.0.4
+   >=x11-libs/libXext-1.0.99.4
+   >=x11-libs/libXfixes-5.0
+   >=x11-libs/libXi-1.2.99.1
+   >=x11-libs/libXmu-1.0.3
+   x11-libs/libXrender
+   >=x11-libs/libXres-1.0.3
+   >=x11-libs/libXtst-1.0.99.2
+   )
+   glamor? (
+   media-libs/libepoxy[X]
+   >=media-libs/mesa-10.3.4-r1[egl,gbm]
+   !x11-libs/glamor
+   )
+   kdrive? (
+   >=x11-libs/libXext-1.0.5
+   x11-libs/libXv
+   )
+   xephyr? (
+

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-03-04 Thread Anthony G. Basile 
commit: 45fedd0100847b71ad863598b224c87622ddeb2b
Author: stefson  yahoo  de>
AuthorDate: Thu Mar  1 10:08:58 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Mar  4 16:57:36 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=45fedd01

x11-base/xorg-server: rebump to unbreak circ dep, see #648926

 .../{xorg-server-1.19.5.ebuild => xorg-server-1.19.5-r1.ebuild}  | 1 -
 .../{xorg-server-1.19.6.ebuild => xorg-server-1.19.6-r1.ebuild}  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.19.5.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
similarity index 99%
rename from x11-base/xorg-server/xorg-server-1.19.5.ebuild
rename to x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
index 1dc8c49..9e51437 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
@@ -101,7 +101,6 @@ DEPEND="${CDEPEND}
>=x11-proto/xcmiscproto-1.2.0
>=x11-proto/xextproto-7.2.99.901
>=x11-proto/xf86dgaproto-2.0.99.1
-   >=x11-proto/xf86rushproto-1.1.2
>=x11-proto/xf86vidmodeproto-2.2.99.1
>=x11-proto/xineramaproto-1.1.3
>=x11-proto/xproto-7.0.31

diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
similarity index 99%
rename from x11-base/xorg-server/xorg-server-1.19.6.ebuild
rename to x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
index 6d816a8..a56636b 100644
--- a/x11-base/xorg-server/xorg-server-1.19.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
@@ -101,7 +101,6 @@ DEPEND="${CDEPEND}
>=x11-proto/xcmiscproto-1.2.0
>=x11-proto/xextproto-7.2.99.901
>=x11-proto/xf86dgaproto-2.0.99.1
-   >=x11-proto/xf86rushproto-1.1.2
>=x11-proto/xf86vidmodeproto-2.2.99.1
>=x11-proto/xineramaproto-1.1.3
>=x11-proto/xproto-7.0.31

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-02-07 Thread Anthony G. Basile 
commit: 57a3aee96b8f91d853a3b9aafcf20f1f7b044ce5
Author: stefson  yahoo  de>
AuthorDate: Sun Feb  4 10:30:56 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Feb  7 12:19:22 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=57a3aee9

x11-base/xorg-server: rebump

 x11-base/xorg-server/xorg-server-1.19.6.ebuild | 252 +
 1 file changed, 252 insertions(+)

diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
new file mode 100644
index 000..22e4152
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~arm"
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid 
systemd tslib +udev unwind xcsecurity"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl )
+   >=x11-apps/iceauth-1.0.2
+   >=x11-apps/rgb-1.0.3
+   >=x11-apps/xauth-1.0.3
+   x11-apps/xkbcomp
+   >=x11-libs/libdrm-2.4.46
+   >=x11-libs/libpciaccess-0.12.901
+   >=x11-libs/libXau-1.0.4
+   >=x11-libs/libXdmcp-1.0.2
+   >=x11-libs/libXfont2-2.0.1
+   >=x11-libs/libxkbfile-1.0.4
+   >=x11-libs/libxshmfence-1.1
+   >=x11-libs/pixman-0.27.2
+   >=x11-libs/xtrans-1.3.5
+   >=x11-misc/xbitmaps-1.0.1
+   >=x11-misc/xkeyboard-config-2.4.1-r3
+   dmx? (
+   x11-libs/libXt
+   >=x11-libs/libdmx-1.0.99.1
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXaw-1.0.4
+   >=x11-libs/libXext-1.0.99.4
+   >=x11-libs/libXfixes-5.0
+   >=x11-libs/libXi-1.2.99.1
+   >=x11-libs/libXmu-1.0.3
+   x11-libs/libXrender
+   >=x11-libs/libXres-1.0.3
+   >=x11-libs/libXtst-1.0.99.2
+   )
+   glamor? (
+   media-libs/libepoxy[X]
+   >=media-libs/mesa-10.3.4-r1[egl,gbm]
+   !x11-libs/glamor
+   )
+   kdrive? (
+   >=x11-libs/libXext-1.0.5
+   x11-libs/libXv
+   )
+   xephyr? (
+   x11-libs/libxcb[xkb]
+   x11-libs/xcb-util
+   x11-libs/xcb-util-image
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-renderutil
+   x11-libs/xcb-util-wm
+   )
+   !minimal? (
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXext-1.0.5
+   >=media-libs/mesa-10.3.4-r1
+   )
+   tslib? ( >=x11-libs/tslib-1.0 )
+   udev? ( >=virtual/udev-150 )
+   unwind? ( sys-libs/libunwind )
+   wayland? (
+   >=dev-libs/wayland-1.3.0
+   media-libs/libepoxy
+   >=dev-libs/wayland-protocols-1.1
+   )
+   >=x11-apps/xinit-1.3.3-r1
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd
+   )"
+
+DEPEND="${CDEPEND}
+   sys-devel/flex
+   >=x11-proto/bigreqsproto-1.1.0
+   >=x11-proto/compositeproto-0.4
+   >=x11-proto/damageproto-1.1
+   >=x11-proto/fixesproto-5.0
+   >=x11-proto/fontsproto-2.1.3
+   >=x11-proto/glproto-1.4.17-r1
+   >=x11-proto/inputproto-2.3
+   >=x11-proto/kbproto-1.0.3
+   >=x11-proto/randrproto-1.5.0
+   >=x11-proto/recordproto-1.13.99.1
+   >=x11-proto/renderproto-0.11
+   >=x11-proto/resourceproto-1.2.0
+   >=x11-proto/scrnsaverproto-1.1
+   >=x11-proto/trapproto-3.4.3
+   >=x11-proto/videoproto-2.2.2
+   >=x11-proto/xcmiscproto-1.2.0
+   >=x11-proto/xextproto-7.2.99.901
+   >=x11-proto/xf86dgaproto-2.0.99.1
+   >=x11-proto/xf86rushproto-1.1.2
+   >=x11-proto/xf86vidmodeproto-2.2.99.1
+   >=x11-proto/xineramaproto-1.1.3
+   >=x11-proto/xproto-7.0.31
+   >=x11-proto/presentproto-1.0
+   >=x11-proto/dri2proto-2.8
+   >=x11-proto/dri3proto-1.0
+   dmx? (
+   >=x11-proto/dmxproto-2.2.99.1
+   doc? (
+   || (
+   www-client/links
+   www-client/lynx
+   www-client/w3m
+   )
+   )
+   )
+   !minimal? (
+   >=x11-proto/xf86driproto-2.1.0
+   )"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-xserver )
+   !x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+   xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+   || ( ${IUSE_SERVERS}

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2018-02-07 Thread Anthony G. Basile 
commit: 783ead0307c3c9ab10396baa1b61d90964029484
Author: stefson  yahoo  de>
AuthorDate: Wed Feb  7 11:36:19 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Feb  7 12:19:22 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=783ead03

x11-base/xorg-server: fix manifest to make travis happy

 x11-base/xorg-server/Manifest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9b10279..6c5d01c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1,2 @@
-DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 
18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 WHIRLPOOL 
01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
+DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-02-07 Thread Anthony G. Basile 
commit: e1b6c26ad078a85dc8e15054169176c96406955f
Author: stefson  yahoo  de>
AuthorDate: Sun Feb  4 10:34:54 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Feb  7 12:19:22 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=e1b6c26a

x11-base/xorg-server: fix for #646390

 .../files/xorg-server-1.19.6-fix-NULL-value-detection.patch | 13 +
 x11-base/xorg-server/xorg-server-1.19.6.ebuild  |  2 ++
 2 files changed, 15 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
new file mode 100644
index 000..94c319a
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/config/udev.c b/config/udev.c
+index e198e8609..3a73189e2 100644
+--- a/config/udev.c
 b/config/udev.c
+@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
+ #endif
+ 
+ value = udev_device_get_property_value(udev_device, "ID_INPUT");
+-if (value && !strcmp(value, "0")) {
++if (!value || !strcmp(value, "0")) {
+ LogMessageVerb(X_INFO, 10,
+"config/udev: ignoring device %s without "
+"property ID_INPUT set\n", path);

diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
index 22e4152..6d816a8 100644
--- a/x11-base/xorg-server/xorg-server-1.19.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
@@ -146,6 +146,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
"${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
"${FILESDIR}"/${PN}-1.17.4-arm-musl.patch
+   # see https://bugs.gentoo.org/646390
+"${FILESDIR}"/${PN}-1.19.6-fix-NULL-value-detection.patch
 )
 
 pkg_pretend() {

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-01-03 Thread Aric Belsito 
commit: 83b7fa3ee934fc0377c4bbb5343de79fb1a0733a
Author: stefson  yahoo  de>
AuthorDate: Wed Jan  3 16:45:43 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Wed Jan  3 16:45:43 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=83b7fa3e

x11-base/xorg-server: revbump

 x11-base/xorg-server/Manifest  |  2 +-
 .../files/xorg-server-1.18-sysmacros.patch | 59 --
 .../files/xorg-server-1.19.4-sysmacros.patch   | 36 +
 ...ver-1.19.3.ebuild => xorg-server-1.19.5.ebuild} |  4 +-
 4 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2021b40..9b10279 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 
677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 
b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669
 WHIRLPOOL 
acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad74416e6be89575523285e1ca3954f9e60a5cf079
+DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 
18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 WHIRLPOOL 
01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e

diff --git a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch 
b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch
deleted file mode 100644
index 5a3dea3..000
--- a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
-Date: Sat, 16 Apr 2016 13:04:59 +0200
-Subject: [PATCH] Include sys/sysmacros.h for major(3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU major(3) manual page prescribes , but that does not work with
-sys-libs/glibc-2.23-r1.
-
-https://bugs.gentoo.org/show_bug.cgi?id=580044
-Signed-off-by: Petr Písař 

- config/udev.c  | 1 +
- hw/xfree86/common/xf86Xinput.c | 2 ++
- hw/xfree86/os-support/linux/lnx_init.c | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/config/udev.c b/config/udev.c
-index 28c2658..62908f4 100644
 a/config/udev.c
-+++ b/config/udev.c
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "input.h"
- #include "inputstr.h"
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index c56a2b9..d33c165 100644
 a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -86,6 +86,8 @@
- #include 
- #ifdef HAVE_SYS_MKDEV_H
- #include   /* for major() & minor() on Solaris */
-+#else
-+#include 
- #endif
- 
- #include "mi.h"
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c 
b/hw/xfree86/os-support/linux/lnx_init.c
-index 1ed213c..6caf531 100644
 a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -38,6 +38,7 @@
- #include "xf86_OSlib.h"
- 
- #include 
-+#include 
- 
- #ifndef K_OFF
- #define K_OFF 0x4
--- 
-2.8.1
-

diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
new file mode 100644
index 000..8a3cb76
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
@@ -0,0 +1,36 @@
+From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Wed, 11 Oct 2017 16:11:49 +0300
+Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor
+ functions for new glibc
+
+Commits d732c36597fa and 84e3b96b5313 added the include to some files, but
+missed config/udev.c, where the major and minor functions are used as well.
+This should be Linux-only, so we don't need the sys/mkdev.h case here for
+Solaris.
+
+Signed-off-by: Mart Raudsepp 
+---
+https://bugs.gentoo.org/633530
+https://patchwork.freedesktop.org/patch/181800/
+
+ config/udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/config/udev.c b/config/udev.c
+index 932f230..b3b8d0f 100644
+--- a/config/udev.c
 b/config/udev.c
+@@ -30,6 +30,9 @@
+ #include 
+ #include 
+ #include 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include 
++#endif
+ 
+ #include "input.h"
+ #include "inputstr.h"
+-- 
+2.10.2
+

diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
similarity index 97%
rename from x11-base/xorg-server/xorg-server-1.19.3.ebuild
rename to

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2017-10-04 Thread Anthony G. Basile 
commit: 20e2d29f21ac8f681063a576a9ea0669140d919c
Author: stefson  yahoo  de>
AuthorDate: Wed Oct  4 09:48:02 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Oct  4 14:36:22 2017 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=20e2d29f

x11-base/xorg-server: sync keywords

 x11-base/xorg-server/Manifest  | 2 +-
 x11-base/xorg-server/xorg-server-1.19.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6a2b83b..f885294 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -7,5 +7,5 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 
SHA256 07ef91cb5
 AUX xorg-server-1.18-sysmacros.patch 1698 SHA256 
bcd9aa80cd37d05aa4c09bb60e72eab47c14165cc479fd8cb743dca47f1b72b8 SHA512 
e92300d9e965ebed7dc6f90d6d58b616e589f3df57efc954280a5eba65fa098bb6069f9b06c81cda169d46051f51a707e5ca659f820fc64948431bbc80e3e5a0
 WHIRLPOOL 
dcb9469c22bc0b6478b0891bf88dcebc214990d12cb7387d1e6f86d8ebd12a5be71c4f0449a10d39034b7e34eef4b1a8846c7f406f1184e19f8e00f8f4c5e69b
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 
677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 
b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669
 WHIRLPOOL 
acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad74416e6be89575523285e1ca3954f9e60a5cf079
-EBUILD xorg-server-1.19.3.ebuild 6433 SHA256 
7d5ab597d6e824d2c74e1ffddbc44753280e49a3e320e35465b432bb8a408c7a SHA512 
fb6d230c365a6b2b1c773b7ccb8b7189bf37b53f86b9fb6a1ec2bd48a75206df2e776ae3e9ceef860bb6cac522e8d78b9b89a941d0df0b1520e11491137001f6
 WHIRLPOOL 
8c3fff1a2a16d7c0bd0e5f94a9d1327e57757621a0c132cca4cb3dea23de70c222f733d9798af97e600f7503b76e051ff28e31f94978b494d22bc88d660a8764
+EBUILD xorg-server-1.19.3.ebuild 6432 SHA256 
416b29bc41487b80c737b49e3a0cd4075bb6247bc0cf54a32cc6ed508c8d3e1d SHA512 
bf66b61f48390c0420d33d961567a50b8e4472dba7d083e9c735598faeccff2aa286a0444321a2bce331415bedaf2af7bad9c50fa5c7c8db19d69383eb681667
 WHIRLPOOL 
abb3b0b7d2192ac22159865e2154df11639168aa9e79849baaf686dc033ff88d5cc9f4c10fd22e52b028a829f14308d7b259a22a749f827bfa3237cda2b9f0fc
 MISC metadata.xml 934 SHA256 
acb36a2492283548f6ece8ae25973cb832092c77976924cde61cfe4ec16a2544 SHA512 
97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
 WHIRLPOOL 
32254696451b638c886b8d78b32973abb7a73f593f2cec14e5f6513c8acb32578881086b29701e7b74c137a21b9d58a589e9c444ca7a23ec2c5ea8dea153b28b

diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.3.ebuild
index ca5c1cf..d4af96d 100644
--- a/x11-base/xorg-server/xorg-server-1.19.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.3.ebuild
@@ -9,7 +9,7 @@ 
EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~arm"
+KEYWORDS="arm"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd 
tslib +udev unwind xcsecurity"

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2017-09-03 Thread Anthony G. Basile 
commit: d2d57ae9fa80cc944a9d13fe4b5b8d95756ff2c9
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Sep  3 21:59:08 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Sep  3 21:59:08 2017 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d2d57ae9

x11-base/xorg-server: sync to tree

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 x11-base/xorg-server/Manifest  |  16 +-
 .../files/xorg-server-1.12-ia64-fix_inx_outx.patch |  60 -
 .../files/xorg-server-1.14.3-musl.patch|  31 ---
 .../files/xorg-server-1.17-ia64-fix_inx_outx.patch |  59 -
 ...rver-1.17-support-multiple-Files-sections.patch |  65 --
 x11-base/xorg-server/metadata.xml  |   1 +
 x11-base/xorg-server/xorg-server-1.16.4.ebuild | 258 -
 x11-base/xorg-server/xorg-server-1.17.4.ebuild | 245 ---
 x11-base/xorg-server/xorg-server-1.18.4.ebuild | 243 ---
 ...ver-1.19.1.ebuild => xorg-server-1.19.3.ebuild} |  22 +-
 10 files changed, 19 insertions(+), 981 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2666149..6a2b83b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,21 +1,11 @@
 AUX xdm-setup.initd-1 232 SHA256 
5985efb5e707b1817b4452410068a322a4db2a00ee0f84e41f3b35b31b9b4dd5 SHA512 
809be51c6fcbc251e7feb18e0e8026d4b5a17d4f15478b80159daabf505ccc4e7e03c991373e6de5ad49fc7e3c39814d094ac5b80744a5207bdb192a59683a30
 WHIRLPOOL 
35c8db787d1a6a35a0027f772dac8dabe9d3dd9e341dd7193dcceddbe3c874054f73ec92a3a4cc756583134cb858d8f64ebd01221ca1d155afde6c58c3659b7f
 AUX xdm.confd-4 562 SHA256 
9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 
facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b
 WHIRLPOOL 
d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
 AUX xdm.initd-11 6028 SHA256 
89728c129014a9ddcd0607da207be91d7b40f22541db51e0e8d22b8d110c40f5 SHA512 
4b931a59b79864ffa4e887a92ba16f80ddaafbae2690be41413b0ba05dc46c094a5a97e7677dc0f50120b542265f5495675062e7517da5a74a0131247d7f7fc0
 WHIRLPOOL 
33c9ac02edb0d3e4347151989a00725f0533a2ed5bdd2fb37f90a917f75b114577aecce94ef4b395b4daec4433e961fdd5ab390f875d645cca169a82b2d3d28b
-AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 
bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 
18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd
 WHIRLPOOL 
cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 
c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 
a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 WHIRLPOOL 
7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
-AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9cf2a319648576b30a1cf5be2621fd1 SHA512 
06bc6860c6fc5508c3e7458f2a6061ad02e893d0ba6303423fe76d12b223ef609f225383da891ecbaf448d9ba82bad94f33d5854763b467c1845588fbbbafcb2
 WHIRLPOOL 
52e957f34a738fe79eb54707252642ee2a748fc10655a02d6998f5f93380766082a772f1de91d8c65042421329af70a9057580dd5f521edec48516ba58803793
-AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 
4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 
1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1
 WHIRLPOOL 
8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc0215
-AUX xorg-server-1.17-support-multiple-Files-sections.patch 2256 SHA256 
1cc57d2e8449d50737c507005df348610bb68241fe36e997e4803b3b8b3e6d86 SHA512 
e3141727c993e02b2e067095807e96ef0cc82e2e7c8b65664d0530ef05a0f7b9170272e4e1e3523ede3f1cc23b00c4776785b8299e0b58a6e7fd56062aecefb6
 WHIRLPOOL 
078a5e30777a8f6e908421a1c7cc4a7e63c23f57b600bb1117bc1e8de2db0e6440870f811e65283acaa48da06fcc5666434d2bdce257709344e8f584d1525623
 AUX xorg-server-1.17.4-arm-musl.patch 682 SHA256 
b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 SHA512 
b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09
 WHIRLPOOL 
3a197692f3d5a7563294248784d8afb5d74eb19e8533cab5166364e96753e0c99c1cbfc236b74c9fcfa553822e277b62f19a4b7193697c9e0c991d3f00de5b8e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 
07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2017-01-25 Thread Aric Belsito 
commit: 38683da262a270db0b91ae9d0ff06a6ff158ed30
Author: Aric Belsito  gmail  com>
AuthorDate: Wed Jan 25 22:59:43 2017 +
Commit: Aric Belsito  gmail  com>
CommitDate: Wed Jan 25 22:59:43 2017 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=38683da2

x11-base/xorg-server: Version bump to 1.19.1

Sync with tree.

 x11-base/xorg-server/Manifest  |  5 +-
 .../files/xorg-server-1.18-sysmacros.patch | 59 ++
 x11-base/xorg-server/xorg-server-1.18.4.ebuild |  3 +-
 ...ver-1.18.4.ebuild => xorg-server-1.19.1.ebuild} | 10 ++--
 4 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b5ed0a9..ed36f90 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,11 +8,14 @@ AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 
4c844b2d41b6412304b8a91
 AUX xorg-server-1.17-support-multiple-Files-sections.patch 2256 SHA256 
1cc57d2e8449d50737c507005df348610bb68241fe36e997e4803b3b8b3e6d86 SHA512 
e3141727c993e02b2e067095807e96ef0cc82e2e7c8b65664d0530ef05a0f7b9170272e4e1e3523ede3f1cc23b00c4776785b8299e0b58a6e7fd56062aecefb6
 WHIRLPOOL 
078a5e30777a8f6e908421a1c7cc4a7e63c23f57b600bb1117bc1e8de2db0e6440870f811e65283acaa48da06fcc5666434d2bdce257709344e8f584d1525623
 AUX xorg-server-1.17.4-arm-musl.patch 682 SHA256 
b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 SHA512 
b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09
 WHIRLPOOL 
3a197692f3d5a7563294248784d8afb5d74eb19e8533cab5166364e96753e0c99c1cbfc236b74c9fcfa553822e277b62f19a4b7193697c9e0c991d3f00de5b8e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 
07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 
5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 WHIRLPOOL 
08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad
+AUX xorg-server-1.18-sysmacros.patch 1698 SHA256 
bcd9aa80cd37d05aa4c09bb60e72eab47c14165cc479fd8cb743dca47f1b72b8 SHA512 
e92300d9e965ebed7dc6f90d6d58b616e589f3df57efc954280a5eba65fa098bb6069f9b06c81cda169d46051f51a707e5ca659f820fc64948431bbc80e3e5a0
 WHIRLPOOL 
dcb9469c22bc0b6478b0891bf88dcebc214990d12cb7387d1e6f86d8ebd12a5be71c4f0449a10d39034b7e34eef4b1a8846c7f406f1184e19f8e00f8f4c5e69b
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL 
63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 
4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
 WHIRLPOOL 
c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
+DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 
79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 
37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 WHIRLPOOL 
9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555
 EBUILD xorg-server-1.16.4.ebuild 6867 SHA256 
8efa7f03ede2f1c8e029da79298d327642be69abbd9aeccb40c5deaea2f02586 SHA512 
841d47e5565f1dc3aa09616c963e2d8a87e6342547a35e936992835397bfff93fac1ede0677fd24f38b86393c1a3f0639155fd1ad4b0c8e197d7c364ab55fc6b
 WHIRLPOOL 
a2fcb8a18cc861ac1efbe9dad65f9c19e46a75db0d900c93a9d1b8bbef8f07c271707175878718d803a51e2cd0f5ea57bc4e1cf7bb2afc26faa7791c27308743
 EBUILD xorg-server-1.17.4.ebuild 6268 SHA256

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2016-12-03 Thread Felix Janda 
commit: d13fa82db6c0ec9f429dd7a209ffaf6c80a06f37
Author: Felix Janda  posteo  de>
AuthorDate: Sun Dec  4 01:17:18 2016 +
Commit: Felix Janda  posteo  de>
CommitDate: Sun Dec  4 01:17:18 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d13fa82d

x11-base/xorg-server-1.18.4: arm stable

 x11-base/xorg-server/Manifest  | 2 +-
 x11-base/xorg-server/xorg-server-1.18.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 01924d7..b5ed0a9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -14,5 +14,5 @@ DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
 EBUILD xorg-server-1.16.4.ebuild 6867 SHA256 
8efa7f03ede2f1c8e029da79298d327642be69abbd9aeccb40c5deaea2f02586 SHA512 
841d47e5565f1dc3aa09616c963e2d8a87e6342547a35e936992835397bfff93fac1ede0677fd24f38b86393c1a3f0639155fd1ad4b0c8e197d7c364ab55fc6b
 WHIRLPOOL 
a2fcb8a18cc861ac1efbe9dad65f9c19e46a75db0d900c93a9d1b8bbef8f07c271707175878718d803a51e2cd0f5ea57bc4e1cf7bb2afc26faa7791c27308743
 EBUILD xorg-server-1.17.4.ebuild 6268 SHA256 
af632318465138602e33f7817e80e611bd3ebe341a82f88b8b05488e473c255f SHA512 
d74dc4d3aeb89f457da4c68845de885d65e0d524aa4a0fe90c3050fa606d9e3f856ab0d540cb8c9459f2eea22b8ef7654cea93432aa2efd731f3a1fc530b4d96
 WHIRLPOOL 
bd1f346462069471f3f2ca777b6e7708fd5f3453ed53ea2a75eaf2db790729933280d414a514582381b321248e08fb5b409e6ef6db4aeb43d12d83d9c968b76f
-EBUILD xorg-server-1.18.4.ebuild 6116 SHA256 
98a95f4e73c0f77324d2a461e7bc4a4ffba95ba7695bd5ba5f6c87dac95f4428 SHA512 
42a0438b7f41e568f510576ead329abfbdd964729e729936e0fe7c9ee1877aca5d6cc937f6454e7b1203bcc0638dff8feae0ebf824cd8502eb3a25d00629ecb8
 WHIRLPOOL 
511d67a2d0eba836fc4fa2982c8d224bee7e4970fb57c7486fbba5eed47cf5d8cb1bdb30aa2ccdc2f52bee93d965b62707ee1c026efa73db3ea4d97ae12839c0
+EBUILD xorg-server-1.18.4.ebuild 6115 SHA256 
538e0f93f41cef8b58628ae60bc94ab57716d19187363979eb0381745903102a SHA512 
1c696fd0c6c5a9ec14d3a3df826c7a02d0de58790f2ddd579c7a0e68f1c46ddccfbae4acd5b8f2e15c0c65f14cc8647020dac75eddd49eebb513b5f76fc89212
 WHIRLPOOL 
d0f153e9c7e85bb90a3990d6dae032e57681227160cf67c068998f50038c6ef98a35d9f4c89319c17c495e1eea08b378d790a749ca8502b2352d679a10e4a919
 MISC metadata.xml 877 SHA256 
b41a133db7c20ca9b78a620f30af984d178baef7207c8c4329e1309835e8b522 SHA512 
370e41da26388e328697958396b808c831e07245dc9e2ea230316bee8067d8501d032a0c9f89b7f1ea27c816490803839a8f14485aacde6143b3db38a6e1ede2
 WHIRLPOOL 
ce70642eac3ef6ea824755d4d1bc7bdf8e5d3b95300ef43a41e1f5e710df0f12179f0a15b21dae0fbebb0dd56e35008f1e991463215a7f23dd2fd977400da40b

diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index 1808a1c..edc100e 100644
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~arm"
+KEYWORDS="arm"
 
 IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib 
+udev unwind wayland"

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2016-11-26 Thread Aric Belsito 
commit: b5ec1dd23bf7e6e4ec5a54a1a1abae5d07097876
Author: Aric Belsito  gmail  com>
AuthorDate: Sat Nov 26 23:44:39 2016 +
Commit: Aric Belsito  gmail  com>
CommitDate: Sat Nov 26 23:44:39 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=b5ec1dd2

x11-base/xorg-server: 1.18.4 has ~arm keyword

 x11-base/xorg-server/Manifest  | 2 +-
 x11-base/xorg-server/xorg-server-1.18.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b5ed0a9..01924d7 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -14,5 +14,5 @@ DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
 EBUILD xorg-server-1.16.4.ebuild 6867 SHA256 
8efa7f03ede2f1c8e029da79298d327642be69abbd9aeccb40c5deaea2f02586 SHA512 
841d47e5565f1dc3aa09616c963e2d8a87e6342547a35e936992835397bfff93fac1ede0677fd24f38b86393c1a3f0639155fd1ad4b0c8e197d7c364ab55fc6b
 WHIRLPOOL 
a2fcb8a18cc861ac1efbe9dad65f9c19e46a75db0d900c93a9d1b8bbef8f07c271707175878718d803a51e2cd0f5ea57bc4e1cf7bb2afc26faa7791c27308743
 EBUILD xorg-server-1.17.4.ebuild 6268 SHA256 
af632318465138602e33f7817e80e611bd3ebe341a82f88b8b05488e473c255f SHA512 
d74dc4d3aeb89f457da4c68845de885d65e0d524aa4a0fe90c3050fa606d9e3f856ab0d540cb8c9459f2eea22b8ef7654cea93432aa2efd731f3a1fc530b4d96
 WHIRLPOOL 
bd1f346462069471f3f2ca777b6e7708fd5f3453ed53ea2a75eaf2db790729933280d414a514582381b321248e08fb5b409e6ef6db4aeb43d12d83d9c968b76f
-EBUILD xorg-server-1.18.4.ebuild 6115 SHA256 
538e0f93f41cef8b58628ae60bc94ab57716d19187363979eb0381745903102a SHA512 
1c696fd0c6c5a9ec14d3a3df826c7a02d0de58790f2ddd579c7a0e68f1c46ddccfbae4acd5b8f2e15c0c65f14cc8647020dac75eddd49eebb513b5f76fc89212
 WHIRLPOOL 
d0f153e9c7e85bb90a3990d6dae032e57681227160cf67c068998f50038c6ef98a35d9f4c89319c17c495e1eea08b378d790a749ca8502b2352d679a10e4a919
+EBUILD xorg-server-1.18.4.ebuild 6116 SHA256 
98a95f4e73c0f77324d2a461e7bc4a4ffba95ba7695bd5ba5f6c87dac95f4428 SHA512 
42a0438b7f41e568f510576ead329abfbdd964729e729936e0fe7c9ee1877aca5d6cc937f6454e7b1203bcc0638dff8feae0ebf824cd8502eb3a25d00629ecb8
 WHIRLPOOL 
511d67a2d0eba836fc4fa2982c8d224bee7e4970fb57c7486fbba5eed47cf5d8cb1bdb30aa2ccdc2f52bee93d965b62707ee1c026efa73db3ea4d97ae12839c0
 MISC metadata.xml 877 SHA256 
b41a133db7c20ca9b78a620f30af984d178baef7207c8c4329e1309835e8b522 SHA512 
370e41da26388e328697958396b808c831e07245dc9e2ea230316bee8067d8501d032a0c9f89b7f1ea27c816490803839a8f14485aacde6143b3db38a6e1ede2
 WHIRLPOOL 
ce70642eac3ef6ea824755d4d1bc7bdf8e5d3b95300ef43a41e1f5e710df0f12179f0a15b21dae0fbebb0dd56e35008f1e991463215a7f23dd2fd977400da40b

diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index edc100e..1808a1c 100644
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="arm"
+KEYWORDS="~arm"
 
 IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib 
+udev unwind wayland"

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2016-11-26 Thread Aric Belsito 
commit: d06ae2570a2b2d80d75e13133e18b40355373e89
Author: Aric Belsito  gmail  com>
AuthorDate: Sat Nov 26 23:38:22 2016 +
Commit: Aric Belsito  gmail  com>
CommitDate: Sat Nov 26 23:38:22 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d06ae257

x11-base/xorg-server: Bump to 1.18.4

Sync with upstream.

Change keywords on 1.17.4 to only include arm because we only use an arm patch.

Drop the r99 postfix.

 x11-base/xorg-server/Manifest| 12 ++--
 x11-base/xorg-server/files/xdm-setup.initd-1 |  2 +-
 x11-base/xorg-server/files/xdm.initd-11  |  2 +-
 ...rg-server-1.16.4-r99.ebuild => xorg-server-1.16.4.ebuild} |  6 +++---
 x11-base/xorg-server/xorg-server-1.17.4.ebuild   |  6 +++---
 ...rg-server-1.18.3-r99.ebuild => xorg-server-1.18.4.ebuild} |  0
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 45e2d2d..b5ed0a9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
-AUX xdm-setup.initd-1 231 SHA256 
f88aadaea4a0d39bfac4e5bee60c316e0dbe6443d34b1f4629bf2324394883f7 SHA512 
ad67389976657127b3c59f86f20f167868acb91afb5bec6fc8e532469bc86f65d95667a13b6f7ecafa829dcf41ec1758ee007bab78951c6d0bec34f828a0618b
 WHIRLPOOL 
f44c55b51c69f14dac809a5e7505f8561789dde931bb11420703ce3ab5f08f0214460c69d19e2e67d8c59964540ae02b9f57a1c2ce75e34c395ce77b7d03b211
+AUX xdm-setup.initd-1 232 SHA256 
5985efb5e707b1817b4452410068a322a4db2a00ee0f84e41f3b35b31b9b4dd5 SHA512 
809be51c6fcbc251e7feb18e0e8026d4b5a17d4f15478b80159daabf505ccc4e7e03c991373e6de5ad49fc7e3c39814d094ac5b80744a5207bdb192a59683a30
 WHIRLPOOL 
35c8db787d1a6a35a0027f772dac8dabe9d3dd9e341dd7193dcceddbe3c874054f73ec92a3a4cc756583134cb858d8f64ebd01221ca1d155afde6c58c3659b7f
 AUX xdm.confd-4 562 SHA256 
9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 
facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b
 WHIRLPOOL 
d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
-AUX xdm.initd-11 6027 SHA256 
19992228827ae635f3ef08c1b08889afedfa563efa50bc2fb7db211caa8d1510 SHA512 
049a6ed1f8c0d55939f736793f988a86010cefb3e8fada60b5a12dc40ccb8e733c7036a4f61af67b1cab0cc24ab14ffadea92c0b1dbb56a41bd6e8869ab9759a
 WHIRLPOOL 
3b7be586db0d33d25a7127f565957c4dbb347f2a681365bd37115a86868246d43cb83542225c23d705b11943c8e7087a6f362685e66a479fdb551e4231cb7981
+AUX xdm.initd-11 6028 SHA256 
89728c129014a9ddcd0607da207be91d7b40f22541db51e0e8d22b8d110c40f5 SHA512 
4b931a59b79864ffa4e887a92ba16f80ddaafbae2690be41413b0ba05dc46c094a5a97e7677dc0f50120b542265f5495675062e7517da5a74a0131247d7f7fc0
 WHIRLPOOL 
33c9ac02edb0d3e4347151989a00725f0533a2ed5bdd2fb37f90a917f75b114577aecce94ef4b395b4daec4433e961fdd5ab390f875d645cca169a82b2d3d28b
 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 
bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 
18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd
 WHIRLPOOL 
cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 
c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 
a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 WHIRLPOOL 
7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
 AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9cf2a319648576b30a1cf5be2621fd1 SHA512 
06bc6860c6fc5508c3e7458f2a6061ad02e893d0ba6303423fe76d12b223ef609f225383da891ecbaf448d9ba82bad94f33d5854763b467c1845588fbbbafcb2
 WHIRLPOOL 
52e957f34a738fe79eb54707252642ee2a748fc10655a02d6998f5f93380766082a772f1de91d8c65042421329af70a9057580dd5f521edec48516ba58803793
@@ -11,8 +11,8 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 
1902 SHA256 07ef91cb5
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2016-10-01 Thread Felix Janda 
commit: 3406b7b5a9c63f1f14f3574b437801e098b4f619
Author: Felix Janda  posteo  de>
AuthorDate: Sat Oct  1 19:22:44 2016 +
Commit: Felix Janda  posteo  de>
CommitDate: Sat Oct  1 19:25:24 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3406b7b5

x11-base/xorg-server: add version 1.18.3 for arm

Reduce KEYWORDS to arm since this is the only arch that still
needs patching.

 x11-base/xorg-server/Manifest  |   3 +
 ...rver-1.18-support-multiple-Files-sections.patch |  53 +
 x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild | 243 +
 3 files changed, 299 insertions(+)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6c5da35..45e2d2d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -7,9 +7,12 @@ AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9c
 AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 
4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 
1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1
 WHIRLPOOL 
8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc0215
 AUX xorg-server-1.17-support-multiple-Files-sections.patch 2256 SHA256 
1cc57d2e8449d50737c507005df348610bb68241fe36e997e4803b3b8b3e6d86 SHA512 
e3141727c993e02b2e067095807e96ef0cc82e2e7c8b65664d0530ef05a0f7b9170272e4e1e3523ede3f1cc23b00c4776785b8299e0b58a6e7fd56062aecefb6
 WHIRLPOOL 
078a5e30777a8f6e908421a1c7cc4a7e63c23f57b600bb1117bc1e8de2db0e6440870f811e65283acaa48da06fcc5666434d2bdce257709344e8f584d1525623
 AUX xorg-server-1.17.4-arm-musl.patch 682 SHA256 
b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 SHA512 
b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09
 WHIRLPOOL 
3a197692f3d5a7563294248784d8afb5d74eb19e8533cab5166364e96753e0c99c1cbfc236b74c9fcfa553822e277b62f19a4b7193697c9e0c991d3f00de5b8e
+AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 
07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 
5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 WHIRLPOOL 
08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL 
63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 
4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
 WHIRLPOOL 
c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
+DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 
ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 
9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171
 WHIRLPOOL 
8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a
 EBUILD xorg-server-1.16.4-r99.ebuild 6767 SHA256 
9d2027c38b5e6cb0f8ecb7f97733172af29d2834dfb023a5f3bdc5a178938cf5 SHA512 
08b8b271c273ba27ac06fcca259ffdf87beaf8768ee326af8750a4f79bf78b99d935d2afa1249086961d5f937e65d597db7f08831d4df7db56ab65e2d9a36f25
 WHIRLPOOL 
b94da2f8bbccefd58b53437042cc3211a75abeaefa814e0fae4b829db055ce4034994dd1395fa2a809aa7c52af16140859de1920d1324a253aa688f1d7a5b911
 EBUILD xorg-server-1.17.4.ebuild 6282 SHA256 
d522e5273a368d66e8cd95906c47873009325dd83cd29dd9dfb4dd3765c8a675 SHA512 
ca9bb36a6c1bb26a579f44496931a8302c8b78c1a5287cbd772447cd79c7b468785b5dfb28368aad47ac8ed4368dab65313ca68528d7145566eb8561d184a2ef
 WHIRLPOOL 
019705c66bc05cbaa8b08affe45de151ec04ccc101df6cb717ec926a7dcadb085f74a774801c3b516dfd01f930fb3ceb00db7047ac93741b768542f0b0a9c11e
+EBUILD xorg-server-1.18.3-r99.ebuild 6115 SHA256

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2015-07-15 Thread Anthony G. Basile 
commit: dbc8ab7482a8144d415d5c70bab91d5479268929
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Wed Jul 15 06:34:20 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Wed Jul 15 06:34:20 2015 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=dbc8ab74

x11-base/xorg-server: fix Manifest.

 x11-base/xorg-server/Manifest | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0bd0d48..16ef984 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,21 +1,10 @@
 AUX xdm-setup.initd-1 346 SHA256 
942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 SHA512 
b12ef1a757213c2df2d4fb50691695fdaf00ee9edb7d4ec551980c48b6eb05598d3eda0db543719a11a82b019939fb4af82a19813d238a725dcc0d818379103e
 WHIRLPOOL 
28a033355ec3871eba2dfdf45969e9ac354d8ae542dcb1449901af856b9c26314318f6a91cec81f2548caaede19d88e14eac2de0fd7dab8957a7358e94a594b2
 AUX xdm.confd-4 562 SHA256 
9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 
facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b
 WHIRLPOOL 
d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
-AUX xdm.initd-10 6032 SHA256 
85e5778e23748c6a6285fdadaeb18e6c04b3fdf98d2a81f0ab9d854dbac8076c SHA512 
60656a77800a773f5e05e4725e62c2a666a4635192f0fa4f51dd27b31e743dac6ed3b2eeef4de271df3a0863b1e1c59d99755987a88c8bdb9542911266dd3bc7
 WHIRLPOOL 
8d2b389b74e45963fcfb98faefe1297d1f8ba2b7d03f243cc9555635073c599c4367e2d54a0081dcfc24964d3045f539f0c88ad22b6f76a517ef326e24957a71
 AUX xdm.initd-11 6136 SHA256 
86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930 SHA512 
6ebd1d4aa538c4de0591348e2befe0d03da2014863208ce52dbe9966e069908adcd5efd5b8ed01cfa3bd3c84121e91494e6d82e1cf96acac2ab0b03a2961dfae
 WHIRLPOOL 
16c6f69008c28f3fc2b84e7257e75df578308ed4a4a537600c43d7a6d372c64a3d8f9e8f1a59c2d8106e1bee9a87694d06f3d1f777d132a19544b747e745473d
-AUX xorg-server-1.12-cve-2013-4396.patch 2807 SHA256 
11707d59d550a9f0b04f0ca3dba1668c7f848a4e8a4cea7a6ae01c665bd11fe9 SHA512 
9c8fea712e7ad727390052fd6a717c00e6d16eecaee23153b21870b82772a67c841d9ae48573cf4f8adfc101c948ed25e454ce420226ca991a3c671ecdefa209
 WHIRLPOOL 
932cba6b4641156de7a56fa977fd39dcf171015e21d196de588694e31cb0fa1d9928b17a3ac81568581c6f722be252ca09125eb08a9f088d5550e205dd09cb42
-AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 
1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 
ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95
 WHIRLPOOL 
048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f466082245bc5fcde254aa5b
 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 
bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 
18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd
 WHIRLPOOL 
cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 
c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 
a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 WHIRLPOOL 
7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
 AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9cf2a319648576b30a1cf5be2621fd1 SHA512 
06bc6860c6fc5508c3e7458f2a6061ad02e893d0ba6303423fe76d12b223ef609f225383da891ecbaf448d9ba82bad94f33d5854763b467c1845588fbbbafcb2
 WHIRLPOOL 
52e957f34a738fe79eb54707252642ee2a748fc10655a02d6998f5f93380766082a772f1de91d8c65042421329af70a9057580dd5f521edec48516ba58803793
-AUX xorg-server-disable-acpi.patch 663 SHA256 
5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 
0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf
 WHIRLPOOL 
69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
-DIST xorg-server-1.14.3.tar.bz2 5502845 SHA256

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/

2015-07-15 Thread Anthony G. Basile 
commit: 340669600fe4ed2b2fb9362c080b908243c67721
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Wed Jul 15 13:29:06 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Wed Jul 15 13:29:06 2015 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=34066960

x11-base/xorg-server: add USE=glamor to metadata.xml.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA

 x11-base/xorg-server/Manifest  | 4 ++--
 x11-base/xorg-server/metadata.xml  | 1 +
 x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 16ef984..32d6e52 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -6,5 +6,5 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 
c68c4c0749b9229c3ca11c72b
 AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9cf2a319648576b30a1cf5be2621fd1 SHA512 
06bc6860c6fc5508c3e7458f2a6061ad02e893d0ba6303423fe76d12b223ef609f225383da891ecbaf448d9ba82bad94f33d5854763b467c1845588fbbbafcb2
 WHIRLPOOL 
52e957f34a738fe79eb54707252642ee2a748fc10655a02d6998f5f93380766082a772f1de91d8c65042421329af70a9057580dd5f521edec48516ba58803793
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL 
63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
-EBUILD xorg-server-1.16.4-r99.ebuild 6876 SHA256 
0739d3d91dbb842561047e565a8178a5f919e305eeefd07537a512f2379048bb SHA512 
ac798c226406c6166c95c52a669b96861a62226ffc0152b553419d527f186bbc37971d405a38ac80a28f300d8a8f9c71929b9522098b4a3d989b920c637b316c
 WHIRLPOOL 
4bdb8a87dac5693d0e8ad840bf156043286dde1feda2ce52133b5fd8a2c326cb3c89b3adfe4ceb6896895692e5d5039b9fdaf95f090b53700eb08b377c6489c6
-MISC metadata.xml 686 SHA256 
70ff076fe4097092f7d5a5515d4706a79123d4d1aa84a92e3c6a798b1ed7d4de SHA512 
b2e7ae9a2d062939bfb92b5628cd239f961bf4e646ec18aad9588abc481d6a3710d73a17cd398a7d8fbc699ef66ee427c3e40c3aeba64df1760e2fd793b07596
 WHIRLPOOL 
4d0b9f2bcfc75dcf2d8a56e7ffa9dbdac33a154033f45b0e66ccd46a091fa8f7c47bf982100a502fb7d4131df0435824a88bd81bd1791e7d9c48ef37cbca82ae
+EBUILD xorg-server-1.16.4-r99.ebuild 6878 SHA256 
2964b54ef3281174961903084f4c6333ced6e16f7fafc20e0655aa7a8d556694 SHA512 
1258f0db4d9b91e428e325c9ed0472792f1b34df290115aff29e3f8211d294ffbc0d4dc4b0d51ae6ffe919f89668dbeed3ea202f4477762034ae6014e634033e
 WHIRLPOOL 
5399e6a4f6d359049082290f0d39de1f8f09fed28d1f2b861a0d07bf14c4588388a366c0f56cf1a6d10b755c048b7353a2deedb8ea35624d64ff814c5f589ec7
+MISC metadata.xml 751 SHA256 
02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 
a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26
 WHIRLPOOL 
67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f

diff --git a/x11-base/xorg-server/metadata.xml 
b/x11-base/xorg-server/metadata.xml
index c5056f1..cbff1d2 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -4,6 +4,7 @@
 herdx11/herd
 use
flag name='dmx'Build the Distributed Multiheaded X server/flag
+   flag name='glamor'Enable Glamor OpenGL 2D acceleration/flag
flag name='kdrive'Build the kdrive X servers/flag
flag name='tslib'Build with tslib support for touchscreen 
devices/flag
flag name='unwind'Enable libunwind usage for backtraces/flag

diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild 
b/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
index 5c88b4a..17e4e65 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
@@ -17,7 +17,7 @@ IUSE=${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid 
systemd tslib +udev
 
 CDEPEND==app-eselect/eselect-opengl-1.0.8
!=app-eselect/eselect-opengl-1.3.0
-   dev-libs/openssl
+   dev-libs/openssl:=
media-libs/freetype
=x11-apps/iceauth-1.0.2
=x11-apps/rgb-1.0.3

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2015-07-14 Thread Anthony G. Basile 
commit: 144beef20cdc81d881a4ddba5921e31478200938
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Wed Jul 15 00:54:29 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Wed Jul 15 00:54:29 2015 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=144beef2

x11-base/xorg-server: clean out older versions.

 x11-base/xorg-server/files/xdm.initd-10| 226 --
 .../files/xorg-server-1.12-cve-2013-4396.patch |  75 --
 .../files/xorg-server-1.12-disable-acpi.patch  |  11 -
 .../files/xorg-server-disable-acpi.patch   |  31 ---
 x11-base/xorg-server/xorg-server-1.14.3-r99.ebuild | 251 
 x11-base/xorg-server/xorg-server-1.15.0-r99.ebuild | 254 
 x11-base/xorg-server/xorg-server-1.15.2-r99.ebuild | 257 -
 7 files changed, 1105 deletions(-)

diff --git a/x11-base/xorg-server/files/xdm.initd-10 
b/x11-base/xorg-server/files/xdm.initd-10
deleted file mode 100644
index 9826e6b..000
--- a/x11-base/xorg-server/files/xdm.initd-10
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-10,v 
1.1 2013/09/26 15:23:33 axs Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a dead keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the a runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the a
-# runlevel, the once key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when xdm is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls telinit a, and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-   need localmount xdm-setup
-
-   # this should start as early as possible
-   # we can't do 'before *' as that breaks it
-   # (#139824) Start after ypbind and autofs for network authentication
-   # (#145219 #180163) Could use lirc mouse as input device
-   # (#70689 comment #92) Start after consolefont to avoid display 
corruption
-   # (#291269) Start after quota, since some dm need readable home
-   # (#390609) gdm-3 will fail when dbus is not running
-   # (#366753) starting keymaps after X causes problems
-   after bootmisc consolefont modules netmount
-   after readahead-list ypbind autofs openvpn gpm lircmd
-   after quota keymaps
-   before alsasound
-
-   # Start before X
-   use consolekit dbus xfs
-}
-
-setup_dm() {
-   local MY_XDM
-   
-   MY_XDM=$(echo ${DISPLAYMANAGER} | tr '[:upper:]' '[:lower:]')
-
-   # Load our root path from profile.env
-   # Needed for kdm
-   PATH=${PATH}:$(. /etc/profile.env; echo ${ROOTPATH})
-
-   NAME=
-   case ${MY_XDM} in
-   kdm|kde)
-   EXE=/usr/bin/kdm
-   PIDFILE=/run/kdm.pid
-   ;;
-   entrance*)
-   EXE=/usr/sbin/entrance
-   PIDFILE=/run/entrance.pid
-   ;;
-   gdm|gnome)
-   # gdm-3 and above has different paths
-   if [ -f /usr/sbin/gdm ]; then
-   EXE=/usr/sbin/gdm
-   PIDFILE=/run/gdm/gdm.pid
-   START_STOP_ARGS=--background
-   AUTOCLEAN_CGROUP=yes
-   else
-   EXE=/usr/bin/gdm
-   PIDFILE=/run/gdm.pid
-   fi
-   [ ${RC_UNAME} != Linux ]  NAME=gdm-binary
-   ;;
-   wdm)
-   EXE=/usr/bin/wdm
-   PIDFILE=
-   ;;
-   gpe)
-   EXE=/usr/bin/gpe-dm
-   PIDFILE=/run/gpe-dm.pid
-   ;;
-   lxdm)
-