media-gfx/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
index 517e2596d527aa46ee09d640200372e225e080e2..cb3737df9143bd37629d1dd36d2c9a8420208959 100644 (file)
--- a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXtst
        gnome? ( gnome-base/libgnome )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/inputproto"
+       x11-base/xorg-proto"
 
 src_configure() {
        econf $(use_with gnome)

diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
index 9f5a7bfdccdfcd045de8fac73c698225b158ba97..83526f625890d8773af9a412949727e92b34cace 100644 (file)
--- a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2
        x11-libs/libXtst"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-proto/xproto"
+       x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
 

diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index a54e6b18ce072c932b061432988418f8755a6ad3..21c9c5498dc45e5b00e7b3989794824bad580051 100644 (file)
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.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
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
        ${CDEPEND}
-       X? ( x11-proto/xextproto x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index b3534f6df82192d7b71e27be6e95473a31c002ba..ca112ea82bfb5d93907d86090b638d55e78c14ad 100644 (file)
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-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=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
        ${CDEPEND}
-       X? ( x11-proto/xextproto x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 482c92a8d70173805b37825b2fdb98838b6c8671..0df94d361425ee4dbac4b042cb90f523fc32fcdf 100644 (file)
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.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=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
        ${CDEPEND}
-       X? ( x11-proto/xextproto x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index dc27ba67de8a9452a7217b3f8c08aecca2689899..ff4be7c5c7ab500e588815535ce592a6dc68605a 100644 (file)
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.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=6
@@ -49,7 +49,7 @@ CDEPEND="
 
 DEPEND="
        ${CDEPEND}
-       X? ( x11-proto/xextproto x11-proto/xproto )
+       X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.ebuild
index 1b1f2eb93d5cdbbebe0a05626b7ccfbce1a32794..72bb0487879c9997bce152ac9ca6a6b9c3ce5ed8 100644 (file)
--- a/media-gfx/feh/feh-2.18.3.ebuild
+++ b/media-gfx/feh/feh-2.18.3.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=6
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
        virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+       x11-base/xorg-proto
        x11-libs/libXt
-       x11-proto/xproto
        test? (
                >=dev-lang/perl-5.10
                dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild
index 97faff3af81084eb9567d5475aa3ac4658ecfccb..ee6ce5b79e0e4ee52071d82dd07639c6391d7c6d 100644 (file)
--- a/media-gfx/feh/feh-2.24.ebuild
+++ b/media-gfx/feh/feh-2.24.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
        virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+       x11-base/xorg-proto
        x11-libs/libXt
-       x11-proto/xproto
        test? (
                >=dev-lang/perl-5.10
                dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild
index 97faff3af81084eb9567d5475aa3ac4658ecfccb..ee6ce5b79e0e4ee52071d82dd07639c6391d7c6d 100644 (file)
--- a/media-gfx/feh/feh-2.25.1.ebuild
+++ b/media-gfx/feh/feh-2.25.1.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
        virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+       x11-base/xorg-proto
        x11-libs/libXt
-       x11-proto/xproto
        test? (
                >=dev-lang/perl-5.10
                dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild
index 97faff3af81084eb9567d5475aa3ac4658ecfccb..ee6ce5b79e0e4ee52071d82dd07639c6391d7c6d 100644 (file)
--- a/media-gfx/feh/feh-2.25.ebuild
+++ b/media-gfx/feh/feh-2.25.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
        virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+       x11-base/xorg-proto
        x11-libs/libXt
-       x11-proto/xproto
        test? (
                >=dev-lang/perl-5.10
                dev-perl/Test-Command

diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
index 3461e5fc1b1a3b8fa3155b2698ca0dce0d2f9f29..ccf771d57450e9884556da1e4b17787153333fb4 100644 (file)
--- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/pkgconfig
-       X? ( x11-proto/inputproto )
+       X? ( x11-base/xorg-proto )
 "
 
 # Needs keywording on many arches.

diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild
index 5d14f6a42a123ee6421d0dddf6aa1ee64f4ad603..4ce9c26ea62366b9bf794dfb90438c1534b01b62 100644 (file)
--- a/media-gfx/gifsicle/gifsicle-1.86.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
-       X? ( x11-proto/xproto )"
+       X? ( x11-base/xorg-proto )"
 
 src_configure() {
        local myconf

diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild
index 1120482889a9c764244492c6d45a973d80ef2db5..9cb9ee7fd17ac988ee7829bfbd11aff3a81d75f7 100644 (file)
--- a/media-gfx/gifsicle/gifsicle-1.90.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.90.ebuild
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
-       X? ( x11-proto/xproto )"
+       X? ( x11-base/xorg-proto )"
 
 src_configure() {
        econf $(usex X "" "--disable-gifview")

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
index 8067e0b9f5979b9062b763e6dc21a427d4d4d46e..7abe28836619be3e71d23c501d2d8488576bea45 100644 (file)
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.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=6
@@ -28,9 +28,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-       x11-proto/xextproto
        >=dev-util/intltool-0.50.2
        virtual/pkgconfig
+       x11-base/xorg-proto
 "
 
 DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to

diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index 1a862494fb19b62487b5f248c53556597b6c0820..22edbc5a0ffdc673a0bea9496ac0fa1bd5cd843c 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        virtual/pkgconfig
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index 7458e47a0da7446596c761d593583aff907b1b0d..d971391a6a9c60fdd2276d7b8ae67a0a179ec367 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        virtual/pkgconfig
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 1aeb69caf13a689d5dd506ed3a025ed503419349..4874250e8c06d6915c913082b0478c2c545d8e52 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        virtual/pkgconfig
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index 5264d406ea24ec9e73b711c8cb4c183370d9c91b..7b4ac4bbb0338063aff6b023ec8eefd4e762b3ba 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        !media-gfx/graphicsmagick[imagemagick]
        virtual/pkgconfig
-       X? ( x11-proto/xextproto )"
+       X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"

diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
index 4104b2e0d1a6a953d7fc69aa91b333daff1aedef..d68fd060b6155f8870042e470b929c3f1a78960b 100644 (file)
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -27,8 +27,7 @@ RDEPEND="
        postscript? ( app-text/ghostscript-gpl )
 "
 DEPEND="${RDEPEND}
-       x11-proto/xproto
-       x11-proto/inputproto
+       x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 64185ccfaefbd4986e2e33dc627f76711d2cfbec..fecafa404d778be861f22f885169d23a68de4114 100644 (file)
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2
 
 DEPEND="${RDEPEND}
        app-text/rman
-       x11-proto/xextproto
+       x11-base/xorg-proto
        x11-misc/imake
        !media-gfx/xloadimage"