commit: 9915647a65aa7787956b5982f63e5563dea36f1a
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jun 17 09:05:35 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:37:31 2018 +0000
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..0000000
--- 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
- >=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}
@@ -146,7 +119,7 @@ PATCHES=(
"${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
+ "${FILESDIR}"/${PN}-1.19.6-fix-NULL-value-detection.patch
)
pkg_pretend() {
