Patch to fix symlinks created by ebuilds in 1.13.3 and 1.14.0

patch (text/plain), 15.80 KB, created by Andreas Schäfer on 2013-04-05 10:05:25 UTC

diff -ru /usr/portage/x11-base/xorg-server/Manifest /usr/local/portage/andis_overlay/x11-base/xorg-server/Manifest
--- /usr/portage/x11-base/xorg-server/Manifest	2013-03-08 12:01:32.000000000 +0100
+++ /usr/local/portage/andis_overlay/x11-base/xorg-server/Manifest	2013-04-05 11:42:49.027191351 +0200
@@ -1,22 +1,3 @@
-AUX xdm-setup.initd-1 346 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 SHA512 b12ef1a757213c2df2d4fb50691695fdaf00ee9edb7d4ec551980c48b6eb05598d3eda0db543719a11a82b019939fb4af82a19813d238a725dcc0d818379103e WHIRLPOOL 28a033355ec3871eba2dfdf45969e9ac354d8ae542dcb1449901af856b9c26314318f6a91cec81f2548caaede19d88e14eac2de0fd7dab8957a7358e94a594b2
-AUX xdm.confd-3 853 SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec SHA512 bc127d71087723c446bdb342c27c10b08445fb42d32bc98f76bb78e347c591702224a59c6007bf96c75dbdbe564614bb96e6cff6407d7a09a4052c3d36e80d99 WHIRLPOOL 4337fdbc5cab1ebfaa326f13630a852aa2c9de4866ffe0f1aa42f8840a29b56c878904863ec00a7b4012263c70d038f2440cf291e403013a1f4877e077892d61
-AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f
-AUX xdm.initd-3 5662 SHA256 36a4b4e5fcb4f7ae303e1dfc20b1ec005a7ada9448ebb96e518d8c992feb5475 SHA512 a1b8debcbd1eab7e1921e8a59ee01864bb8332aa4e0910336f24df53e085a1dee7b9a10c0fdf5f4db7ec72b3d711045fe0162f40472a4098abf4955c1d5c9d0a WHIRLPOOL 4eb0d5918d72e497a4c3b87f7948a2c4d223767dfc8281a89d3aba92ef3f1ba2d5d1fdd639e54839bacee24577ae8a768b64ca161bfeb226906e3ce30689326e
-AUX xdm.initd-5 5721 SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13ef55bf8a0fefa SHA512 014d4dbd7beb236f6c6260953c0c07744211fabd667426b76f5b87030bff5e8b1d1b98c938f1987ba436b5313888134cff18186afdf02627eacdd95b4a3660e8 WHIRLPOOL 921133ec9640aa4b71b91fd5694d3712ef07dda8a26c0a6e33f33cfb9facfefbc5b048f4472e19e19946b47a9a812459ce268952a09a1a64715f0f93d9259c48
-AUX xdm.initd-8 5702 SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f SHA512 daa949c3804d8480a0d6568c02ce2b9f2c3a51f4b630762e119e3faa9d03a4632c76589cb4e6eaca26dce73fe2cbfab9a7bf81726f9c4a65c65895f224b7a12c WHIRLPOOL d292e260d1fa1b85da01a44b009b7aa3d7ff534eabd5dd691a59f2548bcdb6d86218446fa99eca3810648abaa6f033b0299fdda364b232600d1cf4087ac2d4ea
-AUX xdm.initd-9 5700 SHA256 96b1fe826db2b46b08e055d57bffd9405616b7980d9e40e95f19e52bc49eef3f SHA512 a4f652aff6a03d902da7ce1c706396911e853e78031d3246b764cb67930f20935d5aa912834add9f839742e824c380d2793b6b62592a10ad1bde646623b419d3 WHIRLPOOL ebddb96a2552a76f1d2f13b25dd773c822e8a0a5135f950163426477c689d0c35a74946a3323103d604783244e3a2f0bee5f5009b50828c90227370b13c433a9
-AUX xorg-cve-2011-4028+4029.patch 671 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c SHA512 1474c1045de134ec3224bd77d71ab00b57fcd0983eb2f45719ba3916f93020526ae0b4b62578ac8803556ad129d086f814acc957910df4d343d935c7556702ef WHIRLPOOL 183b05d47989b4c4991b37c9007d5b376ff44b627652c92da52eb93c61e452a7214467ad0366fcb2aebed8b65e4a473faa6cc52eb57d54c22a89c5616a602748
-AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e SHA512 d6abd8d50f341ff1d7971c45ab44b50b7ca27cfe84418047f2d0ca722d22f0c5da54753bd80d7e172b3fc54b7aee79b526af5c9444f3c711e3dc6d596cbfcbbf WHIRLPOOL ba2239350399bfddf70968e8126f773fe3b64943f7b87691587a48fb0aa7553338315825c1d619dbebbee04b9fd1ed8326bd432969148ed012abd2e790c7d795
-AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d SHA512 6bae6d30aed0389f0f858b3d3cddd03bad15ec8c21bbf741c30b6163b69066a8dec311a48b82fe44aeab13d4258eac82e9ebb53c84150f60846e3a7f7c266163 WHIRLPOOL 1e3bdd0c95b136410c63dfa380c1b696bec6570aef110c4e526503e54c081e86ddb3e02a49c76ecf52433efa58a1a74bbd00255ac24d5f6db6980f4a674ee839
-AUX xorg-server-1.11-dix-send-focus-events.patch 2345 SHA256 77e1ce80ebf57718b5aa7cfdb1add109c62c8b8728899405c212239b2576d110 SHA512 382d64834fa4e10756efc731954a5e3dc1c00148cecf7ff8506995e5b2258cb8344c679435049ffaa89d847c98a9fa7855849c23de40dc168b806bf1c01eaec9 WHIRLPOOL 0be9ae4e435e2f0dbb794ef2fb30aff6538c3e484267ed0ecc05515b2ee63613be26beed2c4d6c036e2cde3629d7159e96a6e75bbc9cbea059e63a33af6e777f
-AUX xorg-server-1.11-log-format-fix.patch 13585 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0 SHA512 d6c560aa7c7ae0aa0e893e81feaf45850c7b43764b725258db8fb71e3cb85b0ec5bfedb05385582adb2456a7a2cd745f14ef0476fb7139527c6b9c8890e9ab14 WHIRLPOOL 1bc8f276072e613d9c1788bb2df5d5a8e5e1374c71e134854ec8b2154e85321d89dbd5c7b7fe1a533658bc5f020ac3ccc07ccdc78b56029c5d8f0777e1096304
-AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
-AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
-AUX xorg-server-1.13.0-exa-track-source-pixmaps.patch 2803 SHA256 a9cdbe03cad8ffe355de8ae1bd05a2b3b900da409f8f4702c9a28f4c522d2888 SHA512 2d9634f60d22a0b4ea94d2122fdc0b565bc4e16cedad15ffb3459fa8a08b00bb990f996078f95d40c4b1fc84b8c9848e1b2784ecd48b6e51641e0f2982ef0262 WHIRLPOOL 7641904488db86144f8b96e20f262ab69a88b4b88781a006fc18f0a748e35d7c3b666b47e39f15f60b6a5a3c07c76e430cd116cc21ebcf4c7278146a0ac9d870
-AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
-AUX xorg-server-disable-acpi.patch 663 SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 SHA512 0f741e3dac610ba75c3f22cb9412d93e6d8422216100bce886be5f8d6dc49a94e0dab525039247d7af668f162b02fdab302aeb55b02a949ebf56c1f455fa68cf WHIRLPOOL 69e7425e3fbb1154b64568261ab17dc513d561a0d92558fad4e1281869b43132892f14eb89443dc11003cc62bacb4a80f86f592d9dc4bdd873f29fd970c25558
-AUX xorg-server-glapi_c.patch 2215 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b SHA512 77ccf8cf5732930affd41c3631a945e768becf504e507c1140d2d4d55f0fb49fb787fd9ace14463c22173c95c3187c985712cba79b53c3f1472be08ea46401d4 WHIRLPOOL f284f2fb5b04d6ae3a0cb781a7e78ba8763d3fe75efb738a0643783d77685bc1606b8fc940e66c89c1ee41a5f2ffdba1698b8d11b0c59550f4f40dab4716a219
-AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.10.6.tar.bz2 5406712 SHA256 c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682 SHA512 91913cba2549c73f8ea3c23bbc48eaf2d4e392403b73da0f51fd4ed94a135081003c0600df653aaa3e420b30c57da58f3b25d7b8424898870c89a5b419c457f1 WHIRLPOOL 45b26330d2bc1d6bdc1e9ef66226a7e26127ed2b0ef9eb16efdc852174d789a43ea576c8f9df9685900180c8b08a55a244ee61a3d610732ad468064f576f617b
 DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc SHA512 29013ffd51ff1b6a2b5679580c490d68dc5feaebdc9201a2812a410761200f5468de76c8791ab089950504be649e61f2cccb705587fde66eef1bcd3461f537ed WHIRLPOOL f1a5db2396cf1b490542c65177e047b37b636706b2d7e2bc15ef1ba527d2c7afd58669b99b83e7c2d2b7c1994f8603ebfe63419d2d924a75f4032afbe6806f26
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
@@ -25,14 +6,3 @@
 DIST xorg-server-1.13.3.tar.bz2 5481274 SHA256 c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762 SHA512 40d1122baf27522a57190429793a2a5bdc903e729c5a3e422143ebe90a1eb7ffaf093aedd44dc47a6a46fc79f9e88ff6577a6126a46dbac9010256d812121a4f WHIRLPOOL 86e35f5008bd5ccbde75b152670d28802a3fbb192b0ecb32bd9ba8821d4f1eed40d258fd4341e10ae15e595f80ff4711849a6c8d934ecb4cd10c6081b227b6d2
 DIST xorg-server-1.14.0.tar.bz2 5507907 SHA256 1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630 SHA512 d727adfe828636be6c5e01dc8e7b57f0b193052e9bfa25230e90c0859bd70ae471d21a46f5cda791aae978fbb82601d2ec8f147a8992d7180cf6e10ee2a65d2d WHIRLPOOL b9e3a9e62f507a4c2af7563220eba87a85db1ccb0d043e7f3bf714a3672f56106de70f08088d618b3bd016f62c7748dc6ecab66f49557a94017f3318b6344454
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
-EBUILD xorg-server-1.10.6-r1.ebuild 7142 SHA256 7958276d8b4c59ea954deea9d5f10c2cfa4937cb3a0bdb3d0d6f49c9653b38a3 SHA512 55935f2bfec3442eb3814937a0e4a78f86aaf1c97caa2dcf7813e353b11b5b8ca4d9599a625f9a64f7e88c14c4b9c677481beed46a85bbff6d9892d1adad4a5c WHIRLPOOL e207c59bde741f29a6f5de7a5ddb177c1d831f66a9be31df7b2af3c3c9c5d7914eb220260da0e5d123c4206fa0eba54ed989a4fb31dd1743dc444121683bdafc
-EBUILD xorg-server-1.11.4-r1.ebuild 7332 SHA256 7270d4e37cd84cdd583fe8b2b5f36b5bb9f2b2327deb5b4da8da17f9222436db SHA512 485b228505687041fa17bb2920a09f03aeb467e9c7e19bb2c4ca47c6337b20dc43324b05cd6941a2ff77d118d76358e941e9d5f60af671711e83d534504c45be WHIRLPOOL b94ade0494572130712b32606fcd665ffe1a929dc0253f7371fe20375bfa9d6b7971d7dd86b894ebb60db945bbc75fc951b4fb789b49b61a83628dfcb3f6f096
-EBUILD xorg-server-1.12.4.ebuild 6989 SHA256 737851633b54ad13ab718b93800c29ab521421853b76e9689c4c55350db50b40 SHA512 bedc52be98b90f9aff8f090b4357ee2086bdc778e17c926272a10366fb475f9c57209408f879c80bb50f7f3f1c72d0ecfdd01114d968689f3d6130ad7047041d WHIRLPOOL b60ab0cfedf737d25992b9c87eb53fc93980a7ea7e33b243b884cf181358fbbdfb587b2ec3f7420fda240f959a6c62582fc0b47a0d6014e1448c7103f39025a9
-EBUILD xorg-server-1.13.1.ebuild 7062 SHA256 eb7dc44b5766a43c48cd6fc7b52a30368091e345241ebf6e8150d61fb361443f SHA512 f6cafca467059e1814e6c05694fe3eea15d8909910a5c8e2f46b08c7f591732544c273ac37e0f2f370c55dd446d9bf525dea4329edcbdf2a04f138ee949ee1b4 WHIRLPOOL 61ff115dde4dedc319d8470b1c045303224dda42ab46bc5b84de22dc7d3e9bcb5b392375135f2c92ac597235ae65cfdc50c3bdfb557d6bf5325b7e7680126acb
-EBUILD xorg-server-1.13.2.ebuild 7123 SHA256 b7068389ea533a1c6e5687bdb8691f8dd1893f39dd829fff0ff2328897c8d8a4 SHA512 1408e31b98e74033fc64034cf515f19127bff730b5498f24c1ea800d2d878a9b0d0a34e9a290dbf96278307c485eaa233d636fdfb42707f111176e8e1eff233e WHIRLPOOL da7e50eea02ea6f037ddef80d039f593ccf1b9e8ad0cbe6a0fa1c2cd39c0d1becf5c1aac8a96eec14c6182d020c52fb306ade9fffe4b987eee2ad2f460d8e402
-EBUILD xorg-server-1.13.3.ebuild 7124 SHA256 e6d195e63d971e05631fc11582438ccdb6b20ded16c8c2c6ee83b9e801041777 SHA512 e9ab8930988bd15260ad13e867b0653a6fa50ed712cfd401a59bff50e2af9d8227fd092bd78f4f4a6ca7cd1f50099d85dd31ecc16b5d474e3f291916cdd40433 WHIRLPOOL b4e20d9cde8487cbeeac48e0d61299e07534d155bcf5728dd729ce1242de1a4627983589cb89a7bfd123dffb313694a7ffa3871d4a48332607c3a86bdf06bf8e
-EBUILD xorg-server-1.14.0.ebuild 7104 SHA256 6a8ce20d8b0a5be00aa766e1c2e8979fe5306b47b58fdadea62d504a735a1663 SHA512 4d43ecf60e226e19cf986daf03d9d28526581a2c87baa57f61a053d4710f2a57d85bf8277aa4b75c1bbd171099fb409426050f1f5726cd78c7b36ce7df14219b WHIRLPOOL 111dbca3f5eada2245f75171e6d373c30074ebdf8ec8229b98e040d03270d393d01451dda5f2e0f88bf783fc0585ebaae9bb542e58289e31e545d574b4b0c408
-EBUILD xorg-server-1.9.5-r1.ebuild 7865 SHA256 4e75f287de81b0e5ac59841964d55e3479e51c6fa7bf3882e665f25e3ed9c62e SHA512 56a0418baab28f111bec6a4c7377b50a7320c6af69793132c791b01988863c6da3bf3239f10651cfa2893f53075185cc403d925d280307b5b8113e54477a4f50 WHIRLPOOL 83d8ab8b50edf55ab6603d9424aebafc7fc15b3a71e62df0032c64a057f28ed15877683b8c8bfa2fcd8df4f48e2306c965dd4cfc3b4e30f5d24537dfd7866634
-MISC ChangeLog 41455 SHA256 5b9d0271a0e8051cce487b30f4e82386fea89ec0590052f421db59222cd31ad2 SHA512 0e7d8e03443f093b04cba86e3146ee39fc343f1fbf88bbba5947094e8857a38510dc405751bfc411e2d81bcff966f6a6304639ed52a1b94e8460ac8987df987e WHIRLPOOL c997d667b68b7d5210952a767068c65de666d524b4c15a806adfe10798dcdcb167446074f7958088b0e95e5dd943801061a3a04596066d1b0587f564766a5940
-MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
-MISC metadata.xml 537 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f SHA512 6b66fd87c679bd696c5b6f7c32026a2bdaf827f3ea375eb908965352c259354dc242321199cebfab72a8d7854e459798ee851feedc18fa36496aec965ca28676 WHIRLPOOL 751bb9c7446f7bfd44674256bee09d05252b03686be445538a1026c2075533660a3895a8d68f4b77cd3575f4cf589df2bcf9a6e1e493c13f169895f413ea6c78
diff -ru /usr/portage/x11-base/xorg-server/xorg-server-1.13.3.ebuild /usr/local/portage/andis_overlay/x11-base/xorg-server/xorg-server-1.13.3.ebuild
--- /usr/portage/x11-base/xorg-server/xorg-server-1.13.3.ebuild	2013-03-08 12:00:30.000000000 +0100
+++ /usr/local/portage/andis_overlay/x11-base/xorg-server/xorg-server-1.13.3.ebuild	2013-04-05 11:42:23.357191065 +0200
@@ -164,10 +164,10 @@
 	# users of binary drivers.
 	mkdir -p "${T}/mesa-symlinks/GL"
 	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/GL/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
 	done
 	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/GL/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
 	done
 	append-cppflags "-I${T}/mesa-symlinks"
 
diff -ru /usr/portage/x11-base/xorg-server/xorg-server-1.14.0.ebuild /usr/local/portage/andis_overlay/x11-base/xorg-server/xorg-server-1.14.0.ebuild
--- /usr/portage/x11-base/xorg-server/xorg-server-1.14.0.ebuild	2013-03-08 02:31:33.000000000 +0100
+++ /usr/local/portage/andis_overlay/x11-base/xorg-server/xorg-server-1.14.0.ebuild	2013-04-05 11:41:43.057190616 +0200
@@ -164,10 +164,10 @@
 	# users of binary drivers.
 	mkdir -p "${T}/mesa-symlinks/GL"
 	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/GL/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
 	done
 	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/GL/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
 	done
 	append-cppflags "-I${T}/mesa-symlinks"