diff options
19 files changed, 14 insertions, 13 deletions
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 0c1c088dd58d..7f439ecb1b9b 100644 --- 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 140bb05b121d..ec71eacc2bfe 100644 --- 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 8d8286cd45ce..23384f2ecadf 100644 --- 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 49ce4ec28a5b..87eaba8c3a3a 100644 --- 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 index e4b1cc4e7beb..e4b1cc4e7beb 100644 --- a/x11-proto/xcb-proto/Manifest +++ b/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 index 695794864da7..695794864da7 100644 --- 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 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 index fed0745a5e9c..fed0745a5e9c 100644 --- 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 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 index deb6673fe1eb..deb6673fe1eb 100644 --- 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 diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml index e943b72b8a48..e943b72b8a48 100644 --- a/x11-proto/xcb-proto/metadata.xml +++ b/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 index a49cbb8e2a4a..a49cbb8e2a4a 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild +++ b/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 index 81add3e7b94f..81add3e7b94f 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild +++ b/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 5ec2a2ba345b..922c0eb9855b 100644 --- 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 a8f6ab111833..f3ce17fcb187 100644 --- 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 07fec64a5c04..628389e22550 100644 --- 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 372180a1ee44..5e162838c60d 100644 --- 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 0f94c1127f5c..19db570fd479 100644 --- 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 ef80e0b80123..2ed75628ce4a 100644 --- 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 ec01a3cc9a5d..72cb2ec82622 100644 --- 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 882709c0d4e3..a99b66b74284 100644 --- 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() { |