x11-base/xcb-proto: Move from x11-proto/xcb-proto

diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index 0c1c088dd58d6ff96469e9243506915bd28abeb3..7f439ecb1b9b44a4b8b9dd632407e17de888d228 100644 (file)
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
        x11-libs/xcb-util-wm
 "
 DEPEND="${RDEPEND}
-       x11-proto/xcb-proto
+       x11-base/xcb-proto
        >=virtual/perl-Devel-PPPort-3.190.0
        dev-perl/ExtUtils-Depends
        >=virtual/perl-ExtUtils-MakeMaker-6.590.0

diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
index 140bb05b121d700a2000367948b5da1288dcec9c..ec71eacc2bfe6bcaffeb1a00b38a790ffea30605 100644 (file)
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
        >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-       >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+       >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
        doc? (
                dev-libs/libxslt
                app-text/docbook-xml-dtd:4.2

diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 8d8286cd45ce070050c1e8669fc67d10820912bf..23384f2ecadf78aaf54a79802142db9f8de2e241 100644 (file)
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
        >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-       >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+       >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
        doc? (
                dev-libs/libxslt
                app-text/docbook-xml-dtd:4.2

diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 49ce4ec28a5b7c4d265f2fc1c2a8e60e6a4e3c8a..87eaba8c3a3a7150bf544a407ca2cffc96a24342 100644 (file)
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -4,3 +4,4 @@ move gnome-extra/gnome-builder dev-util/gnome-builder
 move kde-apps/kstars sci-astronomy/kstars
 move media-video/kamoso kde-apps/kamoso
 move app-backup/kbackup kde-apps/kbackup
+move x11-proto/xcb-proto x11-base/xcb-proto

diff --git a/x11-proto/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
similarity index 100%
rename from x11-proto/xcb-proto/Manifest
rename to x11-base/xcb-proto/Manifest

diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
similarity index 100%
rename from x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
rename to x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch

diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch
similarity index 100%
rename from x11-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch
rename to x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch

diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch
similarity index 100%
rename from x11-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch
rename to x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch

diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml
similarity index 100%
rename from x11-proto/xcb-proto/metadata.xml
rename to x11-base/xcb-proto/metadata.xml

diff --git a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild b/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild
similarity index 100%
rename from x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
rename to x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild

diff --git a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
similarity index 100%
rename from x11-proto/xcb-proto/xcb-proto-1.13.ebuild
rename to x11-base/xcb-proto/xcb-proto-1.13.ebuild

diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
index 5ec2a2ba345b5c99fc9e83170e273a5fda2512c7..922c0eb9855bdca4ba55848352046a0ab4b79641 100644 (file)
--- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild
+++ b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
@@ -31,10 +31,10 @@ DEPEND="${RDEPEND}
        dev-libs/libxslt
        ${PYTHON_DEPS}
        $(python_gen_any_dep \
-               "~x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+               "~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
 
 python_check_deps() {
-       has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
+       has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index a8f6ab111833e59e846582c0e2c06acc5291c9fc..f3ce17fcb187a71e5fbdc6cb50547369cfd96625 100644 (file)
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -30,10 +30,10 @@ DEPEND="${RDEPEND}
        dev-libs/libxslt
        ${PYTHON_DEPS}
        $(python_gen_any_dep \
-               ">=x11-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+               ">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
 
 python_check_deps() {
-       has_version --host-root ">=x11-proto/xcb-proto-1.13[${PYTHON_USEDEP}]"
+       has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 07fec64a5c040406566519bc3cd8923131d49f87..628389e22550ea57a6e48ab3f77ffdf4432729b9 100644 (file)
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
        >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
        >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-       >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+       >=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
        >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
        >=dev-util/gperf-3.0.1
        test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"

diff --git a/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
index 372180a1ee44be7f6dafa6bc7a676365d21c62c3..5e162838c60d061eaeb536b69255f7390d35b788 100644 (file)
--- a/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND=">=x11-libs/libxcb-1.7
        ${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-       >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
+       >=x11-base/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-python.patch

diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 0f94c1127f5c5f057deb0833f932ac462950d829..19db570fd47903dbd6a6ae963770cf78f03ca464 100644 (file)
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        virtual/pkgconfig
        media-gfx/imagemagick[png]
-       >=x11-proto/xcb-proto-1.5
+       >=x11-base/xcb-proto-1.5
        >=x11-proto/xproto-7.0.15
        doc? (
                app-doc/doxygen

diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index ef80e0b8012398c598f91757bbe04ab51374f894..2ed75628ce4a7ae85270de1a045abaf08310d176 100644 (file)
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
        dev-util/gperf
        virtual/pkgconfig
        media-gfx/imagemagick[png]
-       >=x11-proto/xcb-proto-1.5
+       >=x11-base/xcb-proto-1.5
        >=x11-proto/xproto-7.0.15
        doc? ( dev-lua/ldoc )
        test? (

diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index ec01a3cc9a5d6ced342c1f961d23315a53bd6701..72cb2ec826229105b58517e8fc4ceb00369061b3 100644 (file)
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
        dev-util/gperf
        virtual/pkgconfig
        media-gfx/imagemagick[png]
-       >=x11-proto/xcb-proto-1.5
+       >=x11-base/xcb-proto-1.5
        >=x11-proto/xproto-7.0.15
        doc? ( dev-lua/ldoc )
        test? (

diff --git a/x11-wm/page/page-1.9.9-r2.ebuild b/x11-wm/page/page-1.9.9-r2.ebuild
index 882709c0d4e3672d4e65e88312243c1ee39e4b69..a99b66b7428407312c2aa6520c50db7303168b91 100644 (file)
--- a/x11-wm/page/page-1.9.9-r2.ebuild
+++ b/x11-wm/page/page-1.9.9-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
        >=dev-libs/glib-2.50.3-r1:2"
 
 DEPEND="${RDEPEND}
-       >=x11-proto/xcb-proto-1.12-r2
+       >=x11-base/xcb-proto-1.12-r2
        x11-base/xorg-proto"
 
 src_install() {