Fix wacom panel not getting enabled in panel loader (bug #487240, thanks to Serge Gavrilov and Pacho Ramos). Consolidate various *-optional-* patches into one for sanity, since upstream is not willing to accept any of them in any case. Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

1 files changed, 10 insertions, 11 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 9a6ce8ef9b04..c67a97ff751e 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -12,29 +12,28 @@ AUX gnome-control-center-3.5.91-optional-kerberos.patch 7920 SHA256 49bc7820c9c5
 AUX gnome-control-center-3.6.3-pulseaudio-3-fix.patch 1605 SHA256 cd02aad43cf34a91b2449ab1d583169449ca2a6cea057a1ff205b2b6f1e6463f SHA512 d29dc4ed8ead058c9a5fd94d14c2f1fb3d3287872057d605d4ccecf7146fa6f80a2fd292761ce1420689172e90ec74da8835241bb4f48f36502388da84319d2d WHIRLPOOL d4b294af571aadc5c6915f131c22c2d38ffc5617f7a8d19d8d8615123d5cead41b3d19323cf169c25bc03f57106580cc6f3f63f304b46dd09fece919e09ead89
 AUX gnome-control-center-3.7.4-optional-kerberos.patch 6668 SHA256 7e4807b03c7f5d97294e5a9f933c1764a6a281a4e984c3f03e67fc8b14d80497 SHA512 154284f795f564396a3e30e963e268f39684e526e35d2f4354f12ae5f0660907f44c8ce7cb23ef22930f9e131312a29a88073ea48c69afd5baec0637fecc362d WHIRLPOOL 4fc87d4aef26ea0433cfa65a948c2ce5e7c9f960f823be9d7f5ab3b1ebf697da1c9b97787e6821ee2fc17f61ab2a46a49c0c4137c69be8376690cc6af3b50239
 AUX gnome-control-center-3.8.0-optional-r1.patch 9577 SHA256 9234128cb2c733f46fbbe0f2ec2e1854ac9bc7dae35eb945b3114ad510e50e79 SHA512 e10c6d54db275fe1d8ad774f041c00568be4dd5e5582c0350ba11362a6a007487f8ec7fc9750665ec8a9bb7952325bd758ff7bb8df6e0c369390bbcd51a8a835 WHIRLPOOL 13de899453bafcab1d8f2cc756db6200358f97cd7bda875ad3b8bdbdf224b6f89d335a8023f963fcc8f5ca605acc29d2844c5fa9cb77a9e976a19ab13558cd24
-AUX gnome-control-center-3.8.0-optional.patch 6275 SHA256 d96c9978e4ea4cb71c6710e939b5a55fb8ed211e96fc4c5bb601b7a22dd815cb SHA512 0c944c74344ed2461c9f5c1bf812fb95efd519d745429d0621c6b569343d2aff7828bf954a72865c08af6ab925d6a397666f3a97a0e27a9d4d998a65d1cad718 WHIRLPOOL 479929b80765fa9fcbb4a6f222ce5e198496d9d40cbd499d176d43fbe574b5a59f7cfb1132b682cef459e817b8a51564ca276e6480a24d0f1d4e08ebc0832b19
 AUX gnome-control-center-3.8.0-paths-makefiles.patch 865 SHA256 65deb3482fddbef130b8bcdf67150a8e2ed6775b68922b2958ce0d03556e6101 SHA512 6a4ec4bb5c80ae3ee40a75fb7985a890822ed7e4c53f24263054b016ae59eef4670091d257a5f6eb0e87b5c5cdd40c8b36d0036a59accbe28e2e1c080bffd2eb WHIRLPOOL 9a70893a8edd3bfbd03bebe3ec45246b7a90db1d748421d8ff561acd2bc4f4a845151bb95ef65dc5696daf75d4e66ec067bd19dc114c08c1528d2464297bad7d
 AUX gnome-control-center-3.8.0-paths.patch 2178 SHA256 3c8e3a8232262cb92d0416bd27ed47b157354b6ee4d9b31f5ef0705ff4ce96e3 SHA512 ad64242b6c4c822ea973d938307105c12c41a9cf27fa0f7d9974fdfd3cd5945a02f110db7649bdd2dd95add31ff758a3c0a9b0228f7826b7f135bacd16a5dfe6 WHIRLPOOL a8b0c092da3812b9398e1eacccb5dbf6c899ace1a1b130cd0047f8d7e542c440c9550cc1e4a35384581aadf8cbaab683b21da0a02d431f80304137dde98a86ca
 AUX gnome-control-center-3.8.1.5-optional-modemmanager.patch 1082 SHA256 21bf87ddd13a0615084115c5e09b6a8358bf597899b66c46a885672f2293a63f SHA512 60880c161b5fd0fc96b9748af336b805d9b41d5e58cb676355381a3c2c2fa7354b68c10b676829bee5e35f3c4c2b06a6b101a0c17ac7020744fee9ae980eb0e0 WHIRLPOOL a68e6b0ae5f9d6f1c48164901dc2a7d17330540e1b0b54735360436311d049f4d104f23d684d2339bb9bc9c678e4ba0dbb21a108a7da5ea2260f0a0c5ce04f12
 AUX gnome-control-center-3.8.4-optional-kerberos.patch 3161 SHA256 006b656afe65f0b2bf6fd2780ae4f876ff6c1cd4f846a5ca52cd6e7df7193c06 SHA512 665122f0dd30e911c3c1b1e2fd11239563d5a8467aae43e9a913c66087bdf44a4a8c0a39045022df4d6ecd062a7dc23f57e7ae1f61cfb8234ce47c5124a383b0 WHIRLPOOL 603dfb6708f9afef61527ddd8b4590af3c42c025cc29a21cf3203a72a003d57e4ac58fb6dda5acb5f1f1dee97763c38179db07246c7c902c11c69444094dc109
+AUX gnome-control-center-3.8.5-optional.patch 14242 SHA256 2aa4729552adc055053cb697157735bf5dff9df2932d7f7023871e1603b6bd91 SHA512 5b7f87163fe9d4adbdef9bd6ca6495aa4a1487ebd884d4a6a0cd3c4682425460f67ce4010b2f265463bb9d46edb99bda0319e539618ee7b129651948150b8205 WHIRLPOOL a5f2174bc6a8ae151dc00d75b102317bb48b1b27faef85e548c3df710ed9a73abf1c869f059377885dd37ea17d71e31031552d9a456098c6f2737b2662a82a42
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
 DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb SHA512 77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444 WHIRLPOOL bf4ba1b6c9cb17f6b5f22003ee89af051ad152dd5671ffe01ba5cc0339d51659a8af7c629755726d305caf75c1fe4629b268fc269862751bc24317d323395697
-DIST gnome-control-center-3.8.4.1.tar.xz 6707796 SHA256 3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55 SHA512 8bb9544c07c89593d6e438fb10072326d2f16ecd0ccc62838c61e62f05f70cf99f69e063fff7e0a13dc2c82b14adebf7868ae2e746a56024bc3be659092ec95d WHIRLPOOL 68d2cdbf1406522d248db0a4c5ab1d2d60e8ca78b0a006eb2fceea072c22a44faa20df9b807251646aeb29d5a3b1ca545555c268e8880cff119c924e9dafb69a
 DIST gnome-control-center-3.8.5.tar.xz 6925968 SHA256 efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2 SHA512 5023a859756fe94334632ee2cf6206fbaed5c612d30ba230da52e7d62d95b94002f03adf0b39af18b5489428d559cc9ec6baf95698b894f275a5eaa86ff670b5 WHIRLPOOL 9ae8d2971ea793533bd3a2875f39b33b123a83c25ced2a241e8a7cdc4dd9f34f4547472e60bdffbdad34e09ca7867441a2a2fcd841b2ebbbcf45734a36607944
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
 EBUILD gnome-control-center-3.6.3-r1.ebuild 4559 SHA256 d532e2601572d312f367ee885aedf2f9b057b2ea1151bbf4bb2051f5633bb892 SHA512 db7dd4fdc00654669da0c0213714eb9a966f4a5ac1d98b5455eb1470fdb31c5d31ace30793c2e32f9fecf42adc58aac6e2d2e581e9f73e6eb3d9e6618447d2dd WHIRLPOOL c5bf7f6bcc5ee2eda5bc351975ed9143f9b31a14af3f250cdfc8d82189485eeea5db5f236b29be74ea59914151500d4a3841854146a8f163b58f45228ffd5db8
-EBUILD gnome-control-center-3.8.4.1-r1.ebuild 5456 SHA256 b7f90f7c6e35eddf7443b750349aba2b9542ebbda7dfef2731c293971e74a796 SHA512 3a96f0c873d0be5ed000299bc4e120ed856bbdd2df3f9cdae449529a499f9dc3c0218f5b1f6ce9a9fefc4469757d87c1d6bff7383c213a3d65c5dad44a57eeae WHIRLPOOL 2a65133ce93a9f79ec24cc54d23b600f35f9efeca17a9fac4f1052593f08d321200241ccc6613ad49d199da91f779c528cd33cdd210c32ddf24f83ea026d16b2
+EBUILD gnome-control-center-3.8.5-r1.ebuild 5402 SHA256 66e1b04bd4098f7ab817597113c398ea7064e7a012ce332b4397c8b2d183ddd8 SHA512 e44522c8f6bcc7387ccb93ebfa00a7c1ec96f11caf605293faa1045f9ac7d306c29847693cae193b96149fad7058fc207f49b7b85b0d253b344a04bb9d02e3c8 WHIRLPOOL 6292675813b513e613d80dbf417f3eb3e18ab2a41c2ec005a61ca2e2b167f4001569798b0bcc98eab1645fc9310d6a6dbee4727b7fbcac836e1a8a2bef40aefa
 EBUILD gnome-control-center-3.8.5.ebuild 5594 SHA256 b3a7b1c8eed7c58f567eda05952964ed27d449de3eeb92f5639beab6b3b68aab SHA512 6b7b4f39bef7215e1a23bc319fa206b17a3b316d21b5f3638a0a674d7d777a228669e0b6490a65de6f660e70d876a557496adfa1b2cc8bae1f51f4b70c7e48da WHIRLPOOL 45e5847748acc45290439d836023221c5867f7effa0bb6ece7de4a13a4d36c5f6105903891616f843e083399c00c4b0516216c0abbc2f7d636ba2251e424c13f
-MISC ChangeLog 64893 SHA256 18ce7ed08acf582543d596914126b373ac2eed103413c0775978541302a1d9a2 SHA512 fa9604f13ee5ff529516c1ad8d49bcf32ab4a1274a19274ee923c736bad7785a5bf808f61b8dba9937e583a2a96e615ba0aee44ea2b4feac63935ed16c1f0be7 WHIRLPOOL ff5f53eae27e0a2ea336a011dd26cab76513065b52d96955fc856edca19f8bd8612bc7ad76a2bc1fab5e708fde0963475a5e3b5a9b685dbbef1b2da65c2f6ba6
+MISC ChangeLog 65443 SHA256 c4eeccf0b04cbc439d28820ed2c471316dcf741934a16f55f48275b4a215e017 SHA512 1d3818e9502120053c69ccadff49eeb1486b59db901ce5374bf30b5aa78cd91873781fe665c862a643d8ba0bd41aff0a4ea5e7493e1908bfc2200d6e0c9e98d8 WHIRLPOOL c315f54526c018f3693ca1b316307126737da68abfcf4ab6f800d4aed4e24d79f91511dc8d5324f3eb8ca86c7f89c94b4f03289c75141accb112d9a6ffbf5de2
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSP3XkAAoJEJ0WA1zPCt1hCX4H+wUtvljK83m2bbL5NIcj0+tL
-soXCPYydP0TX2ClrWiQdgBuDhSQwHJO0rHt+AMnFKSa6NyGhZDUyL3dgiayC1Mmk
-5nfonTRICu/UuUaz/P2HJKO5eYg67kfsVPfKJF89DMQBGtNvQb49lJo5/J6kNxZI
-0m+L9kp3VEpMI/DBWvkDWzt2w5NsetdMZrKt9+HgNS+QGRQrTeIWV9rDnSMjXLLp
-e2m9cxVrTW2cjD1etYUtnO9bm7AcuYcQDO6DT3rBwUVIkfRi0PuKuoUxCxLCdYAU
-v01X/du456Vdwgso9Jnn4gpzw/odSC1gj+aonIQBauNNcIa5Cu8UiKy421h4Ac4=
-=91xR
+iQEcBAEBCAAGBQJSVCPDAAoJEJ0WA1zPCt1h/3kIAKtcC8EcNaj7swObpW8SW+Fo
+GA4JZQ2dbzYTpW7GdadJXPublYksLygXk57LdOiYcuhVb6y4TCVGhjPy3kf4ibSy
+cUbqy5cISB0SfpnJzd+d9X829n05Vad8KjtAqcy6dakDvvrUqPfJvfikGDx4NuA7
+NgNcYkbS2KQjDXeK/ISE4GgnX9gENb8LBFNA+ao8Tqm7/KBZn4nzLxoG0F1W0FcL
+7WdZLTS+/4/V5M/TyxhOBhnk54wV4dEyNsXtOfv2+NH6KQHjciNCk8JYAYeIgEID
+muJLoqO8eLaevPbhsUOal7dI6ECgUoALQ1oGdgs8aQQUBCY0wzfXDI/yJJFti8E=
+=Hrjp
 -----END PGP SIGNATURE-----