[gentoo-dev] [PATCH 1/4] xorg-2.eclass: Transition deps to x11-base/xorg-proto

[gentoo-dev] [PATCH 1/4] xorg-2.eclass: Transition deps to x11-base/xorg-proto

[Matt Turner]

DRI_DEPEND can go away since all xf86-video-* drivers now directly
depend on x11-base/xorg-proto, which includes the dependencies from
DRI_DEPEND.
---
 eclass/xorg-2.eclass | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 42067095b55b..96a469163cfd 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -199,25 +199,17 @@ DRI_COMMON_DEPEND="
 	x11-base/xorg-server[-minimal]
 	x11-libs/libdrm
 "
-DRI_DEPEND="
-	x11-proto/xf86driproto
-	x11-proto/glproto
-	x11-proto/dri2proto
-"
 case ${XORG_DRI} in
 	no)
 		;;
 	always)
 		COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
-		DEPEND+=" ${DRI_DEPEND}"
 		;;
 	*)
 		COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
-		DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
 		IUSE+=" ${XORG_DRI}"
 		;;
 esac
-unset DRI_DEPEND
 unset DRI_COMMONDEPEND
 
 if [[ -n "${DRIVER}" ]]; then
@@ -226,26 +218,13 @@ if [[ -n "${DRIVER}" ]]; then
 	"
 fi
 if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
-	DEPEND+="
-		x11-proto/inputproto
-		x11-proto/kbproto
-		x11-proto/xproto
-	"
+	DEPEND+="x11-base/xorg-proto"
 fi
 if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
 	COMMON_DEPEND+="
 		x11-libs/libpciaccess
 	"
-	# we also needs some protos and libs in all cases
-	DEPEND+="
-		x11-proto/fontsproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-		x11-proto/videoproto
-		x11-proto/xextproto
-		x11-proto/xineramaproto
-		x11-proto/xproto
-	"
+	DEPEND+="x11-base/xorg-proto"
 fi
 
 # @ECLASS-VARIABLE: XORG_DOC
-- 
2.16.1

[gentoo-dev] [PATCH 2/4] xorg-2.eclass: Fix typo'd DRI_COMMON_DEPEND

[Matt Turner]

---
 eclass/xorg-2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 96a469163cfd..0329a7aa623a 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -210,7 +210,7 @@ case ${XORG_DRI} in
 		IUSE+=" ${XORG_DRI}"
 		;;
 esac
-unset DRI_COMMONDEPEND
+unset DRI_COMMON_DEPEND
 
 if [[ -n "${DRIVER}" ]]; then
 	COMMON_DEPEND+="
-- 
2.16.1

[gentoo-dev] [PATCH 3/4] toolchain.eclass: Transition deps to x11-base/xorg-proto

[Matt Turner]

---
 eclass/toolchain.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 2da455ad4e3b..df76dc4feb8c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -206,11 +206,10 @@ DEPEND="${RDEPEND}
 if in_iuse gcj ; then
 	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
 	GCJ_GTK_DEPS="
+		x11-base/xorg-proto
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXtst
-		x11-proto/xproto
-		x11-proto/xextproto
 		=x11-libs/gtk+-2*
 		virtual/pkgconfig
 	"
-- 
2.16.1

[gentoo-dev] [PATCH 4/4] kde4-base.eclass: Transition deps to x11-base/xorg-proto

[Matt Turner]

---
 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8abade2677d4..72e4fcfe526b 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -387,7 +387,7 @@ kdedepend="
 	dev-util/automoc
 	virtual/pkgconfig
 	>=x11-libs/libXtst-1.1.0
-	x11-proto/xf86vidmodeproto
+	x11-base/xorg-proto
 "
 
 kderdepend=""
-- 
2.16.1

Re: [gentoo-dev] [PATCH 3/4] toolchain.eclass: Transition deps to x11-base/xorg-proto

[Anthony G. Basile]

On 4/27/18 2:31 AM, Matt Turner wrote:
> ---
>  eclass/toolchain.eclass | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
> index 2da455ad4e3b..df76dc4feb8c 100644
> --- a/eclass/toolchain.eclass
> +++ b/eclass/toolchain.eclass
> @@ -206,11 +206,10 @@ DEPEND="${RDEPEND}
>  if in_iuse gcj ; then
>  	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
>  	GCJ_GTK_DEPS="
> +		x11-base/xorg-proto
>  		x11-libs/libXt
>  		x11-libs/libX11
>  		x11-libs/libXtst
> -		x11-proto/xproto
> -		x11-proto/xextproto
>  		=x11-libs/gtk+-2*
>  		virtual/pkgconfig
>  	"
> 

These patches should be fine.  It looks like you just finished
stabilizing x11-base/xorg-proto for all arches so the transition won't
cause any problems.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail    : blueness@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA