drop some old, clean old impl nd tidy dep 'mock' in some new

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

9 files changed, 28 insertions, 337 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 41eeb1ed2a5f..963a9f2a5de3 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.149 2015/03/11 07:52:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.150 2015/03/20 00:11:25 idella4 Exp $
+
+  20 Mar 2015; Ian Delaney <idella4@gentoo.org> -sqlalchemy-0.7.9-r1.ebuild,
+  -sqlalchemy-0.9.1.ebuild, -sqlalchemy-0.9.4.ebuild, -sqlalchemy-0.9.6.ebuild,
+  sqlalchemy-0.9.7.ebuild, sqlalchemy-0.9.8.ebuild, sqlalchemy-0.9.9.ebuild:
+  drop some old, clean old impl  nd tidy dep 'mock' in some new
 
 *sqlalchemy-0.9.9 (11 Mar 2015)
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 564a60b36aad..a7a46cdf8f9a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.9.7-test-fix.patch 1453 SHA256 4c78479dfda8ba88f9c2aa1d54e2b4b38d3bff2ae2c3a391f9bb6892706a75f8 SHA512 71c83a7d1411230d92a5a393d70da18a2e56c2dfb3e0221af41e77f8fa108070c778b5010f14abfffd866fff9939e710b3792c5ee4609990eb74d8655f83f0bd WHIRLPOOL a7ac8c3fe7d0af947f9c0f268ba3a2137ea4ec551489a7c9d2d6cde863dcd4a1cfc9e1f68db001dd8658619781c8281c904a7aacf3ad20f012e623ce83e2554f
 AUX lru_cache_timestamping.patch 1088 SHA256 e4bbc35e94b5091f9abb1cede122d2773bfa3f96a21a62a090fb1c1733a9f0ac SHA512 9d7ad6990b312dec26ede2c1c0717447cb034c4d701435aa278dd9d0214115c6d94d02c6a608c0aab0e28da69c3bfa7cf8bc1c9d61b3bc3dfdca1eb47f63eda8 WHIRLPOOL 149302829080935d5f620c7d6f97cb939b027b944f24c5d5650e009cbbe1bdba8ce2f7172eb2ca761b5a3ab1513c078710f679ccd61b23909423e4b2c1b0ae10
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
@@ -9,15 +12,11 @@ DIST SQLAlchemy-0.8.1.tar.gz 3776304 SHA256 5646f87ab781755b116d718433637a341b74
 DIST SQLAlchemy-0.8.2.tar.gz 3816467 SHA256 71ce685f0e643bae95c7d4ace7ff8d6dcb37e99605cab3cf31c2be006c17905f SHA512 e08287319f42b4dbdf9f3182668c72fb39e30f248978758257c526c41ef2bccf0fb1f9c3afe767931f2b6de2ea5a3cac08eded450dda64872f87da9176d48ebb WHIRLPOOL cc8e0f35c7b695825112e188faade15e1d110f3723996ba8089758f9b3d8ce7fc47d64839ab4ebd59db9f9cd4178f5e370076b2c0d5439120f31e660711811d8
 DIST SQLAlchemy-0.8.3.tar.gz 3895285 SHA256 80702cd95ade2d31d018e27accd4a75afb5b82e1b77b206c4ea463378c08197b SHA512 eabf019511b8488177361ffba2e7af1612c2df0b981a249c8534fbfa0b28447670a075441e7f3e688a0fb87361ba60ad24f2cd117b6cf80a4b7bef3d3cb9cf18 WHIRLPOOL 36094172a8ad514e852844e79d4ced1c81cf774d9b475d0f0b55fed5e9828e485a0843dd0337ede41478cb71abefc45b79614b63415a725fcbdd44d666f3542d
 DIST SQLAlchemy-0.8.4.tar.gz 3918372 SHA256 92646ef7567d85d42ad7abf4ccc4327d664d32d4e9e4fd8a241f865c639a98c0 SHA512 0ed3d6c60ff8a5aaf72ee5e1c86b9ad4a0cbc9f605e1d58ea0cdcdbd82ef9329e2683f14f33ba1f4fc778e9139454abc00540f92973f0746161db0d41c32c14b WHIRLPOOL 29be0f4bc8eac08cb2f2e55e191e27e029b8eb237d4fe0882bd778eefdca6618a75d60fb847abe7d47dfc927322bbf61a4d2f89cca336fed2d342e729202a7ff
-DIST SQLAlchemy-0.9.1.tar.gz 4289561 SHA256 95f1c3c48556fd281c60f7ca352783fb728604d0c9c48b7ada7fdf9d7b45953e SHA512 b6e2207a044d3427f7b8f00805186543e7ffd873491b7477e6b1aaaca75f5e839e746099c537c5899b5fe9973c37e7b90eb96e2bd09511f065a2186700243e87 WHIRLPOOL 1fb5a3b78f639f16e25a5a9c62839c1cdc0210786dd402b2342ba5b6d5fdfe1f02c4fd466169dcf45e5055c7797635f4f411412b7a637575f42293e9f89018a8
 DIST SQLAlchemy-0.9.2.tar.gz 4389966 SHA256 1411b6e93446350e533ed0b892ba5cbce9afdfab8ce09f060add8ada8911e1ee SHA512 1d4baa0ea02e4f6ee70ff00dbda77c6c814adab6f45df89765123045ced4d65bceb9c7640aa16b60e45887d4454584d49f4a5b06db0fbd9f7770cf78da5ecda3 WHIRLPOOL 79e06d8987dad3bd12cc412980978f670888595b6e7805e17ccc3f0face39d5500b6299a81f5424fe7a77005e928d88e3eec34300075c03a4d788b19c47be2c3
-DIST SQLAlchemy-0.9.4.tar.gz 4492988 SHA256 bc87674f5ac9962e0efe96f060ba22a07e2c61fbebf531efc383b82db5b291ec SHA512 0a497de001c2f26663c16798c2be41b040f79b1463e3fb1a51205a14976bc92795abc6a0fbf4d42790a8041760103c58cb03ce0ea1d5973f84d092c0b86cc1e7 WHIRLPOOL 293816fddd8d7a22e5be7cb52888af6bea92ff40342d94c620127d1a6677463f7f5e9b54536b7f0724e51297b8506c7881c7e53bf3730f235a5e12f84fa60ecc
-DIST SQLAlchemy-0.9.6.tar.gz 4022439 SHA256 0a9ad46f32df2ba87d3092b89e4c760c796ad481b21544485eb97cb8ca321b6b SHA512 86a9237391848f1bfe86202b2376f351b35db3a3aaeb1ee35ebe2808ba7924544f13477610831a145009c572ee6ee12de0067e185b50de7344ad6733ec47e334 WHIRLPOOL 2f2d6c93f8c6d28fa6ca5ed704e47df2734836bbb3f3e4f4af57712ea521a07296c7e22383181e32ec1e3acfee0a7ca0212cc2191a214a00cc0daa26f473b791
 DIST SQLAlchemy-0.9.7.tar.gz 4053445 SHA256 5fff261d0cff21c39913f9d30682659a52bfa2875699b2b7d908d0225df42a15 SHA512 dac79eccb971589eb0fabffbfe731bb31cd58e6ec1309aaea22679d030b82be0f1096635edecdbde2d6cf2374778ecd0f888a22f9c69ee71e50bea41856b4190 WHIRLPOOL 516fc62dc54b436ede46ff32f56dbd8bae2eac815c69cc3270aea8d0f0f40f553e0218530aec9d309f1e5ebae4955be32271169564a468e9fde1792fc37b1369
 DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
 DIST SQLAlchemy-0.9.9.tar.gz 4213948 SHA256 72a51f6ae99116ea969381f65fe471aafe14c21f6760f259b46f919f21345f91 SHA512 a28c83645ddddc17825f7d76443350ef22b23be72524aeb22665b4f8b92e0bf7dd79f9628841732973a565f5edb64b687f9e49daa1af11b1778b854b66728fa0 WHIRLPOOL e60a8ef79da0547b58a53c5f567e6abeba7408cd4cc398feaa7c61dcad7fa344dd31691fee25d4738bc25bb956ecf2b20cbeb6caf29114066dfbec26c2f07695
 EBUILD sqlalchemy-0.7.10.ebuild 1810 SHA256 17add696f5832385bd9a1219e14a7230dbabba4084b82e8ec9f79c3bbf51b347 SHA512 cf72b5f3ead6fb7aa60b9523e5ee661d152fc402b535ca95551ae6646a1a36cc4cb11dd59faec684dceb0f0806102abca478fe5ecd9792af96a433840708f2a9 WHIRLPOOL b5eaf99bcfcfaef95dfb598ed8e0f30c0e30a5fc5baa4a18f5d5e908483e48705dbf84a325aec046df527a475678a4cce0f08343845c1906ea84c2a3615b8aab
-EBUILD sqlalchemy-0.7.9-r1.ebuild 1781 SHA256 ae0ba0303d132dab0ddc8c2751857f6352763a88870bdb3c4ad6875664bd5265 SHA512 e3d14202665eb83b544859c8065db7c4ac2bbdc3556b954675766a025298da2ae1e4f8004a8834aa5ff4ceb3b7079ac811b591a45ce85b9b1dc9c343b6b3cdc6 WHIRLPOOL 02568b2bc0be16e8296b9d923da6a971ae2974776c4213c2ba2560cc625679aa47c9368564af0fc69a7bd65343b2bdb8daed7bcd24d7c798e0f197fd9baa8c01
 EBUILD sqlalchemy-0.7.9.ebuild 1960 SHA256 3a0393d89956f4a5874b13d305668c82a16916154d13a96648a1da4b0138cc58 SHA512 b9641ec4785d6d5a41fe7ce3414e5da1638b5f6b45c6358fd7a686bad824213f93d65c148770bc1476b99e8416331ccb11a5f7b74a3d4c01f5d3a3d1e826e334 WHIRLPOOL ce77a226a3c02a6560868b27d055e90b0b6bc235900afe08e2bffe0505e7e0406f231d53a00a71a779019bb3bff160b855b22d7c65ba2f88f7cca6e0437a91c7
 EBUILD sqlalchemy-0.8.0.ebuild 2096 SHA256 755cf9c6bcf7d1a14f225f126fbb36014254e5a04963ab34ba8d197b23af1851 SHA512 321d71c2db23cbcb5dab3bd932ea511cb7b104c720784a21958c8860e13bb457c95fb5e4c958a6ddefe874a72b0f777322ba00e7ffed77766ac0a169c7b98cb5 WHIRLPOOL 85735e94577680b7d4afa486875c2dcd3579bc5e2dc4a5f1e753b77259f3267fcc434f5b1c87b54160847df43624b21869341dc4b6062ead45fb0d9786003d38
 EBUILD sqlalchemy-0.8.1.ebuild 2250 SHA256 b4fe26c3444fe55e906bb538bb04b4d6a5f8bbe974fd1f0c6dba89bbf528444c SHA512 8f64f229a28bc7114afd7b717d09317950792235fd784173f2866d6115613e3bd2c73ebf6b2d92a43c64a4e73f6fa9c13a4674b5596f8ab1e921f9c3f061c0b6 WHIRLPOOL a4c9cf1911cc3a0ffe5452e7313bbbf194ec8cfb04cc64b3a14ea7f22a96b754557da89aa09a6ab9288a4f6097c13b7dcd08639f9d63eff510352a52d53cfcc3
@@ -25,12 +24,16 @@ EBUILD sqlalchemy-0.8.2-r1.ebuild 2296 SHA256 814f681bd484a28cecc69b11cbf04ab71a
 EBUILD sqlalchemy-0.8.2.ebuild 2293 SHA256 269e68e04e166e22472d3c9a461c6afcd664762fb2c53a797d056aa34a858eb6 SHA512 3ccf9f5d4cc88012915e824797eea9a57e3b17a0fd7c967706c4449b247f83006ced248b0c11b5744f4e6e978418a4d6a6e17d828ff730d4ebd0b38a1d813deb WHIRLPOOL 5568e6496ce17952c826f0b4a82a895abc9c51c07d455977df4ffbd35c726c0699457c29dcd8117791f8a52b72267cfd0cd9c23a9fef8b42452f4610e93ec3f0
 EBUILD sqlalchemy-0.8.3.ebuild 2293 SHA256 07560ce38cb45dba3b9ef652b9fb93f88854517c218f5d93592b9cfd5a0bc07a SHA512 036d40a3e1020520e7ef02b4dcb93213bed5b5d3105ce6b2384298a4acf877c154d1bbf6e630272292286ad06ee4f0b11fd8ddf962a9296c9df614cffa34f96a WHIRLPOOL cc24be22b861adb7738c0c34255f7305747a9cbf50f7f8454c1954028e2b91873bbd3838f313634fb36d427490a162dd006eca2adaf7401f29f8f27363ce15a5
 EBUILD sqlalchemy-0.8.4.ebuild 2293 SHA256 34c6e1a25798d71cfc18960a90e65aae701ea64c2454c3ab03c6de9c453db249 SHA512 8e1d2b3d7df854e38e26ac6fc0063bb8e5aee7fba0a1d465b02c5b3502a1514af848341b38a3f8a52487624e30ed89d99ead65e306ba577485373dc6e95b1965 WHIRLPOOL 734754377cf69f90a6f535b147405d6cf0ffa1e56b2573d00b0f45db4b0809f4d2074da2e90202a0c79b495f92509a6b25c13454e3e7c8cae57a733b51586a3b
-EBUILD sqlalchemy-0.9.1.ebuild 2223 SHA256 1172eb4136ae09a13e948ea4049403ae86081109799d3b184d237dab19dac974 SHA512 d50632555bb7cc48b41092aef1d547c283e25f6c54c832e0cfa89d21d74b047b926c33d447b08c1846430e0f94245d0ede76df4d9db89a33c88c605a8bfe0c37 WHIRLPOOL d9e1c851309799e75c430eec589ccde128edb855ed1957fd57a5b281d264001d7c987321c817e4b3320034b7b3213e1bca60c0ae6b615594e6a872431e050403
 EBUILD sqlalchemy-0.9.2.ebuild 2362 SHA256 b273018c2bd750d60e69fb2ccf67b27130347a0454838675e0826f332889aac1 SHA512 af2c4ea013f828a73c0ce7d280d1355b4237e74cfac8560709f91d7a95c57c9b933fc3af1e966c861cc74e40790db776616a5286bc8d100a7e25bfa92516a363 WHIRLPOOL 0e4c80af3caa14ce8d4e51022412756f0537cde8cdada4d93c891f680791c573e86e958a75550c80a81016f190bd3dc5644ae0a76fbd9a2fe429133710370008
-EBUILD sqlalchemy-0.9.4.ebuild 2379 SHA256 5a5c8fdce112ff97ef2421671c027bf0af60c0654fe56e065bb978267b601f0e SHA512 eb2473af4665745df8bf2656e4210d0509d5bd5bad077544e18a6a192726a118146d5403546b2c881204ff53798af2142758155952beef8d1dd8d5520cedf54c WHIRLPOOL 075e0651777d712b0916cbc23b9f101626dbbfbbb8d5cbf424682656c52dbe962b5863db10250540eefc273fefdab0d67dff0fa7f5b783e47fa7af67475b80fa
-EBUILD sqlalchemy-0.9.6.ebuild 2377 SHA256 fe6572e39a40afb53a4aa372959b91aea1539104a965e4b02f84b66f5725d693 SHA512 2470988428761638a8cc96a161396c0d59fb27bd64efa76411ca8fd2e41408e1c820e4c47fcafea2f1f4fddd3401031ad4d4df9e072378e673e22cb5858e37e9 WHIRLPOOL d96888f963677310ab49b1d1ed66834e1d90539738150a80950cf4d381d45dbd2d09193a77d01732354c035a004a605d13e0c5789e7bf5db7634875390d2251d
-EBUILD sqlalchemy-0.9.7.ebuild 2480 SHA256 68f24999e4bc1052c3ee8e48bafadda20ff7b9aa8f6153ed57902a86258f4883 SHA512 98c682d6b3d6c7cc91aa30e1c6c4ebd0a14f6f79279a1a6422d5dfcc30185ce4f7f07aa19a858782110c8bb5134182ae693ce719d2621a44c74dc8c97876397a WHIRLPOOL 331155a67e78596a54525207609d05b0afdcbf42670908de7b2209d98f74fcfef6a45c4ae0c0abb057f0327fe125adb737f013b2be835d36028b0a3e870ec59f
-EBUILD sqlalchemy-0.9.8.ebuild 2590 SHA256 7704408987f4b0e36cc0e9e50bd525c4c859527dc14fd8f23bb258eb6f72ff11 SHA512 27f80a8b172c6e9089b312f804a6f5c229c9a07e9c114e2459e6139843d5e736148876c80375dd5f85d8836a305f605918f0bcafc4a96d4c7f3170fa07bb752d WHIRLPOOL c641ed64ae0f00e60548b7b054433dfa9a40b7fdda66ad362f626fa21eb2a6afd74a86a649f109b5b8b66e0a0aef82420695ef9d870eee2a998b2e2ebc5d5cbe
-EBUILD sqlalchemy-0.9.9.ebuild 2598 SHA256 a46e10126aa6bf573d48f5ae1380559a2fdbabd94a1c7af1b168e7588344a5f8 SHA512 cfd96b8bdb5d20c0fa39adb8fd2e6384638b0ad2b0344e8d0adc667181729f9878294ffd9e03c5b9c7aee71ca64854106423441eb1b0fcae46ef1ddcb1f5ddb9 WHIRLPOOL 5f1193f7d9959e33ddafa00b034a0080f12e0665d3442f689538d7ac650105e151702fa8fde654fb1f1988870efbd9f6a7d5f50dfc5a6604926c0c2594c4b170
-MISC ChangeLog 21492 SHA256 70f786b6d0746ad73f4bbe9f7a8d046bb86b4f450e3f99e8752f460b685fd077 SHA512 e82218a8d3a455f4f32fb5900f7255921b12c08a24221557a39e13b65f0d79663faec530995d6be36091860d5192997bc95f8ed45cead7af664ad058a511a23d WHIRLPOOL 11f774cd4a7e13c7aa4150a9cf8b2e8703c3c6292333fb2730baee10b2eb2f177626d496796644f3d25c225d9280ab7db0a9f953acfcb8506b9154d27269dfdb
+EBUILD sqlalchemy-0.9.7.ebuild 2469 SHA256 592ace5c5b733957fb41389fbfe06d247eb236b9ebe32ce6a942f18060c2f6f4 SHA512 33cd9942a6ce018a65fc4f641303114360c2860642f9754b02827823c48f5da7017bc070cf5429c69ee344eac34ab85728bc0ce6e098464291e81274e67bfe97 WHIRLPOOL 3956855c528d41a3de580fbc714ab768cde97a33493c1d0520e06ed9a0906b6e023b1a87e8823f0575cec85e30b4419e877e3c38b03d8a5ff77fbee8e981d6a5
+EBUILD sqlalchemy-0.9.8.ebuild 2587 SHA256 c9c4d747f710badf876045b06f1fa7be39cb3cdc39d1d8da6f57b027b12370d0 SHA512 420ba39d32398865d1292487a27e5fd157e1b7be617ad871c67f5bff43aa9d4ea40dca31d5b69c7eeb43dee58a9aae0d95bacddf478c2571c3fdbe06c1bdb26f WHIRLPOOL fa124bc460f59142ce575649a83e2e119e92d409eeca4978aea6957637e34d9621a95ed09e68fc027e2ec7faf588e94ee099964656720a938788674a87e0298f
+EBUILD sqlalchemy-0.9.9.ebuild 2592 SHA256 5dab5c6efde6b1ec6c258271dccb4eb1addba66344fc854559e914e3d3f58f8c SHA512 2ce94435ff719614836b83be548603076686a5ad66f324ef8fa740510c4572a42e2b7b0c19c7319194ba842708ed88df2eb72c0c5f64f8bc8795e4739d31014b WHIRLPOOL 041c4530fa3f85b84df453f222ff7c90279bacc2d6c71f45edd4a0fa9f5f41eea8fbcbdd6817af1ac3a358488070105f983d16bb6c6bfa8ac5ad3b4b7affc05b
+MISC ChangeLog 21791 SHA256 7eb35fd1c7edf280f29f7f281375171658b8f683da34e30664df732fda3d2426 SHA512 d87dc47b44bf863db0493bab8819eb26ff8944e9211a1cdc7469a96234ecd919c15b8c1e26bc70d8c1befe2ddb102d744b61ed6922b7c36b0beaa0f9a365540f WHIRLPOOL 74a1e6f30fd48fffa84fa679621160d4a7872ee9fa425cfb9e539380ee81b2ac3fe1d150ba29c41383565d7d717c070a19bfc57348047e05e87878e682ec44f1
 MISC metadata.xml 233 SHA256 77ca0910fec09997d5679f4de22c824a0b0de12d9ac12b253ad544ae7357f720 SHA512 1521eab2401d4b820c053a13680ec44b9bf4931516f4f4c1508ca92b288bf6cae2db36a875ddc5c2475e862c16d3e92cb662c093958950ead4eb72e463abcff6 WHIRLPOOL 9279e4a60e5c11a72f329dcc13bd9c18d3bbfc1fcaab98f46df1336835f407a8471b4a76b61e74a5fa1bb8e24156cd5e3c2e8418752a412479f37b6193b74ec6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlULZcEACgkQso7CE7gHKw0t8wCeNzHUtrgiZXfpnmlGKAG7BUjp
+eH4AoIgAZVZvVFEwg8rZoLiCrAhKttOQ
+=WKMG
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.9-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.9-r1.ebuild
deleted file mode 100644
index 97196054c17e..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.9-r1.ebuild,v 1.2 2013/10/31 05:12:26 floppym Exp $
-
-EAPI=5
-# py3 appears underdone, 
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples firebird mssql mysql postgres +sqlite test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	firebird? ( dev-python/kinterbasdb )
-	mssql? ( dev-python/pymssql )
-	mysql? ( dev-python/mysql-python )
-	postgres? ( >=dev-python/psycopg-2 )
-	sqlite? (
-		>=dev-db/sqlite-3.3.13 )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-	)"
-
-# py26 tests needs
-DISTUTILS_NO_PARALLEL_BUILD=1
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7-logging.handlers.patch" )
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -fr test/aaa_profiling
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	"${PYTHON}" sqla_nose.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		pushd doc > /dev/null
-		rm -fr build
-		dohtml -r [a-z]* _images _static
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild
deleted file mode 100644
index 21ecab9849a4..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild
+++ /dev/null
@@ -1,81 +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/sqlalchemy/sqlalchemy-0.9.1.ebuild,v 1.3 2014/03/31 20:57:48 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-db/sqlite-3.3.13 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-	fi
-	"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.4.ebuild
deleted file mode 100644
index f3e1c1925620..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.4.ebuild
+++ /dev/null
@@ -1,84 +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/sqlalchemy/sqlalchemy-0.9.4.ebuild,v 1.2 2014/04/11 01:01:28 sdamashek Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-db/sqlite-3.3.13 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-		"${PYTHON}" sqla_nose.py -e test_reflect || die "Testsuite failed under ${EPYTHON}"
-	else
-		"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	fi
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.6.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.6.ebuild
deleted file mode 100644
index 0c588e8b530f..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.6.ebuild
+++ /dev/null
@@ -1,84 +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/sqlalchemy/sqlalchemy-0.9.6.ebuild,v 1.1 2014/07/04 05:55:19 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-db/sqlite-3.3.13 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-		"${PYTHON}" sqla_nose.py -e test_reflect || die "Testsuite failed under ${EPYTHON}"
-	else
-		"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	fi
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
index 0b1e7ae1a9a7..5f09217cb5d9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
@@ -1,9 +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/sqlalchemy/sqlalchemy-0.9.7.ebuild,v 1.6 2014/09/17 19:52:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild,v 1.7 2015/03/20 00:11:25 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 flag-o-matic
@@ -25,7 +25,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7,3_2} pypy)
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
index 973c1aec0a0c..5fb9fd209301 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-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/sqlalchemy/sqlalchemy-0.9.8.ebuild,v 1.9 2015/03/07 08:23:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild,v 1.10 2015/03/20 00:11:25 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -25,7 +25,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7,3_2} pypy)
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild
index 96d9294d3c47..6933cdc36348 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.9.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/sqlalchemy/sqlalchemy-0.9.9.ebuild,v 1.1 2015/03/11 07:52:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.9.ebuild,v 1.2 2015/03/20 00:11:25 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -25,7 +25,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7,3_2} pypy)
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 S="${WORKDIR}/${MY_P}"