Add upstream patch to work with GCC 4.9 and GCC 5. Fixes bug 555648. Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x229E5838

8 files changed, 101 insertions, 713 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index f7f3a5fa25eb..1ba880710631 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.43 2015/06/14 02:41:01 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.44 2015/07/31 22:46:23 jcallen Exp $
+
+*schroot-1.6.10-r2 (31 Jul 2015)
+
+  31 Jul 2015; Jonathan Callen <jcallen@gentoo.org>
+  +files/schroot-1.6.10-cmake-add-additional-regex-tests.patch,
+  +schroot-1.6.10-r2.ebuild, -schroot-1.4.23-r1.ebuild, -schroot-1.4.23.ebuild,
+  -schroot-1.4.25.ebuild, -schroot-1.4.26.ebuild, -schroot-1.6.10-r1.ebuild:
+  Add upstream patch to work with GCC 4.9 and GCC 5. Fixes bug 555648. Remove
+  old.
 
 *schroot-1.6.10-r1 (14 Jun 2015)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 023cabdc20b5..24483c0db9d4 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -2,41 +2,35 @@
 Hash: SHA256
 
 AUX schroot-1.4.7-tests.patch 2427 SHA256 32e6aaea6a3646515040892d6e942ec7509219d5f7a87572f75a76caf89d0146 SHA512 c071533618744710c581e2f744971620ab95fa1db4242e5d885e9ee0d107da5ce9d008ed7cee4cec8c5bbcacab00ca73f29e59086b637607505616bb86143af6 WHIRLPOOL fbbc2c30d5cf781757ea6d075946bbc627472f81a1f3bf33c75ed8520982c99b2985663a917dc3aaf975f74aa87089c059256944ae1fedf11991b2442a7a6517
+AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 SHA256 8effe0d973d51b52e030b3b686847e6029c750bcac5893fa5f6a0d2a07d64b9b SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0 WHIRLPOOL 3ecad5858d87068c26ab7808b0e2009eca7204359cdbbb41ce1afbe07b95282fb819fd7a3233833d2380ab1b92ad05b48070fdf1e6ebf2fa7459666712cebb7d
 AUX schroot-1.6.3-tests.patch 2947 SHA256 6bf27ee40dab7f9dfb730296bfec842813b5572989f4d95b1762d206dfb1e191 SHA512 170203e6a2449ea0c0d8232cd0bac908e626eb4998f366e64e6e07dbcd3c9608155b88a25585c226fa62c224b18e4d35cd863b082b2665b01960edc47d873c24 WHIRLPOOL 424f3bd46b64d3eaaf7b0ca49e412305c26fd45b86e8b322b98f760b9e26511d46f1fa453b08a1677aba621a32591971a9f7d2f6d7a0b62f5194c667f69a68f7
 AUX schroot.confd 371 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98 WHIRLPOOL 921b6677f8400e94d8f5714e24d8c8cf1375fa4b79dac1fe4f67ef338f7c8ad3d8ee072ef64d70473f86c27f93e4b413d4fd3c69968be88f46a6ca87a9fbbc58
 AUX schroot.initd 705 SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5 SHA512 263c4a69d0249884db635906d6b8a86ec1bfbf605868e75cf961ac4e357069ac37bb696e93c5a17dd87b86e1e6c1b1720bdd0b0ee98a61702ebe7dfb9650f409 WHIRLPOOL 23d5caba09d633e26d7ffe94996d95b25eda8a9b516ec0c15f1e997471d21d5ae7648731e867f92606f55ecf4d37632ed55d1088298bce25ce4bc0b1f07d2dd2
-DIST schroot_1.4.23.orig.tar.bz2 824291 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16 SHA512 f15fa6b365fa4885238af9f29abf0f701cae8e44098e8dbdc0df3a22442bdb2bf47919c0a8d7b0eea741f0042bd008b5797894765b52acdce113071ea4acb573 WHIRLPOOL efa9ada10cf48b3d0eee148ac40abc62812ea27f79cb6e848527275b479324657bbb2947218334c431e02e6cb5a0f508897763b75b3b7361d050a01ea52b22c1
-DIST schroot_1.4.25.orig.tar.bz2 828142 SHA256 664d56065d30a5ba8bfe116243f1ef075767d9d379d064f0a5298cbc7778a30c SHA512 fdc56801bce1fe69d9dfbf77e42e9a80ec8655d3d0ec9e6712c8bc91a2ee0d728adf0598ba4564563a47d3d123fe345e86be3c978bf675e6b636a4f04723f0a5 WHIRLPOOL 3def003ce149941aea50d42fdcb4306ca42f90305c936bc2c3fad466ace2a405bb44cf90ad52eca8e3d09fb60562f9a523d5dd0e1c2a1a8426d29c9d1c7d7ba3
-DIST schroot_1.4.26.orig.tar.xz 659816 SHA256 7caa8dc8d5db95972e8459ef603afc6e0f146a139130fca7555f31217d2d469f SHA512 b62771526cf61d6bdab2659c040ea26951a8b0d43e5f7bbb5a5ead6af39bd582d5c912f2dea6a16feb97e3d828c4576225e2925acf56515af9c6b1b02ec8e08d WHIRLPOOL 430fbcb2dfa070cdf956363eb98f25ea5eaf06ebe98602fdec743112f03dc101b6fdde77d6cc80ee604973b9ad174c3e2dc5907fd52679c6a4416edd54cead32
 DIST schroot_1.6.10-1.debian.tar.xz 27108 SHA256 d93a7acc4b6c06a024b6bb0bfc1867a144193aadbb09cab454373c2983120cd9 SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6 WHIRLPOOL 7f9a1b782093321b0dc236098688dacd93f608725bd551ef848262049da3f08b12b2ec34188413ec5b16070753acdc0a07af8d723599581340ecd9cfc6493b67
 DIST schroot_1.6.10.orig.tar.xz 797328 SHA256 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe WHIRLPOOL 91c4682101c6eeb1f56d3e5c583a55af1164abd6853a822ac5c5f1c6820140fb1049765877e97985a90264f4e9d898886487fac794a794904f98210494974090
 DIST schroot_1.6.3.orig.tar.xz 730756 SHA256 0b914a0ae1eef0288e5bf016c14031d3433d1b3f18820bebc5480647594ebc82 SHA512 e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be WHIRLPOOL 065142aa34a225d0cda44ca3d3703131fe2a0ab46ad914bf386a58dd0480650ca03a5b6d00216eca41edff5a534083874d121623002aec57e933a95a4d2cc60f
 DIST schroot_1.6.5-1.debian.tar.gz 30518 SHA256 acf7cdbbb486a5724e61d10ba682df24dc66ec9274c6897f64b7dbd5f9632aed SHA512 3f5753a877cf8226f9eb085620c91f3e6179855adb7faf1f60e78d12b30ac545f6f6d124a239bd6a8d6b3ac28b417ee1d3ccc7ea4978cad77f3bba1d6e2c043d WHIRLPOOL 13b8afc0575fc1d4e27e35ba0cf277ffb04353b2dc0ebcfb8596d6ada064402f2004bd0b9fd658daad8cef69c1a3c5d615be0569335f6b243ed2f09134d63543
 DIST schroot_1.6.5.orig.tar.xz 737656 SHA256 290d1af4eb06db7678277a5aa8104a69bc33b4e0f9b502aed166061d2717343e SHA512 2f7285f9e76fff8db2a9a7cd66f4d06c2c19662f812c3b3108be45bbc6a67bee63b39b56235e257ab226c35efdba6b50a2e2511a618c32d76da10a0d7843fe90 WHIRLPOOL bf9dcdd61862719492bde8e67ca5cd3b42e368cb69e57382b88a85aa1b34825ab40bd2e9f82f4296a0d9721a38fe03e8161f49931a95721be835d52a3a9108fa
-EBUILD schroot-1.4.23-r1.ebuild 4510 SHA256 6b0fd39dfac3e3757c8042d07001b0d74519c846fa592de2c85cec92905fd392 SHA512 4aebb1274d22248b9f9b943b54a8333e863fc9b160b15c463c0f8516dfab97e26750a4dedcaddaab617851de86194d062d7b9832bb5b0fbdb117b61e4a354a32 WHIRLPOOL 3c5cf65ad861f7d514ee376db3938537fa2a599269d031e51c992b3b28f45acfbdbae093635834a10a103c4c6dd07a4f99b06e2a7b4173253a114662056b46be
-EBUILD schroot-1.4.23.ebuild 4580 SHA256 a78d13c93302cad222d10d77b9c4063c86c9964a9677560c6ca5fefff3c42195 SHA512 4b3358c5e39be3047c5bd858c59241e8aa73f73bb5fd5a45ec8ecdde0e423c981f38362cf1e886b7f949253d4270b74dbae42a8607683a4c62c3a04591e93283 WHIRLPOOL ae5576ff45771d5f34a9440f893c40913fd9b485a934ced6620c2f1b5aa464e137e254a46531b2e8a085978a5f0e38a4a7b145fd0b4734fdc3188c06e2a3f670
-EBUILD schroot-1.4.25.ebuild 4523 SHA256 10d82711b555f2c318ba56b6dda6aefbbd9a70f8f7259ed241dc38142ceb852d SHA512 a7e766e4cf5a643633879135f395a046e921b6b905149ca8807090b62df9b75fc970bdfd2feebbff83507901921a388830b77eee231082615cc87f7f5ada52f2 WHIRLPOOL 17611a287db2728c2347c266984e3ee38eaca850b479a5b9d7b338bb67c1f8731ca2f5abb2233e0cfc45118071e69c8c5340bcc7b987ddc39f74f50c0c91ec5d
-EBUILD schroot-1.4.26.ebuild 4541 SHA256 c30a5dccaace658ebf3d92186216e32a95d6af3f5da9778a0870d23fd9256bdd SHA512 a669086bf2b0de086a07ed18b0c81a9c373a47d9721fa02e5fa7951e26870d61826bd81e807f8e689f078c2438c70acd68a6422af90cbf37218da35ced7db585 WHIRLPOOL dbec740691da142bf9dadc0c20d2f5755376b61d926329541e8f1da96cc1c824743d5a2fef48e4d55ff9f7646f7984a1a8a51db808496fb3f76b7c6a355af3ea
-EBUILD schroot-1.6.10-r1.ebuild 2920 SHA256 fb8414c4354d2a562a3d14d4609f85deca205d4cb34ed958bb3b78db1913b036 SHA512 3f9f8e2aec074c18c12b4ee39028de0319613a7c02cad28725953f499acb244e6b3743b6803614ba4631b2070f1d41a3638cec776d5101419241d8b51deb6044 WHIRLPOOL 25b4c0f006440a4dfd62d1b9c31ce9719e8f9a25bb0c6d7254b9a18a1459ba6119401e7a414b1651cc89a6bc2460216f02a525b4443b71e16f6808c9c46e1f9d
+EBUILD schroot-1.6.10-r2.ebuild 3000 SHA256 9f2feaf6052a34161a7718ad4c4b8271201ceff8a57be84b229e149acf53e555 SHA512 2720a20d5b260d5a50cf18c64a4ad1981da1211d326057fbb09ddde3edff50834eb1e4680673636b2d56e21d69c5a7851ba06a33dcb09ce713b8bf5868d91798 WHIRLPOOL 7ad595cdb7ee9e8b8f5584ac01566f54ec8199ef163509a5215b6056a1c4388facafaf935c35a1583d6daf971bfdc5294f9cfdbfbde428d2c56b09e398b8acaa
 EBUILD schroot-1.6.3.ebuild 2955 SHA256 c0fe9da9f49cdc0086a5a8cfe67974d813d67fbe3d01d17dbcce5e3140e2dfc5 SHA512 f2eec795371d8c26d86208204da92748f2cbc44b5bed83460b3d9dcbde7795cb89e7c08cf46bb1f541b66d4a5210e595481875bfa456a7584badddfdfda9a7c3 WHIRLPOOL 40d48232b926e76e32cb015dea2db06d1c3fa58959d9c9d41799f59d6c0e625fe67d865328a363f5893180275d5c953c060ef3b9016db5853fdfbd862d51312a
 EBUILD schroot-1.6.5-r1.ebuild 3160 SHA256 5a3999e22c296d747991bf8f3812a4abd418c90bf8893b44b9b79399b99137ee SHA512 2b67cd0078b987c3226f2a7655af66d0a84a64e924cef5d5060a4899781cf8fd492f757cb6e7b7c6e9b69c3f6887cd81d86a82c8e0c4c3158d12bd6208fcd7fb WHIRLPOOL 0f1ec8ad9e7ee3e1652417895eee49b45f0a8907a65d5159c876e73c230178885d9dc25ebac5e946ae6df616bf1e04dd54179f449cb8987f79750cba56a11a21
 EBUILD schroot-1.6.5.ebuild 3154 SHA256 13494be1f6f9819659f245c23ecd44b23d1b4a979cc29d803e42385dd9ca1c99 SHA512 fe865c332ccce9d96af84208664d2560c49f1825031036b3205a11f5bdefbb9a5767f3371f6d50c6ed3201f5055312c91404e3c90614342119c150b7bef3a632 WHIRLPOOL c74017d6260f343cff4df6c77497d0d406429330796f8598a96fb6729c728c87bdc8c76fa94546ede89203225316729d0576710367d0d267befc9c6d461c9f15
-MISC ChangeLog 7412 SHA256 c11ada2cbc38485698b28acd8b4cf3f89417d93ada9eb28b89a18b5a470d8f78 SHA512 70e0e8fa1847c8d02e14ea8d697fa6c1c55f35ca0073c72eab5e8378087a76721288fb08e19211132da3d974ecdd552ecaf4da96f1b8b96cb6aead0ebd131907 WHIRLPOOL c3ee11fffc8f0332fc5dd106a2d19d64bc4ff62fa55355f6ad8ba593b8beb2d0d6332dee3a5354c2a39aa97edca913652fd3f9e47fac5251d3c1c7793560b22f
+MISC ChangeLog 7805 SHA256 4c6a33fd7c0cc81a9aa7b6d7a6421e56774cb58368677c567c2c60d8d56634ec SHA512 d9fcdf7fa2332a3ab5e4ea3a97c7f65487f227b076e6b210673a46c99cc59dcaed2ab74387d75b11d01994f01f908722ef9432028b1504742cfa3f4aa60e030b WHIRLPOOL d2f6be224a040200d06e10ab6adfe9bb822a63690983bb044b3ee8c31ad32bcc171ee74cc4150eb4f9a97c4a88a5e6700024642171ebbc211612dd07b74be011
 MISC metadata.xml 518 SHA256 2ed5fd79a04cbf7a35bf2f1381e68da5dc648a14dc42d16890cf2c38f8772a40 SHA512 9695afd92e789ee5e380339fdd9c074439589e3c0ad7e6d1e9ee3399a64ffd269b6328a49c2346d1e0224a4be81f5c3023e2cb34fa6a6f0602cf645950cee259 WHIRLPOOL 952634954aa59c7df9ebbbb0efd82840c58c86727cad395777b5490959f810346bbe08d90d450b562c7fb9ae577fa5a49321fdf264a1b00b1f3ea0ea5e5f6d31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfOnBAAoJEEIQbvYRB3mgQVkP/03JNro1+mGjErOsx56coB5w
-55Rur9b210xSS6TFX6jZchgPCjxScPsnOSP+OWFtGCTfu5+YVPANNiaGha9hztP8
-E9qPa90+qfm0LD/2s4lqQvvtP0vIzLwIaqrbU8MJsCITWsfa3IdYV6rNy+wBj1Ae
-9zVX0kaSeX/Xl+xkvmFqx5H2RL5m28CrbEhMIz2+ikDX3Iv0XuD/vk+FPcviVmDw
-PLhWZJ6oMWsltk92SCkwZJ+s+sqVG6zb2i5Eh6r7c705AmSFsoDTHTGlPL3xx0Q6
-dGEmHnLSIQC6RxIAlz6CekHhMcD1p7W+bUTGrdW3KsW/KK05vxs99H8ZhmZInqHI
-iyCT3iXGaPYsEcrYg3fUH1dWEwf9uc1E7HUthfpom9gWczLhimqsUTDZB97pOd1U
-T9KvANRgozgGzK5ljfgzgFhqYIUjjY/Rbk8x4hBZP0DVbpkYP1mr+W3uM7bmpAY9
-Geitk8mz9vH0j1YAz9FP53KQm3uC/G+83T+05TvhIq4NnyiFbdad5qbPstz+0L9q
-WsyRiS827Wr+1S8/4ryy0mrcK2pmlxPbpPpouQ4+1iMtESd1csNsDLD/8jBwsOhB
-9iKGl8X2BoEwd60xjzQyd9YfSlF8OXNZ7XG7jECRfkxQqh0HsyMs+Hr6Vv1T8u7Y
-p0pq09867vX/fhMTl0YC
-=4mZk
+iQIcBAEBCAAGBQJVu/rBAAoJEEIQbvYRB3mgWAAP/1eeemun1kOy1A31PsF30Vzj
+uvIM8xFp9NZWVkqefbkMdNchR5aeTMk6gJlEzjHVxSSbehof/G1wg2D938rqUcYz
+BTv67hLHjD+qjSEPy8Y0F9AqIoBkHNGJQiVFkm7xafxiW7W0Tv/2QMoEr952SPMl
+Fw0HltYT1QPCwdm1vFzZqyjFsxD8qK5WeboVZib/Yb1O1ym2txJwGvXOARkHXjW1
+knxu2eFuZ1JxBv5bHtSkELrt4WhwLElGoTWFxZ8egkcxgPys5UYgVx3029ViAt0V
+s8OrGthSlys+rnFdpfINYCNmy/7LtkPvxV4Q1Je+uKtO8um15xNio1lxgJIbc9Tl
+JWhnmC0+i9Q7KogXyEuo2cfLvEJEwGa5FytubZP8RrEwN3A0nCsiyPkNJQ4eXx0E
+rV+uZiusTdynx2y2xNJVlDYyGtcXHCQybRlDpsYUE9HoXcfRawLoBc9CWGFt20ZA
+9Y54jYNH0CkFo5Ci/43/08SVcW++nMVBj+So/aX5WqQlazD3jcrgPd+ikNX2K4ud
+9JcsuuqFxlW6zkS76kO5grHlquvx/IFREyMVYH2hM5Lz9boX9kRob5vsMlSqBVHR
++RSxG7FhybjCNF/d+i19WE56j2RLro/flAz5jPOMPefFqkv7smleRjMnIIDLykoJ
+VFJq9N5VBmo1oZcenAIe
+=Mchm
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
new file mode 100644
index 000000000000..1660f18ae4b8
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
@@ -0,0 +1,70 @@
+From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
+From: Roger Leigh <rleigh@codelibre.net>
+Date: Sun, 26 Jul 2015 14:00:13 +0100
+Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
+ tests
+
+---
+ cmake/regex-checks.cmake | 10 ++++++++++
+ test/sbuild-regex.cc     | 20 ++++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
+index d0bb211..60507ec 100644
+--- a/cmake/regex-checks.cmake
++++ b/cmake/regex-checks.cmake
+@@ -30,6 +30,16 @@ int main() {
+   if (${namespace}_match(fail, bar)) return 11;
+   if (${namespace}_match(fail, chk)) return 12;
+ 
++  // Checks for broken support in GCC 4.9 and 5.1
++  ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
++  ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
++  if (!${namespace}_match(test, range1)) return 13;
++  if (!${namespace}_match(test, range2)) return 14;
++  if (!${namespace}_match(\"a-\", range1)) return 15;
++  if (!${namespace}_match(\"a-\", range2)) return 16;
++  if (${namespace}_match(\"-a\", range1)) return 17;
++  if (${namespace}_match(\"-a\", range2)) return 18;
++
+   return 0;
+ }"
+ ${outvar})
+diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
+index 915e915..a8520c5 100644
+--- a/test/sbuild-regex.cc
++++ b/test/sbuild-regex.cc
+@@ -33,6 +33,8 @@ class test_regex : public TestCase
+   CPPUNIT_TEST(test_output);
+   CPPUNIT_TEST(test_input);
+   CPPUNIT_TEST(test_match);
++  CPPUNIT_TEST(test_match_bracket1);
++  CPPUNIT_TEST(test_match_bracket2);
+   CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
+   CPPUNIT_TEST_SUITE_END();
+ 
+@@ -88,6 +90,24 @@ class test_regex : public TestCase
+   }
+ 
+   void
++  test_match_bracket1()
++  {
++    sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
++    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
++    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
++    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
++  }
++
++  void
++  test_match_bracket2()
++  {
++    sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
++    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
++    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
++    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
++  }
++
++  void
+   test_input_fail()
+   {
+     sbuild::regex r;
diff --git a/dev-util/schroot/schroot-1.4.23-r1.ebuild b/dev-util/schroot/schroot-1.4.23-r1.ebuild
deleted file mode 100644
index 93879042b8d4..000000000000
--- a/dev-util/schroot/schroot-1.4.23-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.23-r1.ebuild,v 1.1 2011/12/13 22:24:32 abcd Exp $
-
-EAPI="4"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
-	emake all $(usev doc)
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/*
-		docinto html/schroot
-		dohtml doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.4.23.ebuild b/dev-util/schroot/schroot-1.4.23.ebuild
deleted file mode 100644
index 567079ee6e70..000000000000
--- a/dev-util/schroot/schroot-1.4.23.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.23.ebuild,v 1.5 2012/05/26 06:25:17 abcd Exp $
-
-EAPI="4"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-#IUSE="btrfs +dchroot debug doc lvm nls pam test"
-IUSE="+dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-#	btrfs? ( >=sys-fs/btrfs-progs-0.19-r1 )
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		--disable-btrfs-snapshot \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-#		$(use_enable btrfs btrfs-snapshot) \
-}
-
-src_compile() {
-	emake all $(usev doc)
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/*
-		docinto html/schroot
-		dohtml doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.4.25.ebuild b/dev-util/schroot/schroot-1.4.25.ebuild
deleted file mode 100644
index ba56c14f4c53..000000000000
--- a/dev-util/schroot/schroot-1.4.25.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.25.ebuild,v 1.1 2012/03/03 21:20:28 abcd Exp $
-
-EAPI="4"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
-	emake all $(usev doc)
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/*
-		docinto html/schroot
-		dohtml doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.4.26.ebuild b/dev-util/schroot/schroot-1.4.26.ebuild
deleted file mode 100644
index 55f036b84a3b..000000000000
--- a/dev-util/schroot/schroot-1.4.26.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.26.ebuild,v 1.1 2012/05/26 06:25:17 abcd Exp $
-
-EAPI="4"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
-	emake all $(usev doc)
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/*
-		docinto html/schroot
-		dohtml doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.6.10-r1.ebuild b/dev-util/schroot/schroot-1.6.10-r2.ebuild
index 575a67d97978..43e5eacb1179 100644
--- a/dev-util/schroot/schroot-1.6.10-r1.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r2.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-util/schroot/schroot-1.6.10-r1.ebuild,v 1.1 2015/06/14 02:41:01 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r2.ebuild,v 1.1 2015/07/31 22:46:23 jcallen Exp $
 
 EAPI="5"
 
@@ -46,6 +46,10 @@ RDEPEND="${COMMON_DEPEND}
 	nls? ( virtual/libintl )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.patch"
+)
+
 src_unpack() {
 	unpack ${MY_P}.orig.tar.xz
 	cd "${S}"