Rename eclass to xorg-2 as per irc discussion. This time atomic approach :]

66 files changed, 68 insertions, 68 deletions

diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index 9177bf4e..c83575e1 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1 +1 @@
-EBUILD bigreqsproto-9999.ebuild 334 RMD160 e816fc485f09b6c2be3c0799219b999026836fc7 SHA1 e44cc520e9ad2a7dfef051c9ab704085a1c6231a SHA256 0abe4d3a7e0b7fc369bc2bf93eec37d2f1170602b41a550779a1a38640ed3459
+EBUILD bigreqsproto-9999.ebuild 328 RMD160 3ae67c849a513507320cf4c5cc5d5f637d86c28f SHA1 86bfe66adc8a8864758839ca3e34281366aed721 SHA256 b35ed58dd5fc520a933a1569a799e51dabfaad216edc55f7a3f6b825396e5269
diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
index ebaf99e3..6bdffb8f 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org BigReqs protocol headers"
 
diff --git a/x11-proto/calibrateproto/Manifest b/x11-proto/calibrateproto/Manifest
index 088f7ddf..77d511b1 100644
--- a/x11-proto/calibrateproto/Manifest
+++ b/x11-proto/calibrateproto/Manifest
@@ -1 +1 @@
-EBUILD calibrateproto-9999.ebuild 298 RMD160 aa0922649caa652b57d20f454e33f853171abc37 SHA1 10ae108e7bc6ed6024d238e8d08afd7cc7285a3b SHA256 a24dd11b3c0582cebff1b8da16e8f665caacbd4db1b84bcb87b713b7552220c0
+EBUILD calibrateproto-9999.ebuild 292 RMD160 dc2094c127ed16f23dced8a4a5aaf503d882dd0e SHA1 d840427d61c87c384a711f3b9be3156d8e39986c SHA256 2f37a207b22baef5ea447ec9c655dd833d6d141ad40d3d4441df737eb7cbb30b
diff --git a/x11-proto/calibrateproto/calibrateproto-9999.ebuild b/x11-proto/calibrateproto/calibrateproto-9999.ebuild
index 3704b03d..4d933ae2 100644
--- a/x11-proto/calibrateproto/calibrateproto-9999.ebuild
+++ b/x11-proto/calibrateproto/calibrateproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION=""
 
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
index 85e83c8d..6695346d 100644
--- a/x11-proto/compositeproto/Manifest
+++ b/x11-proto/compositeproto/Manifest
@@ -1 +1 @@
-EBUILD compositeproto-9999.ebuild 330 RMD160 3dc08051a66cc93af75fdb50e9972e259f0aede6 SHA1 e7a1f629dc1f4ad44754bb6ef51ee54b0ec62f6f SHA256 716318b75445d08f820624cdbafccb17a0fcfeecb2c791530ef0f3df743c5ca9
+EBUILD compositeproto-9999.ebuild 324 RMD160 fc849336696a76a147188b5b4e40c4615cd757cf SHA1 d511b66e87e460f21131a3813256c14760183e04 SHA256 4b008edda2ee934d140351a4654ec45e6c94a7ea3cae747d05fc14299f20c559
diff --git a/x11-proto/compositeproto/compositeproto-9999.ebuild b/x11-proto/compositeproto/compositeproto-9999.ebuild
index cbcf44e1..44f0646a 100644
--- a/x11-proto/compositeproto/compositeproto-9999.ebuild
+++ b/x11-proto/compositeproto/compositeproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Composite protocol headers"
 
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
index 45d21e9c..f76221f8 100644
--- a/x11-proto/damageproto/Manifest
+++ b/x11-proto/damageproto/Manifest
@@ -1 +1 @@
-EBUILD damageproto-9999.ebuild 327 RMD160 6f12a32bc76d518e6b78d3cbf3e750d055ad13a5 SHA1 8fa5d3832bd8b4f06dfd6336034033e11ff2c27b SHA256 ed2a3bb509811cc357643b49a0c3e0fdbc73c22facf611a070169b91833ac25f
+EBUILD damageproto-9999.ebuild 321 RMD160 d048b6eff180ecc8fb863b9331672d60777bbe81 SHA1 31df5f15a08edb4055314e623785c68a4a97def5 SHA256 7cbc677ca70b065c71487d965888b8563a89c8a99791216596134faa42d6f32d
diff --git a/x11-proto/damageproto/damageproto-9999.ebuild b/x11-proto/damageproto/damageproto-9999.ebuild
index 209e0ea1..0920352d 100644
--- a/x11-proto/damageproto/damageproto-9999.ebuild
+++ b/x11-proto/damageproto/damageproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Damage protocol headers"
 
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index ded0f482..833747b5 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1 +1 @@
-EBUILD dmxproto-9999.ebuild 350 RMD160 c5bb8ae0c3f794f19b27ca7560efca7e3194a1c6 SHA1 3a4f2d09395a4f385684ed487fc856ad64ff3074 SHA256 ea100ce7f3379a14c17677e63b6b146efc5d05c61ac5c1fb3b2e3f1369f5f9a2
+EBUILD dmxproto-9999.ebuild 344 RMD160 abd01555f8e785a73373f72cfe3518c5ff07c7f2 SHA1 12d304070128d04471c9a6233ad72e173df6ee93 SHA256 fe45f8b817f39bfd31ba584c6d38e1324b3235bc27ae8df2787b0c0f5795720f
diff --git a/x11-proto/dmxproto/dmxproto-9999.ebuild b/x11-proto/dmxproto/dmxproto-9999.ebuild
index 528bff59..f4c84ad6 100644
--- a/x11-proto/dmxproto/dmxproto-9999.ebuild
+++ b/x11-proto/dmxproto/dmxproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org DMX protocol headers"
 
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index ccb67a12..ad1fa9a2 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1 +1 @@
-EBUILD dri2proto-9999.ebuild 325 RMD160 4479ce9e13d90a6efb10706a19f072813e0f330e SHA1 a5831bcbd62546e415a92b3daf2f7d5a2bd33b52 SHA256 44b924427a2d11cc75a5bfd1a551acc2f07762400f4c29e764f025d7835e1e8d
+EBUILD dri2proto-9999.ebuild 319 RMD160 0e8018f98062d033539c2dd356b4c00790f5b5b1 SHA1 bd3540f1fd922a2ef55f9902fb35189083de2873 SHA256 8de888d52ab808550cfa2ef2fcb919d606f27da656d9b0db32edc9a1fff283c7
diff --git a/x11-proto/dri2proto/dri2proto-9999.ebuild b/x11-proto/dri2proto/dri2proto-9999.ebuild
index 1f3e9a35..8ff46379 100644
--- a/x11-proto/dri2proto/dri2proto-9999.ebuild
+++ b/x11-proto/dri2proto/dri2proto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org DRI2 protocol headers"
 
diff --git a/x11-proto/evieext/Manifest b/x11-proto/evieext/Manifest
index 0aa15a6b..59bd6eb0 100644
--- a/x11-proto/evieext/Manifest
+++ b/x11-proto/evieext/Manifest
@@ -1 +1 @@
-EBUILD evieext-9999.ebuild 396 RMD160 7bf8d89e676cfab4ca8e6137a2bbf4604b143502 SHA1 2250e411cf0295c8fc7c5226333457190ea48383 SHA256 59b2cc25ef286115085c64f6af066241a859b43289ed15916e6a1e242f2137eb
+EBUILD evieext-9999.ebuild 390 RMD160 e9fb2f3ecf9dd09c9f9858d8cf4bada7cdb416dc SHA1 2fa9f6587874f5bf95ce81cbde4a0da8e1c06637 SHA256 ef31a9fbe025df4089756e07e1764a88ee0fc59fdd9ae4fbf840cd8471c2ce2e
diff --git a/x11-proto/evieext/evieext-9999.ebuild b/x11-proto/evieext/evieext-9999.ebuild
index 04e6c84d..71ac00e6 100644
--- a/x11-proto/evieext/evieext-9999.ebuild
+++ b/x11-proto/evieext/evieext-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/evieproto"
 DESCRIPTION="X.Org EvIE protocol headers"
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
index f7bb6422..659dc3b6 100644
--- a/x11-proto/fixesproto/Manifest
+++ b/x11-proto/fixesproto/Manifest
@@ -1 +1 @@
-EBUILD fixesproto-9999.ebuild 356 RMD160 18acafef0285cc6011730bfcdd7131853d5c9645 SHA1 085baeeeeb0e902408d409937a1778fc8754bb61 SHA256 1c9a43cb75a2317ccffafb95847d1d081067a88c1f8f3d0f344eecbce0973e55
+EBUILD fixesproto-9999.ebuild 350 RMD160 1ea5888e64e315ff0e8b20266e267c44222f8899 SHA1 6e0760b06c6d500b072277e822bdc4cd02b7b610 SHA256 8991c2c661b9a96511e9feb2bbabed6361961744b5a561565339d442ddf0884b
diff --git a/x11-proto/fixesproto/fixesproto-9999.ebuild b/x11-proto/fixesproto/fixesproto-9999.ebuild
index 353b5f98..7520a7da 100644
--- a/x11-proto/fixesproto/fixesproto-9999.ebuild
+++ b/x11-proto/fixesproto/fixesproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Fixes protocol headers"
 
diff --git a/x11-proto/fontcacheproto/Manifest b/x11-proto/fontcacheproto/Manifest
index 6e1f4947..2b6e5c10 100644
--- a/x11-proto/fontcacheproto/Manifest
+++ b/x11-proto/fontcacheproto/Manifest
@@ -1 +1 @@
-EBUILD fontcacheproto-9999.ebuild 330 RMD160 52dcd77dc462de6557ea71a728d5aa5140adabc2 SHA1 5d15608bdc5d6d7fe8b9e7e9adec92f09f59d86c SHA256 2547073b90e25cfb5c9a87a7ace3d4edaf81932f3c8c84b65f2a8e9698395e22
+EBUILD fontcacheproto-9999.ebuild 324 RMD160 49a6fee60671d0fa96903462810e3bd4ed87e4ea SHA1 4fbcaf2f1b45c24970505b5419397d9c246b33a0 SHA256 827b8e3e34b212295ac6b6cce719d6ec4ee52071be4077ec6d49c56cae23181b
diff --git a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild b/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
index b9634c5e..2ee6b4d2 100644
--- a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
+++ b/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Fontcache protocol headers"
 
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index a383e4f3..82d76f19 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1 +1 @@
-EBUILD fontsproto-9999.ebuild 326 RMD160 98918574fae888999833605f2ee6b7daf2ccfd44 SHA1 851aa3e34515d00fe8577d2df72e5f33db26c1f8 SHA256 9c3e8f490ff82ab82b219cac76dff5b2a9f0f93dee4f96f1e9d64e62523a4125
+EBUILD fontsproto-9999.ebuild 320 RMD160 5739f786823a521bc9ed63afac98d2d8b3ee85f4 SHA1 e418b44c896045f0603a187fa572269c8bcf68f9 SHA256 1bca70dc767f6bd6df75d6465df60100fea8a9c583ebda2faa8e72f2b354d3ba
diff --git a/x11-proto/fontsproto/fontsproto-9999.ebuild b/x11-proto/fontsproto/fontsproto-9999.ebuild
index 959690ae..14e6fe32 100644
--- a/x11-proto/fontsproto/fontsproto-9999.ebuild
+++ b/x11-proto/fontsproto/fontsproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Fonts protocol headers"
 
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index 6a138816..d4a927bf 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1 +1 @@
-EBUILD glproto-9999.ebuild 1122 RMD160 dc0e6a66bcdd4ed5002c965fe58c4e0fe5c7d638 SHA1 3bab7d20d36ddc83d9a4e3b92501ceb980a8e345 SHA256 acf7e19cc53e547095f81e8090ce13fb52931737c1338702516f5a9b28d881ce
+EBUILD glproto-9999.ebuild 1104 RMD160 e7bff49ed6834cb4141fe4baa7a51e53227be5fd SHA1 7dbacf78b5013a80fd0a07eca9ae61d7f743663c SHA256 25054ff1378411ce146c13ab143ee25e0e41cb5ffe72e8517c33dbb60cd97ff1
diff --git a/x11-proto/glproto/glproto-9999.ebuild b/x11-proto/glproto/glproto-9999.ebuild
index 23a3bee9..c273dc52 100644
--- a/x11-proto/glproto/glproto-9999.ebuild
+++ b/x11-proto/glproto/glproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 OPENGL_DIR="xorg-x11"
 
@@ -16,12 +16,12 @@ RDEPEND="app-admin/eselect-opengl"
 DEPEND=""
 
 src_install() {
-	x-modular-r2_src_install
+	xorg-2_src_install
 	dynamic_libgl_install
 }
 
 pkg_postinst() {
-	x-modular-r2_pkg_postinst
+	xorg-2_pkg_postinst
 	switch_opengl_implem
 }
 
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 42b2836f..00239da8 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1 +1 @@
-EBUILD inputproto-9999.ebuild 350 RMD160 a7e0a1818ae385d77de93ca16cb5985177d29ec6 SHA1 28e0a738a08eea4ea55b33f992ea3a252703fe7f SHA256 958d4ea471f17fb728b1235e1b63834b62ce167c469b8db32bd4713710a66786
+EBUILD inputproto-9999.ebuild 344 RMD160 ec6a24ccd535c8fd64050fbc6fcb3e4f22c843d6 SHA1 6c1e748997d46bd40e4a161212c3a68797a60d29 SHA256 d93a8a43660e7b86bc71b056dbfc2839ac7785091fbf6e9af6a5ed2603482596
diff --git a/x11-proto/inputproto/inputproto-9999.ebuild b/x11-proto/inputproto/inputproto-9999.ebuild
index ff2cf161..699bc4ba 100644
--- a/x11-proto/inputproto/inputproto-9999.ebuild
+++ b/x11-proto/inputproto/inputproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Input protocol headers"
 
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index 4336d0b3..2b23ca13 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1 +1 @@
-EBUILD kbproto-9999.ebuild 323 RMD160 a614649573c5df3d1f543db44b0bd2fe3bc35ee5 SHA1 915ba078b65112f490139643abb6c5e3a44fe471 SHA256 441abc3f88833127eb45cf3442ae411e7a484218e9c47a66364cd8b563588d0c
+EBUILD kbproto-9999.ebuild 317 RMD160 fa4b8319bff0526c2045f5677b8a3c4385fd4e9d SHA1 2bc1313014491f0505bad89044f1d718b4dd025e SHA256 d0886f92cfcd990f5bb4baabd31a3fe80bab9501704d798e0343d38c04a7ae9a
diff --git a/x11-proto/kbproto/kbproto-9999.ebuild b/x11-proto/kbproto/kbproto-9999.ebuild
index 77308f9b..d38f864f 100644
--- a/x11-proto/kbproto/kbproto-9999.ebuild
+++ b/x11-proto/kbproto/kbproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org KB protocol headers"
 
diff --git a/x11-proto/lg3dproto/Manifest b/x11-proto/lg3dproto/Manifest
index 65e82fb7..b4108af4 100644
--- a/x11-proto/lg3dproto/Manifest
+++ b/x11-proto/lg3dproto/Manifest
@@ -1 +1 @@
-EBUILD lg3dproto-9999.ebuild 298 RMD160 aa0922649caa652b57d20f454e33f853171abc37 SHA1 10ae108e7bc6ed6024d238e8d08afd7cc7285a3b SHA256 a24dd11b3c0582cebff1b8da16e8f665caacbd4db1b84bcb87b713b7552220c0
+EBUILD lg3dproto-9999.ebuild 292 RMD160 dc2094c127ed16f23dced8a4a5aaf503d882dd0e SHA1 d840427d61c87c384a711f3b9be3156d8e39986c SHA256 2f37a207b22baef5ea447ec9c655dd833d6d141ad40d3d4441df737eb7cbb30b
diff --git a/x11-proto/lg3dproto/lg3dproto-9999.ebuild b/x11-proto/lg3dproto/lg3dproto-9999.ebuild
index 3704b03d..4d933ae2 100644
--- a/x11-proto/lg3dproto/lg3dproto-9999.ebuild
+++ b/x11-proto/lg3dproto/lg3dproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION=""
 
diff --git a/x11-proto/printproto/Manifest b/x11-proto/printproto/Manifest
index c03ec071..531296ac 100644
--- a/x11-proto/printproto/Manifest
+++ b/x11-proto/printproto/Manifest
@@ -1 +1 @@
-EBUILD printproto-9999.ebuild 326 RMD160 6f6ee9136e140db5d84a1dc4d5e93c51779e5acd SHA1 5625e0bc9a4b332e2c308d6ec4adc75a5a788507 SHA256 142fc2ec19716de37b49636433ff86139837bb67e41f79173f2656bd5a8862cc
+EBUILD printproto-9999.ebuild 320 RMD160 edf4d42f6e21ce23bc1015b1b2f78f4799eb8721 SHA1 e850e1db155e8a25786a5dd8ee258945e0a0f998 SHA256 445bb3cc5fdc6a8bf22e1d9668ede92c8b0700841b629fd3c418f02254ddac12
diff --git a/x11-proto/printproto/printproto-9999.ebuild b/x11-proto/printproto/printproto-9999.ebuild
index ea7d4c59..8702ca64 100644
--- a/x11-proto/printproto/printproto-9999.ebuild
+++ b/x11-proto/printproto/printproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Print protocol headers"
 
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 34ac8237..84bad7ce 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -1 +1 @@
-EBUILD randrproto-9999.ebuild 326 RMD160 f1d552d8b5b266628ce618ec3e28d2a9c003d55f SHA1 e4c75e0ffa1f660ab8157bde247693374765dfee SHA256 b36beebaa4d88a8fc429171ec0e5c1ee9edadce8bbd730264e0b0effd4f77b2c
+EBUILD randrproto-9999.ebuild 320 RMD160 1e7b3034e3bbe39a16d5809251bca02454b429e8 SHA1 e6610471a12366ae86f451d95484c7cb749cddf1 SHA256 21eb38a46e5dae02c1fbb39428ca44522c878097c0e8a643db2a09554a611c86
diff --git a/x11-proto/randrproto/randrproto-9999.ebuild b/x11-proto/randrproto/randrproto-9999.ebuild
index 5fadb06d..5c30713a 100644
--- a/x11-proto/randrproto/randrproto-9999.ebuild
+++ b/x11-proto/randrproto/randrproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Randr protocol headers"
 
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 56bd11bb..2d5f4454 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1 +1 @@
-EBUILD recordproto-9999.ebuild 354 RMD160 fc63044cd4cb9da687e48428a160b70fc0a096ba SHA1 de2ea89bda493dfdb1891986bb79e3a780bdac3c SHA256 a3e3836cef421acfef937db0b4d29e34284edee112fab93ca44c33ad8191999c
+EBUILD recordproto-9999.ebuild 348 RMD160 0ab2de135899f2b5fb53b681215947cefc12581d SHA1 7a0ce072ae850ac30804744156510be1406035b8 SHA256 52fd47e6443b5c6dd5956647832258ef9eedafc61d6b3bd83f17937357acad54
diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 03ae1273..582f1db3 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Record protocol headers"
 
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
index f19618b4..e3304604 100644
--- a/x11-proto/renderproto/Manifest
+++ b/x11-proto/renderproto/Manifest
@@ -1 +1 @@
-EBUILD renderproto-9999.ebuild 327 RMD160 5b53a8dd786e6d20faae905436ab72c6fb8f046f SHA1 1cf7580e2da367c979752fba870fee364c11c3e7 SHA256 6367589610e01a68f422b6b071860c36e669598b12a8e2d3a564f92ba4834366
+EBUILD renderproto-9999.ebuild 321 RMD160 c2b485e429d9ca19efdeac3ffcf323c0184502d6 SHA1 7e68eef27b61baac01030556ca31e5ebf068e2fb SHA256 053e6d361640a4582763b5dc54c22f290da1757f9e23158ab23ea15843eda74e
diff --git a/x11-proto/renderproto/renderproto-9999.ebuild b/x11-proto/renderproto/renderproto-9999.ebuild
index beef4647..b23d0025 100644
--- a/x11-proto/renderproto/renderproto-9999.ebuild
+++ b/x11-proto/renderproto/renderproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Render protocol headers"
 
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
index 7712991f..31dc3fd7 100644
--- a/x11-proto/resourceproto/Manifest
+++ b/x11-proto/resourceproto/Manifest
@@ -1 +1 @@
-EBUILD resourceproto-9999.ebuild 329 RMD160 f12c2f98fbe5e2f920748933280490e8a00c3031 SHA1 750c9717a2a01ead38a81fab42e19b51ceef62b3 SHA256 120d129579c76749768908118a1a339b8dcdcab1c72e85459818968bdf9092f2
+EBUILD resourceproto-9999.ebuild 323 RMD160 2dbfe88ffe1fc5bae887e1c444b9f913099bbd7d SHA1 4deb7843f2b78de3f8e873cc82d9f99b4767790d SHA256 8e1009e1becdb5a636a873f3c5b4321b6a48201de7b7c21321426ed34a8c219f
diff --git a/x11-proto/resourceproto/resourceproto-9999.ebuild b/x11-proto/resourceproto/resourceproto-9999.ebuild
index 2bae7159..d773b286 100644
--- a/x11-proto/resourceproto/resourceproto-9999.ebuild
+++ b/x11-proto/resourceproto/resourceproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Resource protocol headers"
 
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index 7a7242bf..a3ca6a16 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1 +1 @@
-EBUILD scrnsaverproto-9999.ebuild 358 RMD160 cb436f358cfae31cbaa9ed1e54fcab52f667b6cd SHA1 94649c78f13c3c98725d7346cfa16a27a8973fb7 SHA256 64550e5475cf53ade8ca8c2fbfeb4baa02c43ce627f7299d7fd848513bc992ff
+EBUILD scrnsaverproto-9999.ebuild 352 RMD160 0e8987ed8c9dc5ed0431dd56bbb6e467bfd1b735 SHA1 0738a0794f113ca56847b4b443b484b0a89e4bc5 SHA256 890214fe6c640e86e7d26389f5a38df13410695b20a1990c79aee68a0cd0cbf1
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index 7145be90..d7a12aba 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org ScrnSaver protocol headers"
 
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
index 1550db4b..40b22f9f 100644
--- a/x11-proto/trapproto/Manifest
+++ b/x11-proto/trapproto/Manifest
@@ -1 +1 @@
-EBUILD trapproto-9999.ebuild 325 RMD160 b59164158ca2e91e0f9eb1b984e9bf61a2299191 SHA1 dcc719711d18536fdb068635deb675f6209c2bb0 SHA256 ea95b8a4acdb49c8e64da9d604cb14339b661463c0c0db1056c7953503766504
+EBUILD trapproto-9999.ebuild 319 RMD160 296843e25124e76bff2f219b7d9fa2e7fff53d28 SHA1 de456a3632f3ca66d98675e35defdd3e35f72d13 SHA256 27dc56c555b0e81c43dc53e7be85d8d8fe402915ba4590f7852318301cd8d49a
diff --git a/x11-proto/trapproto/trapproto-9999.ebuild b/x11-proto/trapproto/trapproto-9999.ebuild
index 1651a478..65197c7f 100644
--- a/x11-proto/trapproto/trapproto-9999.ebuild
+++ b/x11-proto/trapproto/trapproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Trap protocol headers"
 
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
index 5e8b79aa..6e8d0cc7 100644
--- a/x11-proto/videoproto/Manifest
+++ b/x11-proto/videoproto/Manifest
@@ -1 +1 @@
-EBUILD videoproto-9999.ebuild 326 RMD160 aee82b133ac10f16786c09b0f2890050c5110b48 SHA1 b318c3d3d1a620a9054d5c2c672ab69b9aaa9266 SHA256 b59f494e17b43d25ad7dae8488874a608e889bc0918e983057f2b0d9b98d8260
+EBUILD videoproto-9999.ebuild 320 RMD160 41d3a94dd7300ef507a606dbe637578df42eb22e SHA1 699e88110b59b7f574288abedcf53eb9ef74d912 SHA256 7e76b157f05089e05d4cf23915c0d5a8d6f68ca704ff324bc7ce70f692ef5400
diff --git a/x11-proto/videoproto/videoproto-9999.ebuild b/x11-proto/videoproto/videoproto-9999.ebuild
index 15e5d9c7..d50d4534 100644
--- a/x11-proto/videoproto/videoproto-9999.ebuild
+++ b/x11-proto/videoproto/videoproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Video protocol headers"
 
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index a80235d4..a06eefc2 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -1 +1 @@
-EBUILD xcb-proto-9999.ebuild 558 RMD160 524ab8cd07d278bc48e9be563fe23bb3016cba23 SHA1 2c5bb810c626f08fb0819f47a57c56dbb467dd4e SHA256 a26309c6bdd2f5682ed59e57270fc8f8b26224d9c1f147b147c6e172cb81f4be
+EBUILD xcb-proto-9999.ebuild 552 RMD160 4ecacfc4e37bbf1a035de83f9618cbcad9ee8123 SHA1 0f3948829adb330b98ac7524e40b51394bd5fdf7 SHA256 18bb65e36c3ab04d5ecb73fcfcec87fd62d943aa091f10a824dd68dfbc001716
diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 16af5c55..3f4a0d1e 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="http://xcb.freedesktop.org/"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index a08f85f6..0c192221 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1 +1 @@
-EBUILD xcmiscproto-9999.ebuild 327 RMD160 5ebe4db1c34a16fbe172adbff4910491c8a0042c SHA1 d2c6957ca3c23f06b99a30ac7d07c858d90176c8 SHA256 c78bb6bcd044abeddc732274390ad313500f30a71702ef399828bef0bd843f53
+EBUILD xcmiscproto-9999.ebuild 321 RMD160 82d962fece220a3b19a1158623108d7857b4f2c9 SHA1 481c2a92caa0b4c8d4e905ae7bd5eb6adf8785dd SHA256 02884571e5290ea6c0bc1f8a987dbd2b696fb24b520d7e0e0658b0652c11fe11
diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
index 09a3cdfd..3f94ee2f 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XCMisc protocol headers"
 
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 3cbd45ad..178fb7bb 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1 +1 @@
-EBUILD xextproto-9999.ebuild 350 RMD160 e9817046682116ab60ccb27597968fecba60ff2c SHA1 2148534668f2571ab0f24a006b554d27b959114c SHA256 07dddcb9ea3c1dbdb3edb64d93787e0b65f2e7c2a9b6c1a764b61ee2f1ad3576
+EBUILD xextproto-9999.ebuild 344 RMD160 09b3701be605447e0fc7b67de91d967b0e60c400 SHA1 4f5d285d6336c14da1eee9a8636f557d21c03a5d SHA256 ab069302aa02be6e1a4c70110d5075f2ec73045ab4f324bcfe209a16b6a81952
diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index 5667b2a3..fa547efd 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XExt protocol headers"
 
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
index 28fbbef9..a24e51ed 100644
--- a/x11-proto/xf86bigfontproto/Manifest
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -1 +1 @@
-EBUILD xf86bigfontproto-9999.ebuild 332 RMD160 2288c7d47bf11c4ab4020a9274b9de30bbc8839f SHA1 79473ad0933ecc73cd09758efc083e4adc1a26d0 SHA256 b4573c6cbb70c56c902b26900b0f86c39e45c07c06e417f3953f29a6aa4d2275
+EBUILD xf86bigfontproto-9999.ebuild 326 RMD160 fbb89dc5bf98f0bd8cc338517d210be7fdf08441 SHA1 60409c66612d88a5baac2f2a7b0cbfab96979f55 SHA256 af9aa12adfe2574d206a4dc5837865f9ac1c08b508dab560a9457dcd5b4835ce
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
index f0d816a4..b08ba411 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86BigFont protocol headers"
 
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
index 9588c5d2..aaf83ed5 100644
--- a/x11-proto/xf86dgaproto/Manifest
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -1 +1 @@
-EBUILD xf86dgaproto-9999.ebuild 359 RMD160 279b16f584732a7ce7f721c349c3b3e4259ccb88 SHA1 d873718c8dd27682ec71a18721e915b753b5c0e2 SHA256 a306dc4aaef45153728e344ddad7b580f4b2b9e59531f44496dda26c066ae21d
+EBUILD xf86dgaproto-9999.ebuild 353 RMD160 98c46e79951cd80f8dea1796732acb8f8962ed56 SHA1 612bf6a26b0e61a6da382f0ece9fe6ee00f9668f SHA256 139ac5f6b54e512340b4214f7c87c56b3da89b83e523d57d9c4086b34b2ecf0b
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
index 420a6dd3..be340752 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86DGA protocol headers"
 
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
index d2d63446..0062eb7d 100644
--- a/x11-proto/xf86driproto/Manifest
+++ b/x11-proto/xf86driproto/Manifest
@@ -1 +1 @@
-EBUILD xf86driproto-9999.ebuild 328 RMD160 95725b4ffdf9aef25ac7f61c6d049b70e734db0a SHA1 301337bffaf578200e937e5e2bce464b604194c6 SHA256 38b93575d69b45697fb72c70bf9287d158a9bda4f8e14545f95e7117183d1173
+EBUILD xf86driproto-9999.ebuild 322 RMD160 489010671e2aef164dd944ad7a0eda39c318b2a1 SHA1 06c8b71c97862c63bae8ee81ce19cf2b55ee65d0 SHA256 077b12c5350d2cc3fe41dc70175e81c79bfa697cb02c35626a5fda27e1d23499
diff --git a/x11-proto/xf86driproto/xf86driproto-9999.ebuild b/x11-proto/xf86driproto/xf86driproto-9999.ebuild
index 2560f2b9..5eb6ca89 100644
--- a/x11-proto/xf86driproto/xf86driproto-9999.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86DRI protocol headers"
 
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
index c690b8ab..4d08e079 100644
--- a/x11-proto/xf86miscproto/Manifest
+++ b/x11-proto/xf86miscproto/Manifest
@@ -1 +1 @@
-EBUILD xf86miscproto-9999.ebuild 329 RMD160 c10761f909a46e570abeed954a4247bd3bf14a63 SHA1 e7f4ee428c3b65d4af6b133c00c826952efe92af SHA256 9d8210e1d86388974522ac2955af53a4dd8eb47bf2d621bc2261a46abf2f509c
+EBUILD xf86miscproto-9999.ebuild 323 RMD160 b66491cfbc3f69c66fc434e83eef371254733f63 SHA1 f3fa88f6c688218c899269e7997ae0bd4aea645d SHA256 5cb94b56d17972853d286dbe61d3ff3b59557da1ab659c64db9dd2a9c1517376
diff --git a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild b/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
index e10e0d52..241c532b 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86Misc protocol headers"
 
diff --git a/x11-proto/xf86rushproto/Manifest b/x11-proto/xf86rushproto/Manifest
index b2a14cbf..fc2eb41b 100644
--- a/x11-proto/xf86rushproto/Manifest
+++ b/x11-proto/xf86rushproto/Manifest
@@ -1 +1 @@
-EBUILD xf86rushproto-9999.ebuild 329 RMD160 d94938981ac24d4088790e00fb43234413e00f9e SHA1 4c04b095af21a8cfdf9107423b2184cac4099096 SHA256 319ae62a44239fecd3b64126cb9f34b3882d5a68e8860fc72132c25aa37c37fd
+EBUILD xf86rushproto-9999.ebuild 323 RMD160 e34efc2c09b2950bcdc1d988fa84c51adc691d00 SHA1 356e71dd88b28c721b53d6b5069138677b016188 SHA256 9586061ab052c0ed7113e66cfe48b0d67ddc9aca49ff8364f0e6cd9ffd391a72
diff --git a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild b/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
index c9996029..66a91e9e 100644
--- a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
+++ b/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86Rush protocol headers"
 
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index 07d01f36..f9b8f217 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1 +1 @@
-EBUILD xf86vidmodeproto-9999.ebuild 362 RMD160 8fbd4ce9d2cf5f47ab085a13a0b0e8e877aa2a2d SHA1 14b6951424da76c329d022770e678e84b859a599 SHA256 8e068e29047b5482a2e08eb5cca0e1ea760bc3b4bc461ae6368580535c254804
+EBUILD xf86vidmodeproto-9999.ebuild 356 RMD160 0b65aec0fdde9eb286332664bab14e22c171ad57 SHA1 b2487ecbf913e1a720642e305f9e15ecfd53418b SHA256 63b701ecc4c506e908d6daa68249f5ef1d8424dbe4d5ec8a150d173faffca384
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
index f0b6cb3e..421ba57a 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org XF86VidMode protocol headers"
 
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index b7e7539d..858452a0 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1 +1 @@
-EBUILD xineramaproto-9999.ebuild 360 RMD160 4e4f114f5000d0126c0400212e6dd1d687c6fb97 SHA1 d11e162fedbae9a3aa49f118a07805844589647a SHA256 3db35e91911fbe76b7152a20d4a1667dce0986adfd8dedf2ea75de1b766a883c
+EBUILD xineramaproto-9999.ebuild 354 RMD160 7f63141e2c2e9128d0aee8fb2707c8c6aeb865f1 SHA1 03422b995c368122833224082e9427192e5bafcd SHA256 45f6855b8dac99b64a04a78bd564ccad9fd16c6bf96b104c6747800eef1f20f0
diff --git a/x11-proto/xineramaproto/xineramaproto-9999.ebuild b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
index 06dab0fa..be0291b6 100644
--- a/x11-proto/xineramaproto/xineramaproto-9999.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama protocol headers"
 
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 269571a6..8ba2bb5a 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1 +1 @@
-EBUILD xproto-9999.ebuild 397 RMD160 6fc8eef4b9a6cb58e16cdca0c3064e0bc61a6865 SHA1 8f1c96e39e8200bec957723b872c6207230cfe1a SHA256 f979291c0c80819e4cd90d0586cfb086cddbefb687b2d700e84f4b4b4587614a
+EBUILD xproto-9999.ebuild 391 RMD160 847de0fcbf430319a9809e8f83c408f6f6d9fddf SHA1 1af33412902a156bd1a9ebaff4bbf9a938a0bf73 SHA256 b8f42c29c38e37151b88ae71b64804a5f5585cc0a0bdad422ce554e40039b7b8
diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild
index 60eec351..13fe830f 100644
--- a/x11-proto/xproto/xproto-9999.ebuild
+++ b/x11-proto/xproto/xproto-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit x-modular-r2
+inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/x11proto"