Sync with portage [Thu Jun 4 08:38:33 MSK 2015].

9 years ago · b218c7a36a
parent 44df8d6136
commit b218c7a36a
1330 changed files with 5593 additions and 5866 deletions
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@ -1 +1,2 @@
 DIST goobook-1.8.tar.gz 29231 SHA256 55c48e2c0e2f22743a0096829e4ed0f3e14978df4d30ec6559195c80f9b9be2f SHA512 4a284e334a7389a28a28b5fa40c39d68a5ab891cb59c79fadc12736867fd8eecf073993e5ac017e577d786e244cb847a76ebe549b226f94cb4c144202203a680 WHIRLPOOL b8071d01433719742663aa15849cc7094ebf8eba5787e32aba84295cd55fd94e5cf6300e2140eb8a4cc6ad45a8b6097d7733ee68909993f81429ad8a6f12b152
 DIST goobook-1.9.tar.gz 29274 SHA256 311cb344d285e8af36dcd4546d3bd499939140287a12b2d509ea6f2535c2b50b SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81 WHIRLPOOL 64d79136a126a19baec327de8cee928d4db025b06ad9364954efbe3cc5e9712f0c1539a57bcd73000f989027c46acfff05ddd75db228eade568c9ded189f3f52
--- a/app-misc/goobook/goobook-1.9.ebuild
+++ b/app-misc/goobook/goobook-1.9.ebuild
@ -0,0 +1,49 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/goobook-1.9.ebuild,v 1.1 2015/06/03 23:11:04 mschiff Exp $
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 readme.gentoo
 DESCRIPTION="Google Contacts wrapper for mutt"
 HOMEPAGE="https://gitlab.com/goobook/goobook"
 SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/gdata-2.0.7[${PYTHON_USEDEP}]
 	>=dev-python/hcs-utils-1.3[${PYTHON_USEDEP}]
 	>=dev-python/keyring-0.2[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/oauth2client-1.4.11[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	dev-python/setuptools"
 src_install() {
 	distutils-r1_src_install
 	readme.gentoo_create_doc
 }
 FORCE_PRINT_ELOG=1 # remove in the next bump
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
 To setup initial authentication, execute:
 ~ $ goobook authenticate
 If you want to use goobook from mutt, add this in your .muttrc file:
 	set query_command=\"goobook query '%s'\"
 to query address book.
 You may find more information and advanced configuration tips at
 http://pypi.python.org/pypi/${PN}/${PV} in \"Configure/Mutt\" section"
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -1,37 +1,7 @@
 DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
 DIST sqlite-autoconf-3080600.tar.gz 1968379 SHA256 53bab14255bc16c3d73fdbe54b364c1764709d68dda167587f8026c98b9f4e95 SHA512 71cb9427c7d05bcd33b7585824bbcfe6b15b379b6c914eba1ec33c7517be158ee43a7f890db55463b811ec90d8a6b15f12336acba70ba01b39b33ff11a411890 WHIRLPOOL 5287cc6a662ad0655c2c8837653402ca2fdf2835e947b65122861ac7282053627b2b3eee7967fa2bdc30ff32d3f3f9812c4957bfa999e9c39e267f3aca9eb65c
 DIST sqlite-autoconf-3080700.tar.gz 1998217 SHA256 d0b42377fb59ea8dfe690334af04505e34e60e6875058a01aebd2502ac63d4ae SHA512 32aafa679e4a1c2f504e69f58fec8824c478defcaefe66bfe2e42a223ddc9c02b07ae4ccb9b497773829cb92fdf90b159ff368b3c20a53a7494fb1eaa4a94265 WHIRLPOOL 82ae1c031c31b26ce7177d329ef7a17462f04a7df2b76f3397923f06860ad9406ad09985d3a541d9764cb16ff9ff759dfbc31c057c73860738defeb9ac4329cb
 DIST sqlite-autoconf-3080701.tar.gz 1998389 SHA256 9d2854bec7b26dfe9aceb1faa17d40674daa15a23bbab67018191ffbe0339533 SHA512 97caaed40600f2831b5d9807f0f4c802ef4dcaa638febf1f6bfa4ce0a16d6c57325e9bccb1f95bdcc5e7c5f473b59f317d6d7773f22ecf3ae157bf1964ac1c39 WHIRLPOOL 704546eb7e45ce671f293056f44378d880a08f27600d57a48a6188069dee584830b271f04900d70d6c73e489b6b5367d4ecd1e281d6d7bacbc7da06adff4e81d
 DIST sqlite-autoconf-3080702.tar.gz 1998965 SHA256 8da1729e8b39d86bc23c8bdb439ad385afe4fcfcfe2b6796406a062a76e9d20e SHA512 7a47e6a85cbbb96d2d6a937f648ec7d764ccc6e40dfe19638f6cf26bdacc0b435e657dcfff6d1da6b0473bcd7fd6bb0d944b81a332d86399700c311894e458ef WHIRLPOOL ba2a3811ff8176730f21068a5807ff5e39d65dbe256cab81632d09073b8954c28b019793469b1a80374d5c8d635e1f1ce16c90b55a784de40c7c4e3f82a16e02
 DIST sqlite-autoconf-3080703.tar.gz 1999200 SHA256 90b43a72a9d43ddf68fff0f71db869c213b9fd5082ade7d13e85a655c39a678a SHA512 f432f95de48bad5e28b7c2ca38f8cf32aecab5e4a9c15a95f88ce96cca3ef03a45f17ae18de047b09f85f63d90eac8c24338661e51ce21e6f89be9ca92d9f97a WHIRLPOOL 216726e63b9d7d62fbbcf559d10a7675faf5db5776aa6427d2d1758007ba425be1a43bff1bb90c5a1c2ea8720cad39116f351f917de68fdd1a794d8e2a089bbe
 DIST sqlite-autoconf-3080704.tar.gz 1999230 SHA256 86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec SHA512 c250108b7467e513ea831a9feed1169c70a397c3fa76cee79a20716b24c23b882d9a02b7ff46c2d439f4fda46c962ef8deae35b5516b3569634abe6bd4764967 WHIRLPOOL 8e66dc298328d540bcfac12f2a027a14fde193699444a0f4b727b30d2ef403e87f09a7a29adc4462300230a3c6c1d4f13521d33876095647a1904a1c796aca49
 DIST sqlite-autoconf-3080801.tar.gz 2021072 SHA256 2721361eb4a71d5f727dfa466bd910dadd5dbeb4d2d57b8b34205f7ce7e5b7f9 SHA512 9b3ce3cd8d43f27a19f32f08c6807abf5cf2fc10f1f0d151882b75668a26bbd8785dd3a3d2ac83d0c55eae4aa52c7aa71d670a5a43378f3c677b355f1888b849 WHIRLPOOL 75009175f91639ca0c67ae8f233d74cfff838316a458b170bbe2fb48269f881b982b0dccb8ce6821002b59c21492af0542de66e6c35bee56a05db7855ed24479
 DIST sqlite-autoconf-3080802.tar.gz 2021091 SHA256 aaa31e961963ff6d34c253c0464e667446d7674f8e375b62a3d66aa5dea26c2d SHA512 d307b4f12ef414d9c5e78c426e1ac0453758b292dbf63ad0230493597423b17583317d1d49b7635e11c66064bbd5f1adf616e9b3c32251e1ff3e817835192836 WHIRLPOOL 377155c8bf62463361f4164e9e5d98cf21ea80c4c8e525376bab5dd5793b9ced8a82daf48894dc197799e4e5619a945fe11e42b09858c4ce23f13f4d75e28d15
 DIST sqlite-autoconf-3080803.tar.gz 2021112 SHA256 74576964cd9db44c13bf95d6a7c36b06cfdfb2fe4e3e26c9ce1ae0b2e328b411 SHA512 bffbdbe099569faa5a6fb527e6c23d41ffe238acc4a1625230ecf9558a816c708a18e255cd0f1fe284715d4ec6d5943beb4e96aa7b0361ab10ebaa75f9efb2b2 WHIRLPOOL 1887d9af1e7cb9b44f72cb15cddd3e3e4dd0975b98fbf31a37258d590410163198a2a51a2f27796694078c5498e3cd82ef5867d62843d380137ec9d29c407d38
 DIST sqlite-autoconf-3080900.tar.gz 2037200 SHA256 76ebb6392cd2289fbff903af7ff67f3e49bd01ff30544b8028ecededd60269a2 SHA512 e5683c11a0f5ed462add032b64d80ac453b549a82466813c2f2778bd857247aca5ed0a22580c5d18ee9c7155a38f68fb8fdad1a0ed6c23066a9059fd80e69b22 WHIRLPOOL 59dccd79874bca49af31aa93e48227665c032a50f63d5d81e4864fb322815087d6eebf1f34453f2ef651877d8d5723f0877943ccd46e907b95ac1ba0c009d3dd
 DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5
 DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8
 DIST sqlite-doc-3080600.zip 4736026 SHA256 c187ffe719e35ab03970db4d1fb4a4865ae4f8d943ceaaa79f635a51d982ca6e SHA512 58bd1a58156e0d5d19c939d7a82b756c68635fe6b7ff8ae2189dcababb2b8c80de8fdb2646da9d8ec5381a716ca73f32f12d63a2be9336091d3ebbb90cc46d54 WHIRLPOOL 6339a21065d2948e6350cae84071528cf492735b83960959cd0ace1007a0c8ab9099d4bd028bc9d02422c4a07b05f8b3246fe93b48b75ae5ddb0587db0d985c7
 DIST sqlite-doc-3080700.zip 4901008 SHA256 79126f7035ae1b32029e8943db492cf82bc617109245fa9a08ec71072122a0eb SHA512 c9d2784dff719515cf3b5a95fddb3c9738eebcfdde5a7605baf4824d01aa3215d293788b55a7d20fa645b952df53951c5e2dfab0bf5defe460ede8a6643dcb77 WHIRLPOOL 9b647a5d6c28a7c8f96883ec85fe14ceb01fb2c48dbe83283ed01ccf8821759fa00f0bb4be126be033cee5271fa47bfdaa62642698f8f35880c8a69835e4b741
 DIST sqlite-doc-3080701.zip 4909904 SHA256 d50444d9ebf4302cb8658172a34602056b65313d93ee32eba213cd7111bfc53a SHA512 cdd4244c9ffa96dfe48db81be193b052a227fea11c6eb67a1179438d03a2846814c11873d60ccb1f2f949b7a8e90bb13b52b7ccc73911b48e575e9ea77b50ce2 WHIRLPOOL 38a44b456997e2830bb529fb9d2f3cbc8e1aa5c8080862fd1694b0bcf75692a996980dcbc749700ba5bf9add8112904b9f625e97d34f9d77b51299cdcc26497e
 DIST sqlite-doc-3080702.zip 4908305 SHA256 c8b9c7380868da96171eba482eb559ef2297d086cca85e29513071ebb317e146 SHA512 cff181246d9f584d3a0d90b9c60ca967da5eea684fabd13b51b224274465e0a9db1cff0db6fbcf94adf9cc86e3fb4596ee86a71b97a56fbcb18102f605dd43f5 WHIRLPOOL dea18fabe9a2910e13c8486e9d7e3a5b5b12e9b33d3b8a2e47baddda4c7283e93e0370c0bf6c07f5ef93c7141dbc9c5603be6397015adeae56858269233a12e5
 DIST sqlite-doc-3080703.zip 4916565 SHA256 c80a12afd8273df3c9305521dc68cd5fa32cf44506686f37c089ba6ac84950cf SHA512 ba14db03b23b3319ebc43af67c13ef1bcdb9d801ebee8aaddf1893215bfb34e08556098585f58a4e96cd673f49ac72b61ae11cfbd58deefedd31196ea1fd5c55 WHIRLPOOL cdeb0e1439148a90efde8f85ef77a7898e7f6f8a14b94ea398d29e5cb9f9268a10ab3dc3ab3f0b385edf367f69b3870507101e79f79567f04e90bef07c48dafa
 DIST sqlite-doc-3080704.zip 4918739 SHA256 b5d6da86e8af181442e4e296fe86054f1a9c2dd05e0378d519cd64d3b9b4a5cb SHA512 f83a0a57e97d4bd506b99889e14c17d78e0e13c87af55d028d2b48868ffe9b02220e9610d4409dbd9625502917cc236e058e7cffdf174d85e26966a03cea917b WHIRLPOOL e487026a7a569429804365ee4bf37d21ef6b183e26c2949df3306e81156180bcccef724e4ccbbe65be56798ac9319c133324ddafb276746c912404cf342193e9
 DIST sqlite-doc-3080801.zip 4949418 SHA256 8bd54fdb0ed5daf4d47ab97838a116b71cc669591ff0bdd7935ab300942ff93f SHA512 1fb073abb9e253feaac6076142d1e9428604f8f8718290fed496c620b19a70b6e7e11ead2163793dba0587e10fb54faad9cf30f831bca170e7c2e57cd4bcd2db WHIRLPOOL 906ad448e9571be41680ee6f57fe0473ca6f3323a61e213ca47ec66b248549d60ef5b2b64f2d334e3704595e78275f937704d75fc9cf43a78c791a8596578d1c
 DIST sqlite-doc-3080802.zip 4962080 SHA256 7cb28c9d4bf2b20f827f433eb9dc2caff1d0ca0b79c14232b0902ca67fbe6d4a SHA512 83f23b14a28179646e72e171e51ccb86360b4f707e1d7aef8c57ace8fbce51937277bf7e3c667bbb3e8527c815489ff1dc9673738ae76b56da537539acfadec5 WHIRLPOOL df6ae3ca2f33b27aa5e290752f682e0cf3c634de894760ceac93e29b85ef38da80ec245c2352acf244a34693b1d536fa8a6570532581697d416b35c4a3cbd77b
 DIST sqlite-doc-3080803.zip 4972781 SHA256 8e3f2c5f006004bda035c96f5a7aa0922397edc3898cd401a7ad8a95e0c6eb3f SHA512 fc73df34811533b0f794c9cb6f179ea13d0e95f5cc0fecf41cbd7afd4a77e03d31a2087ccefcb7137637b74a671c285b2b2db807ce4a7b8e18739bb6dee62986 WHIRLPOOL df86f864a5ff7b72c391c948c796a6c1a721f6c984efccaf5e064dda90db1c2ee12e3caf85a1366abf7ea29a4d55bf63edfcff5033e158e964d701dedaa68a09
 DIST sqlite-doc-3080900.zip 5025367 SHA256 aeeb5b9a410c3efabaccb13860dd04e3dbdfcd75e9f05fcb5c2a41d3a1f8f296 SHA512 d3946ee6537baf596a6e971c3ce277129f43f96532628ea53a3e886727dd450983e94ceec23986d1c9749c489982d6da7bb1a2277aeaf2dd766b9ecf66ee7f15 WHIRLPOOL bd2a094abdfb603e31caf1cd4091ae8d727c4d3242060799d0d9144f7928cee912019181ed36a37307bc0770da1eddd12916d5087d251e3a0be46947798e9a42
 DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c
 DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061
 DIST sqlite-src-3080600.zip 5683499 SHA256 ffe524334ec012a27ab2d2687f35d2ed34286e2ba8f8e13dd9f1ec73ce9dce31 SHA512 92b11db11ddcd8c2e336af29b3f7c1bf39e6e2575eeca7cee20323065958b21df48316f7135757b2a9a31fb52b824064df22ce1ed44ce17ed60444d61f6620ad WHIRLPOOL fdcfda872b72a67709a2725025e06749114c0a6d62cf991e59397d43520a1147ec5356f4cd52fb94263f6fce49364a299dd6d546f7b7970866ccdade3b76b9ff
 DIST sqlite-src-3080700.zip 5751697 SHA256 dc2f064f43d0ce554e53ce6dc8b3616b0b6f7fe0b28ca8af61f72b0d3bc1a191 SHA512 682f71be7c9f8c0d5a4d04302683566350b5a8d8893a3064395ebf969fd5a679afd750abbcefe997a12c2c9e3ba93dac2202e8e63e23f5df8b113b4bbe17a334 WHIRLPOOL 08e22ba6778e4c86214afdb17f68b3569efe8de8fa9e94bab4e74c6687f572891248e3e9f8f9e1a0fb2e001d34df2cb937a1193ec07a9f1d9fc19aa2a2f24b39
 DIST sqlite-src-3080701.zip 5752291 SHA256 1bed8d029b61fd4532659a1bfbdf3621e2146bb7c5389b6aef62e8ee496bd9a9 SHA512 28e57c2e5402cd991cf63dc9b8608113454d23e8ac306f8243269773fb4b908ae28499835d7c38d84da6b6db3a7c909745081b34dbe2d360f4fdc1ef543a9562 WHIRLPOOL 914e587cf739598fbfe6f82aae4591f4332e173933fe04c57c4fbef43e06d966bc2771a013fb2b17e7c5a4bf8b79d5900af665bea0754de95f26ec16c6db758e
 DIST sqlite-src-3080702.zip 5755042 SHA256 27736d78975085632f2391b0d8f21db3c68d1555a1c2fbbdbfc858e18c7aecc2 SHA512 12ded5ca26a9d035305a807fc7ef25d0c04631e2093b89b6b6e2bd3be1f311148790f5e93084705c34515cc7b160ca7cc185c84daa854a57819b26f38e788845 WHIRLPOOL 9e5e1e6a4cc4d7665e4e1635ea2ab7467871e442eaf4fa819d815534acd626d42fd0138f96b56a2ec24292463907b86d991d55fbdc3d395fd79b691fea84f2c4
 DIST sqlite-src-3080703.zip 5756775 SHA256 b838054941c83ca7901f818a51a8e177c2ce5c3e1047731c04437513e1588364 SHA512 68b43e5a251996db5635b7536a547fc88613445b985a9ef97712a5f3b81d673ffc30b37cbfc4a457bb99efe6a07ba8488045db6191c97e3039c5385c6aa5d0cb WHIRLPOOL 9757c09ea2d5f2a3a44b90d1330f4b7f924f745d647e5d8d6f63d657ca3eadb964068c35b21209845eb33f31f6d77a5bde96a0fc056c416f65657a13d6723ff2
 DIST sqlite-src-3080704.zip 5757797 SHA256 0c23dc9e9afc25119470bf335daa8d854ef9f540b1ee59667d0288e700360fb7 SHA512 9a04948102fd88c91f15443540d8d4ea3f5e528e83b5b1f722a5cd71a461cd469f922b2d0173596246df0b6580cf83c95a0caf8da54fc530a95b20c16b0050f0 WHIRLPOOL 890a3af0eab52bad4e2c356eb67e9e21572cbeea0eff50b2fd6dec4b086e7967e1fcfb444db6cee26ea431f167f03093dc74551b059cbc3977c36c1400c922a3
 DIST sqlite-src-3080801.zip 5849483 SHA256 51ba1c97a4cc844dbe8ed9a18fc449580629afe1ef69b48e819a1a7af46b9fb4 SHA512 4f09228cb0c9c608e492da6e480afe3d27a63e27ccdcf33a88d5e56427f0846efab8930c81026b8e608f1bbb8d63e8d937dd26571deb828617f7efa27a765950 WHIRLPOOL 5ac6b44eaae52c0733d01bb06ca0f468e240fd22620aa0d77bd151df73bb15d6ebf7a9cd36f0c946e570743696ffa308996581ec081ea58b6012da680b57110a
 DIST sqlite-src-3080802.zip 5849846 SHA256 7cf44dfb7701ba17509084f5dc9201f6c89dbd517c691dc14c59702c12d30ec1 SHA512 31e5b3dc620ac3e75d2a2b59b999f502637390747d117d08f80f836de2edef9c58b8c39c097f8b231a9316c40489277770efdb0f45aab33d8457df540d42330e WHIRLPOOL 93465fed96c9bdcb1633c8a1abfc0cc3bddfb0ecaffe0d95a0995f7eb120a246839368d22439e4f67c9a5d23f8c1815369d091afc55ecf8dcf942c2e07e04aa5
 DIST sqlite-src-3080803.zip 5850400 SHA256 790ff6be164488d176b3bed7e0e0850bac1567a4011381307685d48eb69fab48 SHA512 a923973482f23028f62b9b04df68a3fe2fa4f8fb06aa77024949215577a687855d79cec9f07947f7e23e8b8836b5b57dec62dc445d6f4996220c3ea2230e721f WHIRLPOOL 6b250211eacea1b32d3c53f95bec8ef77e55d3b2ef3ee6249c2e1a71b0784a5306d864b3bf0b96a347ff0693bbe5a749d35c4c686e743e0b509961b6abffea0b
 DIST sqlite-src-3080900.zip 5894168 SHA256 fd33ee8e079a8ed15adde5a39f567150e0ad26709c737124b3decc4ce4e94f89 SHA512 32621c52184a8009392eab53d1e10aef396ef89e0ff229634bcb572d09ebaa640fc63f652d4f47fc6a0f7ad561557d003fdc3df46fc73a1e6b78088be5833c1c WHIRLPOOL f9041a2941c7b1b219ea41f929f5d41010c7068c04e008162285be862115ad7d43b315f3108b6716c06a16524872a2e5aa671a488837f394318482eccad5a692
 DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
 DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc
--- a/dev-db/sqlite/sqlite-3.8.6.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.6.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.6.ebuild,v 1.11 2015/03/25 12:19:13 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.7.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.7.1.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.7.1.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.7.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.7.2.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.7.2.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.7.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.7.3.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.7.3.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.7.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.7.4.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.7.4.ebuild,v 1.6 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.7.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.7.ebuild
@ -1,167 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.7.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	# http://sqlite.org/c3ref/table_column_metadata.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.8.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.8.1.ebuild
@ -1,175 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.8.1.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support detection of misuse of SQLite API.
 	# http://sqlite.org/compile.html#enable_api_armor
 	append-cppflags -DSQLITE_ENABLE_API_ARMOR
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support scan status functions.
 	# http://sqlite.org/c3ref/stmt_scanstatus.html
 	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
 	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.8.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.8.2.ebuild
@ -1,181 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.8.2.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 		# http://www.sqlite.org/cgi/src/info/1964e656b4b420e8d6a4ba12d270ed02db292b88
 		sed -e "21265,21271d" -i sqlite3.c
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 		# http://www.sqlite.org/cgi/src/info/1964e656b4b420e8d6a4ba12d270ed02db292b88
 		sed -e "215,221d" -i src/printf.c
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support detection of misuse of SQLite API.
 	# http://sqlite.org/compile.html#enable_api_armor
 	append-cppflags -DSQLITE_ENABLE_API_ARMOR
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support scan status functions.
 	# http://sqlite.org/c3ref/stmt_scanstatus.html
 	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
 	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.8.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.8.3.ebuild
@ -1,181 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.8.3.ebuild,v 1.2 2015/03/20 09:58:33 jlec Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0=[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 		# http://www.sqlite.org/cgi/src/info/1964e656b4b420e8d6a4ba12d270ed02db292b88
 		sed -e "21265,21271d" -i sqlite3.c
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 		# http://www.sqlite.org/cgi/src/info/1964e656b4b420e8d6a4ba12d270ed02db292b88
 		sed -e "215,221d" -i src/printf.c
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support detection of misuse of SQLite API.
 	# http://sqlite.org/compile.html#enable_api_armor
 	append-cppflags -DSQLITE_ENABLE_API_ARMOR
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support scan status functions.
 	# http://sqlite.org/c3ref/stmt_scanstatus.html
 	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
 	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-db/sqlite/sqlite-3.8.9.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.9.ebuild
@ -1,175 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.9.ebuild,v 1.10 2015/05/27 13:00:40 ago Exp $
 EAPI="5"
 inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
 SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 	!tcl? (
 		test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
 		!test? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz )
 	)"
 LICENSE="public-domain"
 SLOT="3"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0[${MULTILIB_USEDEP}]
 	)"
 amalgamation() {
 	use !tcl && use !test
 }
 pkg_setup() {
 	if amalgamation; then
 		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	else
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
 	fi
 }
 src_prepare() {
 	if amalgamation; then
 		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
 	else
 		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
 		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
 	fi
 	eautoreconf
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
 			append-cppflags -DNDEBUG
 		fi
 	fi
 	# Support detection of misuse of SQLite API.
 	# http://sqlite.org/compile.html#enable_api_armor
 	append-cppflags -DSQLITE_ENABLE_API_ARMOR
 	# Support column metadata functions.
 	# http://sqlite.org/c3ref/column_database_name.html
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 	# Support Full-Text Search versions 3 and 4.
 	# http://sqlite.org/fts3.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
 	# Support R*Trees.
 	# http://sqlite.org/rtree.html
 	append-cppflags -DSQLITE_ENABLE_RTREE
 	# Support scan status functions.
 	# http://sqlite.org/c3ref/stmt_scanstatus.html
 	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
 	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
 	# Support soundex() function.
 	# http://sqlite.org/lang_corefunc.html#soundex
 	append-cppflags -DSQLITE_SOUNDEX
 	# Support unlock notification.
 	# http://sqlite.org/unlock_notify.html
 	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
 	if use icu; then
 		append-cppflags -DSQLITE_ENABLE_ICU
 		if amalgamation; then
 			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		else
 			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 		fi
 	fi
 	# Enable secure_delete pragma.
 	# http://sqlite.org/pragma.html#pragma_secure_delete
 	if use secure-delete; then
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 	# Starting from 3.6.23, SQLite has locking strategies that are specific to
 	# OSX. By default they are enabled, and use semantics that only make sense
 	# on OSX. However, they require gethostuuid() function for that, which is
 	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
 	# versions of OSX we have to disable all this nifty locking options, as
 	# suggested by upstream.
 	if [[ "${CHOST}" == *-darwin[56789] ]]; then
 		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
 	fi
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
 		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
 		--enable-threadsafe \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
 		$(amalgamation || echo --enable-tcl)
 }
 multilib_src_compile() {
 	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 multilib_src_test() {
 	if [[ "${EUID}" -eq 0 ]]; then
 		ewarn "Skipping tests due to root permissions"
 		return
 	fi
 	emake $(use debug && echo fulltest || echo test)
 }
 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	doman sqlite3.1
 	if use doc; then
 		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
+++ b/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
@ -0,0 +1,22 @@
 https://gmplib.org/list-archives/gmp-discuss/2014-March/005537.html
 # HG changeset patch
 # User Torbjorn Granlund <tege@gmplib.org>
 # Date 1396602422 -7200
 # Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
 # Parent  0194a75b56b21a9196626430af86c5bd9110c42d
 Conditionalise ARM asm on !__thumb__.
 diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
 --- a/mpn/generic/div_qr_1n_pi1.c	Thu Apr 03 23:58:51 2014 +0200
 +++ b/mpn/generic/div_qr_1n_pi1.c	Fri Apr 04 11:07:02 2014 +0200
@@ -130,7 +130,7 @@
 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
 #endif
 -#if defined (__arm__) && W_TYPE_SIZE == 32
 +#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
 #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
   __asm__ (  "adds	%2, %5, %6\n\t"					\
 	     "adcs	%1, %3, %4\n\t"					\
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@ -1 +1,2 @@
 DIST libzip-0.11.2.tar.xz 413352 SHA256 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb SHA512 55cbcbe1cf4afae578d3ac1b9027ac8c21e223415f648b0e74e087d0200842b04abb751c75e40e9a8bc727722791490565fcd912a4fdcc7bf02174eba66b7106 WHIRLPOOL a523d4637c34e786cc9716bae41eaee48a906be81c27c705e9174b7fad5e3358053ddc39c6dd2862fde358f0dc79487280e6b241a12c2a9a2c7ef68a29097faf
 DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41
--- a/dev-libs/libzip/libzip-1.0.1.ebuild
+++ b/dev-libs/libzip/libzip-1.0.1.ebuild
@ -0,0 +1,29 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-1.0.1.ebuild,v 1.2 2015/06/04 04:44:05 jer Exp $
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="http://www.nih.at/libzip/"
 SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 "
 DOCS=( AUTHORS NEWS README THANKS )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.11.2-headers.patch"
 )
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild,v 1.1 2015/05/18 21:22:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.270.0.ebuild,v 1.2 2015/06/03 19:37:40 monsieurp Exp $
 EAPI=5
@ -14,10 +14,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE="test"
-RDEPEND="
+RDEPEND=">=dev-perl/File-BaseDir-0.03
-"
+		>=dev-perl/File-DesktopEntry-0.0
 		x11-misc/shared-mime-info"
 DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-Module-Build
-"
+		test? (
 			dev-perl/Test-Pod
 			dev-perl/Test-Pod-Coverage
 		)
 		virtual/perl-ExtUtils-MakeMaker"
 SRC_TEST="do parallel"
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild,v 1.1 2015/03/04 21:29:31 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild,v 1.4 2015/06/04 04:30:40 jer Exp $
 EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION='Traces memory leaks'
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ppc64 ~x86"
 IUSE=""
 SRC_TEST="do"
--- a/dev-perl/YAML-LibYAML/Manifest
+++ b/dev-perl/YAML-LibYAML/Manifest
@ -1,3 +1 @@
-DIST YAML-LibYAML-0.380.0-patches.tar.gz 619 SHA256 d582d2235aab928a0ba0b50486ea1ee4e7c8586d5fe49f9346ede76444b1131e SHA512 96aa389cee9ef34fa1f267b5f1abedc71bd1eb57a4d21b7f1d3ca1639213515625ee312bb278684f64991a0a61786ffc6f4d0adc46b776c530417dd17d8cff6c WHIRLPOOL dec1cd2e0c818676519a78e42852b19d699824927ea9cd41717fd544ece7fa87a40c1091da68d171f44dfddbddebf1e782ef07bbf913cf2faebe1b1ac96ed085
+DIST YAML-LibYAML-0.59.tar.gz 140949 SHA256 9df424ef5e968054042cacafa2f44354a662329df974d178dffce7529fc99f54 SHA512 0c0bdbd7d93352b1e60f41f185f2947b163a9ea7074945c933850a3d165f75dd202403406f9e355e78535ae7d1726f2328dc006af7a01a6f30c48999013da3bc WHIRLPOOL ea881b3fdc37a3d8a641985f93fcd00d224940ce612962d48488c3195e2085cf6b41ac4d076dd0eda01ef331f560a437aa000ac56ef85b5ea0ae1e3ce9d56cff
 DIST YAML-LibYAML-0.41.tar.gz 179218 SHA256 9a654427a3a63de434c6d03b18bba144cc7ba0f0e61a7100c6d08d77a90145ce SHA512 f978ed941d7642c14f33d08590ccbead0ec6243a37b2e48e937bd456512bd2c6d62357ed06990bbe16d8b31f4703b4d2ae7b8d72335dd0950d0c41baabf8ab08 WHIRLPOOL a17d0d1066b8092e701890c45e2911392d4c3cc44f7a9f7cdbe462a1f115f7e4494186b4be1158808cee40d1afa6615537730ae51089fc0a75ad7bfc0219e42a
 DIST YAML-LibYAML-0.52.tar.gz 140142 SHA256 06c1b162c06ca6b7f76f7e86e3eb0f3b03870d43d2fa88c6975e8bb89c960a93 SHA512 7cda72d05a3c630e1a7c67a5aa5cb22f9a815351a2e89db2af6823d5e92104d323ecd6eef54a1e6f0223eadb8ede8f19c77d0ca2e02527bf1a616e37a954245e WHIRLPOOL cebb964a67084270bbe04d9b826cd5786136324b0c555ebf2c2e0851ca9e31519cad10386c0e4ff8c35207d0c41c2897df4c706581f762aae481eaf1eb4aa083
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.520.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.520.0.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-LibYAML/YAML-LibYAML-0.520.0.ebuild,v 1.1 2014/10/27 20:41:25 dilfridge Exp $
 EAPI=5
 MODULE_AUTHOR=INGY
 MODULE_VERSION=0.52
 inherit perl-module
 DESCRIPTION='Perl YAML Serialization using XS and libyaml'
 SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/dev-perl/${PN}-0.380.0-patches.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 SRC_TEST="do"
 PATCHES=(
 	"${WORKDIR}"/${PN}-patches/0.380.0-format_string_flaws.patch
 )
 export OPTIMIZE="$CFLAGS"
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.590.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.590.0.ebuild
@ -1,22 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-LibYAML/YAML-LibYAML-0.410.0.ebuild,v 1.1 2013/03/17 17:09:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-LibYAML/YAML-LibYAML-0.590.0.ebuild,v 1.1 2015/06/03 20:12:08 monsieurp Exp $
 EAPI=5
 MODULE_AUTHOR=INGY
-MODULE_VERSION=0.41
+MODULE_VERSION=0.59
 inherit perl-module
 DESCRIPTION='Perl YAML Serialization using XS and libyaml'
 SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/dev-perl/${PN}-0.380.0-patches.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 SRC_TEST="do"
 PATCHES=(
 	"${WORKDIR}"/${PN}-patches/0.380.0-format_string_flaws.patch
 )
 export OPTIMIZE="$CFLAGS"
--- a/dev-python/Flask-KVSession/metadata.xml
+++ b/dev-python/Flask-KVSession/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
-<maintainer>
+  <maintainer>
-<email>aballier@gentoo.org</email>
+    <email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
+    <name>Alexis Ballier</name>
-<description>Python team can take the package if they wish.</description>
+    <description>Python team can take the package if they wish.</description>
-</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">Flask-KVSession</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/GridDataFormats/metadata.xml
+++ b/dev-python/GridDataFormats/metadata.xml
@ -5,4 +5,7 @@
  <maintainer>
    <email>jlec@gentoo.org</email>
  </maintainer>
  <upstream>
    <remote-id type="pypi">GridDataFormats</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/Kivy/Kivy-1.8.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.8.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.7 2015/04/08 08:05:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.9 2015/06/03 20:04:07 jlec Exp $
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
+inherit distutils-r1 eutils
-DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications."
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
 HOMEPAGE="http://kivy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@ -17,28 +17,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cairo camera doc examples garden gstreamer spell"
-DEPEND="dev-python/cython
+RDEPEND="
-	garden? ( dev-python/kivy-garden )
+	dev-python/pygame[${PYTHON_USEDEP}]
-	gstreamer? ( dev-python/gst-python:1.0 )
+	virtual/python-imaging[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo )
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
 	spell? ( dev-python/pyenchant )
 	dev-python/pygame
 	dev-python/setuptools
 	camera? ( media-libs/opencv )
-	virtual/python-imaging
+	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
 	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 	"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-src_prepare() {
+python_prepare_all() {
-	sed -e '/data_files=/d' -i "${S}/setup.py"
+	sed -e '/data_files=/d' -i "${S}/setup.py" || die
 	epatch "${FILESDIR}/cython-fixes.patch"
 	if has_version '>=dev-python/cython-0.22' ; then
 	    epatch "${FILESDIR}/cython-0.22.patch"
 	fi
 	distutils-r1_python_prepare_all
 }
-src_install() {
+python_install_all() {
-	distutils-r1_src_install
+	use doc && DOCS=( doc/sources/. )
-	use doc && dodoc -r doc/sources/*
+	use examples && EXAMPLES=( examples )
-	use examples && insinto "/usr/share/doc/${PF}/" && doins -r examples
+	distutils-r1_python_install_all
 }
--- a/dev-python/Kivy/Kivy-1.9.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.9.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild,v 1.1 2015/04/10 08:29:03 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild,v 1.3 2015/06/03 20:04:07 jlec Exp $
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
+inherit distutils-r1 eutils
-DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications."
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
 HOMEPAGE="http://kivy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@ -17,24 +17,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cairo camera doc examples garden gstreamer spell"
-DEPEND="<dev-python/cython-0.22
+RDEPEND="
-	garden? ( dev-python/kivy-garden )
+	dev-python/pygame[${PYTHON_USEDEP}]
-	gstreamer? ( dev-python/gst-python:1.0 )
+	virtual/python-imaging[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo )
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
 	spell? ( dev-python/pyenchant )
 	dev-python/pygame
 	dev-python/setuptools
 	camera? ( media-libs/opencv )
-	virtual/python-imaging
+	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
 	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 	"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
-
+	<dev-python/cython-0.22[${PYTHON_USEDEP}]
-src_prepare() {
+	dev-python/setuptools[${PYTHON_USEDEP}]
-	sed -e '/data_files=/d' -i "${S}/setup.py"
+"
 python_prepare_all() {
 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
 	distutils-r1_python_prepare_all
 }
-src_install() {
+python_install_all() {
-	distutils-r1_src_install
+	use doc && DOCS=( doc/sources/. )
-	use doc && dodoc -r doc/sources/*
+	use examples && EXAMPLES=( examples )
-	use examples && insinto "/usr/share/doc/${PF}/" && doins -r examples
+	distutils-r1_python_install_all
 }
--- a/dev-python/Kivy/metadata.xml
+++ b/dev-python/Kivy/metadata.xml
@ -12,4 +12,7 @@
      Install garden tool to manage user maintained widgets
    </flag>
  </use>
  <upstream>
    <remote-id type="pypi">Kivy</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/Numdifftools/metadata.xml
+++ b/dev-python/Numdifftools/metadata.xml
@ -5,4 +5,7 @@
  <maintainer>
    <email>jlec@gentoo.org</email>
  </maintainer>
  <upstream>
    <remote-id type="pypi">Numdifftools</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/PyECLib/metadata.xml
+++ b/dev-python/PyECLib/metadata.xml
@ -9,5 +9,7 @@
  <longdescription lang="en">
    This library provides a simple Python interface for implementing erasure codes. To obtain the best possible performance, the underlying erasure code algorithms are written in C.
  </longdescription>
  <upstream>
    <remote-id type="pypi">PyECLib</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/PyPDF2/metadata.xml
+++ b/dev-python/PyPDF2/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">PyPDF2</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/SaltTesting/metadata.xml
+++ b/dev-python/SaltTesting/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>chutzpah@gentoo.org</email>
+    <email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
+    <name>Patrick McLean</name>
-	</maintainer>
+  </maintainer>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">SaltTesting</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@ -1,4 +1,3 @@
 DIST datashape-0.4.1.tar.gz 76873 SHA256 cc72f5feec393890183c82c2d0da55cf3e1e8334909ae71bd6aa5c119961b89b SHA512 dd74aa6d001de5122e155d94b50aeaebbc1e3c1ced19166158d2a9860f2e553d17d0c81a45d81130816ab0406c030f2f7cefbbe7f8543e7b57df338d731af493 WHIRLPOOL 851823fa36955bbedcefc866462ca90ae3bd00e78d32ed5875a83c5ecba7b18ac73457835ddb5e1fb4e093419c008431f1f5b4a54cae284dff8a317b5d0a95ec
 DIST datashape-0.4.2.tar.gz 79106 SHA256 56ca27c5eb090d3670d3f59d2cd4a9855c488495fd1888e6f723a21f42acfa32 SHA512 d12eecdce6ffeb77d9367fcf978c2cfddea3bd2daa53a2aea983464c41ff2a408f9d199462ed25eebf247f4bb0f9e827ac97a5acab19979a5d30789898441c49 WHIRLPOOL 5497a90258115e8db30414ab1bedbad88d38462e6606561c9be7645137557608ac12a384e93da08f3e2cb49c1ffbb5a3b5d33483376ee8f170cfe6af10a9dc32
 DIST datashape-0.4.3.tar.gz 81086 SHA256 cb3a0e162b242f4100dadbdf4c45db666457b83b258a340eb5fce59b2af7b2c3 SHA512 267302286a5ec5f875e268750696dc9cca002d57da9710475ecacdd22569ed9ba68bc7be5a6b9b49bd7ddca0d71008621c9732f54b8d658ed08228a1354c381e WHIRLPOOL f4f563e7efee50fbaa12afd50ee60bfb942235d6428855fad8f56beb98e9fbb1314f64d6e8629866ab7b7c7c2d8fff1bddd507e7727b69ffa2e0839617d6115f
 DIST datashape-0.4.4.tar.gz 80923 SHA256 c4142eadbdb986a350941e5427d35a2aa106934f9197e91ccb53809c4c79e394 SHA512 047127e070b1cbecd241a888a8b2d773ee149d05e08556644ae0add79f774be9795caab8b8c6de146dc9281ebfd93aadbcb54c2c08fc8fa7f1612834cecf9753 WHIRLPOOL 8294278a940f2a89e525e1133d5870c320b37d1cf1f48f24b267fa792c1599695e8b72cdda6a455500cd8d6d008d394791ba5ea71c7ff42d71da9059bcf47268
 DIST datashape-0.4.5.tar.gz 93549 SHA256 34d4922fa924ef474de2ef8b69833fe2d5da51703d74426f8c4354c9bb209d0f SHA512 f8fcaf923640e42d0ceb6cd607e89b74145443f33ec1d4c0018dc0093518d572ae890bf582487b0c2de6c9d793e96ebb7dc901a330150f2ef2f203b329db5968 WHIRLPOOL cb78a9fd8337d9047c473914f216a06ff3797cc3fc494982696ba8c379d3e50e7cc194f84557eada06fe8459d3711589ad6e1404eb2ae9e389e81e104d447ce0
--- a/dev-python/datashape/datashape-0.4.1.ebuild
+++ b/dev-python/datashape/datashape-0.4.1.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.1.ebuild,v 1.1 2014/11/18 03:45:16 idella4 Exp $
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
 DESCRIPTION="Language defining a data description protocol"
 HOMEPAGE="https://github.com/ContinuumIO/datashape"
 SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/multipledispatch[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]"
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}] )"
 python_prepare_all() {
 	# Prevent un-needed d'loading
 	sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
 	# https://github.com/ContinuumIO/datashape/issues/115
 	sed -e "s/from_numpy, error/&\nfrom datashape.internal_utils import raises/" \
 		-i ${PN}/tests/test_coretypes.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	py.test -v || die "Tests failed under ${EPYTHON}"
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/datashape/datashape-0.4.5.ebuild
+++ b/dev-python/datashape/datashape-0.4.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.3.ebuild,v 1.1 2015/02/25 06:08:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.5.ebuild,v 1.1 2015/06/04 03:08:17 idella4 Exp $
 EAPI=5
@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-		dev-python/multipledispatch[${PYTHON_USEDEP}]
+		>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]"
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND}
--- a/dev-python/django-haystack/metadata.xml
+++ b/dev-python/django-haystack/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">django-haystack</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-international/metadata.xml
+++ b/dev-python/django-international/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">django-international</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-ldapdb/Manifest
+++ b/dev-python/django-ldapdb/Manifest
@ -1,2 +1 @@
 DIST django-ldapdb-0.1.0_p20130921.tar.gz 16858 SHA256 48d8c08510a4a9d135c78fa85162c32b74702d2a1a6dcdfd25ab69ba5ee8402b SHA512 1cffa04ef9f99f513b39a4c3d23e79a1495ce9120f72f12a8b4736b7713eb1ce1bf9e95e86c19340043e2b29db16d9a3fb4644351625d72de3c2fb5a61297f83 WHIRLPOOL 00148639e7b8ffcc7fdb41ba653ac5b611d5bc1541c936ccbe3c6a3b7eecc049374a70f6bc4215e293ad36b4928eaee1491af75ec215175dc1b7b67e38e6365f
 DIST django-ldapdb-0.3.2.tar.gz 11029 SHA256 b6bab3a4501419ff9ba1e50076b67c5f92e1c0b3d4b2c8c40014aadb5c06cc6d SHA512 d1f88f754bebda53b5f51c5120b070ce93e229a1c31d59bcdb5cbffdfdc1d590479ae5a2024805705d8bcf51bad8787d578a348ec78ffc5565bdeedb9ffa7b96 WHIRLPOOL 013869787a85a822712ea2331272651d43462320319256d5e07355502a7392cd601b084492f03fb40b2f12fa733ca0e87ecc283a4fc7ba71fd37bbdc9d1b0eb3
--- a/dev-python/django-ldapdb/django-ldapdb-0.1.0_p20130921.ebuild
+++ b/dev-python/django-ldapdb/django-ldapdb-0.1.0_p20130921.ebuild
@ -1,34 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/django-ldapdb/django-ldapdb-0.1.0_p20130921.ebuild,v 1.2 2015/04/08 08:04:56 mgorny Exp $
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 DESCRIPTION="An LDAP database backend for Django"
 HOMEPAGE="https://github.com/jlaine/django-ldapdb"
 SRC_URI="http://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 LICENSE="MIT"
 SLOT="0"
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]
 	dev-python/python-ldap[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/mockldap[${PYTHON_USEDEP}] )"
 S="${WORKDIR}/${PN}"
 python_test() {
 	esetup.py test
 }
 python_install_all() {
 	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/django-ldapdb/metadata.xml
+++ b/dev-python/django-ldapdb/metadata.xml
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>idella4@gentoo.org</email>
+    <email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
+    <name>Ian Delaney</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">django-ldapdb</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-openstack-auth/metadata.xml
+++ b/dev-python/django-openstack-auth/metadata.xml
@ -9,5 +9,7 @@
  <longdescription lang="en">
    A Django authentication backend for use with the OpenStack Keystone Identity backend.
  </longdescription>
  <upstream>
    <remote-id type="pypi">django_openstack_auth</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-otp-yubikey/metadata.xml
+++ b/dev-python/django-otp-yubikey/metadata.xml
@ -5,4 +5,7 @@
    <email>ercpe@gentoo.org</email>
    <name>Johann Schmitz (ercpe)</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">django-otp-yubikey</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-otp/metadata.xml
+++ b/dev-python/django-otp/metadata.xml
@ -5,4 +5,7 @@
    <email>ercpe@gentoo.org</email>
    <name>Johann Schmitz (ercpe)</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">django-otp</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-select2/metadata.xml
+++ b/dev-python/django-select2/metadata.xml
@ -10,5 +10,7 @@
    This is a Django integration of Select2
 	The app includes Select2 driven Django Widgets and Form Fields.
  </longdescription>
  <upstream>
    <remote-id type="pypi">Django-Select2</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-tables2/metadata.xml
+++ b/dev-python/django-tables2/metadata.xml
@ -6,4 +6,7 @@
    <email>jlec@gentoo.org</email>
    <name>Justin Lecher</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">django-tables2</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-tagging/metadata.xml
+++ b/dev-python/django-tagging/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">django-tagging</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django-xslt/metadata.xml
+++ b/dev-python/django-xslt/metadata.xml
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>idella4@gentoo.org</email>
+    <email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
+    <name>Ian Delaney</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">django-xslt</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/docopt/metadata.xml
+++ b/dev-python/docopt/metadata.xml
@ -5,4 +5,7 @@
  <maintainer>
    <email>jlec@gentoo.org</email>
  </maintainer>
  <upstream>
    <remote-id type="pypi">docopt</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@ -11,5 +11,7 @@
 	continued access to an expiring data value while
 	a single thread generates a new value.
  </longdescription>
  <upstream>
    <remote-id type="pypi">dogpile.cache</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/dogpile-core/metadata.xml
+++ b/dev-python/dogpile-core/metadata.xml
@ -11,5 +11,7 @@
 	expensive resource while other threads use the "old" value,
 	until the "new" value is ready.
  </longdescription>
  <upstream>
    <remote-id type="pypi">dogpile.core</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/doit/metadata.xml
+++ b/dev-python/doit/metadata.xml
@ -6,4 +6,7 @@
    <email>yngwin@gentoo.org</email>
    <name>Ben de Groot</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">doit</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/doublex/metadata.xml
+++ b/dev-python/doublex/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>alunduil@gentoo.org</email>
+    <email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
+    <name>Alex Brandt</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 	</longdescription>
  <upstream>
    <remote-id type="pypi">doublex</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/dreampie/metadata.xml
+++ b/dev-python/dreampie/metadata.xml
@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
-<maintainer>
+  <maintainer>
-  <email>grozin@gentoo.org</email>
+    <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
+    <name>Andrey Grozin</name>
-</maintainer>
+  </maintainer>
-<longdescription>
+  <longdescription>
  pygtk-based python shell with autocompletion
 </longdescription>
  <upstream>
    <remote-id type="pypi">dreampie</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@ -1,2 +1,3 @@
 DIST dulwich-0.10.0.tar.gz 272600 SHA256 518bb4aa3e5ad81982bfe571594af81ab9f78feb4e33bfade6c1553afff69237 SHA512 a5aa321e1265ee6c96c763a357d204eda7b9d4d6e90e0b18898342f34b9babf4d43857b9974d6bf442f9ba4da54fed4342c5724772cc9028138e8ec75d2e4896 WHIRLPOOL a032b962f106f0b8c9b9dd3238b135a04b6c6787c0344b8c3235c14e0bd3392ee5298776ff318a8bbafacbb60451dd685febd4a01160d017be3ea49541349af9
 DIST dulwich-0.10.1a.tar.gz 272688 SHA256 666600ab5eb0b6d531879ee0f65dfefd71bce2e21ab3910c28f7789e15b6330b SHA512 dfd2fc71d34c503380de385423fe2e0bc64307803616edafc598056888846f526492fa5d17026f1b4c9617b684a25860051999b2f5eb5b6f760a22fe9937ac3f WHIRLPOOL 5dd1439108e43fbcd616f4a05fff97ab5ae440ee6172dbd6f1472566d325957041a12204b2c647f203dccbf49afe0a3c0aff2012c04e71c097847eb22ab129d5
 DIST dulwich-0.9.9.tar.gz 270127 SHA256 084e762c8d4d0c0002823249db57b8e735c99c409dacc2849565dd3c0c288496 SHA512 5039e8e80c51b8ee0df2ba0805fa63d9b476a05c86b6bd9eaf9348ac03a83f0f1208e259ae6bcf40fb2c94ffb57c9b45bff852e367b8bee95c10e672d3dc19d5 WHIRLPOOL 2a79d25f1233d9a6a242d064af179486810555eb3c9803c336ae152095318a32eb8588779cb07f84b073a05bf7f083ba3b3d4c8d2b4f8929b2aa3d01c29a0a01
--- a/dev-python/dulwich/dulwich-0.10.1a.ebuild
+++ b/dev-python/dulwich/dulwich-0.10.1a.ebuild
@ -0,0 +1,44 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.10.1a.ebuild,v 1.1 2015/06/03 23:21:42 mrueg Exp $
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
 HOMEPAGE="https://github.com/jelmer/dulwich/ http://pypi.python.org/pypi/dulwich"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )"
 RDEPEND=""
 DISTUTILS_IN_SOURCE_BUILD=1
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	# https://github.com/jelmer/dulwich/issues/196
 	if [[ "${EPYTHON}" == pypy ]]; then
 		"${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy"
 	else
 		emake check
 	fi
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@ -6,4 +6,7 @@
    <email>grobian@gentoo.org</email>
    <name>Fabian Groffen</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">dulwich</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@ -1,3 +1,2 @@
 DIST ecdsa-0.10.tar.gz 45569 SHA256 deab6b9ab38f0b503e711dd448f593aedb91f744e7a45e0ade65b128a04efa61 SHA512 49b425ad3c051961bff78d2ec275b8e05e37f4a8e210105f1f823d3598f1d1d67ceb463234b0041395b9b485f414229717b9135d266dcb5e33bc43c77255f4f8 WHIRLPOOL f61085c5f2b7756144a02188d01fe6ac5c49423ea95195a2d2041e6e4ea4d9ad37d41cd85b1dec521041012bcd5590da2f3bb7b7695c1ae679948f0b4ab96a14
 DIST ecdsa-0.11-r1.tar.gz 45689 SHA256 8e3b6c193f91dc94b2f3b0261e3eabbdc604f78ff99fdad324a56fdd0b5e958c SHA512 77fc2bc26456d90a630e2ef98d94a1448b30e1c3bcebf81c52f12f8ce0ea305eceacc87e14273d340a70c60ad83fad61361c9dea83dea04546ed3604875b78fb WHIRLPOOL 744a6cc26518bf2a24667aa945a94d6fa0d713df27fc3a46f4379b4cb975f98041a338a7995fe377e222f9d1e39707afbd4b4f97dfa65e54bdd4af1e5174f5b0
 DIST ecdsa-0.13.tar.gz 55579 SHA256 64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594 WHIRLPOOL fb1d368a5198fd1780c2dfdf8bbee8679fd91d1182037e7dfc755e979d4b31c03b97f374186059e3baf47417a78a33aef043f7826a2738619c17f59857d0da43
--- a/dev-python/ecdsa/ecdsa-0.10.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.10.ebuild
@ -1,19 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/ecdsa/ecdsa-0.10.ebuild,v 1.16 2015/04/08 08:05:01 mgorny Exp $
 EAPI=5
 # pypy has test failures with some BadSignatureErrors
 PYTHON_COMPAT=( python{2_7,3_3} )
 inherit distutils-r1 vcs-snapshot
 DESCRIPTION="ECDSA cryptographic signature library in pure Python"
 HOMEPAGE="http://github.com/warner/python-ecdsa"
 SRC_URI="https://github.com/warner/python-${PN}/tarball/python-${P} -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE=""
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
+  <herd>proxy-maintainers</herd>
-	<maintainer>
+  <maintainer>
-		<email>blueness@gentoo.org</email>
+    <email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
+    <name>Anthony G. Basile</name>
-	</maintainer>
+  </maintainer>
-	<maintainer>
+  <maintainer>
-		<email>luke-jr+gentoobugs@utopios.org</email>
+    <email>luke-jr+gentoobugs@utopios.org</email>
-		<name>Luke Dashjr</name>
+    <name>Luke Dashjr</name>
-	</maintainer>
+  </maintainer>
-	<maintainer>
+  <maintainer>
-		<email>maksverver@geocities.com</email>
+    <email>maksverver@geocities.com</email>
-		<name>Maks Verver</name>
+    <name>Maks Verver</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">ecdsa</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/edpwd/metadata.xml
+++ b/dev-python/edpwd/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-	<email>tampakrap@gmail.com</email>
+    <email>tampakrap@gmail.com</email>
-	<name>Theo Chatzimichos</name>
+    <name>Theo Chatzimichos</name>
-</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">edpwd</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/eliot/metadata.xml
+++ b/dev-python/eliot/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>ryao@gentoo.org</email>
+    <email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
+    <name>Richard Yao</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">eliot</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/embedly/metadata.xml
+++ b/dev-python/embedly/metadata.xml
@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">Embedly</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/enaml/enaml-0.6.8-r1.ebuild
+++ b/dev-python/enaml/enaml-0.6.8-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.6.8-r1.ebuild,v 1.4 2015/03/08 23:46:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.6.8-r1.ebuild,v 1.5 2015/06/03 18:03:31 jlec Exp $
 EAPI=5
@ -21,7 +21,8 @@ RDEPEND="
 	dev-python/casuarius[${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/traits[${PYTHON_USEDEP}]
-	|| ( dev-python/wxpython[${PYTHON_USEDEP}] \
+	|| (
 		dev-python/wxpython:*[${PYTHON_USEDEP}] \
 		dev-python/PyQt4[${PYTHON_USEDEP}] \
 		dev-python/pyside[${PYTHON_USEDEP}] )"
--- a/dev-python/enaml/enaml-0.9.8.ebuild
+++ b/dev-python/enaml/enaml-0.9.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.9.8.ebuild,v 1.3 2015/03/08 23:46:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.9.8.ebuild,v 1.4 2015/06/03 18:03:31 jlec Exp $
 EAPI=5
@ -21,7 +21,8 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/atom-0.3.8[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-0.1.2[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	|| ( dev-python/wxpython[${PYTHON_USEDEP}] \
+	|| (
 		dev-python/wxpython:*[${PYTHON_USEDEP}] \
 		dev-python/PyQt4[${PYTHON_USEDEP}] \
 		dev-python/pyside[${PYTHON_USEDEP}] )"
--- a/dev-python/enaml/metadata.xml
+++ b/dev-python/enaml/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
-<longdescription lang="en">
+  <longdescription lang="en">
  Enaml is a framework for writing declarative user interfaces in
  Python. It provides a Yaml-ish/Pythonic syntax language for
  declaring a ui that binds and reacts to changes in the user's
--- a/dev-python/enum34/metadata.xml
+++ b/dev-python/enum34/metadata.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>alunduil@gentoo.org</email>
+    <email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
+    <name>Alex Brandt</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 	</longdescription>
  <upstream>
    <remote-id type="pypi">enum34</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@ -1,3 +1,2 @@
 DIST enzyme-0.2.tar.gz 75520 SHA256 6b146184d06aba79bf9b70f58770a46870a00fef89e45c0c0e54c24be03ff50a SHA512 a9eec867840248edab6f830c454ae371f1da98a06ffb7b1d6357827164b395e9bfd621f9d3df93a587a682370b7282bc8d76698597d21271d8efabb32f02d72a WHIRLPOOL a820aa0e7e75136a09d48c29ae250698c52b699e4425f14178c6aca8fc9fb1132512732f42d32db96b96f9f2d1d391d4ed03b9456e7e496c2ef64c8813679689
 DIST enzyme-0.4.1.tar.gz 47953 SHA256 f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3 WHIRLPOOL 5055306ce3747b1aa2f6a9bf5ac85c705426e1eaa1e946780f626cbda2cf26d508baf9f6781faeb62d09266df00e6b2c7942493d9139e82eda502cc175cb711c
 DIST matroska_test_w1_1.zip 184550509 SHA256 d86f96e165e695e6cf5324ebca184f2df723872f02965b565820d265b53004eb SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f WHIRLPOOL 3d0a16871fc7df0a3ef3f34f7c496eff188400a9796a2ad66667112ef0de7deecf025196898bd24ea395f8c44e75156a8b8c09d40a92e98d833d995473eefa9e
--- a/dev-python/enzyme/enzyme-0.2.ebuild
+++ b/dev-python/enzyme/enzyme-0.2.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-0.2.ebuild,v 1.2 2015/04/08 08:04:59 mgorny Exp $
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 DESCRIPTION="Python module to parse metadata in video files"
 HOMEPAGE="https://github.com/Diaoul/enzyme"
 SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
--- a/dev-python/enzyme/enzyme-0.4.1.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-0.4.1.ebuild,v 1.2 2014/11/27 15:23:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-0.4.1.ebuild,v 1.3 2015/06/03 18:05:54 jlec Exp $
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-9999.ebuild,v 1.3 2014/11/27 15:23:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enzyme/enzyme-9999.ebuild,v 1.4 2015/06/03 18:05:54 jlec Exp $
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 EGIT_REPO_URI="https://github.com/Diaoul/enzyme.git"
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
+  <herd>proxy-maintainers</herd>
-	<maintainer>
+  <maintainer>
-		<email>nikoli@gmx.us</email>
+    <email>nikoli@gmx.us</email>
-		<name>Nikoli</name>
+    <name>Nikoli</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">enzyme</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@ -1,13 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild,v 1.4 2015/04/08 08:05:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild,v 1.5 2015/06/03 18:07:50 jlec Exp $
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
-DESCRIPTION="A logging framework handler that tracks when messages above a certain level have been logged"
+DESCRIPTION="Logging framework handler that tracks when messages above a certain level have been logged"
 HOMEPAGE="http://pypi.python.org/pypi/errorhandler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@ -23,10 +24,13 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 PATCHES=(
 	"${FILESDIR}"/${P}-test.patch
 	"${FILESDIR}"/docs.patch
 )
 python_prepare_all() {
 	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
 	epatch "${FILESDIR}"/${P}-test.patch \
 		"${FILESDIR}"/docs.patch
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/errorhandler/metadata.xml
+++ b/dev-python/errorhandler/metadata.xml
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>idella4@gentoo.org</email>
+    <email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
+    <name>Ian Delaney</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">errorhandler</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/eventlet/metadata.xml
+++ b/dev-python/eventlet/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">eventlet</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/expects/metadata.xml
+++ b/dev-python/expects/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>alunduil@gentoo.org</email>
+    <email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
+    <name>Alex Brandt</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 	</longdescription>
  <upstream>
    <remote-id type="pypi">expects</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/extras/metadata.xml
+++ b/dev-python/extras/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">extras</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/extremes/metadata.xml
+++ b/dev-python/extremes/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">Extremes</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/fixtures/metadata.xml
+++ b/dev-python/fixtures/metadata.xml
@ -13,5 +13,7 @@
 	is provided that makes using fixtures that meet the Fixtures contract in
 	unittest compatible test cases easy and straight forward.
  </longdescription>
  <upstream>
    <remote-id type="pypi">fixtures</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">flake8</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-admin/metadata.xml
+++ b/dev-python/flask-admin/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">Flask-Admin</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
+  <herd>proxy-maintainers</herd>
-	<maintainer>
+  <maintainer>
-		<email>idella4@gentoo.org</email>
+    <email>idella4@gentoo.org</email>
-	</maintainer>
+  </maintainer>
-	<maintainer>
+  <maintainer>
-		<email>wking@tremily.us</email>
+    <email>wking@tremily.us</email>
-		<name>W. Trevor King</name>
+    <name>W. Trevor King</name>
-		<description>proxy maintainer</description>
+    <description>proxy maintainer</description>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">Flask-Cors</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-dashed/metadata.xml
+++ b/dev-python/flask-dashed/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">Flask-Dashed</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-evolution/metadata.xml
+++ b/dev-python/flask-evolution/metadata.xml
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">Flask-Evolution</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-mongoengine/metadata.xml
+++ b/dev-python/flask-mongoengine/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">flask-mongoengine</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/flask-peewee/metadata.xml
+++ b/dev-python/flask-peewee/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">flask-peewee</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/funcsigs/metadata.xml
+++ b/dev-python/funcsigs/metadata.xml
@ -5,4 +5,7 @@
  <maintainer>
    <email>jlec@gentoo.org</email>
  </maintainer>
  <upstream>
    <remote-id type="pypi">funcsigs</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/gcs-oauth2-boto-plugin/metadata.xml
+++ b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
  <upstream>
    <remote-id type="pypi">gcs-oauth2-boto-plugin</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/gevent-socketio/metadata.xml
+++ b/dev-python/gevent-socketio/metadata.xml
@ -14,4 +14,7 @@
    <description>Proxy Maintainer. CC on bugs</description>
  </maintainer>
  <longdescription>SocketIO server based on the Gevent pywsgi server</longdescription>
  <upstream>
    <remote-id type="pypi">gevent-socketio</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/gevent-zeromq/metadata.xml
+++ b/dev-python/gevent-zeromq/metadata.xml
@ -14,4 +14,7 @@
    <description>Proxy Maintainer. CC on bugs</description>
  </maintainer>
  <longdescription>Gevent compatibility layer for pyzmq</longdescription>
  <upstream>
    <remote-id type="pypi">gevent_zeromq</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/ghp-import/metadata.xml
+++ b/dev-python/ghp-import/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+  <maintainer>
-		<email>alunduil@gentoo.org</email>
+    <email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
+    <name>Alex Brandt</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 	</longdescription>
  <upstream>
    <remote-id type="pypi">ghp-import</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/git-review/metadata.xml
+++ b/dev-python/git-review/metadata.xml
@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-<email>prometheanfire@gentoo.org</email>
+    <email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
+    <name>Matthew Thode</name>
-</maintainer>
+  </maintainer>
-<longdescription lang="en">
+  <longdescription lang="en">
 </longdescription>
  <upstream>
    <remote-id type="pypi">git-review</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
+  <herd>openstack</herd>
-	<maintainer>
+  <maintainer>
-		<email>prometheanfire@gentoo.org</email>
+    <email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
+    <name>Matthew Thode</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 	A simple connector pool for python-ldap.
 	</longdescription>
  <upstream>
    <remote-id type="pypi">glance_store</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/gntp/metadata.xml
+++ b/dev-python/gntp/metadata.xml
@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-<email>naota@gentoo.org</email>
+    <email>naota@gentoo.org</email>
-<name>Naohiro Aota</name>
+    <name>Naohiro Aota</name>
-</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">gntp</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/guessit/metadata.xml
+++ b/dev-python/guessit/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
+  <herd>proxy-maintainers</herd>
-	<maintainer>
+  <maintainer>
-		<email>nikoli@gmx.us</email>
+    <email>nikoli@gmx.us</email>
-		<name>Nikoli</name>
+    <name>Nikoli</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">guessit</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@ -14,5 +14,6 @@
 </longdescription>
  <upstream>
    <remote-id type="google-code">h5py</remote-id>
    <remote-id type="pypi">h5py</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/hacking/metadata.xml
+++ b/dev-python/hacking/metadata.xml
@ -11,5 +11,7 @@
    hacking is a set of flake8 plugins that test and enforce
 	the OpenStack Style Commandments, HACKING.rst
  </longdescription>
  <upstream>
    <remote-id type="pypi">hacking</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/hgtools/metadata.xml
+++ b/dev-python/hgtools/metadata.xml
@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>prometheanfire@gentoo.org</email>
+    <email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
+    <name>Matthew Thode</name>
-	</maintainer>
+  </maintainer>
-	<longdescription lang="en">
+  <longdescription lang="en">
 		Classes and setuptools plugin for Mercurial repositories
 	</longdescription>
  <upstream>
    <remote-id type="pypi">hgtools</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
-	<maintainer>
+  <maintainer>
-		<email>swegener@gentoo.org</email>
+    <email>swegener@gentoo.org</email>
-		<name>Sven Wegener</name>
+    <name>Sven Wegener</name>
-	</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="pypi">hiredis</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/hp3parclient/metadata.xml
+++ b/dev-python/hp3parclient/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>openstack</herd>
+  <herd>openstack</herd>
  <upstream>
    <remote-id type="pypi">hp3parclient</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@ -4,5 +4,6 @@
  <herd>python</herd>
  <upstream>
    <remote-id type="google-code">httplib2</remote-id>
    <remote-id type="pypi">httplib2</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/httpretty/metadata.xml
+++ b/dev-python/httpretty/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>openstack</herd>
+  <herd>openstack</herd>
  <upstream>
    <remote-id type="pypi">httpretty</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/idna/metadata.xml
+++ b/dev-python/idna/metadata.xml
@ -6,4 +6,7 @@
    <email>jlec@gentoo.org</email>
    <name>Justin Lecher</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">idna</remote-id>
  </upstream>
 </pkgmetadata>
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST goobook-1.8.tar.gz 29231 SHA256 55c48e2c0e2f22743a0096829e4ed0f3e14978df4d30ec6559195c80f9b9be2f SHA512 4a284e334a7389a28a28b5fa40c39d68a5ab891cb59c79fadc12736867fd8eecf073993e5ac017e577d786e244cb847a76ebe549b226f94cb4c144202203a680 WHIRLPOOL b8071d01433719742663aa15849cc7094ebf8eba5787e32aba84295cd55fd94e5cf6300e2140eb8a4cc6ad45a8b6097d7733ee68909993f81429ad8a6f12b152`	`DIST goobook-1.8.tar.gz 29231 SHA256 55c48e2c0e2f22743a0096829e4ed0f3e14978df4d30ec6559195c80f9b9be2f SHA512 4a284e334a7389a28a28b5fa40c39d68a5ab891cb59c79fadc12736867fd8eecf073993e5ac017e577d786e244cb847a76ebe549b226f94cb4c144202203a680 WHIRLPOOL b8071d01433719742663aa15849cc7094ebf8eba5787e32aba84295cd55fd94e5cf6300e2140eb8a4cc6ad45a8b6097d7733ee68909993f81429ad8a6f12b152`
		`DIST goobook-1.9.tar.gz 29274 SHA256 311cb344d285e8af36dcd4546d3bd499939140287a12b2d509ea6f2535c2b50b SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81 WHIRLPOOL 64d79136a126a19baec327de8cee928d4db025b06ad9364954efbe3cc5e9712f0c1539a57bcd73000f989027c46acfff05ddd75db228eade568c9ded189f3f52`
`@ -1 +1,2 @@`
	`DIST libzip-0.11.2.tar.xz 413352 SHA256 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb SHA512 55cbcbe1cf4afae578d3ac1b9027ac8c21e223415f648b0e74e087d0200842b04abb751c75e40e9a8bc727722791490565fcd912a4fdcc7bf02174eba66b7106 WHIRLPOOL a523d4637c34e786cc9716bae41eaee48a906be81c27c705e9174b7fad5e3358053ddc39c6dd2862fde358f0dc79487280e6b241a12c2a9a2c7ef68a29097faf`	`DIST libzip-0.11.2.tar.xz 413352 SHA256 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb SHA512 55cbcbe1cf4afae578d3ac1b9027ac8c21e223415f648b0e74e087d0200842b04abb751c75e40e9a8bc727722791490565fcd912a4fdcc7bf02174eba66b7106 WHIRLPOOL a523d4637c34e786cc9716bae41eaee48a906be81c27c705e9174b7fad5e3358053ddc39c6dd2862fde358f0dc79487280e6b241a12c2a9a2c7ef68a29097faf`
		`DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41`
`@ -1,2 +1 @@`
	`DIST django-ldapdb-0.1.0_p20130921.tar.gz 16858 SHA256 48d8c08510a4a9d135c78fa85162c32b74702d2a1a6dcdfd25ab69ba5ee8402b SHA512 1cffa04ef9f99f513b39a4c3d23e79a1495ce9120f72f12a8b4736b7713eb1ce1bf9e95e86c19340043e2b29db16d9a3fb4644351625d72de3c2fb5a61297f83 WHIRLPOOL 00148639e7b8ffcc7fdb41ba653ac5b611d5bc1541c936ccbe3c6a3b7eecc049374a70f6bc4215e293ad36b4928eaee1491af75ec215175dc1b7b67e38e6365f`
	`DIST django-ldapdb-0.3.2.tar.gz 11029 SHA256 b6bab3a4501419ff9ba1e50076b67c5f92e1c0b3d4b2c8c40014aadb5c06cc6d SHA512 d1f88f754bebda53b5f51c5120b070ce93e229a1c31d59bcdb5cbffdfdc1d590479ae5a2024805705d8bcf51bad8787d578a348ec78ffc5565bdeedb9ffa7b96 WHIRLPOOL 013869787a85a822712ea2331272651d43462320319256d5e07355502a7392cd601b084492f03fb40b2f12fa733ca0e87ecc283a4fc7ba71fd37bbdc9d1b0eb3`	`DIST django-ldapdb-0.3.2.tar.gz 11029 SHA256 b6bab3a4501419ff9ba1e50076b67c5f92e1c0b3d4b2c8c40014aadb5c06cc6d SHA512 d1f88f754bebda53b5f51c5120b070ce93e229a1c31d59bcdb5cbffdfdc1d590479ae5a2024805705d8bcf51bad8787d578a348ec78ffc5565bdeedb9ffa7b96 WHIRLPOOL 013869787a85a822712ea2331272651d43462320319256d5e07355502a7392cd601b084492f03fb40b2f12fa733ca0e87ecc283a4fc7ba71fd37bbdc9d1b0eb3`