Cleaning out old ebuilds.

svn path=/; revision=340
author: Christian Heim <phreak@gentoo.org> 2007-07-08 21:28:34 +0000
committer: Christian Heim <phreak@gentoo.org> 2007-07-08 21:28:34 +0000
commit: b4340def3ac20267f57f800289a3321660981ea3 (patch)
tree: 46c89ac512f3ea577204f6e709d6faa8a95ef02a /hardened
parent: Bye-Bye. (diff)
download: phreak-b4340def3ac20267f57f800289a3321660981ea3.tar.gz
phreak-b4340def3ac20267f57f800289a3321660981ea3.tar.bz2
phreak-b4340def3ac20267f57f800289a3321660981ea3.zip
82 files changed, 0 insertions, 9300 deletions
diff --git a/hardened/sys-boot/grub/Manifest b/hardened/sys-boot/grub/Manifest
deleted file mode 100644
index 1f38f51..0000000
--- a/hardened/sys-boot/grub/Manifest
+++ /dev/null
@@ -1,77 +0,0 @@
-DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
-DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA1 15bd5aaa816728583235ab0d5477c1ac32855583 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37
-DIST grub-0.94-gentoo-0.1.tar.bz2 40585 RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c SHA1 f59333af3d4fc7b8d77c876ef956681f7cc335cb SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3
-DIST grub-0.94.tar.gz 923518 RMD160 144e085e2eb139f135a7e6eb65d15489da4cf225 SHA1 12e0a2b7b6ee998232b057a8182ae54c33a6e0c5 SHA256 010d15c823cbccc7b5943735799bf8412ae18391307d4c2d5f8dbed158cc4a1b
-DIST grub-0.96-patches-1.0.tar.bz2 49828 RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db SHA1 d10c873c3f94deca3f49645f39b44672193be69c SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956
-DIST grub-0.96-r1-gentoo-0.1.tar.bz2 47051 RMD160 6dea68ba610fd68c99cf2080648df9a66469450b SHA1 1bffd82bd6afdf0e568ca2006fe5f0219182a5cf SHA256 3457a18707a0c733cc9e6caea5b41ce182b55add08bc69aa5b4e2fb92676431e
-DIST grub-0.96-r2-gentoo-0.1.tar.bz2 47639 RMD160 fceb2193a32e8657390045cfc390829aa056fd5d SHA1 9fcb15861e9c9ec4d46fa80a6c91402c7f3e05dc SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c
-DIST grub-0.96.tar.gz 985761 RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa SHA1 2520b03c8990ffe900cfc4fabd800d1056014f48 SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba
-DIST grub-0.97-patches-1.0.tar.bz2 46259 RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 SHA1 36184739f02b582bbe76857d83aae7ea81a06e7e SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f
-DIST grub-0.97-patches-1.2.tar.bz2 20872 RMD160 7d91e01873f52daad271eda85e67f031e72570c9 SHA1 d9a11b6142931baeb8d13adb06fc86706ea17e3d SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049
-DIST grub-0.97-patches-1.4.tar.bz2 24693 RMD160 6afefff73b5f3ab5c6d05563c4f67f37dbfce16c SHA1 7c26a941467b58380747c9d1e07c14dfc3998b10 SHA256 290dd96fdeb9471c516f061f4949ccda33f8d03ab81a6e2beb5005b3022e71da
-DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
-DIST grub-1.95.tar.gz 519269 RMD160 bce7d8790b47f3ce7fa4ce7ac61242cc242ad5da SHA1 6691f7c2f64a1de03f3bc2304fa2c83e92050cc3 SHA256 d40c88f1da2919c252500c4cae0de6e9e1a368695117a7a23c4e07d2b4b9b769
-DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
-EBUILD grub-0.92-r1.ebuild 2635 RMD160 8c11c17f30cdad3b49b368223ca8224ace6fc387 SHA1 e8b9e97af148ddbaaacc50d783600076d067a93c SHA256 fdb5ce6d58b8cc78c2ecda25c9f2fd7015f7e1b34eadfe83e1b18877619e38d5
-MD5 dbe522bcddc446ce034e5a278d9d9fd8 grub-0.92-r1.ebuild 2635
-RMD160 8c11c17f30cdad3b49b368223ca8224ace6fc387 grub-0.92-r1.ebuild 2635
-SHA256 fdb5ce6d58b8cc78c2ecda25c9f2fd7015f7e1b34eadfe83e1b18877619e38d5 grub-0.92-r1.ebuild 2635
-EBUILD grub-0.94-r1.ebuild 3567 RMD160 c941023b180adb6a04113096c141d6c2ab01b986 SHA1 e25a4abcf0d8bdd4093638a6553325b16d89ba1f SHA256 b426a53478a793b025c0cd0fe63dfa78ee6140c8f4aa999e56d05e96ab140fb5
-MD5 cc3d4f9e70bdb3a29fe1da218fc32498 grub-0.94-r1.ebuild 3567
-RMD160 c941023b180adb6a04113096c141d6c2ab01b986 grub-0.94-r1.ebuild 3567
-SHA256 b426a53478a793b025c0cd0fe63dfa78ee6140c8f4aa999e56d05e96ab140fb5 grub-0.94-r1.ebuild 3567
-EBUILD grub-0.96-r1.ebuild 4781 RMD160 f59508e89c6404de3ce6ca06fe1dedaaff6de474 SHA1 6e54e53873514d0515faec60df58f5d356ab0e3b SHA256 d466700e5fca91a2f41fcb0fa90196f99b7fcef24afde56b7d676c3f14d3dce9
-MD5 2d33ab8cd98870128971de5dd90db5be grub-0.96-r1.ebuild 4781
-RMD160 f59508e89c6404de3ce6ca06fe1dedaaff6de474 grub-0.96-r1.ebuild 4781
-SHA256 d466700e5fca91a2f41fcb0fa90196f99b7fcef24afde56b7d676c3f14d3dce9 grub-0.96-r1.ebuild 4781
-EBUILD grub-0.96-r2.ebuild 4343 RMD160 25a2d4263261501e48e6bbedb7fb4761f710778e SHA1 f326fa4e29af49e1a92e0e0604bfa2bf5fadd172 SHA256 3be87c06ae7f39ea3ac8c00befab972f5c1b56da31d9db7d1aede49a8ae1f246
-MD5 b7ac03c16036071c6f0b622e2ed814aa grub-0.96-r2.ebuild 4343
-RMD160 25a2d4263261501e48e6bbedb7fb4761f710778e grub-0.96-r2.ebuild 4343
-SHA256 3be87c06ae7f39ea3ac8c00befab972f5c1b56da31d9db7d1aede49a8ae1f246 grub-0.96-r2.ebuild 4343
-EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb SHA1 04c61e8f7e638c3ecf8753ea02bd997f759726b9 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c
-MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
-RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb grub-0.96-r3.ebuild 4577
-SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c grub-0.96-r3.ebuild 4577
-EBUILD grub-0.97-r2.ebuild 4876 RMD160 ada1c2bdada2fbcebaf6502c2854fff8e6d256c0 SHA1 566dcea350ea246a0d9bc54521658ce5e54d749e SHA256 4086c3682e4e9a42163ea9e4537b73cbd716d219734bdb4de1063a38cb74dcaf
-MD5 becb393a218939ff051dd710c36a5081 grub-0.97-r2.ebuild 4876
-RMD160 ada1c2bdada2fbcebaf6502c2854fff8e6d256c0 grub-0.97-r2.ebuild 4876
-SHA256 4086c3682e4e9a42163ea9e4537b73cbd716d219734bdb4de1063a38cb74dcaf grub-0.97-r2.ebuild 4876
-EBUILD grub-0.97-r3.ebuild 4708 RMD160 5b8345fbc6f5d7d0b35c16e3e0835460ed6bd786 SHA1 903a32056747606ed92ae4aedfa08e290b53d8da SHA256 3f1eb6c792eab07e660286e5ff7b997c5ec6be63c1d0ab307e3091b5cc250259
-MD5 7a31c7ce4cd13208980b52860aa119cb grub-0.97-r3.ebuild 4708
-RMD160 5b8345fbc6f5d7d0b35c16e3e0835460ed6bd786 grub-0.97-r3.ebuild 4708
-SHA256 3f1eb6c792eab07e660286e5ff7b997c5ec6be63c1d0ab307e3091b5cc250259 grub-0.97-r3.ebuild 4708
-EBUILD grub-0.97.ebuild 4557 RMD160 00c8eabb318c7bfbb441220d80071e0de731b4c4 SHA1 52ea334e494eb8d03b233318e17fdec82f72878d SHA256 627804a672ca7b1693a4ea8c59d7315c7a67242e2e7f423e0bed2482ef39de2e
-MD5 053d688e3e1068842f48915f5c7d06e4 grub-0.97.ebuild 4557
-RMD160 00c8eabb318c7bfbb441220d80071e0de731b4c4 grub-0.97.ebuild 4557
-SHA256 627804a672ca7b1693a4ea8c59d7315c7a67242e2e7f423e0bed2482ef39de2e grub-0.97.ebuild 4557
-EBUILD grub-1.95.ebuild 983 RMD160 c06137346c6e513679820b263c52e2edef0e882d SHA1 aa5c2137ca1abc6e010b3b4005aa23869129d6fc SHA256 4aa90f95b36a794754723c9cd61d2ec00c4a092678064ba08bfb068368f8a125
-MD5 eacbf06f7e3288bf10643256ccfe9a2c grub-1.95.ebuild 983
-RMD160 c06137346c6e513679820b263c52e2edef0e882d grub-1.95.ebuild 983
-SHA256 4aa90f95b36a794754723c9cd61d2ec00c4a092678064ba08bfb068368f8a125 grub-1.95.ebuild 983
-MD5 a350d0404e6abe9097c314bde03d7b06 files/digest-grub-0.92-r1 708
-RMD160 dae709227b402c951ee6539812fb415d597d6708 files/digest-grub-0.92-r1 708
-SHA256 65ee4cd4417664ae5b5b7102978271a863f3f53b686e759d1285a859c9b3275b files/digest-grub-0.92-r1 708
-MD5 1658acdeeb7a6eaf980db2ffc2f70049 files/digest-grub-0.94-r1 708
-RMD160 7dc436c7328a63d1365b9e4a52e04fb3761b1821 files/digest-grub-0.94-r1 708
-SHA256 a127a84f5a12c2708dcabac4119a19cd19a7ba44c7ab4473e10a386b6b6dd421 files/digest-grub-0.94-r1 708
-MD5 2347e1b33cda6434b239a3f8376ec474 files/digest-grub-0.96-r1 717
-RMD160 7a2f3a08bd41817a86ad98bf1337890a17008f6d files/digest-grub-0.96-r1 717
-SHA256 f77224d915ffe62e13296661f6d685397c63ea57c3a5edca7d7930c28357337c files/digest-grub-0.96-r1 717
-MD5 ff60dcc93226df482438b1c9f96368ec files/digest-grub-0.96-r2 717
-RMD160 182926c763a82488353c94a5df954c265abc9a17 files/digest-grub-0.96-r2 717
-SHA256 d0f1f8709be17bacc9ec91604209c2fdf7296e21f965880c98f60412741fa954 files/digest-grub-0.96-r2 717
-MD5 500f29f90648b5f4e33b585a82a1ef4b files/digest-grub-0.96-r3 711
-RMD160 a456fe359eec1d90be612a77d51823e0026852d5 files/digest-grub-0.96-r3 711
-SHA256 5d0b53de0abf2a102afcf9a87e1d39a507c6eb4955c60dfb3c6cb0e9a92c7027 files/digest-grub-0.96-r3 711
-MD5 3ec625383a1d66c82b6896db9a23c050 files/digest-grub-0.97 711
-RMD160 3050ceb246ff64cf39a512cc96c7c5122ed4b600 files/digest-grub-0.97 711
-SHA256 a9b9d0d6eda41218f5011138aa52a4bb1bcab702da1b1342fed3d275d1d1bd9c files/digest-grub-0.97 711
-MD5 660ca8ffb71c2a1008754fc599c5dc32 files/digest-grub-0.97-r2 711
-RMD160 17ed023bb1e3e7eb935ae3b5d6f46a1447ae4ae7 files/digest-grub-0.97-r2 711
-SHA256 b0934e5e43d1417abb03e4adc7fbe5b3b6c36bc4db651ceaf832a6eff42bb931 files/digest-grub-0.97-r2 711
-MD5 95650f97ede7437cc0f34b5a519fafd1 files/digest-grub-0.97-r3 711
-RMD160 f89bb19df1610b09fae5ffed1c4b06572ee38ce9 files/digest-grub-0.97-r3 711
-SHA256 8d0b3d6a65d423c40eb72ac88673e653204c2aa4c579e5284f2c327b6b782342 files/digest-grub-0.97-r3 711
-MD5 5b751b3561077f157fe7ce25daceaa3f files/digest-grub-1.95 229
-RMD160 85c7f6ef9d260dfe9049ed77c2d473086548e969 files/digest-grub-1.95 229
-SHA256 fe0d1d73c9724dd4653eb68231878133e6d00f1e33bb3f38dc73c249efa02631 files/digest-grub-1.95 229
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.92-r1 b/hardened/sys-boot/grub/files/digest-grub-0.92-r1
deleted file mode 100644
index bb0332e..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.92-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a74911d3f1a25d06b3243df70bf6e892 grub-0.92-gentoo-0.2.tar.bz2 21727
-RMD160 f420e3352d46fdfb77a1121879382265805bc3ef grub-0.92-gentoo-0.2.tar.bz2 21727
-SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe grub-0.92-gentoo-0.2.tar.bz2 21727
-MD5 50f2786e7bf96b1115ee82b9c101a816 grub-0.92.tar.gz 877112
-RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 grub-0.92.tar.gz 877112
-SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37 grub-0.92.tar.gz 877112
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.94-r1 b/hardened/sys-boot/grub/files/digest-grub-0.94-r1
deleted file mode 100644
index 9d6727a..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.94-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 636201ec318c19987d59c762abcf78f6 grub-0.94-gentoo-0.1.tar.bz2 40585
-RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c grub-0.94-gentoo-0.1.tar.bz2 40585
-SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3 grub-0.94-gentoo-0.1.tar.bz2 40585
-MD5 299672a99cf59656e653d8ffd7851b56 grub-0.94.tar.gz 923518
-RMD160 144e085e2eb139f135a7e6eb65d15489da4cf225 grub-0.94.tar.gz 923518
-SHA256 010d15c823cbccc7b5943735799bf8412ae18391307d4c2d5f8dbed158cc4a1b grub-0.94.tar.gz 923518
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r1 b/hardened/sys-boot/grub/files/digest-grub-0.96-r1
deleted file mode 100644
index 22bfc4f..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.96-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 46235df4ac250f586a07076cd6e907b9 grub-0.96-r1-gentoo-0.1.tar.bz2 47051
-RMD160 6dea68ba610fd68c99cf2080648df9a66469450b grub-0.96-r1-gentoo-0.1.tar.bz2 47051
-SHA256 3457a18707a0c733cc9e6caea5b41ce182b55add08bc69aa5b4e2fb92676431e grub-0.96-r1-gentoo-0.1.tar.bz2 47051
-MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
-RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
-SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r2 b/hardened/sys-boot/grub/files/digest-grub-0.96-r2
deleted file mode 100644
index cf60991..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.96-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 6a7a342fecc62e2d54fa3764b91efa7d grub-0.96-r2-gentoo-0.1.tar.bz2 47639
-RMD160 fceb2193a32e8657390045cfc390829aa056fd5d grub-0.96-r2-gentoo-0.1.tar.bz2 47639
-SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c grub-0.96-r2-gentoo-0.1.tar.bz2 47639
-MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
-RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
-SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r3 b/hardened/sys-boot/grub/files/digest-grub-0.96-r3
deleted file mode 100644
index f79f08f..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.96-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 12665487d79f73748d9c6769b3d9dbbf grub-0.96-patches-1.0.tar.bz2 49828
-RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db grub-0.96-patches-1.0.tar.bz2 49828
-SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956 grub-0.96-patches-1.0.tar.bz2 49828
-MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
-RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
-SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97 b/hardened/sys-boot/grub/files/digest-grub-0.97
deleted file mode 100644
index bacf19c..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.97
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5e6d0bb61fd731753493c1ec39375073 grub-0.97-patches-1.0.tar.bz2 46259
-RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 grub-0.97-patches-1.0.tar.bz2 46259
-SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f grub-0.97-patches-1.0.tar.bz2 46259
-MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
-RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
-SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97-r2 b/hardened/sys-boot/grub/files/digest-grub-0.97-r2
deleted file mode 100644
index b53dc9d..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.97-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 6bb56aebcb3add62a725f0137cebc9df grub-0.97-patches-1.2.tar.bz2 20872
-RMD160 7d91e01873f52daad271eda85e67f031e72570c9 grub-0.97-patches-1.2.tar.bz2 20872
-SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049 grub-0.97-patches-1.2.tar.bz2 20872
-MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
-RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
-SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97-r3 b/hardened/sys-boot/grub/files/digest-grub-0.97-r3
deleted file mode 100644
index 26b24df..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-0.97-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 995985c7bd6d9680b36d6efd677fb751 grub-0.97-patches-1.4.tar.bz2 24693
-RMD160 6afefff73b5f3ab5c6d05563c4f67f37dbfce16c grub-0.97-patches-1.4.tar.bz2 24693
-SHA256 290dd96fdeb9471c516f061f4949ccda33f8d03ab81a6e2beb5005b3022e71da grub-0.97-patches-1.4.tar.bz2 24693
-MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
-RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
-SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
-MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
-RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
-SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-1.95 b/hardened/sys-boot/grub/files/digest-grub-1.95
deleted file mode 100644
index c1e0de7..0000000
--- a/hardened/sys-boot/grub/files/digest-grub-1.95
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ea234d8fc5d551f61bc65e553e51399 grub-1.95.tar.gz 519269
-RMD160 bce7d8790b47f3ce7fa4ce7ac61242cc242ad5da grub-1.95.tar.gz 519269
-SHA256 d40c88f1da2919c252500c4cae0de6e9e1a368695117a7a23c4e07d2b4b9b769 grub-1.95.tar.gz 519269
diff --git a/hardened/sys-boot/grub/grub-0.92-r1.ebuild b/hardened/sys-boot/grub/grub-0.92-r1.ebuild
deleted file mode 100644
index 3b5112d..0000000
--- a/hardened/sys-boot/grub/grub-0.92-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.13 2005/07/28 17:53:38 seemant Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=0.2
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2-r5"
-PROVIDE="virtual/bootloader"
-
-PATCHDIR=${WORKDIR}/gentoo
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	EPATCH_SUFFIX="patch"
-
-	epatch ${PATCHDIR}
-
-	if [ "`gcc-version`" = "3.3" ]
-	then
-		epatch ${PATCHDIR}/gcc-3.3
-	fi
-}
-
-src_compile() {
-	filter-flags "-fstack-protector -fPIE"
-
-	unset BLOCK_SIZE #73499
-
-	#i686-specific code in the boot loader is a bad idea; disabling to ensure
-	#at least some compatibility if the hard drive is moved to an older or
-	#incompatible system.
-	unset CFLAGS
-	./configure --prefix=/usr \
-		--sbindir=/sbin \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-auto-linux-mem-opt \
-		|| die "Configuration of package failed."
-
-	#the vga16.patch changes configure.in but not configure so
-	#--enable-vga16 doesnt work.  config.h gets overwritten by make.
-	echo "#define VGA16 1" >> config.h.in
-
-	emake || die "Building failed!"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		sbindir=${D}/sbin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die "Installation failed."
-
-	insinto /boot/grub
-	doins ${DISTDIR}/splash.xpm.gz
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-	if [ ! -e /boot/grub/stage1 ]
-	then
-		#if the boot loader files aren't in place, copy them over.
-		cd /usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 /boot/grub
-	else
-		einfo '*** A new GRUB has been installed. If you need to reinstall'
-		einfo '*** GRUB to a boot record on your drive, please remember to'
-		einfo '*** "cp /usr/share/grub/i386-pc/*stage* /boot/grub" first.'
-		einfo "*** If you're using XFS, unmount and remount /boot as well."
-	fi
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ln -s grub.conf /boot/grub/menu.lst
-		einfo "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-	fi
-}
diff --git a/hardened/sys-boot/grub/grub-0.94-r1.ebuild b/hardened/sys-boot/grub/grub-0.94-r1.ebuild
deleted file mode 100644
index 4665041..0000000
--- a/hardened/sys-boot/grub/grub-0.94-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.24 2005/08/21 02:24:04 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=0.1
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-IUSE="static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-PATCHDIR="${WORKDIR}/gentoo"
-
-pkg_setup() {
-	if use amd64; then
-		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	EPATCH_SUFFIX="patch"
-
-	epatch ${PATCHDIR}
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-	unset CFLAGS
-
-	filter-ldflags -pie
-	append-flags -DNDEBUG
-	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
-	use static && append-ldflags -static
-
-	autoconf || die
-	aclocal || die
-	WANT_AUTOMAKE=1.7 automake || die
-
-	filter-flags -fPIE -fstack-protector
-
-	# build the net-bootable grub first
-	CFLAGS="" \
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die
-
-	emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-	mv stage2/{nbgrub,pxegrub} ${S}
-	mv stage2/stage2 stage2/stage2.netboot
-
-	make clean || die
-
-	# now build the regular grub
-	CFLAGS="${CFLAGS}" \
-	econf \
-			--libdir=/lib \
-			--datadir=/usr/lib/grub \
-			--exec-prefix=/ \
-			--disable-auto-linux-mem-opt || die
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub/${CHOST}
-	doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${DISTDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	docinto gentoo
-	dodoc ${PATCHDIR}/README*
-}
-
-pkg_postinst() {
-	[ "$ROOT" != "/" ] && return 0
-
-	# change menu.lst to grub.conf
-	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
-	then
-		mv /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	ln -s grub.conf /boot/grub/menu.lst
-
-	[ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /usr/lib/grub to /boot"
-	cp -p /usr/lib/grub/* /boot/grub
-	cp -p /usr/lib/grub/grub/*/* /boot/grub
-
-	[ -e /boot/grub/grub.conf ] \
-		&& /usr/sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/hardened/sys-boot/grub/grub-0.96-r1.ebuild b/hardened/sys-boot/grub/grub-0.96-r1.ebuild
deleted file mode 100644
index 5005139..0000000
--- a/hardened/sys-boot/grub/grub-0.96-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.15 2005/08/21 02:24:04 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=0.1
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${PF}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static netboot custom-cflags"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-PATCHDIR="${WORKDIR}/gentoo"
-
-pkg_setup() {
-	if use amd64; then
-		if ! has_m32; then
-			eerror "Your compiler seems to be unable to compile 32bit code."
-			eerror "If you are on amd64, make sure you compile gcc with:"
-			echo
-			eerror "    USE=multilib FEATURES=-sandbox"
-			die "Cannot produce 32bit objects!"
-		fi
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}
-
-	# a bunch of patches apply to raw autotool files
-	autoconf || die "autoconf failed"
-	aclocal || die "aclocal failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	filter-flags -fPIE -fstack-protector
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub/${CHOST}
-	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${DISTDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	docinto gentoo
-	dodoc ${PATCHDIR}/README.Gentoo.patches
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-
-	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
-
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub
-	done
-
-	# hardened voodoo
-	[[ -x /sbin/chpax ]] && /sbin/chpax -spme /sbin/grub
-	[[ -x /sbin/paxctl ]] && /sbin/paxctl -spme /sbin/grub
-
-	[[ -e /boot/grub/grub.conf ]] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/hardened/sys-boot/grub/grub-0.96-r2.ebuild b/hardened/sys-boot/grub/grub-0.96-r2.ebuild
deleted file mode 100644
index f5856e3..0000000
--- a/hardened/sys-boot/grub/grub-0.96-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.10 2006/02/05 14:44:52 blubb Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=0.1
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${PF}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static netboot custom-cflags"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-PATCHDIR="${WORKDIR}/gentoo"
-
-pkg_setup() {
-	if use amd64; then
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}
-
-	# a bunch of patches apply to raw autotool files
-	autoconf || die "autoconf failed"
-	aclocal || die "aclocal failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub/${CHOST}
-	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${DISTDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	docinto gentoo
-	dodoc ${PATCHDIR}/README*
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-
-	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
-
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub
-	done
-
-	[[ -e /boot/grub/grub.conf ]] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/hardened/sys-boot/grub/grub-0.96-r3.ebuild b/hardened/sys-boot/grub/grub-0.96-r3.ebuild
deleted file mode 100644
index 28145f4..0000000
--- a/hardened/sys-boot/grub/grub-0.96-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.3 2005/08/21 02:24:04 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=1.0
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static netboot custom-cflags"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64 ; then
-		if ! has_m32 ; then
-			eerror "Your compiler seems to be unable to compile 32bit code."
-			eerror "If you are on amd64, make sure you compile gcc with:"
-			echo
-			eerror "    USE=multilib FEATURES=-sandbox"
-			die "Cannot produce 32bit objects!"
-		fi
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}"/patch
-
-	# a bunch of patches apply to raw autotool files
-	autoconf || die "autoconf failed"
-	aclocal || die "aclocal failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub/${CHOST}
-	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
-
-	insinto /boot/grub
-	doins ${DISTDIR}/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	docinto gentoo
-	dodoc ${PATCHDIR}/README*
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-
-	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
-
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub
-	done
-
-	[[ -e /boot/grub/grub.conf ]] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/hardened/sys-boot/grub/grub-0.97-r2.ebuild b/hardened/sys-boot/grub/grub-0.97-r2.ebuild
deleted file mode 100644
index d099cb1..0000000
--- a/hardened/sys-boot/grub/grub-0.97-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.10 2006/11/27 00:35:21 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER="1.2"
-DESCRIPTION="GNU GRUB Legacy boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static netboot custom-cflags"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	=sys-devel/automake-1.9*
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64 ; then
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch breaks booting for some people #111885
-	rm "${WORKDIR}"/patch/400_*
-
-	if [[ -n ${PATCHVER} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-
-		# a bunch of patches apply to raw autotool files
-		autoconf || die "autoconf failed"
-		aclocal || die "aclocal failed"
-		automake || die "automake failed"
-	fi
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	filter-flags -fPIE -fstack-protector
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	if use netboot ; then
-		exeinto /usr/lib/grub/${CHOST}
-		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
-	fi
-
-	insinto /boot/grub
-	doins "${DISTDIR}"/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-setup_boot_dir() {
-	local dir="${1}"
-
-	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
-	[[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
-		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
-	einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}/grub/menu.lst"
-	fi
-
-	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
-	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
-	done
-
-	if [[ -e "${dir}"/grub/grub.conf ]] ; then
-		egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/grub/device.map \
-			> /dev/null
-	fi
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-	setup_boot_dir /boot
-	einfo "To install grub files to another device (like a usb stick), just run:"
-	einfo "   emerge --config =${PF}"
-}
-
-pkg_config() {
-	local dir
-	einfo "Enter the directory where you want to setup grub:"
-	read dir
-	setup_boot_dir ${dir}
-}
diff --git a/hardened/sys-boot/grub/grub-0.97-r3.ebuild b/hardened/sys-boot/grub/grub-0.97-r3.ebuild
deleted file mode 100644
index c68c51e..0000000
--- a/hardened/sys-boot/grub/grub-0.97-r3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.7 2007/01/15 01:50:09 metalgod Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
-
-PATCHVER="1.4"
-DESCRIPTION="GNU GRUB Legacy boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static netboot custom-cflags"
-
-DEPEND=">=sys-libs/ncurses-5.2-r5"
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch breaks booting for some people #111885
-	rm "${WORKDIR}"/patch/400_*
-
-	if [[ -n ${PATCHVER} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	filter-flags -fPIE -fstack-protector
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	if use netboot ; then
-		exeinto /usr/lib/grub/${CHOST}
-		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
-	fi
-
-	insinto /boot/grub
-	doins "${DISTDIR}"/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-}
-
-setup_boot_dir() {
-	local dir="${1}"
-
-	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
-	[[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
-		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/grub/menu.lst ]]; then
-	einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/grub/menu.lst
-	fi
-
-	[[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
-	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
-	done
-
-	if [[ -e ${dir}/grub/grub.conf ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${dir}"/grub/grub.conf | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/grub/device.map \
-			> /dev/null
-	fi
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-	setup_boot_dir /boot
-	einfo "To install grub files to another device (like a usb stick), just run:"
-	einfo "   emerge --config =${PF}"
-}
-
-pkg_config() {
-	local dir
-	einfo "Enter the directory where you want to setup grub:"
-	read dir
-	setup_boot_dir ${dir}
-}
diff --git a/hardened/sys-boot/grub/grub-0.97.ebuild b/hardened/sys-boot/grub/grub-0.97.ebuild
deleted file mode 100644
index 8158b18..0000000
--- a/hardened/sys-boot/grub/grub-0.97.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.2 2005/08/21 02:24:04 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-PATCHVER=1.0
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static netboot custom-cflags"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.5"
-PROVIDE="virtual/bootloader"
-
-pkg_setup() {
-	if use amd64 ; then
-		if ! has_m32 ; then
-			eerror "Your compiler seems to be unable to compile 32bit code."
-			eerror "If you are on amd64, make sure you compile gcc with:"
-			echo
-			eerror "    USE=multilib FEATURES=-sandbox"
-			die "Cannot produce 32bit objects!"
-		fi
-
-		ABI_ALLOW="x86"
-		ABI="x86"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if [[ -n ${PATCHVER} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-
-		# a bunch of patches apply to raw autotool files
-		autoconf || die "autoconf failed"
-		aclocal || die "aclocal failed"
-		automake || die "automake failed"
-	fi
-}
-
-src_compile() {
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	filter-flags -fPIE -fstack-protector
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt || die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	if use netboot ; then
-		exeinto /usr/lib/grub/${CHOST}
-		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
-	fi
-
-	insinto /boot/grub
-	doins "${DISTDIR}"/splash.xpm.gz
-	newins docs/menu.lst grub.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	docinto gentoo
-	dodoc ${PATCHDIR}/README*
-}
-
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
-
-	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
-
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
-	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub
-	done
-
-	[[ -e /boot/grub/grub.conf ]] \
-		&& /sbin/grub \
-			--batch \
-			--device-map=/boot/grub/device.map \
-			< /boot/grub/grub.conf > /dev/null 2>&1
-}
diff --git a/hardened/sys-boot/grub/grub-1.95.ebuild b/hardened/sys-boot/grub/grub-1.95.ebuild
deleted file mode 100644
index 8b5a75a..0000000
--- a/hardened/sys-boot/grub/grub-1.95.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.95.ebuild,v 1.1 2006/10/21 22:46:44 vapier Exp $
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="-*"
-IUSE="static netboot custom-cflags"
-
-DEPEND=">=sys-libs/ncurses-5.2-r5
-	dev-libs/lzo"
-PROVIDE="virtual/bootloader"
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-	use custom-cflags || unset CFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	filter-flags -fPIE -fstack-protector
-
-	econf \
-		--prefix=/ \
-		--datadir=/usr/lib \
-		|| die "econf failed"
-	emake || die "making regular stuff"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/hardened/x11-base/xorg-server/Manifest b/hardened/x11-base/xorg-server/Manifest
deleted file mode 100644
index e914079..0000000
--- a/hardened/x11-base/xorg-server/Manifest
+++ /dev/null
@@ -1,249 +0,0 @@
-AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
-MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
-RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
-SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997 files/01-no-move-damage.patch 1149
-AUX 02-dont-backfill-bg-none.patch 581 RMD160 b38e5b7c945434e6b60748a5f853d7eb773f3427 SHA1 862c2435249d475dd7fdd229449a89b8e2f2207b SHA256 fe5e71b9b5cb7ea4b484e76015bf364e7e1e307c1d35ed3497dc30c9b75dc7ea
-MD5 016e4e9f4bf2296ac756b476ff2c0495 files/02-dont-backfill-bg-none.patch 581
-RMD160 b38e5b7c945434e6b60748a5f853d7eb773f3427 files/02-dont-backfill-bg-none.patch 581
-SHA256 fe5e71b9b5cb7ea4b484e76015bf364e7e1e307c1d35ed3497dc30c9b75dc7ea files/02-dont-backfill-bg-none.patch 581
-AUX 03-tfp-damage.patch 5982 RMD160 7b044a9d151bdd573c80b93b7249888184fad782 SHA1 30c64426cb9db4e1fbabbd8bb8af92b3f7ed682d SHA256 dcc6fe0f6d4031b345e8f3a5a0f5bfbbf43db9ce972fb4ca7b58961fb178da59
-MD5 5994755d0cda4a71d78529f34bf798c7 files/03-tfp-damage.patch 5982
-RMD160 7b044a9d151bdd573c80b93b7249888184fad782 files/03-tfp-damage.patch 5982
-SHA256 dcc6fe0f6d4031b345e8f3a5a0f5bfbbf43db9ce972fb4ca7b58961fb178da59 files/03-tfp-damage.patch 5982
-AUX 04-mesa-copy-sub-buffer.patch 11609 RMD160 d525afd68510bed628742c28d29eec7c47e0592b SHA1 c9a654962fa930b3cced371ba9737f140c46612e SHA256 daeef79d8bd3ae91f2906f7fa62f15892307bfb5f1650ef832bd490a2d6606f5
-MD5 406413344cfe615626dc73f02c1baf5c files/04-mesa-copy-sub-buffer.patch 11609
-RMD160 d525afd68510bed628742c28d29eec7c47e0592b files/04-mesa-copy-sub-buffer.patch 11609
-SHA256 daeef79d8bd3ae91f2906f7fa62f15892307bfb5f1650ef832bd490a2d6606f5 files/04-mesa-copy-sub-buffer.patch 11609
-AUX 05-offscreen-pixmaps.patch 1548 RMD160 e0f87c88379861340524847a57bf72119256a610 SHA1 c57a9aafec35b8158098751028a76a2979379625 SHA256 73be09f2f3756021bd6261fc05733eb39084c2190e7ca107bfa01c7d447a34a6
-MD5 8cae706ff61477f510f9f14b3d64fea9 files/05-offscreen-pixmaps.patch 1548
-RMD160 e0f87c88379861340524847a57bf72119256a610 files/05-offscreen-pixmaps.patch 1548
-SHA256 73be09f2f3756021bd6261fc05733eb39084c2190e7ca107bfa01c7d447a34a6 files/05-offscreen-pixmaps.patch 1548
-AUX 06-aiglx-happy-vt-switch.patch 6043 RMD160 fce467afaa3988b511b9796af164f36172bf6b7b SHA1 ad8eaa9c48699501145a15cc22b98e88a2c4a0f2 SHA256 112f1cccc0f3e1af1d76109e845c0e89462b6e95c2fd1cc80ca9370806a617dc
-MD5 e9248d96ffd078829f56f3d8075a5304 files/06-aiglx-happy-vt-switch.patch 6043
-RMD160 fce467afaa3988b511b9796af164f36172bf6b7b files/06-aiglx-happy-vt-switch.patch 6043
-SHA256 112f1cccc0f3e1af1d76109e845c0e89462b6e95c2fd1cc80ca9370806a617dc files/06-aiglx-happy-vt-switch.patch 6043
-AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1
-MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563
-RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563
-SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 files/1.0.2-Xprint-xprintdir.patch 563
-AUX 1.0.2-fix-readKernelMapping-overrun.patch 468 RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 SHA1 67e69a37a74c7e47387769699c207f0a29bfd96d SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12
-MD5 a8fb013a42270146a12186aeb0651071 files/1.0.2-fix-readKernelMapping-overrun.patch 468
-RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 files/1.0.2-fix-readKernelMapping-overrun.patch 468
-SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12 files/1.0.2-fix-readKernelMapping-overrun.patch 468
-AUX 1.0.2-fix-rom-read-dualhead.patch 3344 RMD160 8e908ee65c4afdf78d8a8eb35af3a3d7f0288eca SHA1 fa406b2e5027e072d67f63c5b2193b5b0871e5cc SHA256 e7e10432b87a692a9d9e6a69299eaaff4b8ed150508f4df2b1342ee07fc5af5a
-MD5 bfe540b7dff88d33ed771535a7a1dc5b files/1.0.2-fix-rom-read-dualhead.patch 3344
-RMD160 8e908ee65c4afdf78d8a8eb35af3a3d7f0288eca files/1.0.2-fix-rom-read-dualhead.patch 3344
-SHA256 e7e10432b87a692a9d9e6a69299eaaff4b8ed150508f4df2b1342ee07fc5af5a files/1.0.2-fix-rom-read-dualhead.patch 3344
-AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620
-MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 SHA1 1487c444de9f6348e49d150a1cdb0517569030ab SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74
-MD5 bf743bd4e1b1c3a6b3d3122f48f8f6a7 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 SHA1 387df8c7669b525fc7b041ce7574324680dbce48 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955
-MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447
-RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447
-SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447
-AUX 1.1.1-dbe-render.diff 5323 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 SHA1 67cfe51fdf314db3cf712cb180bdc7635788ffa3 SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab
-MD5 cffab2cec60a2af892e2853840cf2659 files/1.1.1-dbe-render.diff 5323
-RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 files/1.1.1-dbe-render.diff 5323
-SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab files/1.1.1-dbe-render.diff 5323
-AUX 1.1.1-fix-xrandr-zoom-keys.patch 6332 RMD160 cec1b86e0a6ea88e1e65543046fd1b91ab112b04 SHA1 ebaea3bdff2564d898fe0f1bcacdafcbcfe4b9f6 SHA256 b7bb87d2170f2dd369a8b3a496dae0e93792419ccc7c78449e9affc8f07650ac
-MD5 919801a6a806a9cf93777ee8bb4367bc files/1.1.1-fix-xrandr-zoom-keys.patch 6332
-RMD160 cec1b86e0a6ea88e1e65543046fd1b91ab112b04 files/1.1.1-fix-xrandr-zoom-keys.patch 6332
-SHA256 b7bb87d2170f2dd369a8b3a496dae0e93792419ccc7c78449e9affc8f07650ac files/1.1.1-fix-xrandr-zoom-keys.patch 6332
-AUX 1.1.1-fix_acpi_tokenize.patch 737 RMD160 23e67ce9e8122c163b9baa78ee517abd382e46a9 SHA1 4c0a41a8dc060442fdfbc35f05e58134bd5c2eb0 SHA256 f3ed429b3b5c36f0efa06c11ddbd1dfbf929f031ec6365c5f47a75f7a182367b
-MD5 8753388aa11cec9eab4123a0803aaf66 files/1.1.1-fix_acpi_tokenize.patch 737
-RMD160 23e67ce9e8122c163b9baa78ee517abd382e46a9 files/1.1.1-fix_acpi_tokenize.patch 737
-SHA256 f3ed429b3b5c36f0efa06c11ddbd1dfbf929f031ec6365c5f47a75f7a182367b files/1.1.1-fix_acpi_tokenize.patch 737
-AUX 1.1.1-fix_big_endian_glx.patch 655 RMD160 aa6377a33c015af994053add2c5571a13bd0658a SHA1 9133c745ebe3b1dd39518b245c4836c9a53f40d6 SHA256 2b9f53f31fe9f4e36db01fcbf74745fddfa70a28e41614da608c53af81993dbf
-MD5 87c7bd720ae0573bf5ed8d5879bd781b files/1.1.1-fix_big_endian_glx.patch 655
-RMD160 aa6377a33c015af994053add2c5571a13bd0658a files/1.1.1-fix_big_endian_glx.patch 655
-SHA256 2b9f53f31fe9f4e36db01fcbf74745fddfa70a28e41614da608c53af81993dbf files/1.1.1-fix_big_endian_glx.patch 655
-AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 SHA1 31f3b422d4dc621a7638cf4f9b388ce6a5cccec4 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51
-MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
-RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
-SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 files/1.1.1-sparc64-ati-lockups.patch 652
-AUX 1.1.99.903-mesa-6.5.2.patch 417 RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290095 SHA1 43addaea42f9308193770c12371960db24ab7db6 SHA256 49688c9c03977b7d23b5523195104caea91a0a77375820761eb264549d5df1e0
-MD5 4b10725076194e7e63c96eb44afa9090 files/1.1.99.903-mesa-6.5.2.patch 417
-RMD160 c0db6578a25a5cc2763c5b72d027cc6f34290095 files/1.1.99.903-mesa-6.5.2.patch 417
-SHA256 49688c9c03977b7d23b5523195104caea91a0a77375820761eb264549d5df1e0 files/1.1.99.903-mesa-6.5.2.patch 417
-AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
-MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
-RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
-SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
-AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b
-MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
-RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
-SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b files/CVE-2006-1526-xrender-mitri.patch 819
-AUX x11r7.0-setuid.diff 3513 RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea SHA1 1f46fd5e5938682885c44025a0883a5181859cdc SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6
-MD5 0411ec21c16bdabd945159476b1c796a files/x11r7.0-setuid.diff 3513
-RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea files/x11r7.0-setuid.diff 3513
-SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6 files/x11r7.0-setuid.diff 3513
-AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
-MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
-RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
-SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350 files/xorg-conf-example.patch 1924
-AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
-MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-AUX xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 SHA1 08db11a8a841415496f5ff8ef8a21b1425d392cd SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b
-MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-AUX xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 SHA1 49def422c5b5189dde7581ac295aac1f510bc14d SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1
-MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-AUX xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e
-MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388
-RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388
-SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388
-AUX xorg-server-1.0.2-Xprt-build.patch 7747 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 SHA1 2da85693520d1f787d4ee9e3bd52f14261adee9b SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73
-MD5 fb7fc524e87b10dd3cb506c3398741cf files/xorg-server-1.0.2-Xprt-build.patch 7747
-RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 files/xorg-server-1.0.2-Xprt-build.patch 7747
-SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 files/xorg-server-1.0.2-Xprt-build.patch 7747
-AUX xorg-server-1.0.2-dri-weak-glx.patch 2678 RMD160 4b51505cac1a26af8b68d12cf67571564c12625f SHA1 74d43d976854545585d23dff35f6a7d979b84c95 SHA256 716b4c8b7d5423399d66dd3c7a66e437880e2ea5e4b2eb866a300574611fdeb3
-MD5 52502825e40f9301af5842b32aaf1e12 files/xorg-server-1.0.2-dri-weak-glx.patch 2678
-RMD160 4b51505cac1a26af8b68d12cf67571564c12625f files/xorg-server-1.0.2-dri-weak-glx.patch 2678
-SHA256 716b4c8b7d5423399d66dd3c7a66e437880e2ea5e4b2eb866a300574611fdeb3 files/xorg-server-1.0.2-dri-weak-glx.patch 2678
-AUX xorg-server-1.0.2-glx-needs-GLcore.patch 593 RMD160 b936d8b777ace8623e558260238fa68d8efb67a3 SHA1 1929f9196d326e4e236ed69bc9fe7cd2d3339fe2 SHA256 387045f45a35859d0288e3fc72bfb62e932d0f6423cab0fae3a5e421fda56e31
-MD5 5a686dc328a03672690f0e2375f6d218 files/xorg-server-1.0.2-glx-needs-GLcore.patch 593
-RMD160 b936d8b777ace8623e558260238fa68d8efb67a3 files/xorg-server-1.0.2-glx-needs-GLcore.patch 593
-SHA256 387045f45a35859d0288e3fc72bfb62e932d0f6423cab0fae3a5e421fda56e31 files/xorg-server-1.0.2-glx-needs-GLcore.patch 593
-AUX xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f SHA1 957e201d1095ef4cc4ec1c87736897d37c0103d7 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b
-MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e991092f89a017 SHA1 7d2a4eb212cc770cc22a496df2696a0bca1f7774 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905
-MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
-RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
-SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
-AUX xorg-server-1.1.0-dri-weak-glx.patch 2498 RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 SHA1 059e1f1a2e2a7c62cc82d5b523cc96745f2d0454 SHA256 e93adb6f000cdcdb90c43e16834047286ceb498da6c2c88046fbd7cd46e10f5b
-MD5 81a13cf41cca4414931b7b59e882e04c files/xorg-server-1.1.0-dri-weak-glx.patch 2498
-RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 files/xorg-server-1.1.0-dri-weak-glx.patch 2498
-SHA256 e93adb6f000cdcdb90c43e16834047286ceb498da6c2c88046fbd7cd46e10f5b files/xorg-server-1.1.0-dri-weak-glx.patch 2498
-AUX xorg-server-1.1.0-glx-needs-GLcore.patch 327 RMD160 afd6be3ca3f0c1f1fd1d7370d21e9bf8aaddb6e2 SHA1 6034ee3064559c1461bfbcc7b3b72b1e05647893 SHA256 340d0a699fdefe2afa5ec205f09982b7fc3dce83b271f8b94bb4e55e6c41c787
-MD5 46cd3277ababede150f8c61b9822b91c files/xorg-server-1.1.0-glx-needs-GLcore.patch 327
-RMD160 afd6be3ca3f0c1f1fd1d7370d21e9bf8aaddb6e2 files/xorg-server-1.1.0-glx-needs-GLcore.patch 327
-SHA256 340d0a699fdefe2afa5ec205f09982b7fc3dce83b271f8b94bb4e55e6c41c787 files/xorg-server-1.1.0-glx-needs-GLcore.patch 327
-AUX xorg-server-1.1.0-setuid.diff 3373 RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 SHA1 256aa1ef94425f461c97a6e42b282aaf401fcd14 SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9
-MD5 d806558d64462780cbd1512ab6dc4dd7 files/xorg-server-1.1.0-setuid.diff 3373
-RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 files/xorg-server-1.1.0-setuid.diff 3373
-SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9 files/xorg-server-1.1.0-setuid.diff 3373
-AUX xorg-server-1.1.1-dri-weak-glx.patch 2670 RMD160 810edd690fb4b652366b13abcf1b744ba0ef2b6f SHA1 9ce89bdf874ce85f84101c7c15fa0ccc526fedfb SHA256 61cde597a0f742d45cce199cc8700410e44a58a2bb296392f8b54203bec3d801
-MD5 7b29fd7744218ad130c012981b655bf9 files/xorg-server-1.1.1-dri-weak-glx.patch 2670
-RMD160 810edd690fb4b652366b13abcf1b744ba0ef2b6f files/xorg-server-1.1.1-dri-weak-glx.patch 2670
-SHA256 61cde597a0f742d45cce199cc8700410e44a58a2bb296392f8b54203bec3d801 files/xorg-server-1.1.1-dri-weak-glx.patch 2670
-AUX xorg-server-1.1.1-glx-needs-GLcore.patch 434 RMD160 b22d619fc54f40c9072fc6b380d2f22107f79505 SHA1 fdcd9ad92f5b2b66fee5eacd74a624e601939f48 SHA256 38511006dda6f39d89f1817a99054d38889c3034a02db180300e0795f9097e58
-MD5 efaf78ad4fa13f8ea2cb6cc5bea891dc files/xorg-server-1.1.1-glx-needs-GLcore.patch 434
-RMD160 b22d619fc54f40c9072fc6b380d2f22107f79505 files/xorg-server-1.1.1-glx-needs-GLcore.patch 434
-SHA256 38511006dda6f39d89f1817a99054d38889c3034a02db180300e0795f9097e58 files/xorg-server-1.1.1-glx-needs-GLcore.patch 434
-AUX xorg-server-1.1.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 SHA1 435f5d3c410a7e17b31c27c44a1f36145db626ea SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269
-MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
-RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
-SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
-AUX xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747 RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 SHA1 60ccfea12bddf6cf0a7f56000472781442b10701 SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff
-MD5 ce57ec7f21491975d11f38b346156640 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
-RMD160 fb930b602e9f6f774f2885e11e9caf379594a537 files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
-SHA256 353c8abd75ad891696676298735e424e3726b73ac81f5a92276c67a034de2bff files/xorg-server-1.1.99.901-GetDrawableAttributes.patch 1747
-AUX xorg-server-1.1.99.903-dri-weak-glx.patch 2685 RMD160 d6231369d4262f405b9af7766bcbae3d0646a916 SHA1 88460186cec262fe21fa5024a257ffff370d0b14 SHA256 cbe1b7f2ef2ad9a7a32505df45a6405c1870fdf517a6870069b05567601643dc
-MD5 d6bb07062a786fcaf7219a4250c72b67 files/xorg-server-1.1.99.903-dri-weak-glx.patch 2685
-RMD160 d6231369d4262f405b9af7766bcbae3d0646a916 files/xorg-server-1.1.99.903-dri-weak-glx.patch 2685
-SHA256 cbe1b7f2ef2ad9a7a32505df45a6405c1870fdf517a6870069b05567601643dc files/xorg-server-1.1.99.903-dri-weak-glx.patch 2685
-AUX xorg-server-1.1.99.903-glx-needs-GLcore.patch 449 RMD160 62b4e844b369de2de1f15dc17a3cf0fe934ff4d6 SHA1 755ba3e1f6b8aa196f906142dd90b2345c3c0793 SHA256 cc67000c13ac187f1a3bf3cd0bd56419a0294ab179092accde476b8d4fe75d73
-MD5 29b9d59eeef78de8f36619996f55868c files/xorg-server-1.1.99.903-glx-needs-GLcore.patch 449
-RMD160 62b4e844b369de2de1f15dc17a3cf0fe934ff4d6 files/xorg-server-1.1.99.903-glx-needs-GLcore.patch 449
-SHA256 cc67000c13ac187f1a3bf3cd0bd56419a0294ab179092accde476b8d4fe75d73 files/xorg-server-1.1.99.903-glx-needs-GLcore.patch 449
-AUX xorg-server-1.2.99.0-dri-weak-glx.patch 2679 RMD160 41e7fc4c27217f1f0de12414a58fb75fecd4b994 SHA1 2b7ee58ab2eb300337dd38e18e501b30df8e5f53 SHA256 f9ea35d3a83ad030c1dccd50492f55bb1a8a892a96cfeabb9c044f6399e46821
-MD5 3b07db9b3796a4b92f3ca4423f57f95f files/xorg-server-1.2.99.0-dri-weak-glx.patch 2679
-RMD160 41e7fc4c27217f1f0de12414a58fb75fecd4b994 files/xorg-server-1.2.99.0-dri-weak-glx.patch 2679
-SHA256 f9ea35d3a83ad030c1dccd50492f55bb1a8a892a96cfeabb9c044f6399e46821 files/xorg-server-1.2.99.0-dri-weak-glx.patch 2679
-AUX xorg-server-1.2.99.0-glx-needs-GLcore.patch 443 RMD160 6d61078a5ded7312a164ca5386613f0695587b75 SHA1 fb1c6279a2665126e2f74ec8a3c913a7eaf7cf44 SHA256 8d2cf40165d223df110ed3bf6a6c5785cb287641f94f45e5e16bb2a1dab14114
-MD5 705190274d864f3dae3c67c03f26460e files/xorg-server-1.2.99.0-glx-needs-GLcore.patch 443
-RMD160 6d61078a5ded7312a164ca5386613f0695587b75 files/xorg-server-1.2.99.0-glx-needs-GLcore.patch 443
-SHA256 8d2cf40165d223df110ed3bf6a6c5785cb287641f94f45e5e16bb2a1dab14114 files/xorg-server-1.2.99.0-glx-needs-GLcore.patch 443
-AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
-MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
-RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
-SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
-AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
-MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
-RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
-SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
-DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA1 1e7e66ca37b0a08df754d060db03a1d5ccf7bc42 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67
-DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
-DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
-DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
-DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
-DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
-DIST xorg-server-1.1.99.903.tar.bz2 5980396 RMD160 f6039cab1f233d2785b147e0963ccb90dcd735cd SHA1 e63ebbd368ca0f962de2f1e6a7720473e12f2d9b SHA256 da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde
-DIST xorg-server-1.2.99.0.tar.bz2 6170605 RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e SHA1 06bee10153da39f0f3cc89ca92bca766e996ebdf SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0
-EBUILD xorg-server-1.0.2-r7.ebuild 6285 RMD160 4c6c4d3b3fd0a272df7252ebdd0a8ea631fcc6c7 SHA1 08af9a1db74a60562a0386ae7350161bc8ffa7dc SHA256 edf4a7ffec6f76f1a05f89785c384445770b2e38c910c260c9fc229d7667acb2
-MD5 5f2ce279b3430e13c87d0252490edce7 xorg-server-1.0.2-r7.ebuild 6285
-RMD160 4c6c4d3b3fd0a272df7252ebdd0a8ea631fcc6c7 xorg-server-1.0.2-r7.ebuild 6285
-SHA256 edf4a7ffec6f76f1a05f89785c384445770b2e38c910c260c9fc229d7667acb2 xorg-server-1.0.2-r7.ebuild 6285
-EBUILD xorg-server-1.1.0-r1.ebuild 24647 RMD160 88f07250f6421beee55764e9a878a4b59ca989c3 SHA1 74803b7738f19e014567371d4504f75db3bd7ae7 SHA256 189bdf3d1ad99a212d5deeedcd73c671a84ae97fea51a3bfb527a548d1ecafcd
-MD5 e11b8297fcdc051c0a1e81e34125c35f xorg-server-1.1.0-r1.ebuild 24647
-RMD160 88f07250f6421beee55764e9a878a4b59ca989c3 xorg-server-1.1.0-r1.ebuild 24647
-SHA256 189bdf3d1ad99a212d5deeedcd73c671a84ae97fea51a3bfb527a548d1ecafcd xorg-server-1.1.0-r1.ebuild 24647
-EBUILD xorg-server-1.1.1-r1.ebuild 17197 RMD160 6c417d9a3052fc14aba6cd352492be90cf8fe484 SHA1 d4f2478d0bff3812558b91c38ff8f8f4051d3d6d SHA256 f045c1ad301d291fdf2751d8e82522f46c07f538589d7ac1dcb27ad880525aa7
-MD5 3b747e7a31dd73689d69bb61ee8d1e73 xorg-server-1.1.1-r1.ebuild 17197
-RMD160 6c417d9a3052fc14aba6cd352492be90cf8fe484 xorg-server-1.1.1-r1.ebuild 17197
-SHA256 f045c1ad301d291fdf2751d8e82522f46c07f538589d7ac1dcb27ad880525aa7 xorg-server-1.1.1-r1.ebuild 17197
-EBUILD xorg-server-1.1.1-r2.ebuild 17256 RMD160 6f6eff3800e9b8850987d3346d2a13fd76deda08 SHA1 e06004c7e79a94230885ee578615ce149e41bc28 SHA256 942031391d308314d028d745f7efd549df682bf69b1d8390caadb0fe15081867
-MD5 39aa30e259bdc0a880c088214dac56ed xorg-server-1.1.1-r2.ebuild 17256
-RMD160 6f6eff3800e9b8850987d3346d2a13fd76deda08 xorg-server-1.1.1-r2.ebuild 17256
-SHA256 942031391d308314d028d745f7efd549df682bf69b1d8390caadb0fe15081867 xorg-server-1.1.1-r2.ebuild 17256
-EBUILD xorg-server-1.1.1-r3.ebuild 17302 RMD160 4e8bcef48c430f4943391a9ec817eaf46c22b0d4 SHA1 f8f51e90b999d15b13cb7274ec7e8a316feec1ae SHA256 b804d7cbd1184d56c960946e1c59bd467c34596f8d50252e0a766b5f99395ab5
-MD5 71b5375f42e71f2b4e17e8ccc24d4226 xorg-server-1.1.1-r3.ebuild 17302
-RMD160 4e8bcef48c430f4943391a9ec817eaf46c22b0d4 xorg-server-1.1.1-r3.ebuild 17302
-SHA256 b804d7cbd1184d56c960946e1c59bd467c34596f8d50252e0a766b5f99395ab5 xorg-server-1.1.1-r3.ebuild 17302
-EBUILD xorg-server-1.1.1-r4.ebuild 17328 RMD160 2c5d636f8a39b082f3f531bfecff94884b08ee29 SHA1 9dd7bd2bfce746f63d97dae69225e78c6191be1c SHA256 c3d3ceb0c3e95fc360151c87ab728790afca3f5d38ce7056b12fddec64f66073
-MD5 b6e894245f3ef122e68a7839b3ca606d xorg-server-1.1.1-r4.ebuild 17328
-RMD160 2c5d636f8a39b082f3f531bfecff94884b08ee29 xorg-server-1.1.1-r4.ebuild 17328
-SHA256 c3d3ceb0c3e95fc360151c87ab728790afca3f5d38ce7056b12fddec64f66073 xorg-server-1.1.1-r4.ebuild 17328
-EBUILD xorg-server-1.1.1.ebuild 15369 RMD160 2b2181038276483e450a74cbdce60bcdff640752 SHA1 e47b7130132f3c1afecfeaa6d30a8fb5453784a4 SHA256 36a55bba6a697d23fac948b9dd88217ece5a58a52b2dec8624f850a5c606e26c
-MD5 e1176a71755ff960af2626dc1361a4b1 xorg-server-1.1.1.ebuild 15369
-RMD160 2b2181038276483e450a74cbdce60bcdff640752 xorg-server-1.1.1.ebuild 15369
-SHA256 36a55bba6a697d23fac948b9dd88217ece5a58a52b2dec8624f850a5c606e26c xorg-server-1.1.1.ebuild 15369
-EBUILD xorg-server-1.1.99.903-r1.ebuild 16899 RMD160 4a4685d5bc172a805ff81ee1e1493beefbba50bf SHA1 e3271f4b0c01176a5494903dcaa93bf899a8898f SHA256 2671e658ccfaa1b77fd993e842516d81a951327f83e92c257c40e037b88d2392
-MD5 2168f88bccc4ed6096ebfd3454157219 xorg-server-1.1.99.903-r1.ebuild 16899
-RMD160 4a4685d5bc172a805ff81ee1e1493beefbba50bf xorg-server-1.1.99.903-r1.ebuild 16899
-SHA256 2671e658ccfaa1b77fd993e842516d81a951327f83e92c257c40e037b88d2392 xorg-server-1.1.99.903-r1.ebuild 16899
-EBUILD xorg-server-1.2.99.0.ebuild 16861 RMD160 4b8d1e3720be842985a0757ede279867f8c0bb43 SHA1 39b5a249c0ef292f5b96a028ecf43ab00d3f3659 SHA256 27fa82b0e272bc55bcc3a48ade97a7a32bce5b35f2044c54818e8119e47dd4dd
-MD5 6b7c1844edc127a0d14f8eee7714f246 xorg-server-1.2.99.0.ebuild 16861
-RMD160 4b8d1e3720be842985a0757ede279867f8c0bb43 xorg-server-1.2.99.0.ebuild 16861
-SHA256 27fa82b0e272bc55bcc3a48ade97a7a32bce5b35f2044c54818e8119e47dd4dd xorg-server-1.2.99.0.ebuild 16861
-MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r7 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r7 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r7 771
-MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0-r1 500
-RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0-r1 500
-SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0-r1 500
-MD5 5bbe7de7ebbf30c9991b3fd800b1f219 files/digest-xorg-server-1.1.1 500
-RMD160 0a5b1d758ab4077ac728b7ec6cc7f06fb49ce273 files/digest-xorg-server-1.1.1 500
-SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/digest-xorg-server-1.1.1 500
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r2 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r2 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r2 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r3 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r3 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r3 506
-MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r4 506
-RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r4 506
-SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r4 506
-MD5 8203c18c558952f0a69a3fca15af4f09 files/digest-xorg-server-1.1.99.903-r1 521
-RMD160 e2db17a615b6007f008fb44ff9640f087e6879f1 files/digest-xorg-server-1.1.99.903-r1 521
-SHA256 1099d4eb491d583a636bd3b40807688de8819b9db392b88cd6bf11947195a71c files/digest-xorg-server-1.1.99.903-r1 521
-MD5 308173d8f7a2f60835b95ce92bd47e77 files/digest-xorg-server-1.2.99.0 515
-RMD160 e45f1b4e020b0cc57f5cb4ff3fd511c05e286540 files/digest-xorg-server-1.2.99.0 515
-SHA256 c1013b629f0a3186dc286d28768fdfd34261c14b07d08e52d4149a32875302c8 files/digest-xorg-server-1.2.99.0 515
diff --git a/hardened/x11-base/xorg-server/files/01-no-move-damage.patch b/hardened/x11-base/xorg-server/files/01-no-move-damage.patch
deleted file mode 100644
index 4278043..0000000
--- a/hardened/x11-base/xorg-server/files/01-no-move-damage.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Disable damage notifications on move for manually redirected windows.
-The automatic compositor needs damage notification on move, but a
-compositing manager doesn't.
-
---- ./composite/compwindow.c.spiffiffity	2006-03-29 12:51:53.000000000 -0500
-+++ ./composite/compwindow.c	2006-04-13 23:18:42.000000000 -0400
-@@ -571,12 +571,15 @@
-     }
-     else
-     {
-+	CompWindowPtr	cw = GetCompWindow (pWin);
-+
- 	ptOldOrg.x -= dx;
- 	ptOldOrg.y -= dy;
- 	REGION_TRANSLATE (prgnSrc, prgnSrc,
- 			  pWin->drawable.x - ptOldOrg.x,
- 			  pWin->drawable.y - ptOldOrg.y);
--	DamageDamageRegion (&pWin->drawable, prgnSrc);
-+	if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic)
-+	  DamageDamageRegion (&pWin->drawable, prgnSrc);
-     }
-     cs->CopyWindow = pScreen->CopyWindow;
-     pScreen->CopyWindow = compCopyWindow;
-@@ -655,7 +658,8 @@
-     /*
-      * Report that as damaged so it will be redrawn
-      */
--    DamageDamageRegion (&pWin->drawable, &damage);
-+    if (cw->update == CompositeRedirectAutomatic)
-+      DamageDamageRegion (&pWin->drawable, &damage);
-     REGION_UNINIT (pScreen, &damage);
-     /*
-      * Save the new border clip region
diff --git a/hardened/x11-base/xorg-server/files/02-dont-backfill-bg-none.patch b/hardened/x11-base/xorg-server/files/02-dont-backfill-bg-none.patch
deleted file mode 100644
index 9a5cacd..0000000
--- a/hardened/x11-base/xorg-server/files/02-dont-backfill-bg-none.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Disable backfilling of windows created with bg=none, which otherwise
-would force a framebuffer readback.
-
---- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
-+++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
-@@ -478,6 +478,7 @@
-      * Copy bits from the parent into the new pixmap so that it will
-      * have "reasonable" contents in case for background None areas.
-      */
-+#if 0
-     if (pGC)
-     {
- 	XID val = IncludeInferiors;
-@@ -492,6 +493,7 @@
- 			       w, h, 0, 0);
- 	FreeScratchGC (pGC);
-     }
-+#endif
-     return pPixmap;
- }
- 
diff --git a/hardened/x11-base/xorg-server/files/03-tfp-damage.patch b/hardened/x11-base/xorg-server/files/03-tfp-damage.patch
deleted file mode 100644
index 942d44e..0000000
--- a/hardened/x11-base/xorg-server/files/03-tfp-damage.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- ./GL/glx/glxdrawable.h.tfp-damage	2006-03-11 19:11:33.000000000 -0500
-+++ ./GL/glx/glxdrawable.h	2006-06-20 20:33:53.000000000 -0400
-@@ -41,6 +41,8 @@
- **
- */
- 
-+#include <damage.h>
-+
- typedef struct {
- 
-     DrawablePtr pDraw;
-@@ -49,7 +51,7 @@
-     ScreenPtr pScreen;
-     Bool idExists;
-     int refcnt;
--
-+    DamagePtr pDamage;
- } __GLXpixmap;
- 
- struct __GLXdrawable {
---- ./GL/glx/glxcmds.c.tfp-damage	2006-05-09 13:44:26.000000000 -0400
-+++ ./GL/glx/glxcmds.c	2006-06-20 20:33:53.000000000 -0400
-@@ -1271,6 +1271,7 @@
-     pGlxPixmap->pGlxScreen = pGlxScreen;
-     pGlxPixmap->pScreen = pScreen;
-     pGlxPixmap->idExists = True;
-+    pGlxPixmap->pDamage = NULL;
-     pGlxPixmap->refcnt = 0;
- 
-     pGlxPixmap->modes = modes;
---- ./GL/glx/glxdri.c.tfp-damage	2006-04-02 21:25:21.000000000 -0400
-+++ ./GL/glx/glxdri.c	2006-06-21 00:39:40.000000000 -0400
-@@ -296,24 +296,18 @@
- }
- 
- static void
--glxFillAlphaChannel (PixmapPtr pixmap)
-+glxFillAlphaChannel (PixmapPtr pixmap, int x, int y, int width, int height)
- {
--    int i, j;
--    CARD32 *pixels = (CARD32 *)pixmap->devPrivate.ptr;
-+    int i;
-+    CARD32 *p, *end, *pixels = (CARD32 *)pixmap->devPrivate.ptr;
-     CARD32 rowstride = pixmap->devKind / 4;
--    CARD32 x, y;
--
--    x = pixmap->drawable.x;
--    y = pixmap->drawable.y;
-     
--    for (i = y; i < pixmap->drawable.height + y; ++i)
-+    for (i = y; i < y + height; i++)
-     {
--        for (j = x; j < pixmap->drawable.width + x; ++j)
--        {
--            int index = i * rowstride + j;
--
--            pixels[index] |= 0xFF000000;
--        }
-+	p = &pixels[i * rowstride + x];
-+	end = p + width;
-+	while (p < end)
-+	  *p++ |= 0xFF000000;
-     }
- }
- 
-@@ -326,7 +320,6 @@
-  * - No fbconfig handling for TEXTURE_TARGET
-  * - No fbconfig exposure of Y inversion state
-  * - No GenerateMipmapEXT support (due to no FBO support)
-- * - No damage tracking between binds
-  * - No support for anything but 16bpp and 32bpp-sparse pixmaps
-  */
- 
-@@ -335,38 +328,97 @@
- 		     int buffer,
- 		     __GLXpixmap *glxPixmap)
- {
-+    RegionPtr	pRegion;
-     PixmapPtr	pixmap;
-     int		bpp;
--    Bool	npot;
-+    GLenum	target, format, type;
- 
-     pixmap = (PixmapPtr) glxPixmap->pDraw;
--    bpp = pixmap->drawable.depth >= 24 ? 4 : 2; /* XXX 24bpp packed, 8, etc */
--    
-+    if (!glxPixmap->pDamage) {
-+        glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
-+					  TRUE, glxPixmap->pScreen, NULL);
-+	if (!glxPixmap->pDamage)
-+            return BadAlloc;
-+
-+	DamageRegister ((DrawablePtr) pixmap, glxPixmap->pDamage);
-+	pRegion = NULL;
-+    } else {
-+	pRegion = DamageRegion(glxPixmap->pDamage);
-+	if (REGION_NIL(pRegion))
-+	    return Success;
-+    }
-+
-+    /* XXX 24bpp packed, 8, etc */
-+    if (pixmap->drawable.depth >= 24) {
-+	bpp = 4;
-+	format = GL_BGRA;
-+	type = GL_UNSIGNED_BYTE;
-+    } else {
-+	bpp = 2;
-+	format = GL_RGB;
-+	type = GL_UNSIGNED_SHORT_5_6_5;
-+    }
-+
-+    target = GL_TEXTURE_RECTANGLE_ARB;
-+
-     CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
--                                       pixmap->devKind / bpp) );
--    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
--                                       pixmap->drawable.y) );
--    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
--                                       pixmap->drawable.x) );
--
--    if (pixmap->drawable.depth == 24)
--        glxFillAlphaChannel(pixmap);
--
--    npot = !(glxCountBits(pixmap->drawable.width) == 1 &&
--             glxCountBits(pixmap->drawable.height) == 1) /* ||
--             strstr(CALL_GetString(GL_EXTENSIONS,
--                    "GL_ARB_texture_non_power_of_two")) */ ;
--    
--    CALL_TexImage2D( GET_DISPATCH(),
--		     ( npot ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
--		       0,
--		       bpp == 4 ? 4 : 3,
--		       pixmap->drawable.width,
--		       pixmap->drawable.height,
--		       0,
--		       bpp == 4 ? GL_BGRA : GL_RGB,
--		       bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
--		       pixmap->devPrivate.ptr ) );
-+				       pixmap->devKind / bpp) );
-+    if (pRegion == NULL)
-+    {
-+	if (pixmap->drawable.depth == 24)
-+	    glxFillAlphaChannel(pixmap,
-+				pixmap->drawable.x,
-+				pixmap->drawable.y,
-+				pixmap->drawable.width,
-+				pixmap->drawable.height);
-+
-+        CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
-+					   pixmap->drawable.x) );
-+	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
-+					   pixmap->drawable.y) );
-+
-+	CALL_TexImage2D( GET_DISPATCH(),
-+			 (target,
-+			  0,
-+			  bpp == 4 ? 4 : 3,
-+			  pixmap->drawable.width,
-+			  pixmap->drawable.height,
-+			  0,
-+			  format,
-+			  type,
-+			  pixmap->devPrivate.ptr) );
-+    } else {
-+        int i, numRects;
-+	BoxPtr p;
-+
-+	numRects = REGION_NUM_RECTS (pRegion);
-+	p = REGION_RECTS (pRegion);
-+	for (i = 0; i < numRects; i++)
-+	{
-+	    if (pixmap->drawable.depth == 24)
-+		glxFillAlphaChannel(pixmap,
-+				    pixmap->drawable.x + p[i].x1,
-+				    pixmap->drawable.y + p[i].y1,
-+				    p[i].x2 - p[i].x1,
-+				    p[i].y2 - p[i].y1);
-+
-+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
-+					       pixmap->drawable.x + p[i].x1) );
-+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
-+					       pixmap->drawable.y + p[i].y1) );
-+
-+	    CALL_TexSubImage2D( GET_DISPATCH(),
-+				(target,
-+				 0,
-+				 p[i].x1, p[i].y1,
-+				 p[i].x2 - p[i].x1, p[i].y2 - p[i].y1,
-+				 format,
-+				 type,
-+				 pixmap->devPrivate.ptr) );
-+	}
-+    }
-+
-+    DamageEmpty(glxPixmap->pDamage);
- 
-     return Success;
- }
---- ./GL/glx/glxext.c.tfp-damage	2006-03-16 20:47:25.000000000 -0500
-+++ ./GL/glx/glxext.c	2006-06-20 20:33:53.000000000 -0400
-@@ -141,6 +141,10 @@
- 
-     pGlxPixmap->idExists = False;
-     if (!pGlxPixmap->refcnt) {
-+	if (pGlxPixmap->pDamage) {
-+	    DamageUnregister (pGlxPixmap->pDraw, pGlxPixmap->pDamage);
-+	    DamageDestroy(pGlxPixmap->pDamage);
-+	}
- 	/*
- 	** The DestroyPixmap routine should decrement the refcount and free
- 	** only if it's zero.
diff --git a/hardened/x11-base/xorg-server/files/04-mesa-copy-sub-buffer.patch b/hardened/x11-base/xorg-server/files/04-mesa-copy-sub-buffer.patch
deleted file mode 100644
index 2b62dad..0000000
--- a/hardened/x11-base/xorg-server/files/04-mesa-copy-sub-buffer.patch
+++ /dev/null
@@ -1,361 +0,0 @@
---- ./GL/glx/glxdrawable.h.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
-+++ ./GL/glx/glxdrawable.h	2006-07-06 21:56:33.000000000 -0400
-@@ -58,6 +58,8 @@
-     void (*destroy)(__GLXdrawable *private);
-     GLboolean (*resize)(__GLXdrawable *private);
-     GLboolean (*swapBuffers)(__GLXdrawable *);
-+    void      (*copySubBuffer)(__GLXdrawable *drawable,
-+			       int x, int y, int w, int h);
- 
-     /*
-     ** list of drawable private structs
---- ./GL/glx/glxcmds.c.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
-+++ ./GL/glx/glxcmds.c	2006-07-06 22:30:01.000000000 -0400
-@@ -1331,21 +1331,14 @@
- 
- /*****************************************************************************/
- 
--/*
--** NOTE: There is no portable implementation for swap buffers as of
--** this time that is of value.  Consequently, this code must be
--** implemented by somebody other than SGI.
--*/
--int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
-+static __GLXdrawable *
-+SyncContextGetDrawable (__GLXclientState *cl, GLXContextTag tag,
-+			XID drawId, int *status)
- {
-     ClientPtr client = cl->client;
-     DrawablePtr pDraw;
--    xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
--    GLXContextTag tag = req->contextTag;
--    XID drawId = req->drawable;
-     __GLXpixmap *pGlxPixmap;
-     __GLXcontext *glxc = NULL;
--    int error;
-     
-     /*
-     ** Check that the GLX drawable is valid.
-@@ -1361,11 +1354,11 @@
- 	    ** Drawable is an X pixmap, which is not allowed.
- 	    */
- 	    client->errorValue = drawId;
--	    return __glXBadDrawable;
-+	    *status = __glXBadDrawable;
-+	    return NULL;
- 	}
-     } else {
--	pGlxPixmap = (__GLXpixmap *) LookupIDByType(drawId,
--						    __glXPixmapRes);
-+	pGlxPixmap = (__GLXpixmap *) LookupIDByType(drawId, __glXPixmapRes);
- 	if (pGlxPixmap) {
- 	    /*
- 	    ** Drawable is a GLX pixmap.
-@@ -1375,21 +1368,23 @@
- 	    ** Drawable is neither a X window nor a GLX pixmap.
- 	    */
- 	    client->errorValue = drawId;
--	    return __glXBadDrawable;
-+	    *status = __glXBadDrawable;
-+	    return NULL;
- 	}
-     }
- 
-     if (tag) {
- 	glxc = __glXLookupContextByTag(cl, tag);
- 	if (!glxc) {
--	    return __glXBadContextTag;
-+	    *status = __glXBadContextTag;
-+	    return NULL;
- 	}
- 	/*
- 	** The calling thread is swapping its current drawable.  In this case,
- 	** glxSwapBuffers is in both GL and X streams, in terms of
- 	** sequentiality.
- 	*/
--	if (__glXForceCurrent(cl, tag, &error)) {
-+	if (__glXForceCurrent(cl, tag, status)) {
- 	    /*
- 	    ** Do whatever is needed to make sure that all preceding requests
- 	    ** in both streams are completed before the swap is executed.
-@@ -1397,33 +1392,53 @@
- 	    CALL_Finish( GET_DISPATCH(), () );
- 	    __GLX_NOTE_FLUSHED_CMDS(glxc);
- 	} else {
--	    return error;
-+	    return NULL;
- 	}
-     }
- 
-+    *status = Success;
-     if (pDraw) {
--	__GLXdrawable *glxPriv;
-+        __GLXdrawable *glxPriv;
- 
- 	if (glxc) {
- 	    glxPriv = __glXGetDrawable(glxc, pDraw, drawId);
- 	    if (glxPriv == NULL) {
--		return __glXBadDrawable;
-+		*status = __glXBadDrawable;
-+		return NULL;
- 	    }
- 	}
- 	else {
- 	    glxPriv = __glXFindDrawable(drawId);
- 	    if (glxPriv == NULL) {
- 		/* This is a window we've never seen before, do nothing */
--		return Success;
-+		return NULL;
- 	    }
- 	}
- 
--	if ((*glxPriv->swapBuffers)(glxPriv) == GL_FALSE) {
--	    return __glXBadDrawable;
--	}
-+	return glxPriv;
-     }
- 
--    return Success;
-+    return NULL;
-+}
-+
-+/*
-+** NOTE: There is no portable implementation for swap buffers as of
-+** this time that is of value.  Consequently, this code must be
-+** implemented by somebody other than SGI.
-+*/
-+int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
-+{
-+    xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
-+    GLXContextTag tag = req->contextTag;
-+    __GLXdrawable *glxPriv;
-+    int status;
-+
-+    glxPriv = SyncContextGetDrawable (cl, tag, req->drawable, &status);
-+    if (glxPriv && (*glxPriv->swapBuffers)(glxPriv) == GL_FALSE) {
-+        return __glXBadDrawable;
-+    }
-+
-+    return status;
- }
- 
- 
-@@ -1544,6 +1559,30 @@
- 						       pGlxPixmap);
- }
- 
-+int __glXCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
-+{
-+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
-+    GLXContextTag tag = req->contextTag;
-+    __GLXdrawable *glxPriv;
-+    GLXDrawable		  drawId;
-+    int                   x, y, width, height;
-+    int status;
-+
-+    pc += __GLX_VENDPRIV_HDR_SIZE;
-+
-+    drawId = *((CARD32 *) (pc));
-+    x      = *((INT32 *)  (pc + 4));
-+    y      = *((INT32 *)  (pc + 8));
-+    width  = *((INT32 *)  (pc + 12));
-+    height = *((INT32 *)  (pc + 16));
-+
-+    glxPriv = SyncContextGetDrawable (cl, tag, drawId, &status);
-+    if (glxPriv)
-+	(*glxPriv->copySubBuffer)(glxPriv, x, y, width, height);
-+
-+    return status;
-+}
-+
- /*
- ** Get drawable attributes
- */
-@@ -2173,7 +2212,9 @@
-     case X_GLXvop_BindTexImageEXT:
- 	return __glXBindTexImageEXT(cl, pc);
-     case X_GLXvop_ReleaseTexImageEXT:
--	return __glXReleaseTexImageEXT(cl, pc);  
-+	return __glXReleaseTexImageEXT(cl, pc);
-+    case X_GLXvop_CopySubBufferMESA:
-+	return __glXCopySubBufferMESA(cl, pc);
-     }
- #endif
- 
---- ./GL/glx/glxdri.c.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
-+++ ./GL/glx/glxdri.c	2006-07-06 21:59:38.000000000 -0400
-@@ -112,12 +112,28 @@
-  *            months ago. :(
-  * 20050727 - Gut all the old interfaces.  This breaks compatability with
-  *            any DRI driver built to any previous version.
-+ * 20060314 - Added support for GLX_MESA_copy_sub_buffer.
-  */
-+
- #define INTERNAL_VERSION 20050727
- 
- static const char CREATE_NEW_SCREEN_FUNC[] =
-     "__driCreateNewScreen_" STRINGIFY (INTERNAL_VERSION);
- 
-+/* The DRI driver entry point version wasn't bumped when the
-+ * copySubBuffer functionality was added to the DRI drivers, but the
-+ * functionality is still conditional on the value of the
-+ * internal_api_version passed to __driCreateNewScreen.  However, the
-+ * screen constructor doesn't fail for a DRI driver that's older than
-+ * the passed in version number, so there's no way we can know for
-+ * sure that we can actually use the copySubBuffer functionality.  But
-+ * since the earliest (and at this point only) released mesa version
-+ * (6.5) that uses the 20050727 entry point does have copySubBuffer,
-+ * we'll just settle for that.  We still have to pass in a higher to
-+ * the screen constructor to enable the functionality.
-+ */
-+#define COPY_SUB_BUFFER_INTERNAL_VERSION 20060314
-+
- static void
- __glXDRIleaveServer(void)
- {
-@@ -177,6 +193,27 @@
-     return TRUE;
- }
- 
-+static void
-+__glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate,
-+			       int x, int y, int w, int h)
-+{
-+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
-+    __GLXDRIscreen *screen;
-+
-+    /* FIXME: We're jumping through hoops here to get the DRIdrawable
-+     * which the dri driver tries to keep to it self...  cf. FIXME in
-+     * createDrawable. */
-+
-+    screen = (__GLXDRIscreen *) __glXgetActiveScreen(private->base.pDraw->pScreen->myNum);
-+    private->driDrawable = (screen->driScreen.getDrawable)(NULL,
-+							   private->base.drawId,
-+							   screen->driScreen.private);
-+
-+    (*private->driDrawable->copySubBuffer)(NULL,
-+					   private->driDrawable->private,
-+					   x, y, w, h);
-+}
-+
- static __GLXdrawable *
- __glXDRIcontextCreateDrawable(__GLXcontext *context,
- 			      DrawablePtr pDraw,
-@@ -195,10 +232,11 @@
- 	return NULL;
-     }
- 
--    private->base.destroy     = __glXDRIdrawableDestroy;
--    private->base.resize      = __glXDRIdrawableResize;
--    private->base.swapBuffers = __glXDRIdrawableSwapBuffers;
--    
-+    private->base.destroy       = __glXDRIdrawableDestroy;
-+    private->base.resize        = __glXDRIdrawableResize;
-+    private->base.swapBuffers   = __glXDRIdrawableSwapBuffers;
-+    private->base.copySubBuffer = __glXDRIdrawableCopySubBuffer;
-+
- #if 0
-     /* FIXME: It would only be natural that we called
-      * driScreen->createNewDrawable here but the DRI drivers manage
-@@ -218,7 +256,6 @@
-     return &private->base;
- }
- 
--
- static void
- __glXDRIcontextDestroy(__GLXcontext *baseContext)
- {
-@@ -770,7 +807,7 @@
-     __DRIframebuffer  framebuffer;
-     int   fd = -1;
-     int   status;
--    int api_ver = INTERNAL_VERSION;
-+    int api_ver = COPY_SUB_BUFFER_INTERNAL_VERSION;
-     drm_magic_t magic;
-     drmVersionPtr version;
-     char *driverName;
---- ./GL/glx/g_disptab.h.mesa-copy-sub-buffer	2006-03-11 19:11:33.000000000 -0500
-+++ ./GL/glx/g_disptab.h	2006-07-06 21:56:33.000000000 -0400
-@@ -48,6 +48,7 @@
- extern int __glXSwapBuffers(__GLXclientState*, GLbyte*);
- extern int __glXBindTexImageEXT(__GLXclientState *cl, GLbyte *pc);
- extern int __glXReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc);
- extern int __glXGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc);
- extern int __glXUseXFont(__GLXclientState*, GLbyte*);
- extern int __glXCreateGLXPixmap(__GLXclientState*, GLbyte*);
-@@ -76,6 +77,7 @@
- extern int __glXSwapSwapBuffers(__GLXclientState*, GLbyte*);
- extern int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLbyte *pc);
- extern int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
-+extern int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
- extern int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc);
- extern int __glXSwapUseXFont(__GLXclientState*, GLbyte*);
- extern int __glXSwapCreateGLXPixmap(__GLXclientState*, GLbyte*);
-@@ -105,4 +107,11 @@
- extern __GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE];
- extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE];
- extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE];
-+
-+/* Copied from mesa src/glx/x11/glxcmds.c
-+ *
-+ * Apparently there's no standardized opcode for this extension.
-+ */
-+#define X_GLXvop_CopySubBufferMESA 5154 /* temporary */
-+
- #endif /* _GLX_g_disptab_h_ */
---- ./GL/glx/glxscreens.c.mesa-copy-sub-buffer	2006-03-20 15:10:29.000000000 -0500
-+++ ./GL/glx/glxscreens.c	2006-07-06 21:56:33.000000000 -0400
-@@ -139,6 +139,7 @@
-                         "GLX_SGIX_swap_barrier "
- #endif
- 			"GLX_SGIX_fbconfig "
-+			"GLX_MESA_copy_sub_buffer "
- 			;
- 
- __GLXscreen **__glXActiveScreens;
---- ./GL/glx/glxcmdsswap.c.mesa-copy-sub-buffer	2006-04-02 22:09:15.000000000 -0400
-+++ ./GL/glx/glxcmdsswap.c	2006-07-06 21:56:33.000000000 -0400
-@@ -432,6 +432,31 @@
-     return __glXReleaseTexImageEXT(cl, (GLbyte *)pc);
- }
- 
-+int __glXSwapCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
-+{
-+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
-+    GLXDrawable		 *drawId;
-+    int			 *buffer;
-+
-+    (void) drawId;
-+    (void) buffer;
-+
-+    __GLX_DECLARE_SWAP_VARIABLES;
-+
-+    pc += __GLX_VENDPRIV_HDR_SIZE;
-+
-+    __GLX_SWAP_SHORT(&req->length);
-+    __GLX_SWAP_INT(&req->contextTag);
-+    __GLX_SWAP_INT(pc);
-+    __GLX_SWAP_INT(pc + 4);
-+    __GLX_SWAP_INT(pc + 8);
-+    __GLX_SWAP_INT(pc + 12);
-+    __GLX_SWAP_INT(pc + 16);
-+
-+    return __glXCopySubBufferMESA(cl, pc);
-+
-+}
-+
- int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc)
- {
-     xGLXVendorPrivateWithReplyReq *req = (xGLXVendorPrivateWithReplyReq *)pc;
-@@ -899,7 +924,9 @@
-     case X_GLXvop_BindTexImageEXT:
- 	return __glXSwapBindTexImageEXT(cl, pc);
-     case X_GLXvop_ReleaseTexImageEXT:
--	return __glXSwapReleaseTexImageEXT(cl, pc);  
-+	return __glXSwapReleaseTexImageEXT(cl, pc);
-+    case X_GLXvop_CopySubBufferMESA:
-+	return __glXSwapCopySubBufferMESA(cl, pc);
-     }
- #endif
- 
diff --git a/hardened/x11-base/xorg-server/files/05-offscreen-pixmaps.patch b/hardened/x11-base/xorg-server/files/05-offscreen-pixmaps.patch
deleted file mode 100644
index 3841b04..0000000
--- a/hardened/x11-base/xorg-server/files/05-offscreen-pixmaps.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
-+++ ./hw/xfree86/xaa/xaaInit.c	2006-08-30 16:47:29.000000000 -0400
-@@ -98,6 +98,30 @@
-     xfree(infoRec);
- }
- 
-+void
-+XAAEvictPixmaps(void)
-+{
-+    XAAScreenPtr pScreenPriv;
-+    XAAInfoRecPtr infoRec;
-+    ScreenPtr pScreen;
-+    int i;
-+
-+    xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n");
-+
-+    for (i = 0; i < screenInfo.numScreens; i++) {
-+	pScreen = screenInfo.screens[i];
-+	infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
-+
-+	pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
-+	infoRec = pScreenPriv->AccelInfoRec;
-+
-+	infoRec->offscreenDepths = 0;
-+	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
-+       
-+	XAAMoveOutOffscreenPixmaps(pScreen);
-+	XAAInvalidatePixmapCache(pScreen);
-+    }
-+}
- 
- Bool 
- XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
---- ./GL/glx/glxdri.c.offscreen-pixmaps	2006-08-30 16:46:45.000000000 -0400
-+++ ./GL/glx/glxdri.c	2006-08-30 16:45:52.000000000 -0400
-@@ -367,6 +367,19 @@
-     int		bpp;
-     GLenum	target, format, type;
- 
-+    /* When the GLX_EXT_texture_from_pixmap is used, as it's
-+     * implemented here, we want to pull pixmap out of video memory
-+     * and into host memory. */
-+    {
-+      extern void XAAEvictPixmaps(void);
-+      static int evictedPixmaps;
-+
-+      if (!evictedPixmaps) {
-+	XAAEvictPixmaps();
-+	evictedPixmaps = TRUE;
-+      }
-+    }
-+
-     pixmap = (PixmapPtr) glxPixmap->pDraw;
-     if (!glxPixmap->pDamage) {
-         glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
diff --git a/hardened/x11-base/xorg-server/files/06-aiglx-happy-vt-switch.patch b/hardened/x11-base/xorg-server/files/06-aiglx-happy-vt-switch.patch
deleted file mode 100644
index 314f1f0..0000000
--- a/hardened/x11-base/xorg-server/files/06-aiglx-happy-vt-switch.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
-index cfa9996..77fa4bf 100644
---- a/GL/glx/glxdri.c
-+++ b/GL/glx/glxdri.c
-@@ -63,27 +63,30 @@ #include "dispatch.h"
- #define STRINGIFY(macro_or_string)	STRINGIFY_ARG (macro_or_string)
- #define	STRINGIFY_ARG(contents)	#contents
- 
--typedef struct __GLXDRIscreen      __GLXDRIscreen;
--typedef struct __GLXDRIcontext         __GLXDRIcontext;
-+typedef struct __GLXDRIscreen   __GLXDRIscreen;
-+typedef struct __GLXDRIcontext  __GLXDRIcontext;
- typedef struct __GLXDRIdrawable __GLXDRIdrawable;
- 
- struct __GLXDRIscreen {
--    __GLXscreen		 base;
-+    __GLXscreen	     base;
- 
--    __DRIscreen			 driScreen;
--    void			*driver;
-+    xf86EnterVTProc *enterVT;
-+    xf86LeaveVTProc *leaveVT;
-+
-+    __DRIscreen	     driScreen;
-+    void	    *driver;
- };
- 
- struct __GLXDRIcontext {
--    __GLXcontext		 base;
-+    __GLXcontext base;
- 
--    __DRIcontext		 driContext;
-+    __DRIcontext driContext;
- };
- 
- struct __GLXDRIdrawable {
--    __GLXdrawable	 base;
-+    __GLXdrawable  base;
- 
--    __DRIdrawable		*driDrawable;
-+    __DRIdrawable *driDrawable;
- };
- 
- /* History:
-@@ -594,8 +597,7 @@ static __DRIfuncPtr getProcAddress(const
- 
- static __DRIscreen *findScreen(__DRInativeDisplay *dpy, int scrn)
- {
--    __GLXDRIscreen *screen =
--	(__GLXDRIscreen *) __glXgetActiveScreen(scrn);
-+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(scrn);
- 
-     return &screen->driScreen;
- }
-@@ -789,6 +791,30 @@ static const __DRIinterfaceMethods inter
- 
- static const char dri_driver_path[] = DRI_DRIVER_PATH;
- 
-+static Bool
-+glxDRIEnterVT (int index, int flags)
-+{
-+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
-+
-+    LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
-+
-+    glxResumeClients();
-+
-+    return (*screen->enterVT) (index, flags);
-+}
-+
-+static void
-+glxDRILeaveVT (int index, int flags)
-+{
-+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
-+
-+    LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
-+
-+    glxSuspendClients();
-+
-+    return (*screen->leaveVT) (index, flags);
-+}
-+
- static __GLXscreen *
- __glXDRIscreenProbe(ScreenPtr pScreen)
- {
-@@ -813,6 +839,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-     void *dev_priv = NULL;
-     char filename[128];
-     Bool isCapable;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- 
-     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable")) {
- 	LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
-@@ -983,6 +1010,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
- 
-     __glXsetEnterLeaveServerFuncs(__glXDRIenterServer, __glXDRIleaveServer);
- 
-+    screen->enterVT = pScrn->EnterVT;
-+    pScrn->EnterVT = glxDRIEnterVT; 
-+    screen->leaveVT = pScrn->LeaveVT;
-+    pScrn->LeaveVT = glxDRILeaveVT;
-+
-     LogMessage(X_INFO,
- 	       "AIGLX: Loaded and initialized %s\n", filename);
- 
-diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
-index 8bbb83f..edc257c 100644
---- a/GL/glx/glxext.c
-+++ b/GL/glx/glxext.c
-@@ -234,13 +231,11 @@ GLboolean __glXFreeContext(__GLXcontext 
-      * __glXDispatch() or as a callback from the resource manager.  In
-      * the latter case we need to lift the DRI lock manually. */
- 
--    if (!inDispatch)
--      __glXleaveServer();
-+    __glXleaveServer();
- 
-     cx->destroy(cx);
- 
--    if (!inDispatch)
--      __glXenterServer();
-+    __glXenterServer();
- 
-     return GL_TRUE;
- }
-@@ -336,7 +331,7 @@ void GlxExtensionInit(void)
-     /*
-     ** Initialize table of client state.  There is never a client 0.
-     */
--    for (i=1; i <= MAXCLIENTS; i++) {
-+    for (i = 1; i <= MAXCLIENTS; i++) {
- 	__glXClients[i] = 0;
-     }
- 
-@@ -407,11 +402,36 @@ __GLXcontext *__glXForceCurrent(__GLXcli
- 
- /************************************************************************/
- 
--/*
--** Top level dispatcher; all commands are executed from here down.
--*/
-+static int glxServerLeaveCount;
-+static int glxBlockClients;
- 
--/* I cried when I wrote this.  Damn you XAA! */
-+void glxSuspendClients(void)
-+{
-+    int i;
-+
-+    for (i = 1; i <= MAXCLIENTS; i++) {
-+	if (__glXClients[i] == NULL || !__glXClients[i]->inUse)
-+	    continue;
-+
-+	IgnoreClient(__glXClients[i]->client);
-+    }
-+
-+    glxBlockClients = TRUE;
-+}
-+
-+void glxResumeClients(void)
-+{
-+    int i;
-+
-+    glxBlockClients = FALSE;
-+
-+    for (i = 1; i <= MAXCLIENTS; i++) {
-+	if (__glXClients[i] == NULL || !__glXClients[i]->inUse)
-+	    continue;
-+
-+	AttendClient(__glXClients[i]->client);
-+    }
-+}
- 
- static void
- __glXnopEnterServer(void)
-@@ -436,14 +456,19 @@ void __glXsetEnterLeaveServerFuncs(void 
- 
- void __glXenterServer(void)
- {
--  (*__glXenterServerFunc)();
-+  glxServerLeaveCount--;
-+
-+  if (glxServerLeaveCount == 0)
-+    (*__glXenterServerFunc)();
- }
- 
- void __glXleaveServer(void)
- {
--  (*__glXleaveServerFunc)();
--}
-+  if (glxServerLeaveCount == 0)
-+    (*__glXleaveServerFunc)();
- 
-+  glxServerLeaveCount++;
-+}
- 
- /*
- ** Top level dispatcher; all commands are executed from here down.
-@@ -496,6 +521,15 @@ static int __glXDispatch(ClientPtr clien
- 	return __glXError(GLXBadLargeRequest);
-     }
- 
-+    /* If we're currently blocking GLX clients, just put this guy to
-+     * sleep, reset the request and return. */
-+    if (glxBlockClients) {
-+	ResetCurrentRequest(client);
-+	client->sequence--;
-+	IgnoreClient(client);
-+	return(client->noClientException);
-+    }
-+
-     /*
-     ** Use the opcode to index into the procedure table.
-     */
-@@ -506,12 +540,8 @@ static int __glXDispatch(ClientPtr clien
- 
-     __glXleaveServer();
- 
--    inDispatch = True;
--
-     retval = proc(cl, (GLbyte *) stuff);
- 
--    inDispatch = False;
--
-     __glXenterServer();
- 
-     return retval;
-diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
-index 8ece1e2..9eed1bc 100644
---- a/GL/glx/glxserver.h
-+++ b/GL/glx/glxserver.h
-@@ -136,6 +136,9 @@ void __glXsetEnterLeaveServerFuncs(void 
- void __glXenterServer(void);
- void __glXleaveServer(void);
- 
-+void glxSuspendClients(void);
-+void glxResumeClients(void);
-+
- /*
- ** State kept per client.
- */
diff --git a/hardened/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch b/hardened/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
deleted file mode 100644
index 0992565..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-server-1.0.2.orig/Xprint/Makefile.am xorg-server-1.0.2/Xprint/Makefile.am
---- xorg-server-1.0.2.orig/Xprint/Makefile.am	2006-04-23 14:26:07.000000000 -0700
-+++ xorg-server-1.0.2/Xprint/Makefile.am	2006-04-23 14:26:23.000000000 -0700
-@@ -4,7 +4,7 @@
- 
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
- 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
--	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
-+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
- 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
- 
- Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/hardened/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch b/hardened/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch
deleted file mode 100644
index c279b8f..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.2-fix-readKernelMapping-overrun.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~	2005-07-03 11:51:16.000000000 +0100
-+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 17:37:10.000000000 +0100
-@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
- /*
-  * Maps the AT keycodes to Linux keycodes
-  */
--static unsigned char at2lnx[NUM_KEYCODES] =
-+static unsigned char at2lnx[] =
- {
- 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
- 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */
diff --git a/hardened/x11-base/xorg-server/files/1.0.2-fix-rom-read-dualhead.patch b/hardened/x11-base/xorg-server/files/1.0.2-fix-rom-read-dualhead.patch
deleted file mode 100644
index 0dea684..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.2-fix-rom-read-dualhead.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=6751
-
-X.org breaks on newer Linux kernels as it re-writes BARs behind the kernels back
-when attempting to read the ROMs, this causes crashes and hangs on dual-card
-systems.
-
---- hw/xfree86/os-support/bus/Pci.c	2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/Pci.c	2006-06-29 15:48:37.000000000 -0700
-@@ -233,6 +233,8 @@
- 
- static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, };
- 
-+static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len);
-+
- /*
-  * Platform specific PCI function pointers.
-  *
-@@ -266,6 +268,11 @@
- #endif
- }
- 
-+void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len))
-+{
-+	pciOSHandleBIOS = bios_fn;
-+}
-+
- PCITAG
- pciFindFirst(CARD32 id, CARD32 mask)
- {
-@@ -1347,6 +1354,13 @@
-   PCITAG *pTag;
-   int i;
- 
-+  /* fall back to the old code if the OS code fails */
-+  if (pciOSHandleBIOS) {
-+	n = pciOSHandleBIOS(Tag, basereg, func, ptr);
-+   if (n)
-+      		return n;
-+  }
-+
-   n = handlePciBIOS(Tag,basereg,func,ptr);
-   if (n)
-       return n;
---- hw/xfree86/os-support/bus/Pci.h	2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/Pci.h	2006-06-29 15:43:50.000000000 -0700
-@@ -431,6 +431,7 @@
- Bool          pciMfDev(int, int);
- ADDRESS       pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS);
- 
-+extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len));
- extern PCITAG (*pciFindFirstFP)(void);
- extern PCITAG (*pciFindNextFP)(void);
- 
---- hw/xfree86/os-support/bus/linuxPci.c	2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/linuxPci.c	2006-06-29 15:43:50.000000000 -0700
-@@ -73,6 +73,7 @@
- static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val);
- static CARD16 linuxPciCfgReadWord(PCITAG tag, int off);
- static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val);
-+static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len);
- 
- static pciBusFuncs_t linuxFuncs0 = {
- /* pciReadLong      */	linuxPciCfgRead,
-@@ -125,6 +126,7 @@
- 	pciBusInfo[0]  = &linuxPci0;
- 	pciFindFirstFP = pciGenFindFirst;
- 	pciFindNextFP  = pciGenFindNext;
-+	pciSetOSBIOSPtr(linuxPciHandleBIOS);
- }
- 
- static int
-@@ -892,3 +894,44 @@
- }
- 
- #endif /* !INCLUDE_XF86_NO_DOMAIN */
-+
-+int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len)
-+{
-+  unsigned int dom, bus, dev, func;
-+  unsigned int fd;
-+  char file[256];
-+  struct stat st;
-+  int ret;
-+  int sofar = 0;
-+
-+  dom  = PCI_DOM_FROM_TAG(Tag);
-+  bus  = PCI_BUS_FROM_TAG(Tag);
-+  dev  = PCI_DEV_FROM_TAG(Tag);
-+  func = PCI_FUNC_FROM_TAG(Tag);
-+  sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
-+	  dom, bus, dev, func);
-+
-+  if (stat(file, &st) == 0)
-+  {
-+    if ((fd = open(file, O_RDWR)))
-+      basereg = 0x0;
-+    
-+    /* enable the ROM first */
-+    write(fd, "1", 2);
-+    lseek(fd, 0, SEEK_SET);
-+    do {
-+        /* copy the ROM until we hit Len, EOF or read error */
-+    	ret = read(fd, buf+sofar, len-sofar);
-+    	if (ret <= 0)
-+		break;
-+	sofar += ret;
-+    } while (sofar < len);
-+    
-+    write(fd, "0", 2);
-+    close(fd);
-+    if (sofar < len)
-+    	xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024);
-+    return sofar;
-+  }
-+  return 0;
-+}
diff --git a/hardened/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch b/hardened/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
deleted file mode 100644
index dd10673..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: xorg/hw/xfree86/utils/xorgconfig/cards.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v
-retrieving revision 1.4
-diff -u -b -B -r1.4 cards.c
---- xorg/hw/xfree86/utils/xorgconfig/cards.c	1 Jul 2005 22:43:35 -0000	1.4
-+++ xorg/hw/xfree86/utils/xorgconfig/cards.c	23 Mar 2006 07:42:26 -0000
-@@ -19,7 +19,7 @@
- 
- /* Some vars to make path names in texts more flexible. */
- #ifndef PROJECTROOT
--# define PROJECTROOT		"/usr/X11R6"
-+# define PROJECTROOT		"/usr"
- #endif
- #define TREEROOT		PROJECTROOT
- #define TREEROOTLX		TREEROOT "/lib/X11"
-Index: xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v
-retrieving revision 1.19
-diff -u -b -B -r1.19 xorgconfig.c
---- xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c	8 Nov 2005 06:33:30 -0000	1.19
-+++ xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c	23 Mar 2006 07:42:28 -0000
-@@ -157,11 +157,12 @@
-  * may be more irritated than Unix users
-  */
- #ifndef PROJECTROOT
--#define PROJECTROOT		"/usr/X11R6"
-+#define PROJECTROOT		"/usr"
- #endif
- #define TREEROOT		PROJECTROOT
- #define TREEROOTLX		TREEROOT "/lib/X11"
- #define TREEROOTCFG		TREEROOT "/etc/X11"
-+#define TREEROOTSHARE		TREEROOT "/share/X11"
- #ifdef XDOCDIR
- # define TREEROOTDOC		XDOCDIR
- #else
-@@ -495,7 +496,7 @@
- #elif defined(__FreeBSD__)
- # define DEF_MOUSEDEV "/dev/sysmouse";
- #else
--# define DEF_MOUSEDEV "/dev/mouse";
-+# define DEF_MOUSEDEV "/dev/input/mice";
- #endif
- 
- #ifndef __UNIXOS2__
-@@ -1970,7 +1971,7 @@
- "# file minus the extension (like \".txt\" or \".db\").  There is normally\n"
- "# no need to change the default.\n"
- "\n"
--"    RgbPath	\"" TREEROOTLX "/rgb\"\n"
-+"#    RgbPath	\"" TREEROOTSHARE "/rgb\"\n"
- "\n"
- "# Multiple FontPath entries are allowed (which are concatenated together),\n"
- "# as well as specifying multiple comma-separated entries in one FontPath\n"
diff --git a/hardened/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch b/hardened/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch
deleted file mode 100644
index 288d79c..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: xorg/hw/xfree86/utils/xorgcfg/interface.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v
-retrieving revision 1.8
-diff -u -b -B -r1.8 interface.c
---- xorg/hw/xfree86/utils/xorgcfg/interface.c	8 Nov 2005 06:33:30 -0000	1.8
-+++ xorg/hw/xfree86/utils/xorgcfg/interface.c	23 Mar 2006 07:42:49 -0000
-@@ -65,7 +65,7 @@
- #ifdef PROJECT_ROOT
- #define DefaultXFree86Dir	PROJECT_ROOT
- #else
--#define DefaultXFree86Dir	"/usr/X11R6"
-+#define DefaultXFree86Dir	"/usr"
- #endif
- 
- #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
-Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v
-retrieving revision 1.5
-diff -u -b -B -r1.5 keyboard-cfg.c
---- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c	8 Nov 2005 06:33:30 -0000	1.5
-+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c	23 Mar 2006 07:42:51 -0000
-@@ -72,7 +72,7 @@
-  */
- static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
- static int num_xkb_desc;
--static char *XkbRulesDir = "lib/X11/xkb/rules/";
-+static char *XkbRulesDir = "share/X11/xkb/rules/";
- #ifdef XFREE98_XKB
- static char *XkbRulesFile = "xfree98";
- #else
-Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v
-retrieving revision 1.3
-diff -u -b -B -r1.3 keyboard-cfg.h
---- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h	4 Dec 2004 00:43:11 -0000	1.3
-+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h	23 Mar 2006 07:42:51 -0000
-@@ -38,7 +38,7 @@
- /*
-  * All file names are from XProjectRoot or XWINHOME environment variable.
-  */
--#define	XkbConfigDir		"lib/X11/xkb/"
-+#define	XkbConfigDir		"share/X11/xkb/"
- #define	XkbConfigFile		"X0-config.keyboard"
- 
- /*
-Index: xorg/hw/xfree86/utils/xorgcfg/loader.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v
-retrieving revision 1.5
-diff -u -b -B -r1.5 loader.c
---- xorg/hw/xfree86/utils/xorgcfg/loader.c	8 Dec 2005 17:54:40 -0000	1.5
-+++ xorg/hw/xfree86/utils/xorgcfg/loader.c	23 Mar 2006 07:42:51 -0000
-@@ -55,7 +55,7 @@
- #include <stdarg.h>
- 
- #ifndef OPTIONSPATH
--#define OPTIONSPATH "/usr/X11R6/lib/X11"
-+#define OPTIONSPATH "/usr/lib/X11"
- #endif
- 
- #ifndef SIGNALRETURNSINT
-Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v
-retrieving revision 1.6
-diff -u -b -B -r1.6 text-mode.c
---- xorg/hw/xfree86/utils/xorgcfg/text-mode.c	8 Dec 2005 17:54:40 -0000	1.6
-+++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c	23 Mar 2006 07:42:55 -0000
-@@ -52,12 +52,12 @@
- 	(strcmp((X), "keyboard") == 0))
- 
- #ifndef PROJECT_ROOT
--#define PROJECT_ROOT "/usr/X11R6"
-+#define PROJECT_ROOT "/usr"
- #endif
- 
- #ifndef XKB_RULES_DIR
- #ifndef __UNIXOS2__
--#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
-+#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
- #else
- #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
- #endif
-@@ -558,7 +558,7 @@
- #elif defined(__UNIXOS2__)
- 	str = "mouse$";
- #else
--	str = "/dev/mouse";
-+	str = "/dev/input/mice";
- #endif
- 
-     ClearScreen();
diff --git a/hardened/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch b/hardened/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
deleted file mode 100644
index 5a91db4..0000000
--- a/hardened/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:39	1.1
-+++ xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:52
-@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
- 
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
- 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
--	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
-+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
- 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
- 
- Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/hardened/x11-base/xorg-server/files/1.1.1-dbe-render.diff b/hardened/x11-base/xorg-server/files/1.1.1-dbe-render.diff
deleted file mode 100644
index d2f27e5..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.1-dbe-render.diff
+++ /dev/null
@@ -1,183 +0,0 @@
-diff --git a/dbe/dbe.c b/dbe/dbe.c
-index 5b43dd1..6a2ed6a 100644
---- a/dbe/dbe.c
-+++ b/dbe/dbe.c
-@@ -39,6 +39,11 @@
- #endif
- 
- #include <string.h>
-+#if HAVE_STDINT_T
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
- 
- #include <X11/X.h>
- #include <X11/Xproto.h>
-@@ -713,11 +718,14 @@ ProcDbeSwapBuffers(ClientPtr client)
-         return(Success);
-     }
- 
-+    if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec))
-+	    return BadAlloc;
-+
-     /* Get to the swap info appended to the end of the request. */
-     dbeSwapInfo = (xDbeSwapInfo *)&stuff[1];
- 
-     /* Allocate array to record swap information. */ 
--    swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec));
-+    swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec));
-     if (swapInfo == NULL)
-     {
-         return(BadAlloc);
-@@ -732,14 +740,14 @@ ProcDbeSwapBuffers(ClientPtr client)
-         if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client,
- 					  SecurityWriteAccess)))
-         {
--            DEALLOCATE_LOCAL(swapInfo);
-+            Xfree(swapInfo);
- 	    return(BadWindow);
-         }
- 
-         /* Each window must be double-buffered - BadMatch. */
-         if (DBE_WINDOW_PRIV(pWin) == NULL)
-         {
--            DEALLOCATE_LOCAL(swapInfo);
-+            Xfree(swapInfo);
-             return(BadMatch);
-         }
- 
-@@ -748,7 +756,7 @@ ProcDbeSwapBuffers(ClientPtr client)
-         {
-             if (dbeSwapInfo[i].window == dbeSwapInfo[j].window)
-             {
--                DEALLOCATE_LOCAL(swapInfo);
-+                Xfree(swapInfo);
-                 return(BadMatch);
- 	    }
-         }
-@@ -759,7 +767,7 @@ ProcDbeSwapBuffers(ClientPtr client)
-             (dbeSwapInfo[i].swapAction != XdbeUntouched ) &&
-             (dbeSwapInfo[i].swapAction != XdbeCopied    ))
-         {
--            DEALLOCATE_LOCAL(swapInfo);
-+            Xfree(swapInfo);
-             return(BadValue);
-         }
- 
-@@ -789,12 +797,12 @@ ProcDbeSwapBuffers(ClientPtr client)
-         error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo);
-         if (error != Success)
-         {
--            DEALLOCATE_LOCAL(swapInfo);
-+            Xfree(swapInfo);
-             return(error);
-         }
-     }
-     
--    DEALLOCATE_LOCAL(swapInfo);
-+    Xfree(swapInfo);
-     return(Success);
- 
- } /* ProcDbeSwapBuffers() */
-@@ -876,10 +884,12 @@ ProcDbeGetVisualInfo(ClientPtr client)
- 
-     REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
- 
-+    if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
-+	    return BadAlloc;
-     /* Make sure any specified drawables are valid. */
-     if (stuff->n != 0)
-     {
--        if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n *
-+        if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n *
-                                                  sizeof(DrawablePtr))))
-         {
-             return(BadAlloc);
-@@ -892,7 +902,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
-             if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable(
- 				drawables[i], client, SecurityReadAccess)))
-             {
--                DEALLOCATE_LOCAL(pDrawables);
-+                Xfree(pDrawables);
-                 return(BadDrawable);
-             }
-         }
-@@ -904,7 +914,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
-     {
-         if (pDrawables)
-         {
--            DEALLOCATE_LOCAL(pDrawables);
-+            Xfree(pDrawables);
-         }
- 
-         return(BadAlloc);
-@@ -931,7 +941,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
-             /* Free pDrawables if we needed to allocate it above. */
-             if (pDrawables)
-             {
--                DEALLOCATE_LOCAL(pDrawables);
-+                Xfree(pDrawables);
-             }
- 
-             return(BadAlloc);
-@@ -1012,7 +1022,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
- 
-     if (pDrawables)
-     {
--        DEALLOCATE_LOCAL(pDrawables);
-+        Xfree(pDrawables);
-     }
- 
-     return(client->noClientException);
-diff --git a/render/render.c b/render/render.c
-index e4d8d6b..55f360a 100644
---- a/render/render.c
-+++ b/render/render.c
-@@ -47,6 +47,12 @@
- #include <X11/Xfuncproto.h>
- #include "cursorstr.h"
- 
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- static int ProcRenderQueryVersion (ClientPtr pClient);
- static int ProcRenderQueryPictFormats (ClientPtr pClient);
- static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
-@@ -1103,11 +1109,14 @@ ProcRenderAddGlyphs (ClientPtr client)
-     }
- 
-     nglyphs = stuff->nglyphs;
-+    if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
-+	    return BadAlloc;
-+
-     if (nglyphs <= NLOCALGLYPH)
- 	glyphsBase = glyphsLocal;
-     else
-     {
--	glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
-+	glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
- 	if (!glyphsBase)
- 	    return BadAlloc;
-     }
-@@ -1164,7 +1173,7 @@ ProcRenderAddGlyphs (ClientPtr client)
-     }
- 
-     if (glyphsBase != glyphsLocal)
--	DEALLOCATE_LOCAL (glyphsBase);
-+	Xfree (glyphsBase);
-     return client->noClientException;
- bail:
-     while (glyphs != glyphsBase)
-@@ -1173,7 +1182,7 @@ bail:
- 	xfree (glyphs->glyph);
-     }
-     if (glyphsBase != glyphsLocal)
--	DEALLOCATE_LOCAL (glyphsBase);
-+	Xfree (glyphsBase);
-     return err;
- }
- 
diff --git a/hardened/x11-base/xorg-server/files/1.1.1-fix-xrandr-zoom-keys.patch b/hardened/x11-base/xorg-server/files/1.1.1-fix-xrandr-zoom-keys.patch
deleted file mode 100644
index fc9bd8d..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.1-fix-xrandr-zoom-keys.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff --git a/dix/Makefile.am b/dix/Makefile.am
-index c9a19f7..414f125 100644
---- a/dix/Makefile.am
-+++ b/dix/Makefile.am
-@@ -29,7 +29,8 @@ libdix_la_SOURCES = 	\
- 	swaprep.c	\
- 	swapreq.c	\
- 	tables.c	\
--	window.c
-+	window.c	\
-+	strcasecmp.c
- 
- libxpstubs_la_SOURCES =	\
- 	xpstubs.c
-diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index d1b806a..9023a0c 100644
---- a/hw/xfree86/dixmods/Makefile.am
-+++ b/hw/xfree86/dixmods/Makefile.am
-@@ -95,6 +95,7 @@ libtype1_la_SOURCES = type1mod.c
- libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
- 
- libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-+libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
- 
- libxtrap_la_LDFLAGS = -avoid-version
- libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
-diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c
-index 0479bca..b986432 100644
---- a/hw/xfree86/dixmods/xkbPrivate.c
-+++ b/hw/xfree86/dixmods/xkbPrivate.c
-@@ -26,13 +26,13 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode k
-     if (xf86act->type == XkbSA_XFree86Private) {
-         memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize);
-         msgbuf[XkbAnyActionDataSize]= '\0';
--        if (strcmp(msgbuf, "-vmode")==0)
-+        if (strcasecmp(msgbuf, "-vmode")==0)
-             xf86ProcessActionEvent(ACTION_PREV_MODE, NULL);
--        else if (strcmp(msgbuf, "+vmode")==0)
-+        else if (strcasecmp(msgbuf, "+vmode")==0)
-             xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL);
--        else if (strcmp(msgbuf, "ungrab")==0)
-+        else if (strcasecmp(msgbuf, "ungrab")==0)
-             xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
--        else if (strcmp(msgbuf, "clsgrb")==0)
-+        else if (strcasecmp(msgbuf, "clsgrb")==0)
-             xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
-         else
-             xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf);
-diff --git a/include/dix.h b/include/dix.h
-index 0177721..84fc849 100644
---- a/include/dix.h
-+++ b/include/dix.h
-@@ -820,4 +820,10 @@ typedef struct {
-     SelectionCallbackKind   kind;
- } SelectionInfoRec;
- 
-+/* strcasecmp.c */
-+#if NEED_STRCASECMP
-+#define strcasecmp xstrcasecmp
-+extern int xstrcasecmp(char *s1, char *s2);
-+#endif
-+
- #endif /* DIX_H */
-diff --git a/xkb/maprules.c b/xkb/maprules.c
-index d4e9829..eff02ad 100644
---- a/xkb/maprules.c
-+++ b/xkb/maprules.c
-@@ -62,12 +62,6 @@ #define PR_DEBUG1(s,a)
- #define PR_DEBUG2(s,a,b)
- #endif
- 
--#ifdef NEED_STRCASECMP
--extern int _XkbStrCaseCmp(char *s1, char *s2);
--#else
--#define _XkbStrCaseCmp strcasecmp
--#endif
--
- /***====================================================================***/
- 
- #define DFLT_LINE_SIZE	128
-@@ -1092,20 +1086,20 @@ int			len,headingtype,extra_ndx = 0;
-     for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
- 	if (line.line[0]=='!') {
- 	    tok = strtok(&(line.line[1]), " \t");
--	    if (_XkbStrCaseCmp(tolower(tok),"model") == 0)
-+	    if (strcasecmp(tok,"model") == 0)
- 		headingtype = HEAD_MODEL;
--	    else if (_XkbStrCaseCmp(tok,"layout") == 0)
-+	    else if (strcasecmp(tok,"layout") == 0)
- 		headingtype = HEAD_LAYOUT;
--	    else if (_XkbStrCaseCmp(tok,"variant") == 0)
-+	    else if (strcasecmp(tok,"variant") == 0)
- 		headingtype = HEAD_VARIANT;
--	    else if (_XkbStrCaseCmp(tok,"option") == 0)
-+	    else if (strcasecmp(tok,"option") == 0)
- 		headingtype = HEAD_OPTION;
- 	    else {
- 		int i;
- 		headingtype = HEAD_EXTRA;
- 		extra_ndx= -1;
- 		for (i=0;(i<rules->num_extra)&&(extra_ndx<0);i++) {
--		    if (!_XkbStrCaseCmp(tok,rules->extra_names[i]))
-+		    if (!strcasecmp(tok,rules->extra_names[i]))
- 			extra_ndx= i;
- 		}
- 		if (extra_ndx<0) {
-diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
-index 3389ba8..3ed68c2 100644
---- a/xkb/xkbfmisc.c
-+++ b/xkb/xkbfmisc.c
-@@ -247,19 +247,3 @@ XkbNameMatchesPattern(char *name,char *p
-     /* if we get here, the pattern is exhausted (-:just like me:-) */
-     return (name[0]=='\0');
- }
--
--#ifdef NEED_STRCASECMP
--_X_HIDDEN int
--_XkbStrCaseCmp(char *str1,char *str2)
--{
--    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
--
--    while (tolower(*us1) == tolower(*us2)) {
--        if (*us1++ == '\0')
--            return (0);
--        us2++;
--    }
--
--    return (tolower(*us1) - tolower(*us2));
--}
--#endif
-diff --git a/dix/strcasecmp.c b/dix/strcasecmp.c
-new file mode 100644
-index 0000000..bf3f008
---- /dev/null
-+++ b/dix/strcasecmp.c
-@@ -0,0 +1,50 @@
-+/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */
-+/************************************************************
-+ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
-+
-+ Permission to use, copy, modify, and distribute this
-+ software and its documentation for any purpose and without
-+ fee is hereby granted, provided that the above copyright
-+ notice appear in all copies and that both that copyright
-+ notice and this permission notice appear in supporting
-+ documentation, and that the name of Silicon Graphics not be
-+ used in advertising or publicity pertaining to distribution
-+ of the software without specific prior written permission.
-+ Silicon Graphics makes no representation about the suitability
-+ of this software for any purpose. It is provided "as is"
-+ without any express or implied warranty.
-+
-+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+
-+ ********************************************************/
-+/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#include <ctype.h>
-+#include "dix.h"
-+
-+#ifdef NEED_STRCASECMP
-+int
-+xstrcasecmp(char *str1,char *str2)
-+{
-+    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
-+
-+    while (tolower(*us1) == tolower(*us2)) {
-+        if (*us1++ == '\0')
-+            return (0);
-+        us2++;
-+    }
-+
-+    return (tolower(*us1) - tolower(*us2));
-+}
-+#endif
diff --git a/hardened/x11-base/xorg-server/files/1.1.1-fix_acpi_tokenize.patch b/hardened/x11-base/xorg-server/files/1.1.1-fix_acpi_tokenize.patch
deleted file mode 100644
index 407617f..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.1-fix_acpi_tokenize.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0567a6337b84fa045b5732e98203f488274aa2a2
-Author: Bram Verweij <amverweij@gmail.com>
-Date:   Wed Nov 8 18:00:52 2006 +0200
-
-    xfree86/linux acpi: fix tokenising
-    Split on a space, rather on the 'video' string, as strtok takes a char,
-    not a string.
-
-diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
-index aa30e72..024e6ef 100644
---- a/hw/xfree86/os-support/linux/lnx_acpi.c
-+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
-@@ -78,7 +78,7 @@ lnxACPIGetEventFromOs(int fd, pmEvent *e
- 	char *data = NULL; /* doesn't appear to be used in the kernel */
- 	unsigned long int notify_l, data_l;
- 
--	video = strtok(ev, "video");
-+	video = strtok(ev, " ");
- 
- 	GFX = strtok(NULL, " ");
- #if 0
diff --git a/hardened/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch b/hardened/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch
deleted file mode 100644
index 5bc902b..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 3ad1642f1bbaa5f96558cdf3384b40f7122f8781
-Author: Michel Dänzer <michel@tungstengraphics.com>
-Date:   Sun Oct 15 16:57:09 2006 +0200
-
-    Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
-
-diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
-index b572304..170662c 100644
---- a/GL/glx/glxdri.c
-+++ b/GL/glx/glxdri.c
-@@ -359,7 +359,12 @@ __glXDRIbindTexImage(__GLXcontext *baseC
-     if (pixmap->drawable.depth >= 24) {
- 	bpp = 4;
- 	format = GL_BGRA;
--	type = GL_UNSIGNED_BYTE;
-+	type =
-+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-+	    GL_UNSIGNED_BYTE;
-+#else
-+	    GL_UNSIGNED_INT_8_8_8_8_REV;
-+#endif
-     } else {
- 	bpp = 2;
- 	format = GL_RGB;
diff --git a/hardened/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch b/hardened/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch
deleted file mode 100644
index d44d969..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
-index a3c07f3..a97e6f0 100644
---- a/hw/xfree86/os-support/bus/linuxPci.c
-+++ b/hw/xfree86/os-support/bus/linuxPci.c
-@@ -83,7 +83,13 @@ #if defined(__powerpc__)
- /* pciAddrBusToHost */	linuxPpcBusAddrToHostAddr,
- #else
- /* pciAddrHostToBus */	pciAddrNOOP,
-+/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
-+ * makes it all moot, so we kludge it for now */
-+#if defined(__sparc__)
-+/* pciAddrBusToHost */  pciAddrNOOP,
-+#else
- /* pciAddrBusToHost */	linuxTransAddrBusToHost,
-+#endif /* __sparc64__ */
- #endif
- 
- /* pciControlBridge */		NULL,
diff --git a/hardened/x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch b/hardened/x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch
deleted file mode 100644
index 022c603..0000000
--- a/hardened/x11-base/xorg-server/files/1.1.99.903-mesa-6.5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-server-1.1.99.903/GL/mesa/main/Makefile.am.orig	2006-12-03 16:24:27.786630074 +0100
-+++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.am	2006-12-03 16:24:37.985074238 +0100
-@@ -60,6 +60,7 @@
-                     light.c \
-                     lines.c \
-                     matrix.c \
-+                    mipmap.c \
-                     mm.c \
-                     occlude.c \
-                     pixel.c \
diff --git a/hardened/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch b/hardened/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
deleted file mode 100644
index 7d5b8ab..0000000
--- a/hardened/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.old	2006-11-04 15:27:24.000000000 -0700
-+++ configure.ac	2006-11-04 15:28:32.000000000 -0700
-@@ -1342,7 +1342,7 @@
- 
- 	dnl these only go in xorg-config.h
- 	XF86CONFIGFILE="xorg.conf"
--	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
-+	CONFIGFILE="$sysconfdir/X11/$XF86CONFIGFILE"
- 	LOGPREFIX="$logdir/Xorg."
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
diff --git a/hardened/x11-base/xorg-server/files/CVE-2006-1526-xrender-mitri.patch b/hardened/x11-base/xorg-server/files/CVE-2006-1526-xrender-mitri.patch
deleted file mode 100644
index a832b8d..0000000
--- a/hardened/x11-base/xorg-server/files/CVE-2006-1526-xrender-mitri.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- xserver/xorg/render/mitri.c	3 Jul 2005 07:02:08 -0000	1.5
-+++ xserver/xorg/render/mitri.c	18 Apr 2006 22:34:08 -0000
-@@ -145,7 +145,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     first = points++;
-
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7
deleted file mode 100644
index b2e8218..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
-RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
-SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
-MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
-RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
-SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1
deleted file mode 100644
index 33bc255..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 d070c58a598fb52c5cb86344725c4ad6 xorg-server-1.1.0.tar.bz2 6322751
-RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 xorg-server-1.1.0.tar.bz2 6322751
-SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461 xorg-server-1.1.0.tar.bz2 6322751
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1
deleted file mode 100644
index 740e340..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1
deleted file mode 100644
index 1330edc..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2
deleted file mode 100644
index 1330edc..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3
deleted file mode 100644
index 1330edc..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4
deleted file mode 100644
index 1330edc..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
-MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
-RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
-SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1
deleted file mode 100644
index 0364100..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.1.99.903-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
-RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
-SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
-MD5 aa7d6b3577d4d851faf1c591df490bd5 xorg-server-1.1.99.903.tar.bz2 5980396
-RMD160 f6039cab1f233d2785b147e0963ccb90dcd735cd xorg-server-1.1.99.903.tar.bz2 5980396
-SHA256 da42f8b8118bbe6afe8b920c986835bff05923f38bd7adc96534fa7788c25cde xorg-server-1.1.99.903.tar.bz2 5980396
diff --git a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0 b/hardened/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0
deleted file mode 100644
index 1069963..0000000
--- a/hardened/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
-RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
-SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
-MD5 b21e7262541f6d3c8c5dfdfd29238bbe xorg-server-1.2.99.0.tar.bz2 6170605
-RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e xorg-server-1.2.99.0.tar.bz2 6170605
-SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0 xorg-server-1.2.99.0.tar.bz2 6170605
diff --git a/hardened/x11-base/xorg-server/files/x11r7.0-setuid.diff b/hardened/x11-base/xorg-server/files/x11r7.0-setuid.diff
deleted file mode 100644
index 4d81353..0000000
--- a/hardened/x11-base/xorg-server/files/x11r7.0-setuid.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: xserver/xorg/hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.29
-diff -u -u -r1.29 xf86Init.c
---- xserver/xorg/hw/xfree86/common/xf86Init.c	14 Dec 2005 20:11:16 -0000	1.29
-+++ xserver/xorg/hw/xfree86/common/xf86Init.c	20 Jun 2006 07:58:44 -0000
-@@ -1905,7 +1905,11 @@
-           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-           break;
-       case 0:  /* child */
--          setuid(getuid());
-+	  if (setuid(getuid()) == -1) {
-+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+			 strerror(errno));
-+	      exit(255);
-+	  }
-           /* set stdin, stdout to the consoleFd */
-           for (i = 0; i < 2; i++) {
-             if (xf86Info.consoleFd != i) {
-Index: xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
-retrieving revision 1.9
-diff -u -u -r1.9 libc_wrapper.c
---- xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c	3 Jul 2005 08:53:48 -0000	1.9
-+++ xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c	20 Jun 2006 07:58:45 -0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- 	xf86DisableIO();
- #endif
--        setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+		exit(255);
-+	}
- #if !defined(SELF_CONTAINED_WRAPPER)
-         /* set stdin, stdout to the consoleFD, and leave stderr alone */
-         for (i = 0; i < 2; i++)
-Index: xserver/xorg/hw/xfree86/parser/write.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
-retrieving revision 1.3
-diff -u -u -r1.3 write.c
---- xserver/xorg/hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
-+++ xserver/xorg/hw/xfree86/parser/write.c	20 Jun 2006 07:58:45 -0000
-@@ -170,7 +170,10 @@
- 					strerror(errno));
- 			return 0;
- 		case 0: /* child */
--			setuid(getuid());
-+			if (setuid(getuid()) == -1) 
-+			    FatalError("xf86writeConfigFile(): "
-+				"setuid failed(%s)\n", 
-+				strerror(errno));
- 			ret = doWriteConfigFile(filename, cptr);
- 			exit(ret);
- 			break;
-Index: xserver/xorg/os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
-retrieving revision 1.21
-diff -u -u -r1.21 utils.c
---- xserver/xorg/os/utils.c	8 Nov 2005 06:33:30 -0000	1.21
-+++ xserver/xorg/os/utils.c	20 Jun 2006 07:58:47 -0000
-@@ -1718,8 +1718,10 @@
-     case -1:	/* error */
- 	p = -1;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- 	_exit(127);
-     default:	/* parent */
-@@ -1770,8 +1772,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-@@ -1845,8 +1849,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
diff --git a/hardened/x11-base/xorg-server/files/xorg-conf-example.patch b/hardened/x11-base/xorg-server/files/xorg-conf-example.patch
deleted file mode 100644
index 8ec7476..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-conf-example.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.ac.old	2006-09-24 11:30:40.000000000 -0600
-+++ configure.ac	2006-09-24 11:31:11.000000000 -0600
-@@ -806,6 +806,7 @@
- 
- AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
- AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
-+AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
- AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
- AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
- AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
---- hw/xfree86/xorgconf.cpp.old 2006-09-29 19:02:00.000000000 -0600
-+++ hw/xfree86/xorgconf.cpp     2006-09-29 19:02:07.000000000 -0600
-@@ -54,10 +54,7 @@
- 
-     FontPath	LOCALFONTPATH
-     FontPath	MISCFONTPATH
--    FontPath	DPI75USFONTPATH
--    FontPath	DPI100USFONTPATH
-     FontPath	T1FONTPATH
--    FontPath    TRUETYPEFONTPATH
-+    FontPath	TRUETYPEFONTPATH
-     FontPath	CIDFONTPATH
--    FontPath	SPFONTPATH
-     FontPath	DPI75FONTPATH
---- hw/xfree86/Makefile.am.old	2006-09-24 11:59:57.000000000 -0600
-+++ hw/xfree86/Makefile.am	2006-09-24 11:59:51.000000000 -0600
-@@ -1,3 +1,5 @@
-+include $(top_srcdir)/cpprules.in
-+
- if DRI
- DRI_SUBDIR = dri
- endif
-@@ -75,7 +77,23 @@
- optionsdir = $(libdir)/X11
- dist_options_DATA = Options
- 
-+BUILT_SOURCES = xorg.conf.example
-+CLEAN = xorg.conf.example xorg.conf.example.pre
- EXTRA_DIST = xorgconf.cpp
- 
-+CPP_FILES_FLAGS = \
-+	-DRGBPATH=\"$(RGB_DB)\" \
-+	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
-+	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
-+	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
-+	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
-+	-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
-+	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
-+	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
-+	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
-+
- relink:
- 	rm -f Xorg && $(MAKE) Xorg
-+
-+xorg.conf.example.pre: xorgconf.cpp
-+	cp $< $@
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch
deleted file mode 100644
index 23aa89a..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2005-11-30 02:02:16.000000000 +0300
-+++ ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2006-02-07 10:38:46.000000000 +0300
-@@ -39,6 +39,9 @@
- # include "imports.h"
- # define __glXMemset  memset
- #else
-+# if defined (HAVE_DIX_CONFIG_H)
-+#  include <dix-config.h>
-+# endif
- # include <X11/X.h>
- # include <GL/glx.h>
- # include "GL/glxint.h"
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch
deleted file mode 100644
index 55177bc..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
-rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.70
-retrieving revision 1.71
-diff -u -r1.70 -r1.71
---- ../Mesa-6.4.2/src/mesa/main/glheader.h	2006/02/11 02:59:38	1.70
-+++ ../Mesa-6.4.2/src/mesa/main/glheader.h	2006/02/15 21:03:34	1.71
-@@ -46,6 +46,9 @@
- #ifndef GLHEADER_H
- #define GLHEADER_H
- 
-+#ifdef HAVE_DIX_CONFIG_H
-+#include "dix-config.h"
-+#endif
- 
- #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
- #include "xf86_ansic.h"
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch
deleted file mode 100644
index 4c1291b..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
-rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c	2005/08/19 18:53:26	1.6
-+++ ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c	2006/02/14 15:04:45	1.7
-@@ -530,7 +530,7 @@
- emit_DrawArrays_header_old( __GLXcontext * gc,
- 			    struct array_state_vector * arrays,
- 			    size_t * elements_per_request,
--			    size_t * total_requests,
-+			    unsigned int * total_requests,
- 			    GLenum mode, GLsizei count )
- {
-     size_t command_size;
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch
deleted file mode 100644
index f9b8e7b..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- hw/xfree86/os-support/bus/xf86Sbus.h-	2005-12-19 19:30:39.000000000 +0000
-+++ hw/xfree86/os-support/bus/xf86Sbus.h	2005-12-19 19:30:39.000000000 +0000
-@@ -0,0 +1,70 @@
-+/*
-+ * Platform specific SBUS and OpenPROM access declarations.
-+ *
-+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
-+
-+#ifdef HAVE_XORG_CONFIG_H
-+#include <xorg-config.h>
-+#endif
-+
-+#ifndef _XF86_SBUS_H
-+#define _XF86_SBUS_H
-+
-+#if defined(linux)
-+#include <asm/types.h>
-+#include <linux/fb.h>
-+#include <asm/fbio.h>
-+#include <asm/openpromio.h>
-+#elif defined(SVR4)
-+#include <sys/fbio.h>
-+#include <sys/openpromio.h>
-+#elif defined(__OpenBSD__) && defined(__sparc64__)
-+/* XXX */
-+#elif defined(CSRG_BASED)
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/fbio.h>
-+#include <dev/ofw/openpromio.h>
-+#else
-+#include <machine/fbio.h>
-+#endif
-+#else
-+#include <sun/fbio.h>
-+#endif
-+
-+#ifndef FBTYPE_SUNGP3
-+#define FBTYPE_SUNGP3 -1
-+#endif
-+#ifndef FBTYPE_MDICOLOR
-+#define FBTYPE_MDICOLOR -1
-+#endif
-+#ifndef FBTYPE_SUNLEO
-+#define FBTYPE_SUNLEO -1
-+#endif
-+#ifndef FBTYPE_TCXCOLOR
-+#define FBTYPE_TCXCOLOR -1
-+#endif
-+#ifndef FBTYPE_CREATOR
-+#define FBTYPE_CREATOR -1
-+#endif
-+
-+#endif /* _XF86_SBUS_H */
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
deleted file mode 100644
index 85f9db0..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
-retrieving revision 1.157
-diff -u -r1.157 configure.ac
---- configure.ac	30 Dec 2005 12:05:47 -0000	1.157
-+++ configure.ac	6 Jan 2006 16:05:21 -0000
-@@ -1632,6 +1632,7 @@
- Xprint/Makefile
- Xprint/doc/Makefile
- Xprint/pcl/Makefile
-+Xprint/pcl-mono/Makefile
- Xprint/raster/Makefile
- Xprint/ps/Makefile
- Xprint/etc/Makefile
-Index: Xprint/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
-retrieving revision 1.6
-diff -u -r1.6 Makefile.am
---- Xprint/Makefile.am	2 Dec 2005 06:02:38 -0000	1.6
-+++ Xprint/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -1,13 +1,17 @@
--SUBDIRS = doc pcl raster ps etc
-+SUBDIRS = doc pcl pcl-mono raster ps etc
- 
- bin_PROGRAMS = Xprt
- 
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
--	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
--	-DXPRINTDIR=\"$(prefix)/X11/xserver\"  
-+	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
-+	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
-+	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
- 
- Xprt_LDFLAGS = -L$(top_srcdir)
--Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
-+Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
-+	pcl/libpcl.la pcl-mono/libpcl.la  \
-+	../mfb/libmfb.la ../mi/libmi.la  \
-+	../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
- 
- miinitext-wrapper.c:
- 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
-Index: Xprint/ddxInit.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
-retrieving revision 1.7
-diff -u -r1.7 ddxInit.c
---- Xprint/ddxInit.c	3 Jul 2005 07:01:09 -0000	1.7
-+++ Xprint/ddxInit.c	6 Jan 2006 16:05:22 -0000
-@@ -85,6 +85,11 @@
- 
-     pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
-     screenInfo.numVideoScreens = 0;
-+    
-+#ifdef PRINT_ONLY_SERVER
-+    PrinterInitOutput(pScreenInfo, argc, argv);
-+#endif
-+
- }
- 
- static void
-Index: Xprint/pcl/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
-retrieving revision 1.3
-diff -u -r1.3 Makefile.am
---- Xprint/pcl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
-+++ Xprint/pcl/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -1,31 +1,6 @@
- noinst_LTLIBRARIES = libpcl.la
- 
--INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-+PCL_DRIVER = -DXP_PCL_COLOR
- 
--AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
--	-D_XP_PRINT_SERVER_ -DPSZ=8
-+include ../pcl/Makefile.am.inc
- 
--libpcl_la_SOURCES =		\
--	PclArc.c		\
--	PclArea.c		\
--	PclAttr.c		\
--	PclAttVal.c		\
--	PclColor.c		\
--	PclCursor.c		\
--	PclDef.h		\
--	PclFonts.c		\
--	PclGC.c			\
--	Pcl.h			\
--	PclInit.c		\
--	PclLine.c		\
--	Pclmap.h		\
--	PclMisc.c		\
--	PclPixel.c		\
--	PclPixmap.c		\
--	PclPolygon.c		\
--	PclPrint.c		\
--	PclSFonts.c		\
--	PclSFonts.h		\
--	PclSpans.c		\
--	PclText.c		\
--	PclWindow.c
-Index: cfb/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.am
---- cfb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.7
-+++ cfb/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -9,7 +9,7 @@
- 
- libcfb_la_LIBADD = ../mfb/libmfb.la
- 
--AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
- 
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
- 
-Index: cfb/Makefile.am.inc
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile.am.inc
---- cfb/Makefile.am.inc	21 Sep 2005 00:24:10 -0000	1.2
-+++ cfb/Makefile.am.inc	6 Jan 2006 16:05:22 -0000
-@@ -138,3 +138,16 @@
- cfbglrop8.c:
- 	echo "#define GLYPHROP" > $@
- 	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
-+
-+
-+if XPRINT
-+
-+PLATFORMDEFS = -DXFREE86
-+
-+cfb8bit.c:   compiler.h
-+
-+compiler.h:
-+	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
-+
-+endif
-+
-Index: cfb16/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb16/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
-+++ cfb16/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -6,4 +6,4 @@
- 
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
- 
--AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-Index: cfb24/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb24/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
-+++ cfb24/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -6,6 +6,6 @@
- 
- EXTRA_DIST = cfbrrop24.h
- 
--AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
- 
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
-Index: cfb32/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb32/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
-+++ cfb32/Makefile.am	6 Jan 2006 16:05:22 -0000
-@@ -6,4 +6,4 @@
- 
- INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
- 
--AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-Index: mi/miinitext.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
-retrieving revision 1.28
-diff -u -r1.28 miinitext.c
---- mi/miinitext.c	29 Dec 2005 00:19:33 -0000	1.28
-+++ mi/miinitext.c	6 Jan 2006 16:05:27 -0000
-@@ -250,7 +250,7 @@
- #include <X11/extensions/lbxstr.h>
- #endif
- #ifdef XPRINT
--#include "Print.h"
-+#include <X11/extensions/Print.h>
- #endif
- #ifdef XAPPGROUP
- #define _XAG_SERVER_
---- Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:44	1.1
-+++ Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:49
-@@ -0,0 +1,5 @@
-+noinst_LTLIBRARIES = libpcl.la
-+
-+PCL_DRIVER = -DXP_PCL_MONO
-+
-+include ../pcl/Makefile.am.inc
---- Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:44     1.1
-+++ Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:49
-@@ -0,0 +1,29 @@
-+INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-+ 
-+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-+	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
-+ 
-+libpcl_la_SOURCES =		\
-+	$(srcdir)/../pcl/PclArc.c	\
-+	$(srcdir)/../pcl/PclArea.c	\
-+	$(srcdir)/../pcl/PclAttr.c	\
-+	$(srcdir)/../pcl/PclAttVal.c	\
-+	$(srcdir)/../pcl/PclColor.c	\
-+	$(srcdir)/../pcl/PclCursor.c	\
-+	$(srcdir)/../pcl/PclDef.h	\
-+	$(srcdir)/../pcl/PclFonts.c	\
-+	$(srcdir)/../pcl/PclGC.c	\
-+	$(srcdir)/../pcl/Pcl.h		\
-+	$(srcdir)/../pcl/PclInit.c	\
-+	$(srcdir)/../pcl/PclLine.c	\
-+	$(srcdir)/../pcl/Pclmap.h	\
-+	$(srcdir)/../pcl/PclMisc.c	\
-+	$(srcdir)/../pcl/PclPixel.c	\
-+	$(srcdir)/../pcl/PclPixmap.c	\
-+	$(srcdir)/../pcl/PclPolygon.c	\
-+	$(srcdir)/../pcl/PclPrint.c	\
-+	$(srcdir)/../pcl/PclSFonts.c	\
-+	$(srcdir)/../pcl/PclSFonts.h	\
-+	$(srcdir)/../pcl/PclSpans.c	\
-+	$(srcdir)/../pcl/PclText.c	\
-+	$(srcdir)/../pcl/PclWindow.c
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch
deleted file mode 100644
index fff5ce1..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-dri-weak-glx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: xorg-server-1.0.2/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.0.2/hw/xfree86/dri/dri.c
-@@ -75,6 +75,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -783,13 +788,24 @@ static Bool
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreenInfo *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -847,11 +863,22 @@ DRICreateContext(ScreenPtr pScreen, Visu
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreenInfo *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-glx-needs-GLcore.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-glx-needs-GLcore.patch
deleted file mode 100644
index 61ff275..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-glx-needs-GLcore.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xorg-server-1.0.2/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.0.2/hw/xfree86/dixmods/Makefile.am
-@@ -84,7 +84,8 @@ libfb_la_LIBADD = $(top_builddir)/fb/lib
- libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
- 
- libglx_la_LDFLAGS = -avoid-version
--libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la
-+libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \
-+		   ./libGLcore.la
- libglx_la_SOURCES = glxmodule.c
- 
- liblayer_la_LDFLAGS = -avoid-version
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch
deleted file mode 100644
index 13a66d4..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v
-rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- xorg.orig/xserver/xorg/cfb/cfbrrop.h	2005/07/03 07:01:15	1.4
-+++ xorg/xserver/xorg/cfb/cfbrrop.h	2006/03/20 18:43:18	1.5
-@@ -284,6 +284,7 @@
- #define RROP_UNROLL_CASE4(p,i)    RROP_UNROLL_CASE2(p,(i)+2) RROP_UNROLL_CASE2(p,i)
- #define RROP_UNROLL_CASE8(p,i)    RROP_UNROLL_CASE4(p,(i)+4) RROP_UNROLL_CASE4(p,i)
- #define RROP_UNROLL_CASE16(p,i)   RROP_UNROLL_CASE8(p,(i)+8) RROP_UNROLL_CASE8(p,i)
-+#define RROP_UNROLL_CASE32(p,i)   RROP_UNROLL_CASE16(p,(i)+16) RROP_UNROLL_CASE16(p,i)
- #define RROP_UNROLL_CASE3(p)	RROP_UNROLL_CASE2(p,2) RROP_UNROLL_CASE1(p,1)
- #define RROP_UNROLL_CASE7(p)	RROP_UNROLL_CASE4(p,4) RROP_UNROLL_CASE3(p)
- #define RROP_UNROLL_CASE15(p)	RROP_UNROLL_CASE8(p,8) RROP_UNROLL_CASE7(p)
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
deleted file mode 100644
index a4783ab..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Xprint/etc/init.d/Makefile.am	2006/04/14 04:47:28	1.1
-+++ Xprint/etc/init.d/Makefile.am	2006/04/14 05:26:42
-@@ -1 +1,12 @@
-+include $(top_srcdir)/cpprules.in
-+
-+noinst_PRE = xprint
-+BUILT_SOURCES = $(noinst_PRE)
-+CLEANFILES = $(noinst_PRE) xprint.pre
-+
-+CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX
-+
-+xprint.pre: xprint.cpp
-+	$(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@
-+
- EXTRA_DIST = xprint.cpp
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-dri-weak-glx.patch
deleted file mode 100644
index 4095d88..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-dri-weak-glx.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- hw/xfree86/dri/dri.c.orig	2006-07-01 10:48:09.000000000 +0200
-+++ hw/xfree86/dri/dri.c	2006-07-01 10:57:06.000000000 +0200
-@@ -73,6 +73,11 @@
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -781,13 +786,24 @@
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -845,11 +861,22 @@
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-glx-needs-GLcore.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-glx-needs-GLcore.patch
deleted file mode 100644
index 97d8e2d..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-glx-needs-GLcore.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hw/xfree86/dixmods/Makefile.am.orig 2006-06-30 12:47:17.000000000 +0200
-+++ hw/xfree86/dixmods/Makefile.am      2006-06-30 12:48:27.000000000 +0200
-@@ -78,6 +78,7 @@
- endif
- libglx_la_LIBADD = \
-        $(top_builddir)/GL/glx/libglx.la \
-+       ./libGLcore.la \
-        $(GLXDRI_LIBRARY)
- libglx_la_SOURCES = glxmodule.c
-
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff b/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
deleted file mode 100644
index 96d2d0a..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.33.2.2
-diff -u -u -r1.33.2.2 xf86Init.c
---- hw/xfree86/common/xf86Init.c	9 May 2006 18:04:19 -0000	1.33.2.2
-+++ hw/xfree86/common/xf86Init.c	20 Jun 2006 08:33:03 -0000
-@@ -1905,7 +1905,11 @@
-           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-           break;
-       case 0:  /* child */
--          setuid(getuid());
-+	  if (setuid(getuid()) == -1) {
-+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+			 strerror(errno));
-+	      exit(255);
-+	  }
-           /* set stdin, stdout to the consoleFd */
-           for (i = 0; i < 2; i++) {
-             if (xf86Info.consoleFd != i) {
-Index: hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
-retrieving revision 1.11
-diff -u -u -r1.11 libc_wrapper.c
---- hw/xfree86/os-support/shared/libc_wrapper.c	25 Mar 2006 19:52:04 -0000	1.11
-+++ hw/xfree86/os-support/shared/libc_wrapper.c	20 Jun 2006 08:33:03 -0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- 	xf86DisableIO();
- #endif
--        setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+		exit(255);
-+	}
- #if !defined(SELF_CONTAINED_WRAPPER)
-         /* set stdin, stdout to the consoleFD, and leave stderr alone */
-         for (i = 0; i < 2; i++)
-Index: hw/xfree86/parser/write.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
-retrieving revision 1.3
-diff -u -u -r1.3 write.c
---- hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
-+++ hw/xfree86/parser/write.c	20 Jun 2006 08:33:03 -0000
-@@ -170,7 +170,10 @@
- 					strerror(errno));
- 			return 0;
- 		case 0: /* child */
--			setuid(getuid());
-+			if (setuid(getuid()) == -1) 
-+			    FatalError("xf86writeConfigFile(): "
-+				"setuid failed(%s)\n", 
-+				strerror(errno));
- 			ret = doWriteConfigFile(filename, cptr);
- 			exit(ret);
- 			break;
-Index: os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
-retrieving revision 1.25
-diff -u -u -r1.25 utils.c
---- os/utils.c	25 Mar 2006 19:52:05 -0000	1.25
-+++ os/utils.c	20 Jun 2006 08:33:04 -0000
-@@ -1721,8 +1721,10 @@
-     case -1:	/* error */
- 	p = -1;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- 	_exit(127);
-     default:	/* parent */
-@@ -1773,8 +1775,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-@@ -1848,8 +1852,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-dri-weak-glx.patch
deleted file mode 100644
index 79c4e8a..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-dri-weak-glx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: xorg-server-1.1.1/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.1.1.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.1.1/hw/xfree86/dri/dri.c
-@@ -73,6 +73,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -781,13 +786,24 @@ static Bool
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -845,11 +861,22 @@ DRICreateContext(ScreenPtr pScreen, Visu
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-glx-needs-GLcore.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-glx-needs-GLcore.patch
deleted file mode 100644
index e7ab7ec..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-glx-needs-GLcore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server-1.1.1.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am
-@@ -78,6 +78,7 @@ GLXDRI_LIBRARY = $(top_builddir)/GL/glx/
- endif
- libglx_la_LIBADD = \
- 	$(top_builddir)/GL/glx/libglx.la \
-+	./libGLcore.la \
- 	$(GLXDRI_LIBRARY)
- libglx_la_SOURCES = glxmodule.c
- 
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-install-libxf86config-headers.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-install-libxf86config-headers.patch
deleted file mode 100644
index 07b5219..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.1-install-libxf86config-headers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index acda83d..6b9b62a 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -25,10 +25,12 @@ libxf86config_a_SOURCES = \
- 
- AM_CFLAGS = $(XORG_CFLAGS)
- 
-+sdk_HEADERS = \
-+	xf86Optrec.h \
-+	xf86Parser.h
-+
- EXTRA_DIST = \
- 	Configint.h \
- 	configProcs.h \
--	xf86Optrec.h \
--	xf86Parser.h \
- 	xf86tokens.h \
- 	cpconfig.c
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch
deleted file mode 100644
index 181273c..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.901-GetDrawableAttributes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- xorg-server-9999/GL/glx/indirect_table.c.orig	2006-10-12 16:02:06.000000000 +0800
-+++ xorg-server-9999/GL/glx/indirect_table.c	2006-10-12 16:15:35.000000000 +0800
-@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di
- 
- /*****************************************************************/
- /* tree depth = 13 */
--static const int_fast16_t VendorPriv_dispatch_tree[155] = {
-+static const int_fast16_t VendorPriv_dispatch_tree[159] = {
-     /* [0] -> opcode range [0, 131072], node depth 1 */
-     2,
-     5,
-@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis
-     /* [152] -> opcode range [65536, 65552], node depth 13 */
-     1,
-     LEAF(88),
-+    156,
-     EMPTY_LEAF,
- 
-+    /* [156] -> opcode range [65544, 65552], node depth 13 */
-+    1,
-+    LEAF(96),
-+    EMPTY_LEAF,
- };
- 
--static const void *VendorPriv_function_table[96][2] = {
-+static const void *VendorPriv_function_table[99][2] = {
-     /* [  0] =     0 */ {NULL, NULL},
-     /* [  1] =     1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
-     /* [  2] =     2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
-@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t
-     /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
-     /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
-     /* [ 95] = 65543 */ {NULL, NULL},
-+    /* [ 96] = 65544 */ {NULL, NULL},
-+    /* [ 97] = 65545 */ {NULL, NULL},
-+    /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
- };
- 
- const struct __glXDispatchInfo VendorPriv_dispatch_info = {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-dri-weak-glx.patch
deleted file mode 100644
index ec8f240..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-dri-weak-glx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: xorg-server-1.1.99.903/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.1.99.903.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.1.99.903/hw/xfree86/dri/dri.c
-@@ -75,6 +75,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -800,13 +805,24 @@ static Bool
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -864,11 +880,22 @@ DRICreateContext(ScreenPtr pScreen, Visu
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-glx-needs-GLcore.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-glx-needs-GLcore.patch
deleted file mode 100644
index b056c2b..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.1.99.903-glx-needs-GLcore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xorg-server-1.1.99.903/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server-1.1.99.903.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.1.99.903/hw/xfree86/dixmods/Makefile.am
-@@ -72,6 +72,7 @@ GLXDRI_LIBRARY = $(top_builddir)/GL/glx/
- endif
- libglx_la_LIBADD = \
- 	$(top_builddir)/GL/glx/libglx.la \
-+	./libGLcore.la \
- 	$(GLXDRI_LIBRARY)
- libglx_la_SOURCES = glxmodule.c
- 
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-dri-weak-glx.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-dri-weak-glx.patch
deleted file mode 100644
index 0ebdb76..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-dri-weak-glx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: xorg-server-1.2.99.0/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.2.99.0.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.2.99.0/hw/xfree86/dri/dri.c
-@@ -72,6 +72,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- extern Bool noPanoramiXExtension;
- #endif
- 
-+#ifdef XFree86LOADER
-+typedef __GLXscreen *(*__glXgetActiveScreenFn)(int);
-+__glXgetActiveScreenFn __glXgetActiveScreenPtr = NULL;
-+#endif
-+
- static int DRIScreenPrivIndex = -1;
- static int DRIWindowPrivIndex = -1;
- static unsigned long DRIGeneration = 0;
-@@ -774,13 +779,24 @@ static Bool
- DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
--    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
--    __GLcontextModes *modes = pGLXScreen->modes;
--    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-     DRIContextPrivPtr pDRIContextPriv;
-     void *contextStore;
-     VisualPtr visual;
-     int visNum;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-+    __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-+    __GLcontextModes *modes = pGLXScreen->modes;
-+    void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#endif
- 
-     visual = pScreen->visuals;
- 
-@@ -838,11 +854,22 @@ DRICreateContext(ScreenPtr pScreen, Visu
-                  XID context, drm_context_t * pHWContext)
- {
-     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-+    DRIContextPrivPtr pDRIContextPriv;
-+    void *contextStore;
-+#if defined(XFree86LOADER)
-+    __GLXscreen *pGLXScreen;
-+    __GLcontextModes *modes;
-+    void **pVisualConfigPriv;
-+    if (__glXgetActiveScreenPtr == NULL)
-+	__glXgetActiveScreenPtr = (__glXgetActiveScreenFn)LoaderSymbol("__glXgetActiveScreen");
-+    pGLXScreen = (*__glXgetActiveScreenPtr)(pScreen->myNum);
-+    modes = pGLXScreen->modes;
-+    pVisualConfigPriv = pGLXScreen->pVisualPriv;
-+#else
-     __GLXscreen *pGLXScreen = __glXgetActiveScreen(pScreen->myNum);
-     __GLcontextModes *modes = pGLXScreen->modes;
-     void **pVisualConfigPriv = pGLXScreen->pVisualPriv;
--    DRIContextPrivPtr pDRIContextPriv;
--    void *contextStore;
-+#endif
- 
-     if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
-         if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
diff --git a/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-glx-needs-GLcore.patch b/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-glx-needs-GLcore.patch
deleted file mode 100644
index a952d6c..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-server-1.2.99.0-glx-needs-GLcore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xorg-server-1.2.99.0/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server-1.2.99.0.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.2.99.0/hw/xfree86/dixmods/Makefile.am
-@@ -78,6 +78,7 @@ GLXDRI_LIBRARY = $(top_builddir)/GL/glx/
- endif
- libglx_la_LIBADD = \
- 	$(top_builddir)/GL/glx/libglx.la \
-+	./libGLcore.la \
- 	$(GLXDRI_LIBRARY)
- libglx_la_SOURCES = glxmodule.c
- 
diff --git a/hardened/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch b/hardened/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch
deleted file mode 100644
index 48f4380..0000000
--- a/hardened/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
-index 867fe57..4d5b0cd 100644
---- a/GL/mesa/main/Makefile.am
-+++ b/GL/mesa/main/Makefile.am
-@@ -29,6 +27,7 @@ nodist_libmain_la_SOURCES = accum.c \
-                     api_loopback.c \
-                     api_noop.c \
-                     api_validate.c \
-+                    arrayobj.c \
-                     attrib.c \
-                     blend.c \
-                     bufferobj.c \
-@@ -67,6 +66,7 @@ nodist_libmain_la_SOURCES = accum.c \
-                     points.c \
-                     polygon.c \
-                     rastpos.c \
-+                    rbadaptors.c \
-                     renderbuffer.c \
-                     state.c \
-                     stencil.c \
-diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
-index ccaa2a9..32f839a 100755
---- a/GL/symlink-mesa.sh
-+++ b/GL/symlink-mesa.sh
-@@ -88,8 +88,11 @@ symlink_mesa_main() {
-     action api_noop.h
-     action api_validate.c
-     action api_validate.h
-+    action arrayobj.c
-+    action arrayobj.h
-     action attrib.c
-     action attrib.h
-+    action bitset.h
-     action blend.c
-     action blend.h
-     action bufferobj.c
-@@ -168,6 +171,8 @@ symlink_mesa_main() {
-     action polygon.h
-     action rastpos.c
-     action rastpos.h
-+    action rbadaptors.c
-+    action rbadaptors.h
-     action renderbuffer.c
-     action renderbuffer.h
-     action simple_list.h
-@@ -468,7 +468,7 @@ symlink_mesa_shader_slang_library() {
-     action slang_core_gc.h
-     action slang_fragment_builtin_gc.h
-     action slang_shader_syn.h
--    action slang_version_syn.h
-+    action slang_pp_version_syn.h
-     action slang_vertex_builtin_gc.h
- }        
- 
diff --git a/hardened/x11-base/xorg-server/files/xprint.init b/hardened/x11-base/xorg-server/files/xprint.init
deleted file mode 100644
index e5fed1b..0000000
--- a/hardened/x11-base/xorg-server/files/xprint.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $
-
-opts="${opts} get_xpserverlist lsprinters"
-
-depend() {
-	use cupsd
-}
-
-start() {
-	ebegin "Starting xprint"
-	/usr/lib/misc/xprint start > /dev/null
-	eend $?
-}
-
-get_xpserverlist() {
-	/usr/lib/misc/xprint get_xpserverlist
-}
-
-lsprinters() {
-	/usr/lib/misc/xprint lsprinters
-}
-
-stop() {
-	ebegin "Stopping xprint"
-	/usr/lib/misc/xprint stop > /dev/null
-	eend $?
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild
deleted file mode 100644
index 05531a6..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r7.ebuild,v 1.6 2006/09/08 18:36:21 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
-
-inherit flag-o-matic x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.4.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
-	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
-	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
-	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
-	${FILESDIR}/${P}-64bit-fix-for-glx.patch
-	${FILESDIR}/${P}-Xprt-build.patch
-	${FILESDIR}/${P}-xprint-init.patch
-	${FILESDIR}/${PV}-Xprint-xprintdir.patch
-	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
-	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
-	${DISTDIR}/${PV}-overlay-window.patch.bz2
-	${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch
-	${FILESDIR}/${PV}-fix-rom-read-dualhead.patch
-	${FILESDIR}/x11r7.0-setuid.diff
-	${FILESDIR}/${P}-dri-weak-glx.patch
-	${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2"
-DESCRIPTION="X.Org X servers"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="dri ipv6 minimal xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	media-libs/mesa
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libdmx
-		x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.1_pre20051013
-	!minimal? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xprint)
-		--with-mesa-source=${WORKDIR}/${MESA_P}
-		--enable-xorg
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	use xprint && xprint_src_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
deleted file mode 100644
index 40a0da7..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,709 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.22 2006/10/06 21:57:29 wolf31o2 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${PN}-1.0.2-xprint-init.patch
-	${FILESDIR}/1.0.99.901-Xprint-xprintdir.patch
-	${FILESDIR}/${P}-setuid.diff
-	${FILESDIR}/${P}-dri-weak-glx.patch
-	${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 mips ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.6
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-###############################################################################
-###############################################################################
-##                                                                           ##
-##   REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES   ##
-##                                                                           ##
-###############################################################################
-###############################################################################
-PDEPEND="
-	xorg? ( || (
-			(
-				input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-				input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-				input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-				input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-				input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-				input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-				input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-				input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-				input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-				input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-				input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-				input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-				input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-				input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-				input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-				input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-				input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-				input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-				input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-				input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-				input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-				input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-				input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-				input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-				input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-				input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-				input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-				input_devices_synaptics? ( x11-drivers/synaptics )
-				input_devices_wacom? ( x11-drivers/linuxwacom )
-			)
-			!minimal? (
-				>=x11-drivers/xf86-input-acecad-1.1.0
-				>=x11-drivers/xf86-input-calcomp-1.1.0
-				>=x11-drivers/xf86-input-citron-2.2.0
-				>=x11-drivers/xf86-input-digitaledge-1.1.0
-				>=x11-drivers/xf86-input-dmc-1.1.0
-				>=x11-drivers/xf86-input-dynapro-1.1.0
-				>=x11-drivers/xf86-input-elo2300-1.1.0
-				>=x11-drivers/xf86-input-elographics-1.1.0
-				>=x11-drivers/xf86-input-fpit-1.1.0
-				>=x11-drivers/xf86-input-hyperpen-1.1.0
-				>=x11-drivers/xf86-input-jamstudio-1.1.0
-				>=x11-drivers/xf86-input-joystick-1.1.0
-				>=x11-drivers/xf86-input-keyboard-1.1.0
-				>=x11-drivers/xf86-input-magellan-1.1.0
-				>=x11-drivers/xf86-input-microtouch-1.1.0
-				>=x11-drivers/xf86-input-mouse-1.1.0
-				>=x11-drivers/xf86-input-mutouch-1.1.0
-				>=x11-drivers/xf86-input-palmax-1.1.0
-				>=x11-drivers/xf86-input-penmount-1.1.0
-				>=x11-drivers/xf86-input-spaceorb-1.1.0
-				>=x11-drivers/xf86-input-summa-1.1.0
-				>=x11-drivers/xf86-input-tek4957-1.1.0
-				>=x11-drivers/xf86-input-void-1.1.0
-
-				kernel_linux? (
-					>=x11-drivers/xf86-input-aiptek-1.0.1
-					>=x11-drivers/xf86-input-evdev-1.1.1
-					>=x11-drivers/xf86-input-ur98-1.1.0
-				)
-
-				x86? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-drivers/linuxwacom
-				)
-				x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-				amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0
-					x11-drivers/synaptics
-					x11-drivers/linuxwacom
-				)
-				ppc? ( x11-drivers/synaptics
-					x11-drivers/linuxwacom
-				)
-				ppc64? ( x11-drivers/synaptics
-					x11-drivers/linuxwacom
-				)
-			)
-		)
-	input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 )
-	|| (
-			(
-				video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-				video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-				video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-				video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-				video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-				video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-				video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-				video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-				video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-				video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-				video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-				video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-				video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-				video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-				video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-				video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-				video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-				video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-				video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-				video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-				video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-				video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-				video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-				video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-				video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-				video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-				video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-				video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-				video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-				video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-				video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-				video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-				video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-				video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-				video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-				video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-				video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-				video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-				video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-				video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-				video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-				video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-				video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-				video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-				video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-				video_cards_nvidia? ( || (
-						>=x11-drivers/nvidia-drivers-1.0.8774
-						>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-					)
-				)
-			)
-			!minimal? (
-				>=x11-drivers/xf86-video-dummy-0.2.0
-				>=x11-drivers/xf86-video-fbdev-0.2.0
-
-				!hppa? (
-					kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-				)
-
-				3dfx? ( >=media-libs/glide-v3-3.10 )
-
-				alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				amd64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				arm? ( >=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ia64? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				mips? ( >=x11-drivers/xf86-video-impact-0.2.0
-					>=x11-drivers/xf86-video-newport-0.2.0 )
-				ppc? ( >=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				ppc64? ( >=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1 )
-				sparc? ( >=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-sunbw2-1.1.0
-					>=x11-drivers/xf86-video-suncg14-1.1.0
-					>=x11-drivers/xf86-video-suncg3-1.1.0
-					>=x11-drivers/xf86-video-suncg6-1.1.0
-					>=x11-drivers/xf86-video-sunffb-1.1.0
-					>=x11-drivers/xf86-video-sunleo-1.1.0
-					>=x11-drivers/xf86-video-suntcx-1.1.0
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86? ( >=x11-drivers/xf86-video-apm-1.1.1
-					>=x11-drivers/xf86-video-ark-0.6.0
-					>=x11-drivers/xf86-video-ati-6.6.0
-					>=x11-drivers/xf86-video-chips-1.1.1
-					>=x11-drivers/xf86-video-cirrus-1.1.0
-					>=x11-drivers/xf86-video-cyrix-1.1.0
-					>=x11-drivers/xf86-video-glint-1.1.1
-					>=x11-drivers/xf86-video-i128-1.2.0
-					>=x11-drivers/xf86-video-i740-1.1.0
-					>=x11-drivers/xf86-video-i810-1.6.0
-					>=x11-drivers/xf86-video-imstt-1.1.0
-					>=x11-drivers/xf86-video-mga-1.4.1
-					>=x11-drivers/xf86-video-neomagic-1.1.1
-					>=x11-drivers/xf86-video-nsc-2.8.1
-					>=x11-drivers/xf86-video-nv-1.1.1
-					>=x11-drivers/xf86-video-rendition-4.1.0
-					>=x11-drivers/xf86-video-s3-0.4.1
-					>=x11-drivers/xf86-video-s3virge-1.9.1
-					>=x11-drivers/xf86-video-savage-2.1.1
-					>=x11-drivers/xf86-video-siliconmotion-1.4.1
-					>=x11-drivers/xf86-video-sis-0.9.1
-					>=x11-drivers/xf86-video-sisusb-0.8.1
-					>=x11-drivers/xf86-video-tdfx-1.2.1
-					>=x11-drivers/xf86-video-tga-1.1.0
-					>=x11-drivers/xf86-video-trident-1.2.1
-					>=x11-drivers/xf86-video-tseng-1.1.0
-					>=x11-drivers/xf86-video-vesa-1.1.0
-					>=x11-drivers/xf86-video-vga-4.1.0
-					>=x11-drivers/xf86-video-via-0.2.1
-					>=x11-drivers/xf86-video-vmware-10.13.0
-					>=x11-drivers/xf86-video-voodoo-1.1.0 )
-				x86-fbsd? (
-					>=x11-drivers/xf86-video-vmware-10.13.0 )
-			)
-		) )"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# Bug #145274 - anything that uses vm86.h is broken on AMD64
-	if use kdrive && use amd64 && use video_cards_vesa; then
-		eerror "kdrive's VESA driver does not build on AMD64 because it uses"
-		eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
-		die "kdrive's VESA driver does not build on AMD64."
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		einfo "Removing unused kdrive drivers ..."
-		for card in ${IUSE_VIDEO_CARDS}; do
-			# (bug #136370) Radeon needs fbdev and vesa
-			if use video_cards_radeon; then
-				if [[ ${card} = video_cards_fbdev ]] \
-					|| [[ ${card} = video_cards_vesa ]]; then
-					continue
-				fi
-			fi
-
-			real_card=${card#video_cards_}
-
-			# Differences between VIDEO_CARDS name and kdrive server name
-			real_card=${real_card/glint/pm2}
-			real_card=${real_card/radeon/ati}
-			real_card=${real_card/nv/nvidia}
-			real_card=${real_card/siliconmotion/smi}
-			real_card=${real_card/%sis/sis300}
-			if ! use ${card}; then
-				ebegin "  ${real_card}"
-				sed -i \
-					-e "s:\b${real_card}\b::g" \
-					${S}/hw/kdrive/Makefile.am \
-					|| die "sed of ${real_card} failed"
-				eend
-			fi
-
-		done
-
-		# smi and via are the only things on line 2. If line 2 ends up blank,
-		# we need to get rid of the backslash at the end of line 1.
-		if ! use video_cards_siliconmotion && ! use video_cards_via; then
-			sed -i \
-				-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-				${S}/hw/kdrive/Makefile.am
-		fi
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
deleted file mode 100644
index b14fb21..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,551 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.21 2006/12/01 18:24:51 gustavoz Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-		${FILESDIR}/${P}-install-libxf86config-headers.patch
-		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-		${FILESDIR}/xorg-conf-example.patch
-		${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-	# Patches required for compiz to work with AIGLX,
-	# but they slow EXA down (bug #147841).
-	if use aiglx; then
-		einfo "AIGLX patches will be applied."
-		ewarn "These patches are known to cause problems with EXA enabled."
-		PATCHES="${FILESDIR}/01-no-move-damage.patch
-			${FILESDIR}/02-dont-backfill-bg-none.patch
-			${FILESDIR}/03-tfp-damage.patch
-			${FILESDIR}/04-mesa-copy-sub-buffer.patch
-			${FILESDIR}/05-offscreen-pixmaps.patch
-			${FILESDIR}/06-aiglx-happy-vt-switch.patch
-			${PATCHES}"
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild
deleted file mode 100644
index 5715da5..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild,v 1.1 2006/11/09 16:05:49 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-		${FILESDIR}/${P}-install-libxf86config-headers.patch
-		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-		${FILESDIR}/xorg-conf-example.patch
-		${FILESDIR}/${PV}-fix_acpi_tokenize.patch
-		${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-	# Patches required for compiz to work with AIGLX,
-	# but they slow EXA down (bug #147841).
-	if use aiglx; then
-		einfo "AIGLX patches will be applied."
-		ewarn "These patches are known to cause problems with EXA enabled."
-		PATCHES="${FILESDIR}/01-no-move-damage.patch
-			${FILESDIR}/02-dont-backfill-bg-none.patch
-			${FILESDIR}/03-tfp-damage.patch
-			${FILESDIR}/04-mesa-copy-sub-buffer.patch
-			${FILESDIR}/05-offscreen-pixmaps.patch
-			${FILESDIR}/06-aiglx-happy-vt-switch.patch
-			${PATCHES}"
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild
deleted file mode 100644
index 3ed26a3..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,553 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild,v 1.2 2006/12/07 16:49:11 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-		${FILESDIR}/${P}-install-libxf86config-headers.patch
-		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-		${FILESDIR}/xorg-conf-example.patch
-		${FILESDIR}/${PV}-fix_acpi_tokenize.patch
-		${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-	# Patches required for compiz to work with AIGLX,
-	# but they slow EXA down (bug #147841).
-	if use aiglx; then
-		einfo "AIGLX patches will be applied."
-		ewarn "These patches are known to cause problems with EXA enabled."
-		PATCHES="${FILESDIR}/01-no-move-damage.patch
-			${FILESDIR}/02-dont-backfill-bg-none.patch
-			${FILESDIR}/03-tfp-damage.patch
-			${FILESDIR}/04-mesa-copy-sub-buffer.patch
-			${FILESDIR}/05-offscreen-pixmaps.patch
-			${FILESDIR}/06-aiglx-happy-vt-switch.patch
-			${FILESDIR}/${PV}-fix_big_endian_glx.patch
-			${PATCHES}"
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild
deleted file mode 100644
index ed902d0..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild,v 1.3 2007/01/13 23:24:22 ticho Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-		${FILESDIR}/${P}-install-libxf86config-headers.patch
-		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-		${FILESDIR}/xorg-conf-example.patch
-		${FILESDIR}/${PV}-fix_acpi_tokenize.patch
-		${FILESDIR}/${PV}-dbe-render.diff
-		${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-	# Patches required for compiz to work with AIGLX,
-	# but they slow EXA down (bug #147841).
-	if use aiglx; then
-		einfo "AIGLX patches will be applied."
-		ewarn "These patches are known to cause problems with EXA enabled."
-		PATCHES="${FILESDIR}/01-no-move-damage.patch
-			${FILESDIR}/02-dont-backfill-bg-none.patch
-			${FILESDIR}/03-tfp-damage.patch
-			${FILESDIR}/04-mesa-copy-sub-buffer.patch
-			${FILESDIR}/05-offscreen-pixmaps.patch
-			${FILESDIR}/06-aiglx-happy-vt-switch.patch
-			${FILESDIR}/${PV}-fix_big_endian_glx.patch
-			${PATCHES}"
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.1.ebuild
deleted file mode 100644
index 22a3363..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.1.ebuild
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.21 2006/10/06 21:57:29 wolf31o2 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-	${FILESDIR}/${P}-dri-weak-glx.patch
-	${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 mips ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5-r2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.6
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# Bug #145274 - anything that uses vm86.h is broken on AMD64
-	if use kdrive && use amd64 && use video_cards_vesa; then
-		eerror "kdrive's VESA driver does not build on AMD64 because it uses"
-		eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
-		die "kdrive's VESA driver does not build on AMD64."
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		einfo "Removing unused kdrive drivers ..."
-		for card in ${IUSE_VIDEO_CARDS}; do
-			# (bug #136370) Radeon needs fbdev and vesa
-			if use video_cards_radeon; then
-				if [[ ${card} = video_cards_fbdev ]] \
-					|| [[ ${card} = video_cards_vesa ]]; then
-					continue
-				fi
-			fi
-
-			real_card=${card#video_cards_}
-
-			# Differences between VIDEO_CARDS name and kdrive server name
-			real_card=${real_card/glint/pm2}
-			real_card=${real_card/radeon/ati}
-			real_card=${real_card/nv/nvidia}
-			real_card=${real_card/siliconmotion/smi}
-			real_card=${real_card/%sis/sis300}
-			if ! use ${card}; then
-				ebegin "  ${real_card}"
-				sed -i \
-					-e "s:\b${real_card}\b::g" \
-					${S}/hw/kdrive/Makefile.am \
-					|| die "sed of ${real_card} failed"
-				eend
-			fi
-
-		done
-
-		# smi and via are the only things on line 2. If line 2 ends up blank,
-		# we need to get rid of the backslash at the end of line 1.
-		if ! use video_cards_siliconmotion && ! use video_cards_via; then
-			sed -i \
-				-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-				${S}/hw/kdrive/Makefile.am
-		fi
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
deleted file mode 100644
index 4a04b37..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.99.903-r1.ebuild,v 1.2 2006/12/05 20:05:25 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dri ipv6 minimal nptl sdl xprint"
-RDEPEND=">=x11-libs/libXfont-1.2.5
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5.2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	dmx? ( x11-libs/libdmx )
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0.3
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dmx? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.3 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# PaX/hardened Xorg mockup patches
-	PATCHES="${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch
-		${PATCHES}"
-
-# Allow build against Mesa 6.5.2
-	PATCHES="${FILESDIR}/${PV}-mesa-6.5.2.patch
-		${PATCHES}"
-
-	# Adds missing functionality to GLX to
-	# allow compiz/beryl to work.
-	# https://bugs.freedesktop.org/show_bug.cgi?id=8991
-	if use aiglx; then
-		einfo "AIGLX patches will be applied."
-		PATCHES="${FILESDIR}/xorg-server-1.1.99.901-GetDrawableAttributes.patch
-			${PATCHES}"
-	fi
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable xprint)
-		$(use_enable nptl glx-tls)
-		$(use_enable !minimal xorgcfg)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
diff --git a/hardened/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild b/hardened/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
deleted file mode 100644
index 36cf65b..0000000
--- a/hardened/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
+++ /dev/null
@@ -1,559 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild,v 1.10 2006/12/07 03:45:32 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.5.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="-*"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_impact
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
-# dmx doesn't currently work
-# dmx
-IUSE_SERVERS="kdrive xorg"
-# xprint is broken too
-# xprint
-# so is sdl...
-# sdl
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	${IUSE_SERVERS}
-	3dfx
-	aiglx
-	dbus
-	dri ipv6 minimal nptl"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6.5.2
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libXtst
-		x11-libs/libXres )
-	>=x11-libs/libxkbui-1.0.2
-	x11-libs/liblbxutil
-	dbus? ( sys-apps/dbus )"
-	# dmx is currently broken
-	# dmx? ( x11-libs/libdmx )
-	# and so is sdl
-	# kdrive? ( sdl? ( media-libs/libsdl ) )
-
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	>=x11-proto/fixesproto-4
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	>=x11-proto/scrnsaverproto-1.1.0
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.4
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.8
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.2 )"
-	# xprint is currently broken
-#	xprint? ( x11-proto/printproto
-#		x11-apps/mkfontdir
-#		x11-apps/mkfontscale
-#		x11-apps/xplsprinters )"
-	#dmx is currently broken
-	# dmx? ( x11-proto/dmxproto )
-
-# Drivers
-PDEPEND="
-	xorg? (
-		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
-		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
-		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
-		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
-		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.4 )
-		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
-		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
-		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
-		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
-		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.2.0 )
-		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
-		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
-		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
-		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
-
-		input_devices_synaptics? ( x11-drivers/synaptics )
-		input_devices_wacom? ( x11-drivers/linuxwacom )
-
-		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
-		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
-		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
-		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
-		video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
-		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
-		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
-		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
-		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
-		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
-		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
-		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
-		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
-		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
-		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
-		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
-		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
-		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
-		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
-		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
-		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
-		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
-		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
-		video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
-		video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
-		video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
-		video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
-		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
-		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
-		video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
-		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
-		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
-		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
-		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
-		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
-		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
-		video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
-		video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
-		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
-		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
-
-		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
-		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
-			)
-		)
-	)"
-LICENSE="${LICENSE} MIT"
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	PATCHES="${FILESDIR}/${PV}-fix-sysconfdir-references.patch
-		${FILESDIR}/${P}-dri-weak-glx.patch
-		${FILESDIR}/${P}-glx-needs-GLcore.patch"
-
-	# SDL only available in kdrive build
-	# SDL broken!
-#	if use kdrive && use sdl; then
-#		conf_opts="${conf_opts} --enable-xsdl"
-#	else
-		conf_opts="${conf_opts} --disable-xsdl"
-#	fi
-
-	# Only Xorg and Xgl support this, and we won't build Xgl
-	# until it merges to trunk
-	if use xorg; then
-		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# --enable-install-setuid needed because sparcs default off
-	# broken:
-	#	$(use_enable dmx)
-	#	$(use_enable xprint)
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable kdrive)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal xorgcfg)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable dbus)
-		$(use_enable dri)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		--disable-dmx
-		--disable-xprint
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		${conf_opts}"
-
-	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
-	if built_with_use media-libs/mesa nptl; then
-		use nptl || die "${diemsg}"
-	else
-		use nptl && die "${diemsg}"
-	fi
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_unpack() {
-	x-modular_specs_check
-	x-modular_dri_check
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	# Set up kdrive servers to build
-	if use kdrive; then
-		kdrive_setup
-	fi
-
-	# Make sure eautoreconf gets run if we need the autoconf/make
-	# changes.
-	if [[ ${SNAPSHOT} != "yes" ]]; then
-#		if use kdrive || use xprint; then
-		if use kdrive; then
-			eautoreconf
-		fi
-	fi
-	x-modular_reconf_source
-}
-
-src_compile() {
-	x-modular_src_configure
-
-	# Hack to get it to build
-	sed -i -e 's#CONFIG_H#XXX_MESA_CONFIG_H#g' ${S}/GL/mesa/main/config.h
-
-	x-modular_src_make
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-kdrive_setup() {
-	local card real_card disable_card kdrive_fbdev kdrive_vesa
-
-	einfo "Removing unused kdrive drivers ..."
-
-	# Some kdrive servers require fbdev and vesa
-	kdrive_fbdev="radeon neomagic sis siliconmotion"
-	# Some kdrive servers require just vesa
-	kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-	for card in ${IUSE_VIDEO_CARDS}; do
-		real_card=${card#video_cards_}
-
-		# Differences between VIDEO_CARDS name and kdrive server name
-		real_card=${real_card/glint/pm2}
-		real_card=${real_card/radeon/ati}
-		real_card=${real_card/%nv/nvidia}
-		real_card=${real_card/siliconmotion/smi}
-		real_card=${real_card/%sis/sis300}
-
-		disable_card=0
-
-		# Check whether it's a valid kdrive server before we waste time
-		# on the rest of this
-		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-			continue
-		fi
-
-		if ! use ${card}; then
-			if use x86; then
-				# Some kdrive servers require fbdev and vesa
-				for i in ${kdrive_fbdev}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = fbdev ]] \
-							|| [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-						fi
-				done
-
-				# Some kdrive servers require just vesa
-				for i in ${kdrive_vesa}; do
-					if use video_cards_${i}; then
-						if [[ ${real_card} = vesa ]]; then
-							continue 2 # Don't disable
-						fi
-					fi
-				done
-			fi
-			disable_card=1
-		# Bug #150052
-		# fbdev is the only VIDEO_CARDS setting that works on non-x86
-		elif ! use x86 \
-			&& [[ ${real_card} != fbdev ]]; then
-			ewarn "  $real_card does not work on your architecture; disabling."
-			disable_card=1
-		fi
-
-		if [[ $disable_card = 1 ]]; then
-			ebegin "  ${real_card}"
-			sed -i \
-				-e "s:\b${real_card}\b::g" \
-				${S}/hw/kdrive/Makefile.am \
-				|| die "sed of ${real_card} failed"
-			eend
-		fi
-
-	done
-
-	# smi and via are the only things on line 2. If line 2 ends up blank,
-	# we need to get rid of the backslash at the end of line 1.
-	if ! use video_cards_siliconmotion && ! use video_cards_via; then
-		sed -i \
-			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-			${S}/hw/kdrive/Makefile.am
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-#	use xprint && xprint_src_install
-
-	if ! use xorg; then
-		rm ${D}/usr/share/man/man1/Xserver.1x \
-			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
-			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			${D}/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-#		eselect opengl set --use-old ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}
author	Christian Heim <phreak@gentoo.org>	2007-07-08 21:28:34 +0000
committer	Christian Heim <phreak@gentoo.org>	2007-07-08 21:28:34 +0000
commit	b4340def3ac20267f57f800289a3321660981ea3 (patch)
tree	46c89ac512f3ea577204f6e709d6faa8a95ef02a /hardened
parent	Bye-Bye. (diff)
download	phreak-b4340def3ac20267f57f800289a3321660981ea3.tar.gz phreak-b4340def3ac20267f57f800289a3321660981ea3.tar.bz2 phreak-b4340def3ac20267f57f800289a3321660981ea3.zip