clean old python impl, minor upgrade to fix to qa issue, remove many old

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

12 files changed, 18 insertions, 462 deletions

diff --git a/dev-python/apsw/ChangeLog b/dev-python/apsw/ChangeLog
index dc9cc617c056..4fffc49133ea 100644
--- a/dev-python/apsw/ChangeLog
+++ b/dev-python/apsw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/apsw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.72 2014/11/06 06:16:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.73 2014/12/01 05:50:43 idella4 Exp $
+
+  01 Dec 2014; Ian Delaney <idella4@gentoo.org> -apsw-3.7.17_p1.ebuild,
+  -apsw-3.8.0.2_p1.ebuild, -apsw-3.8.0_p2.ebuild, -apsw-3.8.1_p1.ebuild,
+  -apsw-3.8.2_p1.ebuild, -apsw-3.8.3.1_p1.ebuild, -apsw-3.8.4.1_p1.ebuild,
+  -apsw-3.8.4.3_p1.ebuild, apsw-3.8.5_p1.ebuild, apsw-3.8.7.1_p1.ebuild:
+  clean old python impl, minor upgrade to fix to qa issue, remove many old
 
 *apsw-3.8.7.1_p1 (06 Nov 2014)
 
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index dd1b24a34cf7..c069637cf843 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -3,37 +3,17 @@ Hash: SHA256
 
 AUX apsw-3.6.20.1-fix_tests.patch 336 SHA256 87cafad98bbdeeed0cfe82ca98b2f7fa9768793535abb1bc7562de8c52f2adb1 SHA512 42dbd31ed6041bb387a5d31c2e7302e361da94c2d150216b7bb347794a92b071a6a3feecdcc7bfbd2810272304ba1df63b0d022073c6f022c594a5f13b04d8a4 WHIRLPOOL b1933540b99df955f8e4593c424d141aefb179bd63b164a7ac2c253b396c029e211972960071c32b8615d53b9d1483bf1a15298d2d6bd84292188630511afaec
 DIST apsw-3.7.13-r1.zip 632647 SHA256 5f26b670069b1bde2635a219db2314c674bb7d7d9ffffd24fd8a32ee637eda2c SHA512 abd0e59575b66ce70b8edded1fcb46beb259edb2b05438881144e041bef7e541277c4fed66863430e75b8846752b6b9776f179fd8accf04b9095b4253cf7e58c WHIRLPOOL 94b05fdd660460091720629ca49fe553de77feb03b33ebf5bedf2c4c0fecc772c30b2f5ea04561ae1b664d023bf6f1ee7b49a8204aa16c424aadf9bebc639e07
-DIST apsw-3.7.17-r1.zip 659131 SHA256 4e58472b6adff5aec9830ae209d65815d0d6ca74878d6cfed7becbbadec096b7 SHA512 0b974c9daf3409572e99d9420f9da834c7a84a4f96faf16574370531e2f6d2f553b54ed776ce9b29fd75aaf5caaedcff7a01bbf60d02ebc76eaa08320952829f WHIRLPOOL 5ecaed829d15a155a9e3d59d035d27872436dec68ce97275b40bc5d2ca0951c8df210f77974768ec4d0a6aba3dbae51c513e2db237100a88f225ec04688150ca
-DIST apsw-3.8.0-r2.zip 660361 SHA256 756fea8e8a47e405c43f03d644d0d49587a3cb992e3bbe63bdd3faea6fce7d82 SHA512 a42eb0735d07874f5a01bee8ffd100dcda1f8ef022871d5b2764fa8f0c8ae408334b33d3fb3a99b0e0bf5017f8e1588984f96ce7764e909f919c8be5fe6ac8df WHIRLPOOL c52ad06bdb55844c9d8208d34d018d21868faf3a888986ecfe7d3783a585246d96ec9c13b6d9162ea2df4ff790b6442de8bf172d04bbb3ae5aeb6fa742a5cb49
-DIST apsw-3.8.0.2-r1.zip 662335 SHA256 f3da7dbc1c92b9962086de90d6c6ec5ce199ffcc9f4edca9f55ee62b27db61f0 SHA512 12788c33381face2e3f4b555ee31956979c0a7afe07a439bedec1d0fec6231e80fc7e25819c9d50c77a9ba9ca6137446d35baa17d5b9131213356b44610d7dd4 WHIRLPOOL 0323257ff12ae208807c9b7863241c5ef4527a28b2161b5d6667a774791aa623062438e7de6b4f1e247aae03a88893984fb621b9ce44e2af809449b77d6044cd
-DIST apsw-3.8.1-r1.zip 662227 SHA256 19e62811235672364549221c72956e649dc7cb79388b0d1fb288931377750a21 SHA512 a3b046d5b7b5f407695b44d3aa657cbb633e909b584ae5f17016b263415725e15daa88b7dbebf8745b3f5f89a09c716c8a3cc5a752d7bace34446a44654c7b9d WHIRLPOOL 81339c9c3885ca285fa793e58f8dca287790fea299a448984f27ff517d11ce2182a2f4ca03c392b8f1ba65b353a8768e7616ade6691b71ecd037879d8b80e7f5
-DIST apsw-3.8.2-r1.zip 662521 SHA256 fc6e6f4e03eee1d1693fb6705a6b258f3533e86b43545ac3a70cfa73474f812a SHA512 b9d0bc29878694c5fc274356e934ed29b10e8e97c7978b0c197d032026acf626d153a561bf6e12184f534a5d17bb04398ce42d6a1eefd277516567c0ad0e61ba WHIRLPOOL bd6308dae90c4e2b6b8182aff42645e372b10c79ab7a63b3d21dbb30bcf7a96e9992718660a6483f72c8dc4dd747bd6392e2a3eac1514e11116b6dc283f39511
-DIST apsw-3.8.3.1_p1.tar.gz 302356 SHA256 ddbaf6fd45162b103f26ae9a1b48ba84174cf9f2818c87c2a3a1f65f73b7ddf7 SHA512 785599e16ea7619cbdc04e7e0cf62b0b866ea984c3af5108c7decaa3bc085fe4306db20fe23e48083951cf064a0fb147aef5cd6807033d66c6f7babc27cf13f3 WHIRLPOOL 0c16568997c2b1bf6a997696f44720f8220d8f3f0c03eb0fecfdeb82b79993680f961623fdc138eb573f34714106cdd5e2e3efaff1da3f54509c3bb3bd5539cf
-DIST apsw-3.8.4.1_p1.tar.gz 302791 SHA256 6e06f48ecfc0a5d518122f75d8e74cb2978de8ec80674057df63cb4cae8289d0 SHA512 24340e9898088cac14dfd25e3a44a7a986aa00088087658c8c9dc04c7db2065c9ad8d2f0a176d38fa098da5b22aa62dd5a49c8bd9e28096358f9c37d0b04964a WHIRLPOOL 8ef224f9a6eea831267a20ba6aa28e27e972289f8349da6b2a54d6c62a0e9c639a5a539651c293a2d47e0e72fb74a311dcfed9e07319ef9e7298a36bcd7c3a7d
-DIST apsw-3.8.4.3_p1.tar.gz 303203 SHA256 6f119be599af7c7c342820ebf429381741101531c387dad323b8729eee06cd35 SHA512 0ba33febe7fb7eb2e28c4ca48c6924532e7c05b883c3432b22ce958604c8a1cd85a48e697971b0649a64103ec9cc8f0fee4fe512934b3d608f5afcab45205363 WHIRLPOOL 797eda23380053afb0981038afd41a250bfe25163cb8816f84c6db5a0ed761efd3a1d8821c755c73ef24f5e219f73dbfa236260d86630ae041ad1212d1bcfe7f
 DIST apsw-3.8.5_p1.tar.gz 303479 SHA256 f828556f88926eff858e7b5a43e36edd18ed2c1c62c6925a60aa5ed5aa1f96cd SHA512 f62f3c3bbb39ffe63d1eaaeacf7a3e7562e4964774047923cce7fae2f947a14b41b51ee93546a15b27dde216b009e0fd8664bf86569ec94cb8f9f16d2d6e245f WHIRLPOOL 85390d53bba173f1b1118675830743cf282325f73bf5bf8d7205d954fbac37755c502a0c0e48ba5e1463a9a30d7832ae78dea5818e3f99c26e5638c2eb625822
 DIST apsw-3.8.7.1_p1.tar.gz 303446 SHA256 7aee29cc170332aa1a16fb80753152e809208bbc91823f64178e4afc32526fec SHA512 104aad3a8cec07647b71c77814cc069587daf84450b41f992d0b3c752c476105351b28912768a29f7952bfd75e9b2d3fcd8e6ae758b3bab8b986bf8e1300c256 WHIRLPOOL cc95728b07e384ee88002afce4b68abcfb259a62188cc77bad1154a83bf3e1979fec8761fe8a3c9e5ae35d5027cdf42c1b4a4b7749ad76d7935e032e253c8167
 EBUILD apsw-3.7.13.1.ebuild 1305 SHA256 dbe5ffa224330f04317c401884ba395b139a12be377706f510b7efd3de147d62 SHA512 1ef6e9dee8f4253d94400710c18da85be4650f161f2057e09f48f7f8670306fdde022604d5c81ec131d9fc490ebe48d96aa8d5dbc84aedf6b5731be8c96177e1 WHIRLPOOL 4f82524190a16e0009fc1db63fc05f619000c020c17de39cb0f5f12701e7cdf50d40c8d0f1f059f8e91797a707db33950e1337f292afd9d4607b77982d61a38d
-EBUILD apsw-3.7.17_p1.ebuild 1227 SHA256 821a18c75b0454ce5b8af9e52de5b31ca48b9d96a5994b8be7842f7071c0c4b3 SHA512 e3b1ac2f4a79d7f6a3bc1f2c4666f7c50a87c1346a87d24b4b8057b5ce46bd2f33ab6cab1217c13288a5075c6d7a16962e60d863d8d3f0131e50a167b406663f WHIRLPOOL 25e2d03489ae745e5470f0d5c53d0d3562b44bdc3415c277edfc243433725d8209df3805644405bc9d52a2e992e106878b9b893ce2e54dfcd1cf678af3f97a66
-EBUILD apsw-3.8.0.2_p1.ebuild 1231 SHA256 4883fd71df8bd53ff909b8545100f21eda86a108a404962c6b01aeb3e848e240 SHA512 5a4dcdf625f7c5ea8f7fb95c2ddff767b2b307a88cf36158872d4ad7f7973d016c4d40d1a3c402a312b86a214842c9fdc9485ba5ffbebb7fe7b17d4b0c30b60f WHIRLPOOL 4b3f9756cfde2543b5a03cc93a76423d12b065eb7e0440c55e6584ede3bc068d05d0e1ca849ee8c90b58e83127da41a08165e870c335a35a1c7a1bdbc6a23187
-EBUILD apsw-3.8.0_p2.ebuild 1229 SHA256 4266370b4dfb106cf9b1eb9be8708c29872a3cb574ed253ed14f9914010c1181 SHA512 76c3f7713dce79faba395bcd9c0788eaaf981f5e23c13d8d18e0ff80d6746c2efc387452e70b0b2cb39db9b5be555060ce1311357203312d7e2c4e4923aeb7c0 WHIRLPOOL 694e8324d2b0db42920a971e7fc7f4f1105b0f3bc4258d0262ab6becc1ec867e7ff8128c51b7b1a40c528dd64cc591816001ed95f8c531da7e79e24747785b66
-EBUILD apsw-3.8.1_p1.ebuild 1229 SHA256 c8e05d592498da4159d7fab5632a242da5faf31221a34c14cd05b1ba0626229b SHA512 4215d540b074cc06478e0718edad37d3819a99fcee8ecbd877935a457a43eed2b687197ffc2cf2b8f09f203a830a88dd19c67530e3ca117573946d986de1ec46 WHIRLPOOL 5dbaca81ca0b84a42bbf39145cb633d956a9b6146fe3ca46112d9c1c712d7703354724473cc7d8fa83488f8ba22c893bb3115de4d03018a7314a4afa938df90e
-EBUILD apsw-3.8.2_p1.ebuild 1229 SHA256 b3249af5afe73d27c74552eb91efac8352de76bd3c7d34042de45231ac611df6 SHA512 c94b232da107e1f475b4f741304caef1f3f696798eea0f42cb84349d9c3b6740cee439db09757bbee757576a2904eee0c25ad5629da4581ca52a79de05a5c703 WHIRLPOOL eacb0c529c7e06f15bf83b7cb6734c5d9a09d77e485942598d61f331384a36161eaa46770b7f2ff6404a7020817e79a5dd65ec75c0d6706cf26df24947cbfce1
-EBUILD apsw-3.8.3.1_p1.ebuild 1322 SHA256 b29c9454b8ca378bed306762291423b4ac0ea728b549abd53e193de7ab73171d SHA512 2bd95ab5c7047a8e785f6225a8a05b5522fe9cf37314dd6518d0ca000abe2bd03aaeaaa6c95d83fe0cbbcc32b2b9f9cb25e1a51c86c5b58d27466b5fd2f80ecb WHIRLPOOL 965633208880e75b97bb6290f60ee2ba860b3c1ec51e1701c065cabcc23691aca29f3cf3b2718d291052ea51e9b2e5886a1faa8b8cb26d8f7a59382348b0508f
-EBUILD apsw-3.8.4.1_p1.ebuild 1326 SHA256 b0233495c64a4db4df22d0b144811c692c07ca3f6d07d9732760f78c4ce5b02c SHA512 0d04bd9d828f591f707381aa3976b52c4eea199b5491a8e9e5e10ff281ac1aad816add7b2b7bc31194fe2e9c5bfe68d705fd60b95532ac6957bda872dfe74692 WHIRLPOOL 39a9b8f12ec8a0970879609d19c75720897414a19616a4a249e5e032af43d262d5c642b4fd77ea0b25012d1d1b6dcccf1cd32dae512bd7cfe3a6799c8a348021
-EBUILD apsw-3.8.4.3_p1.ebuild 1327 SHA256 6c4661ffd328d6cafe13a42cd7611cc5a74061e76e14e113d6a51062c6b7ea99 SHA512 7a5e16ae18d63681cd1eae5df8cf7d983bc2d33c43c86271c7504465ad4c415057518ce05be335c726f78e4af132181f714a6bf17412ee4ae50fb9d230ea4e7f WHIRLPOOL b6a39a2238b4f841fd295656cfb350e1f84be355ee901fa884e67ce5b089316f00d1ed2bfd61e213177312631fe75690d2d7969cef3610a6d691dab8bd1fd5ab
-EBUILD apsw-3.8.5_p1.ebuild 1325 SHA256 3a9386e0cf65c307d498f9e330dde06a1bd84071ae0fcbf7afa50969ca380482 SHA512 380c0bf92cd3ad6640855b8b02ba643740b1e1e8976c9bcb58c62870dae5c969de98a0cbbaea801bcff2ca32778bb8f70e19d7fa31fcdb1fab49c752209489c7 WHIRLPOOL 2029ee940a1f0591df00dd9b616e2854c4d60f36fc60429f57fddd7b4c53ed2888f6e3cb4af767bb57046461d0ee953ab8c3307a5b5aa4e322ce2d72a2daf3e5
-EBUILD apsw-3.8.7.1_p1.ebuild 1323 SHA256 707ea247d9b0614e10182d6a84fff5b642a4fc0019b4710e88e1c2c48d712c4e SHA512 5e2b99553ff951406eb84a00e527208f5a48fc4645d3b97d67c712fd5d401460c2f789bf0b2024528fb3b68f5c7d990d48fe8578818819153960f0cf0c726ba9 WHIRLPOOL ea9ba0be43d12918b0605d48da17c634b36b2b9c1c88234b23bc2ae8818ef8f84da23be1fd8b88e462566871e3e9d07190d3a77a8981b8538d13b64ec7f96e8a
-MISC ChangeLog 10132 SHA256 663e3bc0cf718d81d812baece1cf138abd6ff40f937118eac510807f7ac2c168 SHA512 483e6879de2c4beb3ded20e44f3abde89db19323e5ba4367c636accc45156b502b4b51e2537852af4dbbedcfa4d097f435d8fe1d6fe54877409bff1138d6d68c WHIRLPOOL b2ee7e640668c3f2f0b47c802e3df304c575724dff4938ed963980f39136b9bb89d9b9c2963ec41e167e86852be4b188969b9b9916fb3bc601531896b49fe148
+EBUILD apsw-3.8.5_p1.ebuild 1310 SHA256 d5565c94b5f9c08de005ce13b2003be8020e735049b2f5ea01321e2d2bd5d67f SHA512 6a7d99e3c48722e31fbf44d1f62f9a06159e5890bc0bffef68c294b024014e981a748ac5719bf05f2bd1527321dadf60b03f5454fa10e2a38a45a71be37705e8 WHIRLPOOL 4d773bc62983ea840459f34cefc73f5bf35259dc2dc313333fdf417daf53b54e95c3cc30f223f1f1c0a7c9d7536c635ce7c5201fe4b8423f649307070e02b015
+EBUILD apsw-3.8.7.1_p1.ebuild 1312 SHA256 e198e44462ee7cf753c53856aedf1fbcc2c87b570604dd2f7c37ac1c72f0788e SHA512 aa89e2122793b19951bc03a475303a8bc150fd50b366303e0bad41ab7080d67a43427157ad28310a5470fc498637c2585f58b1f7a097b4f7f11b8c3d77501f0a WHIRLPOOL c113b4e3cbf15b4bf6b31083a39354104f17c8284ae4484a2c45924a0c20f4eb5dbb275e84ee61c68edb242027ebf28718370ac7fb43b5f62caad774753454ab
+MISC ChangeLog 10499 SHA256 20a2d2e76db003cb23e71914006320d5778f37ae7c69fff8ae66cc3202cedef5 SHA512 623778404757887dbb0b791a06a59fa466101487357f9905b180e41b25e917a7c2245bf4462669ea2ac215f18de6beb5e8184d29b31f7ac4792099b1a4b95a55 WHIRLPOOL 4654fa03743eaff09f2529712264f18f0b0274305e031e28984c3501732ac553dcbcf0906f5a83bbffdfe26c59ec7ee4419463aa6b995e9ab16dfe76529ace0f
 MISC metadata.xml 561 SHA256 9c3e45ca4e55f72b64f7cf353e3d75b11b00383fb73de31a965d12d4a44a6cbb SHA512 26ed95ea6af58cccb764063f083e599422fdbea744848566e93a2ef49e0f6d4f5554a9d1fa767e0e8e7e38af2cac93bc3ab7a8c92903f7e86760e289dd9dd3e1 WHIRLPOOL 48b57a0768e727f0194ced5c9730d97f3c36f8cd2d44a3865131f19a971614911aa8ec190458f03d242bcdf38e2f11fb8612091df0e5b773b842f170134f51ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUWxJDAAoJEEqz6FtPBkyj1WAIALdKwRNhvVuwyhSJBRvghl9v
-dOttYSRDUcgtuNdSEeITXl/rpsEo9xGqhdppx3hK9hjs8vvQ4u6ZMXiMRgUDwPzw
-lETgRCrRiXsXiI5HFEl2hiY4MECqyy2QQrG2yckTfvOU4HFOcdwMC2Gyd9rqB9mo
-s/W8oqikYj0/Gt7Q6SJBZxXkV3RrWfO1gJMWhxxFvu76f9HU3cWAS82m94LL8RiV
-wkpnlK3AeThvJ348vHFtXG25KFcsqvxc/SS9cN0qzGcz+zuULPcNyDAF4lgK0y/l
-vc5g2Pv8QvyHEqilTv5zinLpUZtRABqA3lgGKshiYCEFVMJ/iYf1OVrSwhIpqb8=
-=Q//N
+iEYEAREIAAYFAlR8AcIACgkQso7CE7gHKw0OFQCfaUubu163fdgHOxSKVJ8cpvgT
+PtsAoKdgatG/sZ/4ka5l166Bo+SvLMB/
+=ajRG
 -----END PGP SIGNATURE-----
diff --git a/dev-python/apsw/apsw-3.7.17_p1.ebuild b/dev-python/apsw/apsw-3.7.17_p1.ebuild
deleted file mode 100644
index 9c9f1e41bc15..000000000000
--- a/dev-python/apsw/apsw-3.7.17_p1.ebuild
+++ /dev/null
@@ -1,53 +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/apsw/apsw-3.7.17_p1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.0.2_p1.ebuild b/dev-python/apsw/apsw-3.8.0.2_p1.ebuild
deleted file mode 100644
index fcf71b443bf4..000000000000
--- a/dev-python/apsw/apsw-3.8.0.2_p1.ebuild
+++ /dev/null
@@ -1,53 +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/apsw/apsw-3.8.0.2_p1.ebuild,v 1.1 2013/09/07 18:26:08 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.0_p2.ebuild b/dev-python/apsw/apsw-3.8.0_p2.ebuild
deleted file mode 100644
index 7435f4ecf3d7..000000000000
--- a/dev-python/apsw/apsw-3.8.0_p2.ebuild
+++ /dev/null
@@ -1,53 +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/apsw/apsw-3.8.0_p2.ebuild,v 1.1 2013/08/29 05:45:40 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.1_p1.ebuild b/dev-python/apsw/apsw-3.8.1_p1.ebuild
deleted file mode 100644
index bd303e85feb2..000000000000
--- a/dev-python/apsw/apsw-3.8.1_p1.ebuild
+++ /dev/null
@@ -1,53 +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/apsw/apsw-3.8.1_p1.ebuild,v 1.1 2013/11/21 03:26:19 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.2_p1.ebuild b/dev-python/apsw/apsw-3.8.2_p1.ebuild
deleted file mode 100644
index ec07e4914f56..000000000000
--- a/dev-python/apsw/apsw-3.8.2_p1.ebuild
+++ /dev/null
@@ -1,53 +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/apsw/apsw-3.8.2_p1.ebuild,v 1.1 2014/01/04 10:09:52 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.3.1_p1.ebuild b/dev-python/apsw/apsw-3.8.3.1_p1.ebuild
deleted file mode 100644
index 1859cd6c9099..000000000000
--- a/dev-python/apsw/apsw-3.8.3.1_p1.ebuild
+++ /dev/null
@@ -1,55 +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/apsw/apsw-3.8.3.1_p1.ebuild,v 1.1 2014/02/14 07:36:52 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.4.1_p1.ebuild b/dev-python/apsw/apsw-3.8.4.1_p1.ebuild
deleted file mode 100644
index bdb75c900b13..000000000000
--- a/dev-python/apsw/apsw-3.8.4.1_p1.ebuild
+++ /dev/null
@@ -1,55 +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/apsw/apsw-3.8.4.1_p1.ebuild,v 1.1 2014/04/03 06:25:39 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.4.3_p1.ebuild b/dev-python/apsw/apsw-3.8.4.3_p1.ebuild
deleted file mode 100644
index 0575d9cf41e0..000000000000
--- a/dev-python/apsw/apsw-3.8.4.3_p1.ebuild
+++ /dev/null
@@ -1,55 +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/apsw/apsw-3.8.4.3_p1.ebuild,v 1.2 2014/05/20 22:18:49 mrueg Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://code.google.com/p/apsw/"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile --enable=load_extension
-}
-
-src_test() {
-	# tests use overlapping database files
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/dev-python/apsw/apsw-3.8.5_p1.ebuild b/dev-python/apsw/apsw-3.8.5_p1.ebuild
index 85a19afc1b15..e7c61fe60be6 100644
--- a/dev-python/apsw/apsw-3.8.5_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.5_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.5_p1.ebuild,v 1.1 2014/06/10 23:56:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.5_p1.ebuild,v 1.2 2014/12/01 05:50:43 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
 
 python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
+	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		export CFLAGS
 	fi
diff --git a/dev-python/apsw/apsw-3.8.7.1_p1.ebuild b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
index 0b997ac83429..eb5b095a0ab8 100644
--- a/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.7.1_p1.ebuild,v 1.1 2014/11/06 06:16:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.7.1_p1.ebuild,v 1.2 2014/12/01 05:50:43 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
 
 python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
+	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		export CFLAGS
 	fi