x11: Move x11-proto/xorgproto to x11-base/xorg-proto
authorMatt Turner <mattst88@gentoo.org>
Mon, 26 Feb 2018 19:05:41 +0000 (11:05 -0800)
committerMatt Turner <mattst88@gentoo.org>
Mon, 26 Feb 2018 19:08:19 +0000 (11:08 -0800)
Once the individual x11-proto/ packages subsumed by xorg-proto are gone,
the x11-proto/ category will contain only xcb-proto, printproto (should
be tree cleaned) and xorgproto. That's not enough packages for a
category, so move xorgproto to x11-base/xorg-proto (with the hyphen to
match other packages in x11-base/).

34 files changed:
profiles/package.mask
profiles/updates/1Q-2018
x11-base/xorg-proto/Manifest [moved from x11-proto/xorgproto/Manifest with 100% similarity]
x11-base/xorg-proto/metadata.xml [moved from x11-proto/xorgproto/metadata.xml with 100% similarity]
x11-base/xorg-proto/xorg-proto-2018.3.ebuild [moved from x11-proto/xorgproto/xorgproto-2018.3.ebuild with 94% similarity]
x11-base/xorg-proto/xorg-proto-9999.ebuild [moved from x11-proto/xorgproto/xorgproto-9999.ebuild with 94% similarity]
x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
x11-proto/glproto/glproto-1.4.17-r2.ebuild
x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
x11-proto/presentproto/presentproto-1.1-r1.ebuild
x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
x11-proto/xproto/xproto-7.0.31-r1.ebuild

index a15f79a39c08a4cebd79e1c5585933c410827bfd..b0e84576a6011341ce4610298fec2a80fddcee89 100644 (file)
@@ -175,7 +175,7 @@ media-sound/lastfmplayer
 # Matt Turner <mattst88@gentoo.org> (06 Feb 2018)
 # New package with subsuming lots of existing packages. Lots of reverse
 # dependencies will need to be updated.
-x11-proto/xorgproto
+x11-base/xorg-proto
 >=x11-proto/bigreqsproto-1.1.2-r1
 >=x11-proto/compositeproto-0.4.2-r2
 >=x11-proto/damageproto-1.2.1-r2
index 6c2aef30c139f96c2b7e509eb1d0c436d5fcfb90..9ef13e4e949655a80f1329c0a33a20606e42ed40 100644 (file)
@@ -5,3 +5,4 @@ slotmove =dev-util/cucumber-3.1.0 3.0 3.1
 move app-admin/restart_services app-admin/restart-services
 move dev-libs/purpose kde-frameworks/purpose
 move kde-misc/plasma-applet-redshift-control kde-misc/plasma-redshift-control
+move x11-proto/xorgproto x11-base/xorg-proto
similarity index 94%
rename from x11-proto/xorgproto/xorgproto-2018.3.ebuild
rename to x11-base/xorg-proto/xorg-proto-2018.3.ebuild
index a72ac3844f5cc872cc0519405092d8d67f5793a0..4fdeec342fcdeaf4b9dc63dcae6d9891126c145c 100644 (file)
@@ -3,7 +3,10 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
 
 if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git-r3"
@@ -17,7 +20,8 @@ if [[ ${PV} = 9999* ]]; then
        SRC_URI=""
 else
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-       SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+       SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+       S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
similarity index 94%
rename from x11-proto/xorgproto/xorgproto-9999.ebuild
rename to x11-base/xorg-proto/xorg-proto-9999.ebuild
index a72ac3844f5cc872cc0519405092d8d67f5793a0..4fdeec342fcdeaf4b9dc63dcae6d9891126c145c 100644 (file)
@@ -3,7 +3,10 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
 
 if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git-r3"
@@ -17,7 +20,8 @@ if [[ ${PV} = 9999* ]]; then
        SRC_URI=""
 else
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-       SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+       SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+       S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
index bd8af00504ceb5086af7fa0eb9eb76aef49e0a28..8e6d950fbcaa0ea4cd611824ad0d2faaf26ac465 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index e086aacf8640326bb1e00192a2e08ecef0f0f09e..957e7d20a292f0468f33794f00981c7e6fca3870 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index db2e631815de0784bb33392e8e77206b17a5057b..4ba1a539c5125bffd2eac499a758ed00957e5d75 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 98f26f92c221252564da9c0660efe5b55f1f0fa5..b671964fcfb2ec2a73aa5381aa251ee883f6882c 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 205caa075a842d3af68057f271b626a0c04a75d4..9be37edea51e06e83badf73de712b7f76b78fb18 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 2db3bb148c14067cc30d7194264fd1a92e5c4719..7327b3fc0368de0098ee6769769991d41358e9e5 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index f3e7178a70159caf431dea359f731532f247b1d9..742d2ae6fc62c59e27fd64c0b651bc1c49ab58ed 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index ed40f9e1bd4bde8b7cdc3b931a1e304015817cb6..57bec58fd15ea4e11eb62b197c0c0e4b08545e37 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 02011f2e903d6a03e4b84c270577f4cd30bfc7df..1bf6a2199b8f29af8c10169fde888d3ce19d479a 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 4f0e727bdb5baabfc8664ac9c4b1fe6241bb8dde..125857ed70eafe63d2d1dfcdbca51920f7019115 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 6d6a4b8a4c4416755b5a4d815943203fb4f8d0b6..cb25885925d7ae969dc60c06e54f4f88583dbfe5 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 43c75d92086e33e8b9709e4141237794f042628a..09e0205d97ee5d60e1b4fe4893ade604e0488867 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 5daf023f65b06dcf04b5893fa5679f309f791eef..32f3614b2cfad0422e76a323cdb74c5c2f449816 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index e8528d21584c68a25537451611212217ea188599..c32fd3009f6473fbbba89c99d318b9a9d114ece1 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 948a815baea5473b794acdeade3a085984192f88..1dc58b18d83d80094b7a15bc304f928d016c3586 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index a0a993bcfd1295d976c166747393a2dadf2480a9..f3265388014e3d3bf0e91008669461e15f66dc5f 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 8f76ad120ae4ea0db6a999839fd8b8c2cbf45b33..4b6eea962ab94a0491f2099be93ee56d2522c0c7 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index b10e96d4d021c0b38cd984c53e95c9770669938f..203515807b5be58baec3e0b5e43fe99f8a440c41 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 983e4b68b6c30d530372dc33dfd4c64997f6967a..0258f0820fdaf0ef917315f5715bf9c870ea79a7 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index e144c941a7925e9255f140bfadba951ca65ec823..aeddba3376e25dd3e66b921b144fc70f5c8047f6 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index ffae14aec727947e765ed76d294167e247f9820b..3ebb61ec478deee7ae1a0579a2614f046a9974e6 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 23bf43a361d03fcb58bac84bc042c9ab54db00fb..38e55aefab9476a2b0e7ed6786fddb88cb2a3273 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index f4ed6f35f72b2a07c5981642d9680a28d804aa16..e5a7ad87bcff968e30633ed290461e612462824b 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 56c563cbeff6e8e37adb23a255f30c2e920b9955..0eb048e674aedb3e92a0df161d890b55e0745f5d 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 9bfe52aa37d6fa445389e73bc8997acc7eb9af6e..c21fa3a711fd1c9319f55cb1a203018c12073e3e 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 586b90e7a97d4567c17c59df8f06bd6cdf880034..3ed52c08587075984bc203f8da0d5f9e91b56bed 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 3f4845e018489f7bf0d0926dc79644baade50928..34e052a45eed58e15dcae784a91bbdd0d4b8947a 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"
index 2a8172c25c81912bef154448e99e19b0156ee9e8..15241378423914d2e449f796e682d89c807ce736 100644 (file)
@@ -14,4 +14,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 DEPEND=""
-RDEPEND="x11-proto/xorgproto"
+RDEPEND="x11-base/xorg-proto"