From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12B491382C5 for ; Fri, 27 Apr 2018 06:32:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3827BE0917; Fri, 27 Apr 2018 06:31:57 +0000 (UTC) Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEDC9E089F for ; Fri, 27 Apr 2018 06:31:56 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id o76so737419pfi.5 for ; Thu, 26 Apr 2018 23:31:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oZn0ED1Qury/XW09ymSqqJqQ29mJNK4bg6IAFU7Yq/M=; b=LDAA6vl/zMt5l8RbuyipcP0ncW3Xhq2TeoFo8/cSFkAaXdTFZrueJY5KYjCVVd75Vl u8i7RIIkof9WvPwJgm56MStSl0NCxvnz5MaOE5C8dXZhdINVnX3eMzbtsb0eM9ibosSM pasbfdRsxIDUGHe4ZRY36xr2e5puJy2vCW2m70HviMv9wJat9NermwxkCSiLy45xCqls AD4IEPYLqD1eWLKI+7Kwexj/qUk0XcwYg/aDBHt7GSnr+hiHBv+ZL1Q3UGCrsT5N/F+v D7VMnPE8uN3VB0JJp0g7MybeJkSF5w64ae00py32/YpwPscmfEfFFEoMaD5YGni8m13f j+MA== X-Gm-Message-State: ALQs6tD4SO3DqH2tWDY6ueEj8MxY85WTo0OMoqD+/Nhe84aUEXYjCyBJ kTYCX4aJ581CMBRWZhwhoj/qTrIq X-Google-Smtp-Source: AB8JxZpyy3Z6jf2Fg+/bCmVC9aE2MzUUE8jNIJgH/BCR34W/QuvLN+Shuig2ZxzcCrqv5xavCmgoKw== X-Received: by 2002:a65:4a45:: with SMTP id a5-v6mr1088507pgu.32.1524810715583; Thu, 26 Apr 2018 23:31:55 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id w7sm1131593pfn.83.2018.04.26.23.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 23:31:55 -0700 (PDT) From: Matt Turner To: gentoo-dev@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-dev] [PATCH 1/4] xorg-2.eclass: Transition deps to x11-base/xorg-proto Date: Thu, 26 Apr 2018 23:31:45 -0700 Message-Id: <20180427063148.6430-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.16.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 7ff8c69f-bb76-4352-8cfc-ea8325559fd9 X-Archives-Hash: 63c6a00babe8a1203f497cb80fb411e8 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