Fix absolute paths to be Gentoo-appropriate and add missing runtime dependency on system-config-printer-gnome.

Package-Manager: portage-2.2.0_alpha119/cvs/Linux x86_64

5 files changed, 327 insertions, 41 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 54f8455bf958..28f09154688a 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.105 2012/05/27 23:14:36 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.106 2012/07/19 02:46:04 tetromino Exp $
+
+*gnome-control-center-3.4.2-r1 (19 Jul 2012)
+
+  19 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.4.2.ebuild, +gnome-control-center-3.4.2-r1.ebuild,
+  +files/gnome-control-center-3.4.2-gentoo-paths.patch:
+  Fix absolute paths to be Gentoo-appropriate and add missing runtime
+  dependency on system-config-printer-gnome.
 
   27 May 2012; Matt Turner <mattst88@gentoo.org>
   gnome-control-center-3.2.3.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 70598d4cceee..6ae4b98ab491 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,43 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 RMD160 2d4c8c024e4b89e719f339be17e2de24470979ef SHA1 15d0854f5bdb3e05c74e81a1031922b7a1715c01 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d
-AUX gnome-control-center-2.32.1-erase-background.patch 1899 RMD160 3407e35a16bf8862ef99f8bccc270b183948bae5 SHA1 3cdd95012ec99df9c0d0dd6dc8350e0f1eed7b6d SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8
-AUX gnome-control-center-2.32.1-mime-handler.patch 55290 RMD160 0001d36b7409ece4ab0b0f1ecf3f762863028c9a SHA1 9b17ebe472aabb69c768618cada7bfbd10cbe910 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd
-AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 RMD160 b8afdaa2b5df38ca6ba31f925bcbbb1b54f04d0e SHA1 6af85fb5fe55a8e05948338f66d79f10ca787e3e SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d
-AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1e95cfc9ffcfe3b8cd294ee712 SHA1 b069adce19b7286e410beae4b9909ecc13485d2e SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538
-AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
-AUX gnome-control-center-3.2.2-metacity-gconf.patch 1051 RMD160 3e828bc3217ff67cc862cc47edbc5b7c7f1a2309 SHA1 fbdfccca12c536bed76ad7783763b9e5a677dc2d SHA256 c3fa18ddebaec274e6095277cd1586041bba08b89cc03daaedada9103abea64d
-AUX gnome-control-center-3.2.2-timezone-free.patch 983 RMD160 1d8a84ebac8b3b80f3db953421f07adf4649359b SHA1 8ffe002d9af49a40bbe7b8a4c06067815b75610b SHA256 4c76fae0549ed5893cf594340576c7ca4230c470bd5402ed686b95fdd65b05af
-AUX gnome-control-center-3.2.2-timezones-linguas.patch 1266 RMD160 e54de3d8eff1b9de3f609c9fe21b128ffb82add5 SHA1 1bff83ce2d7ac31864f2d4f4fccee8043f52f9d7 SHA256 f693ecb6a03c4dbdc220609e6d1976d4a6f3bc8740c0bf1cbd1784e8eabc67d7
-AUX gnome-control-center-3.2.3-optional-colord-goa.patch 3205 RMD160 5322cd75ca4101fbde06ed2b4d89765d714d0b68 SHA1 a82b68cf3467ac003fc9abeeabb3eacb522cfc50 SHA256 6de471d3b2468daeaf05265745ea090bd89c584c2218d8079299d1dd8d79e0af
-AUX gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch 7023 RMD160 65e29321c5a2ba21cb9449a49440018cfd76573e SHA1 08d93d2c3265d8dde8136a422bc14027377dcdd4 SHA256 933af56534f4b62c74d55a650f4af510f7d39f9ae0a846d53988bbc06ec703d5
-AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
-DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
-DIST gnome-control-center-3.2.2.tar.xz 4225196 RMD160 6a97f6cf9824c99daf3b33c0e347131b7024988f SHA1 e946ab719625e6f793141434179a932c35ece183 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369
-DIST gnome-control-center-3.2.3.tar.xz 4238612 RMD160 1a16ffcd39d743b84fba8049c55607cbf97b6f6d SHA1 ce66ae73d10f3a971ce0e95eca61ecc3177b415a SHA256 f0460410ba5af5a1f784a0006d814bab93b1e647f93a490a5c4c2c585815ae14
-DIST gnome-control-center-3.4.2.tar.xz 4267688 RMD160 e5ef20cf80d148cd0a94a9d42206ac17805dd64d SHA1 f5296d1ae8eade22ad89fe30cfe32420c068f01b SHA256 efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
-EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 RMD160 400f355138bc3cc71bde6a48905ef3a6ffd64a43 SHA1 c0d41d57a9d3ac2b5230dd45f3fcf32b3f72c630 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270
-EBUILD gnome-control-center-3.2.2-r1.ebuild 3571 RMD160 312489edc0c7af7735e5e26a0c5a7ef51b50ac44 SHA1 bdcdde4ba2d4b3a0d7911f99721af7e7d3b41696 SHA256 6d1abc936f24c89b964daa0333d97cfd4ad6f95330466bfd5a0d2eb354e1b4ae
-EBUILD gnome-control-center-3.2.2.ebuild 3304 RMD160 43f5e9159212a70279adf977e837128828516051 SHA1 d02782155d02ed93260501a601a17f23f43354ad SHA256 ae8b43325c9140cd707d69321c5995ed234029b0fc4412cd8d7f6a9ab4caa206
-EBUILD gnome-control-center-3.2.3.ebuild 3439 RMD160 154d5f1e7d090a816c8e7ad59f2263c61d4783d7 SHA1 22add6ea09f7f4ecf90c1adfb50edc0455431a18 SHA256 4f252f2f50b2a32dd071aa729b02f835dc791ee9e54424f6000616778895f39a
-EBUILD gnome-control-center-3.4.2.ebuild 3994 RMD160 02a38e51106c9e9dbfdf9da9a387b18d5b260077 SHA1 131c831552fc0059ab842a75501c85b3b3410eac SHA256 eb52529b166f318a46f338a2e706cf679ee9fc50472ca4e262a87bde979e4aaa
-MISC ChangeLog 57492 RMD160 aa851a9b6d961a18c46fe5d380dfed58b24778d0 SHA1 3b1ed97519a3594ba5473f72ccb4dfb644419642 SHA256 1d2b0db8514fdf76966e7b982f6cc0dada7c79f09fa1f0cb364c72d83058758f
-MISC metadata.xml 861 RMD160 68868736303c9a6aee041f79272e335ecf598800 SHA1 7b0e8ada654c3d833ca8b9f861f002fa52fab146 SHA256 9f78bdf41ecb164c1465a0bd87889b7bf64c92bc7057123718f9894ee3f6e1bb
+AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d SHA512 753b142ba24075276117a475453a4f2f083720fb13398d250c3a18f9047b4a429bb7a178076111f0c5b846c4cdca62824ad380a2db3d2a561c51f14a6df83b93 WHIRLPOOL 36027ef7289a94f2a477f1d2ea5d338c3205611b7d1684d8b36f2a088c3c5e9d58b1fc3a388305b50f1452f8e833e67d564bf67ef2537b0b38c5abaa8b7167bd
+AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8 SHA512 6f5c9aa935d74648b90fdaa8a3cf992e88f05d8f4bf02349760dd355313aa18ee3eefcadecdff585d67a6ba9b4df0851ddfc7bccf3c8e2780c749444707cd838 WHIRLPOOL 7d4b063a3e27a9c11a20c8e62fdc25a000c42fc4d22a1ec206b291571ccd9f9f11c4a3810700c043cbd5c758de70e713e55729c4de52aef8eee0451193cdd229
+AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130
+AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d SHA512 ea81dc45ef7f2b5c14e9a094a9a8601c6631ad1df60a9316ea2f2fe8c922979bbb23e1a3a13adb3ca909eed1b489a7eb521b85cf7bd0dd7e09ce528c0a38d751 WHIRLPOOL 1b8450b5073ddb44b30964373024005c6fadd58f3246cdf37290e8350cc3d9ca54754c6ac1eca5fcedbd06e288495e8657102d8c8200e30e83c07702eb34531a
+AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822
+AUX gnome-control-center-3.2.1-optional-colord.patch 2005 SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a SHA512 90d0d77a83b06d00a9e364884539eb13de61596e26e3bc7ad38db216339453c91c5dedfe45b2f02b6579da4681d3d83bb12ae10cb8f8bec38051af4e99aac17e WHIRLPOOL 647806b15063ea9582475c3e1e00e9e38379b846fa597ba84d57d90b9db3112255e50163d22e24ae698bcffa806482542afe17d5ad6852b07c761baab5749320
+AUX gnome-control-center-3.2.2-metacity-gconf.patch 1051 SHA256 c3fa18ddebaec274e6095277cd1586041bba08b89cc03daaedada9103abea64d SHA512 33b18e0565f7b86ba489e14aa60832340618441c764f1c2c7fa3ee85b7abecdd6251ddf125c13b85e6c89ef5becc2725bd54873f7b29a95a14fda51d1ca29fe1 WHIRLPOOL b38e2f2e3545eec4ab50a7d9c35155c2205cc67973af559ffcc307cfc607c6c6a938a73dc2bcc2a67c465d3e395965bc953e1be6415d190200ca31267e714db7
+AUX gnome-control-center-3.2.2-timezone-free.patch 983 SHA256 4c76fae0549ed5893cf594340576c7ca4230c470bd5402ed686b95fdd65b05af SHA512 8d9c3fa0343591c429dd55ca098d560fe7f8b24de11ead958b4f8fd216bad6cbaf547a531f6b73f8e23b4212ed06392bc78b56dda180977ba18d4efbfcfbac9b WHIRLPOOL 5a4cc630cab7d53a018e5bf36f27f5b4b547a7a94e26dc907cc898de8669d08383899688b95387d0427c4b3329cc485641f84f96157e95bb3ef72a1f81cc143e
+AUX gnome-control-center-3.2.2-timezones-linguas.patch 1266 SHA256 f693ecb6a03c4dbdc220609e6d1976d4a6f3bc8740c0bf1cbd1784e8eabc67d7 SHA512 1222a9b1652a1192ca2b94f7ee67e13a18f1a98f645eba7ed72016143f95c274a0853bfc32f72abf079be0bac3e665782a43962c3d726f3271fbd9eedb27ea9d WHIRLPOOL 64a0d056451d4c51418d89fa5aed88f0a072536916c0cd616d6127ef688ceb60efd4beec16f03b187479e5fb461fc42905104f9b4be36cfa895f11b878c58898
+AUX gnome-control-center-3.2.3-optional-colord-goa.patch 3205 SHA256 6de471d3b2468daeaf05265745ea090bd89c584c2218d8079299d1dd8d79e0af SHA512 10496912641e9a0f94e03ace6e1439fc62f656255b26be9aa47bb9d8e2b07b33a7e7e53cfca3fc0451bd1f10a645178268e45499396ac10dfebeb2f00b5fc16e WHIRLPOOL e3363ebc7c2d6a44f95d1836e1ecbb4147487e250bb66b717e3d3579545d447f044e4c06cea647c87d21b38ed4f32f43cb62c3692279f24e3cb902f9b3dd1a48
+AUX gnome-control-center-3.4.2-gentoo-paths.patch 5677 SHA256 25ed849a4275356d276faf22469019cf255398f02d5faf3669cb05fdc70cd03e SHA512 037eb05937a716c27292967adbc57d987376b180016d3f08912f641070dc772afa7a516c0a47e75fd0c197a2f402c13b8bab16bfc5117bece6b5cc9ecdd53860 WHIRLPOOL 48ec525a6af077f0cc799b5423fb6e403bd74842bfd17874f58414899a439bdb8ac4e8bcd192487b43643bb064e00c7c6a7e2ca689ff0ecf59394b03992bdd22
+AUX gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch 7023 SHA256 933af56534f4b62c74d55a650f4af510f7d39f9ae0a846d53988bbc06ec703d5 SHA512 e89d5e214698197de4ba1a9e313fe7ae6a8e400c62a67422f9c2cf1f4634e73a408e580efa92590ca3cbadb90dfcd3c60bcb739063ba9d3d31f8b7dd3b6e9b2a WHIRLPOOL 80d025875246792ea871bc25adf0b13c23d7f3ba90408d0580f056fa6907929f5de6ae5c3446ca5b0e32dabcbc97e689785355f0fdc50fbd40bac69d64f8ac8c
+AUX org.gnome.control-center.defaultbackground.policy 836 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52 SHA512 2ffacecc13caa96f9e766e9dd87af53e039cecd76d2334c6bf75afd462722f837fb89e03007f4b26780ffe84cbd59c93aad6edd589154b603793c2d159cb5b85 WHIRLPOOL 243f5c683a5df573f00e62f61ad45f8039ed10f37313762b10df345aae350b4baca886c2d3ddb63a21af005f23043d321ac3448a137293073a8f20be558dc5df
+DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
+DIST gnome-control-center-3.2.2.tar.xz 4225196 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369 SHA512 1818fd6fc70fa634fa596c4159a780b0b60ffe9b77999ee12b1913c8b82ac06162e61208deaa64b58519d9fb97cb829b778ea11180f2f32173ad807075f9f7e1 WHIRLPOOL 6ac037538fce1bcd4c13c9c83f68212370cb19b0dcfb23669328dd4984f546bfc61574752c170195b641d1f75cd5c67241b6db1568630d68e2c581d8071bd81d
+DIST gnome-control-center-3.2.3.tar.xz 4238612 SHA256 f0460410ba5af5a1f784a0006d814bab93b1e647f93a490a5c4c2c585815ae14 SHA512 711bf0a7d676dc52bd9e4b851391a6d004c3869843a28a25e5c61ea5bf3b9d785afe7c95f8b5985a8a70c992056ef6693004884250bf891f9b1afa7b9915c46e WHIRLPOOL b386a7e83521a9927e427a2657ef33e6123ed907fd2d0e5d34c72969b03a73e322e54ab07023f660728fdd91e53da4750573edc18d77eec95d83b98657fdd002
+DIST gnome-control-center-3.4.2.tar.xz 4267688 SHA256 efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a SHA512 78927f56f1e1af4043f0d96bae174513916e752aa3e987b545e78213f34527a25ba69ce61da43dcd21ed51aa9d1ee713cabed507853f20bb6c0b0bea82f272e6 WHIRLPOOL fa4eb7659963d416594b4f983d304f84d7a0673b0b990d2975f559d25eea6048a602369a18a88736be857df3f9c3a91af31a5b3346171bb8ec62d4f92f3327e7
+EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
+EBUILD gnome-control-center-3.2.2-r1.ebuild 3571 SHA256 6d1abc936f24c89b964daa0333d97cfd4ad6f95330466bfd5a0d2eb354e1b4ae SHA512 cc800293cff08c77db95410be9679871a4d1e71f7f678f3798f783941778ecdf7d85ee553378013240d92bd8bb301c7fb5adb273dfbb302bb36f84a1b9b2ae82 WHIRLPOOL aaf17a66c9dfb08dd840726e260c9fdc07e600abac4d65d5e921a59b247d9d8c8a9f2bae3013e2472218583d182ce40d4b4029934c0a4325011529df9c65daed
+EBUILD gnome-control-center-3.2.2.ebuild 3304 SHA256 ae8b43325c9140cd707d69321c5995ed234029b0fc4412cd8d7f6a9ab4caa206 SHA512 36e12f16db0cff7955e0b61dba7c861b3c52ede761acb37f89b3b55429a02e9f04e2fcfd66fccf1559337cc9c1e2f82b9b61b6edca35a850b003cc709e054d2a WHIRLPOOL 8a92c35d8a2e9c728aa2440f34e61738e4f9320a86c07954e2cff541f585e678dd747db2d52def200add26b91795ee0e4c78a9db716de46d5f8687e4fa7d7960
+EBUILD gnome-control-center-3.2.3.ebuild 3439 SHA256 4f252f2f50b2a32dd071aa729b02f835dc791ee9e54424f6000616778895f39a SHA512 a9ef8086100f9cd0e1f6e8484fbc789254d25b2f3849a846b99078dbb43c4fb87430ea2da6881f42751e5d7a539c95fc13443e47f003cf022f048d39d1034213 WHIRLPOOL f1091cb982c48c1a3be904d9582d7a912051bfe05375f91a8069b8981f35372f2ff6ff1b630ad71caaaad9586258c03b41f4505ea1c28d9a84540500e64716a5
+EBUILD gnome-control-center-3.4.2-r1.ebuild 4156 SHA256 c0efab99fa0819221a5f4af7a6e645b1e77b27d624604e3c34da4e982f54f14b SHA512 3fa6185dde2fef65b55c97ccf72f94b1c25567e3398f54e46b1c37d7ec51b3bc9929980a27b009a06e8d0c6864173e1df1243e64ce5830bece01d3bdf3e3b1ce WHIRLPOOL fbf4112e07ec005611695e14b6a133571b0b61b0924998ccd08e5a84d2d3c31fa90f6ccdf59206ec5f914fe9490be5c604b9face03a224056bd51d359915a96b
+EBUILD gnome-control-center-3.4.2.ebuild 4044 SHA256 8cc6ca1d1e01be24762f6c6d23d22737123bbcb266a9ac7034e48f56f4f2058c SHA512 0cb894212213893648242b863d880a0b608a0495ae7a0f86f793e87f3e0a93220ff8be64086557be821f2d8b4477aeb944371585fc61ebf343c24c27afde1385 WHIRLPOOL 61629183cbbd860ce85f75e2ccb8fed3dcd682f21834c895432de0916876b908d320aa873f2fb539b6ac248bfb17f623300dc37accfa6bfed905a750e6f1b425
+MISC ChangeLog 57846 SHA256 6f56489b8e0cff2c8d902a38236c0d1bc502ae34c9d772a826c40ae75c00e8d8 SHA512 1e5339b6c022b63d9801af927ef5c7d236a757639d313fea56a96b1638f1481f91b91966cf1f47dcb9602bc59980e9f7bade1ca741b9a7ed982bd59466b2a8cf WHIRLPOOL cec59071f2a34190e73b3610c4398d5c3fecb736c7eeae85f2abb21327527a9cb31a577697862506f01f02a64e821bff4ef0e82f8527d0bf88c4581e855f1f4c
+MISC metadata.xml 861 SHA256 9f78bdf41ecb164c1465a0bd87889b7bf64c92bc7057123718f9894ee3f6e1bb SHA512 5efc19121142f80e4ef4424a6380cbde01f6ec8ad86ec799f3f20502be6aee8fcc4c4f463eaf206836345be800677ad90c8553a94f5b261ad8e7a5649a65b715 WHIRLPOOL 6b9743343315c1220ee8bef3c034242ca86f7eea33bb373ca3ad95e9d454696fe7adaf9db58eef6418d29ef45267f6e5407cb4177631654792dafae1900ddd27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPwrVeAAoJEA/daC2XTKcqFAgQALewmKW5ta4JkiKfsqXWmXop
-cQdu72Wu+pN7dusGkJV4QcNAdEz6iU9YyBdL/kXjAQngwZXVpGhni1GvSStyWdpS
-qOhF+H4q0cjZIUTxwexLNx54TeG3xBpZBMnAI3BCoGCMU4FM2kkhELo7rCchEazv
-IGXLCZXrOvo5lhpyhW9HeH8yBSOvVcEsXJ6oVkAu0zl8I+OmcX00lTNjIm7Mqohx
-O8yhetnv63Tgw8qC6ECH27CRIsGgEa7nfCgWuW6+kEMp3Kh9QaW+JrkOIJX4irin
-vncJAajw+w64ha4VUBUzvqFU8eiWeqKlJXOHZLOEE0qR2MVE2B7R1h6qW/5O9+7W
-bkySeWJpIM40IeZkk0r88LBG/KD8yTSmpdGiVbnLu1VfNLGnXhmYsUiExlJysyzS
-3Yx0q6tDpmHpylp/9GBbffMHymYATLnVzvHo6gp/NpAtVSEipCDEwOpPTn6L0r5l
-JrFNSAHeUL9P4ct7KggwCtPmhkplvFfvs2UPSze7oG/DOh78e0zbril8v/L4MKGr
-uDuFB/FkxObKv9CYH6nhnWINFxm2J3aLUaZxxdGjJe/jYPlNAR/68tGqlQRCV4wP
-nJ+nUh/sILpfxC8y4eHSC7nRPHfJU45LD+K583YIblIgNNGqtyxiKmTcI//sPnC2
-uP7ehjPREPK68SJz3S3O
-=KmNl
+iQEcBAEBCAAGBQJQB3TyAAoJEJ0WA1zPCt1hFrsH/ja+NJOBDVNps/+oPaqE9Qr5
+PFozO6YRVRVeYm3dY14jloaAdRFPK42VvNAT5Pe+hTXi2upK+BPI5QiS0VLLuQeK
+Q7H0yK14Axg5Hg2p1/EQZZBZd2vbNhkapus/idNGbWMJKscjOYpALJP+oegcU3GW
++uMTdputLrukKm+EIsvuRDhNB750WnNvE2AtNYD1MMiw3Bn+CUuZV5QPmh/UotvV
+0exJApmhJrctlJAiJe7+0hjBIcQvclFbNC0m6duo3LoCBUelFNNGu/sAsJB0rGV/
+zWoujAhELIuQyHJvoSk52hjXlPQ91vOxldfub7O1XnD4E1Tk0HA/hirjegVN0gk=
+=TUIJ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch
new file mode 100644
index 000000000000..377312ec3fcd
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch
@@ -0,0 +1,147 @@
+From 44cd56e05a59fbdfcd3dc5b12c0c7ff178b230f1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 18 Jul 2012 22:12:04 -0400
+Subject: [PATCH] Use Gentoo-appropriate absolute paths
+
+---
+ panels/common/Makefile.am               |    2 +-
+ panels/datetime/Makefile.am             |    1 +
+ panels/datetime/test-endianess.c        |    4 ++--
+ panels/datetime/test-timezone.c         |    2 +-
+ panels/datetime/tz.h                    |    4 ++--
+ panels/printers/Makefile.am             |    3 +++
+ panels/printers/cc-printers-panel.c     |    4 ++--
+ panels/printers/pp-new-printer-dialog.c |    2 +-
+ panels/user-accounts/Makefile.am        |    2 +-
+ 9 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
+index 6ed8e6c..2d7b1cc 100644
+--- a/panels/common/Makefile.am
++++ b/panels/common/Makefile.am
+@@ -9,7 +9,7 @@ AM_CPPFLAGS =						\
+ 	$(LIBLANGUAGE_CFLAGS)				\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DUIDIR=\""$(pkgdatadir)/ui"\"			\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
++	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
+ 
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index 65ee027..9a97d24 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -72,6 +72,7 @@ AM_CPPFLAGS =						\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+ 	-DDATADIR="\"$(uidir)\""			\
++	-DREALDATADIR="\"$(datadir)\""			\
+ 	$(NULL)
+ 
+ noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 490df17..b43fc87 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -38,11 +38,11 @@ int main (int argc, char **argv)
+ 		return 0;
+ 	}
+ 
+-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ 	if (dir == NULL) {
+ 		/* Try with /usr/share/locale/
+ 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+-		dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ 		if (dir == NULL) {
+ 			return 1;
+ 		}
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index 5667657..8483b87 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -1,7 +1,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+ 
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+ 
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 71c1c23..ca4b3c4 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -29,9 +29,9 @@
+ #include <glib.h>
+ 
+ #ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+ 
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 0dade8c..3e5d7a8 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -12,6 +12,9 @@ INCLUDES = 						\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+ 	-DDATADIR="\"$(uidir)\""			\
++	-DREALDATADIR="\"$(datadir)\""			\
++	-DPREFIX="\"$(prefix)\""			\
++	-DLIBEXECDIR="\"$(libexecdir)\""			\
+ 	$(NULL)
+ 
+ ccpanelsdir = $(PANELS_DIR)
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index f5cf0d9..09f3e56 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -2199,8 +2199,8 @@ test_page_cb (GtkButton *button,
+ 
+   if (printer_name)
+     {
+-      const gchar  *const dirs[] = { "/usr/share/cups",
+-                                     "/usr/local/share/cups",
++      const gchar  *const dirs[] = { REALDATADIR "/cups",
++                                     PREFIX "/local/share/cups",
+                                      NULL };
+       const gchar  *testprint[] = { "%s/data/testprint",
+                                     "%s/data/testprint.ps",
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index eb134b5..d435a61 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -1058,7 +1058,7 @@ search_address_cb (GtkToggleButton *togglebutton,
+                 }
+ 
+               /* Use SNMP to get printer's informations */
+-              command = g_strdup_printf ("/usr/lib/cups/backend/snmp %s", host);
++              command = g_strdup_printf (LIBEXECDIR "/cups/backend/snmp %s", host);
+               if (g_spawn_command_line_sync (command, &standard_output, NULL, &exit_status, &error))
+                 {
+                   if (exit_status == 0 && standard_output)
+diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
+index 2907f01..4da4fee 100644
+--- a/panels/user-accounts/Makefile.am
++++ b/panels/user-accounts/Makefile.am
+@@ -10,7 +10,7 @@ ccpanels_LTLIBRARIES = libuser-accounts.la
+ AM_CPPFLAGS =						\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"	\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
++	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
+ 	-I$(srcdir)/../common/				\
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..a61fd5dfdb11
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild,v 1.1 2012/07/19 02:46:04 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
+#
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
+# g-s-d[policykit] needed for bug #403527
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.3.5:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	>=gnome-base/gnome-desktop-3.1.91:3
+	>=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	app-text/iso-codes
+	dev-libs/libxml2:2
+	gnome-base/gnome-menus:3
+	gnome-base/libgtop:2
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-0.9.16[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
+
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.1
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-3.3.5 )
+	colord? ( >=x11-misc/colord-0.1.8 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
+	socialweb? ( net-libs/libsocialweb )
+	systemd? ( >=sys-apps/systemd-31 )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-libs/libXi )"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
+	sys-apps/accountsservice
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	!systemd? ( sys-auth/consolekit )
+	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_enable bluetooth)
+		$(use_with cheese)
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_enable gnome-online-accounts goa)
+		$(use_with socialweb libsocialweb)
+		$(use_enable systemd)
+		$(use_enable wacom)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch"
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}/${PN}-3.4.2-gentoo-paths.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+
+	# panels/datetime/Makefile.am gets touched as a result of something in our
+	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
index aff960bfacaf..3157107ab82c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild,v 1.3 2012/05/25 08:15:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild,v 1.4 2012/07/19 02:46:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? ( net-print/cups-pk-helper )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
 	!systemd? ( sys-auth/consolekit )
 	wacom? ( gnome-base/gnome-settings-daemon[wacom] )