summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-02-18 13:52:05 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2010-02-18 13:52:05 +0100
commit3660731636fe3406f20084207f4268c1400503c2 (patch)
tree11da110990b1d07d68bf757dbe497c508ec5d810 /x11-apps
parentRename eclass to xorg-2 as we decided on irc. (diff)
downloadx11-3660731636fe3406f20084207f4268c1400503c2.tar.gz
x11-3660731636fe3406f20084207f4268c1400503c2.tar.bz2
x11-3660731636fe3406f20084207f4268c1400503c2.zip
Rename the eclass calls in ebuilds.
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/mkfontdir/Manifest2
-rw-r--r--x11-apps/mkfontdir/mkfontdir-9999.ebuild2
-rw-r--r--x11-apps/mkfontscale/Manifest2
-rw-r--r--x11-apps/mkfontscale/mkfontscale-9999.ebuild2
-rw-r--r--x11-apps/smproxy/Manifest2
-rw-r--r--x11-apps/smproxy/smproxy-9999.ebuild2
-rw-r--r--x11-apps/x11perf/Manifest2
-rw-r--r--x11-apps/x11perf/x11perf-9999.ebuild2
-rw-r--r--x11-apps/xcursorgen/Manifest2
-rw-r--r--x11-apps/xcursorgen/xcursorgen-9999.ebuild2
-rw-r--r--x11-apps/xdriinfo/Manifest2
-rw-r--r--x11-apps/xdriinfo/xdriinfo-9999.ebuild6
-rw-r--r--x11-apps/xev/Manifest2
-rw-r--r--x11-apps/xev/xev-9999.ebuild2
-rw-r--r--x11-apps/xinit/Manifest2
-rw-r--r--x11-apps/xinit/xinit-9999.ebuild8
-rw-r--r--x11-apps/xinput/Manifest2
-rw-r--r--x11-apps/xinput/xinput-9999.ebuild2
-rw-r--r--x11-apps/xkbevd/Manifest2
-rw-r--r--x11-apps/xkbevd/xkbevd-9999.ebuild2
-rw-r--r--x11-apps/xkbutils/Manifest2
-rw-r--r--x11-apps/xkbutils/xkbutils-9999.ebuild2
-rw-r--r--x11-apps/xman/Manifest2
-rw-r--r--x11-apps/xman/xman-9999.ebuild2
-rw-r--r--x11-apps/xrandr/Manifest2
-rw-r--r--x11-apps/xrandr/xrandr-9999.ebuild4
-rw-r--r--x11-apps/xvinfo/Manifest2
-rw-r--r--x11-apps/xvinfo/xvinfo-9999.ebuild2
-rw-r--r--x11-apps/xwininfo/Manifest2
-rw-r--r--x11-apps/xwininfo/xwininfo-9999.ebuild2
30 files changed, 36 insertions, 36 deletions
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index d239b5df..04a9f0a2 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1 +1 @@
-EBUILD mkfontdir-9999.ebuild 364 RMD160 761a5854d312748a070fd00fce306283e34b104d SHA1 13a7fbe98f9fece3aa518da9dcefcdcb31691ad9 SHA256 adc1317449c6223f9b76cd3f9bab8dd62195c250be87e77308f56abb1af24d77
+EBUILD mkfontdir-9999.ebuild 358 RMD160 027959f653d07cc3fe00e63eb632358587feb97a SHA1 fee8c7700f020b079ffd8e24a15f5b2dd3e686c3 SHA256 f3e90dab4e7f2c1d15c28a47cb76d3dfe9b3e07fa292b02514f00b8688dc7b20
diff --git a/x11-apps/mkfontdir/mkfontdir-9999.ebuild b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
index 790bf9d8..a3b8fa3a 100644
--- a/x11-apps/mkfontdir/mkfontdir-9999.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="create an index of X font files in a directory"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 4276352a..80163f8e 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1 +1 @@
-EBUILD mkfontscale-9999.ebuild 438 RMD160 f23d63adb83fb0484efab7ef8e4a58bb4d0702f4 SHA1 1163818699da73d24213ea7827e51ba6d174739c SHA256 d97d9f25463addbeb989a6112a444917ae9be6124d32b6da226a2184a2fa3d1d
+EBUILD mkfontscale-9999.ebuild 432 RMD160 be172a6ab9a321e2de1bcae4ab00c87b4e3af8fb SHA1 d38443f44184cd5a7567f98982fd5ef9c669580d SHA256 b540c015ed76e8165f4d8981a081b3d06475bc7acf8400236bef6fd95e008ea2
diff --git a/x11-apps/mkfontscale/mkfontscale-9999.ebuild b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
index ada8cc31..9840e12c 100644
--- a/x11-apps/mkfontscale/mkfontscale-9999.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="create an index of scalable font files for X"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 90f7e884..3564e12b 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1 +1 @@
-EBUILD smproxy-9999.ebuild 350 RMD160 0ae9c2ed5672e95a900c6d602e61a6e3ffdf5686 SHA1 7c25e187a944d2678eab8165c425dfac449204d2 SHA256 b39eef6461da41070d0974cc893f8f8a67943abdc7d99df8a080676bf9ea8e1e
+EBUILD smproxy-9999.ebuild 344 RMD160 2b264ddc53d43d55767696ba30e941b92403a5d7 SHA1 c3f63fa00180670ac3edabbaa9101e40b6243248 SHA256 48f209d673f47cec4570713f183eed9513de23b318eae1d4c80dd8d46dd75663
diff --git a/x11-apps/smproxy/smproxy-9999.ebuild b/x11-apps/smproxy/smproxy-9999.ebuild
index dd8d9083..aa4ed861 100644
--- a/x11-apps/smproxy/smproxy-9999.ebuild
+++ b/x11-apps/smproxy/smproxy-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="Session Manager Proxy"
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index e14ed186..9c2008bf 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1 +1 @@
-EBUILD x11perf-9999.ebuild 427 RMD160 05701be34aa3c352b7ce9b1c3c9b760877064c59 SHA1 242a227cc99bc4ca6e1ec3dbb3faeb56dc3ab25f SHA256 688ff92d8d388ca169a9162f0c178fc3ee8ef60fea0857562f337cb6c77b76fa
+EBUILD x11perf-9999.ebuild 421 RMD160 56ed35b9e27ccfa9e33ee4fc4abd74625ab9616f SHA1 86af53a4a77ad65ecddb3a37ef7c4b9592641772 SHA256 c6ef42f2a47f8902401e33b9c4e093bcfcee76be85be57f3d9ce5d0da6354d07
diff --git a/x11-apps/x11perf/x11perf-9999.ebuild b/x11-apps/x11perf/x11perf-9999.ebuild
index 5941cd4b..90850ddc 100644
--- a/x11-apps/x11perf/x11perf-9999.ebuild
+++ b/x11-apps/x11perf/x11perf-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="X rendering operation stress test utility"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 43d6a625..4efd741d 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1 +1 @@
-EBUILD xcursorgen-9999.ebuild 414 RMD160 d37b88bf3937f22a35f98818ca9ead1620db68d7 SHA1 6f0d48d80288fee2bc5a082310764fdacd61741c SHA256 1ea2af6240bd3fe8e46f48388565fff5c413ca514f8b97c157b9d7f3431a4ebe
+EBUILD xcursorgen-9999.ebuild 408 RMD160 cbcc3932d79f759ac5c35d2372fc977107e053ff SHA1 46285be387874ace5ebe0d45a8dabca9759f4152 SHA256 748357e193d945d67358cc148105301b97def5a8a5a92b86957184e24846d474
diff --git a/x11-apps/xcursorgen/xcursorgen-9999.ebuild b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
index c6ed89ca..2885e0a0 100644
--- a/x11-apps/xcursorgen/xcursorgen-9999.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="create an X cursor file from a collection of PNG images"
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 8a44b346..2fca421a 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1 +1 @@
-EBUILD xdriinfo-9999.ebuild 675 RMD160 d501164f16fd7117971f7d48725e5445d964ba9c SHA1 8dd51261852b226be80467595f93c39e62eee842 SHA256 cc534c81a208c3bec73b383a8372fc7167c95a31fe7a45db7b84c0a37aceaf50
+EBUILD xdriinfo-9999.ebuild 657 RMD160 5af34c1bb888415529bd2c893ce72020a9912492 SHA1 00592367aef7d19e641a7b3a32e4b763e435c8e9 SHA256 6f032d59cf7d79326448db2e7bfa983c608534e109335ca980f5796b4b75a1a0
diff --git a/x11-apps/xdriinfo/xdriinfo-9999.ebuild b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
index 4ed1096e..1949db61 100644
--- a/x11-apps/xdriinfo/xdriinfo-9999.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="query configuration information of DRI drivers"
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
x11-proto/glproto"
pkg_setup() {
- x-modular-r2_pkg_setup
+ xorg-2_pkg_setup
# Bug #138920
ewarn "Forcing on xorg-x11 for header sanity..."
@@ -26,7 +26,7 @@ pkg_setup() {
}
pkg_postinst() {
- x-modular-r2_pkg_postinst
+ xorg-2_pkg_postinst
echo
eselect opengl set ${OLD_IMPLEM}
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index e93c4d77..4d102390 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1 +1 @@
-EBUILD xev-9999.ebuild 339 RMD160 92961b1d834a61371a504626e88e22c8c2b84aab SHA1 730ff3858edd9108a4118a033b9dee4b1d7dd51c SHA256 8b6be401aee7c93fe4eddb924b89777428d7648c1b945726646ba9fee5c8ec43
+EBUILD xev-9999.ebuild 333 RMD160 ff0b12437b16f35b1ab4309d49946c751bf3f9e2 SHA1 3cb4e0b05a58584e26ce9d72c0ebeb6f03c2d4fd SHA256 cb4601aea2d36eaaf87ed0d878d2384721516475ecec5868f96a9ff506c27cd0
diff --git a/x11-apps/xev/xev-9999.ebuild b/x11-apps/xev/xev-9999.ebuild
index e7464208..d50003db 100644
--- a/x11-apps/xev/xev-9999.ebuild
+++ b/x11-apps/xev/xev-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="print contents of X events"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 0359d5d0..b14946bc 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,4 +8,4 @@ AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a8
AUX xdm.initd-4 6515 RMD160 d42bd4fe05d64c1e432aac26141f052d093fc563 SHA1 b2a997a564441d2f543d80d19201897bbe6f363a SHA256 341a3a2fab2618e20784394adc2a2af5e60234cca7d6c3f9cc863308a836d158
AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
-EBUILD xinit-9999.ebuild 1832 RMD160 6e1201d42d2bd4363bd1505884b051e10eba6eb2 SHA1 0eb6d8b76fcc81591868355a376a2548eebb62ca SHA256 4c54e93a2337210da2e5ed0e8c94666e8ca96d27552e0a7577b2e8a5eb439312
+EBUILD xinit-9999.ebuild 1808 RMD160 8d98d62c023c3ea1a9ca77aed04cd7090ce7a5fe SHA1 69f35075e5002a55d984f28191bdd8a8035bc0e7 SHA256 29d9dc4e66fa6835c08909cb51bd086ed414cc8c575d710c286d42f21f0aff37
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index f8ad4d17..42d62352 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2 pam
+inherit xorg-2 pam
DESCRIPTION="X Window System initializer"
@@ -30,12 +30,12 @@ PATCHES=(
)
pkg_setup() {
- x-modular-r2_pkg_setup
+ xorg-2_pkg_setup
CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
}
src_install() {
- x-modular-r2_src_install
+ xorg-2_src_install
exeinto /etc/X11
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
exeinto /etc/X11/Sessions
@@ -52,7 +52,7 @@ src_install() {
}
pkg_postinst() {
- x-modular-r2_pkg_postinst
+ xorg-2_pkg_postinst
ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
ewarn "any executable. When you run startx, it will run this as the login session."
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index fd1e9b35..bed517b7 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,2 +1,2 @@
-EBUILD xinput-9999.ebuild 420 RMD160 a507314d5f4c0327c5481d89f139fef431a2579c SHA1 0a58e861c33900d8fdeddb5ba6b5a92af8cd97c2 SHA256 dffd35742cf7a0857c54bf709d17af0de3ddda6ab7e3c530eef8cb31a2115fa3
+EBUILD xinput-9999.ebuild 414 RMD160 41a0aa2fa3c3dbfa65908bfd24b385edacd02ffc SHA1 33b6718344fbe1bbafab0f2a5987f6dc66f1142e SHA256 71f304d106721f80ceb8559813bb75519133dd858407856854a3a0b1000548cb
MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-apps/xinput/xinput-9999.ebuild b/x11-apps/xinput/xinput-9999.ebuild
index 8430f3e7..3b959c79 100644
--- a/x11-apps/xinput/xinput-9999.ebuild
+++ b/x11-apps/xinput/xinput-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="Utility to set XInput device parameters"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index ff9b1c0b..8942fac9 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1 +1 @@
-EBUILD xkbevd-9999.ebuild 333 RMD160 1fb5eb6412ba2be9a0050d177b7e35608ffb3e62 SHA1 8ad776793133d3a8a56fa8e44c8dd4f2b5c20704 SHA256 ebcc2092455385261adc02e9ca36a491660f8e3154ddf7343f6f3141f429511b
+EBUILD xkbevd-9999.ebuild 327 RMD160 2077253ecffc1975ec096ffeef98a81be726a42d SHA1 b427561034039e7a025bd96f5257dacdf9e417cb SHA256 6336c3a551ff28185d60510b74786ab994339cb2b636433ccfb51ab6d4ff6d8c
diff --git a/x11-apps/xkbevd/xkbevd-9999.ebuild b/x11-apps/xkbevd/xkbevd-9999.ebuild
index 2dd323fd..1706bd36 100644
--- a/x11-apps/xkbevd/xkbevd-9999.ebuild
+++ b/x11-apps/xkbevd/xkbevd-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="XKB event daemon"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 65cc6165..18993c30 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1 +1 @@
-EBUILD xkbutils-9999.ebuild 382 RMD160 f300d9b5fb988dbae9ccbf385fd92e9b7483a5af SHA1 cfb3a179df6e4422c2566b1a63d791cec82f9b4e SHA256 2a9c7d246ed9a33d108d5e184223e16a919b4f5e1927dee6d5c1f4b9710715ce
+EBUILD xkbutils-9999.ebuild 376 RMD160 b4573259bee1f2274d661347fc672e7f4e024aad SHA1 4c93ca90569b405df62dcaf43b84e5df3c9ccdc4 SHA256 b2235262173d101dcacd540861b52c1a7195a96e2de26254eda772d49d9e2a15
diff --git a/x11-apps/xkbutils/xkbutils-9999.ebuild b/x11-apps/xkbutils/xkbutils-9999.ebuild
index 6201401a..b923c891 100644
--- a/x11-apps/xkbutils/xkbutils-9999.ebuild
+++ b/x11-apps/xkbutils/xkbutils-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="X.Org xkbutils application"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 2f68454d..eac22c99 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1 +1 @@
-EBUILD xman-9999.ebuild 341 RMD160 d47509eff0c5c890efe133b1ac8d4452794826e6 SHA1 6379f68b4079a0d3fc64d6ecb224ab5465bde88e SHA256 dec0352c115eec60746a100c3ae469515fd84f968cbfcf8139ee8cfc0901a906
+EBUILD xman-9999.ebuild 335 RMD160 0aaa18ab5edea0bb7c6f87d4207ae1094b25edd9 SHA1 9ed46af8744a5a9f9bdc9b989f01f69fa897cfec SHA256 a15a598393fc2ea5fa11c42c1ebab10070bee85e05cf797acc765202611cd666
diff --git a/x11-apps/xman/xman-9999.ebuild b/x11-apps/xman/xman-9999.ebuild
index 710127ae..88cb6b0a 100644
--- a/x11-apps/xman/xman-9999.ebuild
+++ b/x11-apps/xman/xman-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="Manual page display program for the X Window System"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index c7a4d76d..c8cf8af4 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrandr-9999.ebuild 488 RMD160 ca2187ea85f3d01835d2edd1ad9aa7b1b10db5f7 SHA1 a1c0d21130abffabf318749da0214c99a556c217 SHA256 30d14928121b1e8fed78ef9f96bb390bdf8887414edd6782bc7727449b4a1b71
+EBUILD xrandr-9999.ebuild 476 RMD160 18de1a32b97b1b0672a46d854284d00fb0cdbee2 SHA1 85aa32e01c1b2f9208a642597e0f8db3ba3ad795 SHA256 218898bd8c5eb038afd11bd71fb8cf192edb6009169c285978eec0e03f2a8731
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/xrandr/xrandr-9999.ebuild b/x11-apps/xrandr/xrandr-9999.ebuild
index dcaa1843..0306db0e 100644
--- a/x11-apps/xrandr/xrandr-9999.ebuild
+++ b/x11-apps/xrandr/xrandr-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="primitive command line interface to RandR extension"
@@ -16,6 +16,6 @@ RDEPEND=">=x11-libs/libXrandr-1.3
DEPEND="${RDEPEND}"
src_install() {
- x-modular-r2_src_install
+ xorg-2_src_install
rm -f "${D}"/usr/bin/xkeystone
}
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index d1cf2148..3c4c1fcd 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1 +1 @@
-EBUILD xvinfo-9999.ebuild 376 RMD160 f47bd99e18ce5482eee50eb5f7908bc7cd137a84 SHA1 1d184fcfebc51f1726049c2d67e29d06b7a75c9a SHA256 0a1143fea8b015ac823f70d202d420392960c50aa1b4f31f211c54907c693e29
+EBUILD xvinfo-9999.ebuild 370 RMD160 45b6dfde817c4194f5f6da668c11afbd1658aae2 SHA1 88a7a762eae65349c48b08df3c8e00dd8a5babe0 SHA256 6bea38021e943277bc41b3424bd18a6295aa4d1a7ddd20605536be7011a8c4e3
diff --git a/x11-apps/xvinfo/xvinfo-9999.ebuild b/x11-apps/xvinfo/xvinfo-9999.ebuild
index e9e0eac1..b0d7f05d 100644
--- a/x11-apps/xvinfo/xvinfo-9999.ebuild
+++ b/x11-apps/xvinfo/xvinfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="Print out X-Video extension adaptor information"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index f4cf5817..c95be6e8 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1 +1 @@
-EBUILD xwininfo-9999.ebuild 362 RMD160 94dd4560d4ce80f87e7544a86e4ea28b75b2dca7 SHA1 1f7deb5af3634cc952a72cc872dfead1624124ff SHA256 d6bf47c3f8586922969e3f343d198673536366167fcb3c782035379b7084e025
+EBUILD xwininfo-9999.ebuild 356 RMD160 94e3c47c691b3f957c4c0de743d37ad7f82635de SHA1 efd0a92f49c2688115c27e2c84b47ad61ff410f2 SHA256 19e94667d7345828b32162b25673f703e21a29c9afa11c1c7a1d2c9d1338f189
diff --git a/x11-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
index b852b47e..62b72b3e 100644
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ b/x11-apps/xwininfo/xwininfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit x-modular-r2
+inherit xorg-2
DESCRIPTION="window information utility for X"