Big EAPI update and misc build fixes

119 files changed, 168 insertions, 485 deletions

diff --git a/app-misc/simplify/Manifest b/app-misc/simplify/Manifest
index 3e63954..0df1426 100644
--- a/app-misc/simplify/Manifest
+++ b/app-misc/simplify/Manifest
@@ -1,4 +1,4 @@
 DIST simplify-0.2.1.tar.gz 4216 BLAKE2B c54d7785e452b743b9c17327994683b4574c0033ef3226225cea39a2e82eb3a6f5b47739e0d971748390fa3b18ad7b7bd520df2a470c82a91070d2ad91decf76 SHA512 87c556e56d4a9761d747e4f300a9c25b5b261eee4f08cf57b51a607d51afa95783123df33c627c3c64465186c0d054f87e655a4c99a44685cd2e9a9fa98fd834
 DIST simplify-0.2.2.tar.gz 4338 BLAKE2B 140019fadabbab16b7de9173f13ec6c83492f36f6aafdd0a012c8cf5c11183e757fe85dfdff0c22ee4fa0654b59a312be77334585067ac6ea12bf511f2d6e66a SHA512 5f97cf5d8604be8a500124bcf2fb92284af15ea090ff007326649a97fa1851e5507d689fe2a0dfd0d3445dfaa6fe11f1b6930c89880a975c44e4a6e4ee0beafe
-EBUILD simplify-0.2.1.ebuild 524 BLAKE2B 8a5233f6ab342ff5587f3421e2497770cc60b97deabfe6a9f881ba93c0d1edf2948c6da003cb31b719bd52edc7b8f478b1957f2e6c9257ab90effe8bc10ce6ef SHA512 f0e5dc9598bfbf90b96b8a136424a4e442644e9e7920a78e2bf5d1f54936deb6208074434245fceeaac5bb856ea8af285f8a5574829db0ef954ec28dad95618a
-EBUILD simplify-0.2.2.ebuild 535 BLAKE2B b2697b0e23740f4efe093e2b6a0a6babee452a9b04e48354cc719e7cceb492f6ba73e253e360b53bed45ec28261db751d7d146c47e537b94d8ac9c9cbbd4a286 SHA512 e6bfe285334a1c7badc76e451c9e57e6d7ce2a1e238550f2cc996e15fb9dd2d2d2759e9fc0dc55e95ebaf34eb01df7ed3e7af6f4ce8a16f5a393173e4a8503cb
+EBUILD simplify-0.2.1.ebuild 526 BLAKE2B 9be52d78bd5ddc7428a5cc8d049b5546c73c148947ae365c6cd77a09485777bd375934d13059705fa12c98c9ab433788b692934cfa148ec48c96e17d60ba7702 SHA512 14950be0a5b43dd2e6afa33b808e00935b52d0e2896230ae9405e8b909c06d3e84f0e2d267583194b7d3bce26b4ddd7d6f8f4b3bfa13b34afc4799bf6722813f
+EBUILD simplify-0.2.2.ebuild 537 BLAKE2B dfb2854d66ff1a57b01ad25ff217340c7ff1fff44ab37b992c463afb91fd42510ea1fbe0cf2348c44e927e1333bb77bc0167d356d2577d0c9bd18a927604b629 SHA512 9f3d76845179de3b3d96751d9e9bc3d61d3bf87b5c77d5e4a3de1601b08f029a4e1724d6151653bb3e350e30819ba285cf05a015987e0b7773bf8cda6abfc116
diff --git a/app-misc/simplify/simplify-0.2.1.ebuild b/app-misc/simplify/simplify-0.2.1.ebuild
index 2409146..b9c9b22 100644
--- a/app-misc/simplify/simplify-0.2.1.ebuild
+++ b/app-misc/simplify/simplify-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="Simplify a list of files and folders."
diff --git a/app-misc/simplify/simplify-0.2.2.ebuild b/app-misc/simplify/simplify-0.2.2.ebuild
index 91c75dc..a2ee599 100644
--- a/app-misc/simplify/simplify-0.2.2.ebuild
+++ b/app-misc/simplify/simplify-0.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="Simplify a list of files and folders."
diff --git a/app-vim/vim-javascript/Manifest b/app-vim/vim-javascript/Manifest
index e6d9325..4f912a9 100644
--- a/app-vim/vim-javascript/Manifest
+++ b/app-vim/vim-javascript/Manifest
@@ -1,2 +1,2 @@
 DIST vim-javascript-1.2.5.1.tar.gz 13068 BLAKE2B 41f61eceaeda93f5b77a7e9347d575e547aefa2f6cd4f7740d73e33f235abe69ed18b2ed37c0fbad4872645385e4adc0866b31f2cfd8905cc8d797111f3d3141 SHA512 289f3328a7f6fc6242b19248e6da02f080cd887d0f9088c15b6e6d89495f45b425ed88b074c5202e59a6d20810e0534c7ca50e70b6d0e42e88d459483a1d7677
-EBUILD vim-javascript-1.2.5.1.ebuild 559 BLAKE2B c25996999a52501f34ce6d54707ae436c1b50bd0cd54bccdbd9117be8f014cfad66f6a6b54652f2d97c3cc1fd7975b00f78298d690af95d85e8460aca5924d56 SHA512 2cd9d96f61cfaf0216955fa4128b8897d46a202e101d001a4ae4820302969ed7eb9ccd86a644559127128f66adbf4e3ead1ba339d93f9e398a63f27b954723ed
+EBUILD vim-javascript-1.2.5.1.ebuild 561 BLAKE2B 9cf13a1b52359a5faa3ca8bea6b1e7f00e68b2c5714985239173039f78a143360d112aba1ec2ef89c4661185cda141731306a7d5e0bff5d5b67540984365f0eb SHA512 79dbc1f2921e37a0627852d1148fccaf90dc595448adca27c051e33fc203b840c0c9b33fa5baea2a5cb0db3d212d6855e38841530fd43f46501d2dc63cefc0a3
diff --git a/app-vim/vim-javascript/vim-javascript-1.2.5.1.ebuild b/app-vim/vim-javascript/vim-javascript-1.2.5.1.ebuild
index fa0e41d..5115a5c 100644
--- a/app-vim/vim-javascript/vim-javascript-1.2.5.1.ebuild
+++ b/app-vim/vim-javascript/vim-javascript-1.2.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 #VIM_PLUGIN_VIM_VERSION="7.0"
 inherit vim-plugin
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 7796cd0..348bf7d 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -9,7 +9,7 @@ DIST ycmd-4dfa50eb5873c071b446f25b17cbad066164b339.tar.gz 4550802 BLAKE2B de11b0
 DIST youcompleteme-25ebc0b9abb1b135c809ee850085a0305cbc5533.tar.gz 291574 BLAKE2B 99f03166cf6c5192e63c307b8c5558589ea877df74a595694f3169982b0ae2939d24fac469e80b476e23d99bf800ebc0b2e8795f1cf4b4a1c18bdd21f25e9bdb SHA512 6abf0696fcd9472d33071a890411bc0f19ba939a2c2a9d2a60480404759e19c3fd93d9eaa916dcd6c777bd8f8f0d02efac89efefca6219ea7b34c93555101115
 DIST youcompleteme-c9ff2177377a85515b7e081966685f3c46a33eca.tar.gz 281863 BLAKE2B 26625d245db2fea42838e8f8cee7fdff3d14a97a84a3a82ef317978ffedd8ab1c77120ac2acc0aad917ae3a97999c431bfc70cd1ed0639aaacb39e1622e56ef6 SHA512 69bf67117cc9a66e0b613ee7dce962f0e1f668c1bc785bbaf0527309970fc32606c5a43b13493163dae28ba96f90028d9c09fd7f33246216bd4be81ade870d1b
 DIST youcompleteme-ccc06c2c423e7ee7008f7439ff99c604d474cec1.tar.gz 286814 BLAKE2B af87fd800c57d53c9719465c8c7b0c380e8563ef8f16fe60455b8321c4a6389192616f7dc63e3b32a9bdc6a412840a0431df2884b693d02db76ea3d3e8663020 SHA512 45fd32b4384134ab7c1b15c152e0fb72a8cfe508644115036aafca9e16058c2b8cc076622153de7193a1167e1b60d6c44561cbc2225a15bdc5f04d28ce35e727
-EBUILD youcompleteme-20180610-r1.ebuild 3653 BLAKE2B c49503fe3a2584d0d71fc3f7e0738b667928d6379188273aac803ca2d689222a956146bd0544db5ba8a7f801da14f493ebc749d0094041b427d1863ecc808171 SHA512 e0b0e3203a23fe0e0d38c1f738a1fbe212549338bbd0dd76ff2eb4daad5545dbdc791236b9888a551d0db61abafb83d0f32f136bba3be328bef753005dfd866f
-EBUILD youcompleteme-20180610.ebuild 3653 BLAKE2B 1108265b0c9adeca1a8346f4c1a340f06e64ac28b2499ee8d1bd50f3a5502c2f93335a544f3d0c4ddec032b285ab121fda45a207e7759aafa64684cf89841180 SHA512 7d817acb5c57ffa547688b996151bebb20c89c98d2405258d5a2f117cb26de97097224c1a3ae13a16698da5daa36a90855322267deabbc05b8676861c185939d
-EBUILD youcompleteme-20190115.ebuild 3666 BLAKE2B e544ae3d166edfbb76fd10f6408d16cc379950c48120f41ad353389912f3400591536e0305482202990d031518b4dcd122bbd40c2fe73bea87c644f0fdc4c6f3 SHA512 033e6fc94a51e890765fd9184b456aca25116c410c2286b971271d3d84e0f5c81026cc6e12a10e3916136093291cb0227f63b2766d8d3f1b3c5bfddc822e95f4
-EBUILD youcompleteme-20190321.ebuild 3688 BLAKE2B 706b8e65933e24e0036df11f8661a8b99a69e68a88bfabfe397e7bd45f607500af9dc7474c68508d5e92d926d01f5a853acc1602cc3af1ed7afaa3793c104425 SHA512 d7243dd08a86dd46672f3427992b444e12312200f1236fa6a4aedd92886efde1b3db241b11907e5eeb4dcc85acb7dd8d5c62f0fa711a5182588937386f8eec10
+EBUILD youcompleteme-20180610-r1.ebuild 3655 BLAKE2B 9a9ea015178781b31ec574440d9d8d507d606b72b3a8893f1162b86631efceb86cd8dbda8b1451df1f1393dba2981b5e35d0f32eae4e6ab9e086dc6179ec1e35 SHA512 f84c22ba306b0e7f4310dbd40b2fc8180b86c210f4b52294620468571becfbd9a0aa91bb8966d1eb3da582658cd651d2afe80e72f118d8236459427876debe22
+EBUILD youcompleteme-20180610.ebuild 3655 BLAKE2B 16ff36a2eb4b7b57c34557e5a1f2f6005d7b9cdc97c452ac4e4de7fe8b535adb69fa67b8cc701298e60ce0333aa6779e5337eaff330c6c339652f589bb5d1604 SHA512 55ca97e31eab5752902c0afa242de10367af1cd3ace847bf71740e62235c4df762b07ddaee4f1da849bd97c66040f179fdc186498b7d0ef19f71c10604771a2b
+EBUILD youcompleteme-20190115.ebuild 3668 BLAKE2B c1ed2ecfab6e289320aef761214e1b5d140200170f7ebe0970d031cd6dcf39ab2b958e7dd38df8d5abb7f3855439da72c81725deb2df90cca59d1ca79d62f88d SHA512 39e208ed16084f1167e419bfcd479387bbec80e8c8ef1290501dd26be10f9682097159370a07fdeb73b34ee7ebfdad21c0837ae37ded76f7be6b18c8ad771887
+EBUILD youcompleteme-20190321.ebuild 3690 BLAKE2B 4e6506e58e17fab2f1f0582be57533fbddce24ea83080af1cea9120eb169acaaa353762c49d06506a37f1b911e7b25988261d0d2611b55b5fc299aa4ef88d629 SHA512 191e43e7ae87cb5b7fdaf5c6f2c9e113449267e13fce6fd464a5b8506e94fb2a70a35b5ed1386d51004c8409562aa08a5a2538637d8f04231f071bf96d79ad0e
diff --git a/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild
index 15c4a87..49cc92a 100644
--- a/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
diff --git a/app-vim/youcompleteme/youcompleteme-20180610.ebuild b/app-vim/youcompleteme/youcompleteme-20180610.ebuild
index 6b2f854..a58cf79 100644
--- a/app-vim/youcompleteme/youcompleteme-20180610.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20180610.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
diff --git a/app-vim/youcompleteme/youcompleteme-20190115.ebuild b/app-vim/youcompleteme/youcompleteme-20190115.ebuild
index ccef83e..00b9434 100644
--- a/app-vim/youcompleteme/youcompleteme-20190115.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190115.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
diff --git a/app-vim/youcompleteme/youcompleteme-20190321.ebuild b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
index 18df4a9..fa560be 100644
--- a/app-vim/youcompleteme/youcompleteme-20190321.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6} )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
diff --git a/dev-cpp/libjsonpp/Manifest b/dev-cpp/libjsonpp/Manifest
index d3d55b0..7647c04 100644
--- a/dev-cpp/libjsonpp/Manifest
+++ b/dev-cpp/libjsonpp/Manifest
@@ -1,6 +1,6 @@
 DIST libjsonpp-0.11.0.tar.xz 11544 BLAKE2B 3eae6cc32cd41f3f2c52cf96e80b05497c86d07043fb2f6487ea50156d2c6f8b0c3f46f26a4f8fad6a5bde2813f7af3c6ea914610e505651edddb3a5fdd6e1a7 SHA512 9090bd6d9b7916c1c6bdd917b28b870fd1cbdfcc3f586447571d7a3c058e398aeaf9695b4b08e432bded399e6e4c9466005fcd9ad9d4cee774eb29940cfd0672
 DIST libjsonpp-0.11.2.tar.xz 11636 BLAKE2B 9c65348803b1c367b3a9970eb15f4522c76fc286c9bb120081d7906c38c403978a11bdc4588520b22ff06511a69054f458c7b0721c0a78a3acf01222dc528115 SHA512 bd3e1d5b2d795636c39ec5a706946201129c2f1c35ddd73a63c22277f3d2f588f63f78b653eeffe17a100651c7d53d744e89a7eae7b87c26d349edead74f99d8
 DIST libjsonpp-0.12.0.tar.xz 11968 BLAKE2B 76eca9c7c8e99ab75187e734344364ef5dcb7d21d4ea7f9e0268ef04395cc5cfe98fc7d9c9f6352978e94451e758fb8be2ed3e01628f3193479a218947259075 SHA512 5506f87bc3982e57e2f2e2e9f1991b850bcf78d4b24664515e41564ce74144cd6640ce773745c46b81b50727c5dfd5dbc70a5f0cab0427816b58da7f63eb13b6
-EBUILD libjsonpp-0.11.0.ebuild 462 BLAKE2B c8686242e89d0fb0a2c8672055bd51da7a8cba8ce4dd84c4fab142e46e3994235f43417e40d6f14c38a3b6779afa0f5ae37e3dbff1b47bc4d017f9ae5bc82b62 SHA512 c3c99e428518b3ecc7e1c610fa58328ecaada323455c296b8852601e7fc902cdcf94901fee17298a8461d26864874cb450f1b0c6e4c01df7474b8e10051e8ee6
-EBUILD libjsonpp-0.11.2.ebuild 444 BLAKE2B 456243a286bd5938c39d21df875823e572deeb959bc58f5e0046488f254c6b1eea8aac33e70dce01c2911649c6a84beacc9164d6cf6a90cc83621a1806c8cdb5 SHA512 ffd8e89e88945ab14427fb8ab63ac20312290ea4f9568bbe4b6c978aa73bc4d2bce09b4c2b954ddc6c32e4383a6abd976892196c21957a97e2ef05dfde0acb7e
-EBUILD libjsonpp-0.12.0.ebuild 444 BLAKE2B 456243a286bd5938c39d21df875823e572deeb959bc58f5e0046488f254c6b1eea8aac33e70dce01c2911649c6a84beacc9164d6cf6a90cc83621a1806c8cdb5 SHA512 ffd8e89e88945ab14427fb8ab63ac20312290ea4f9568bbe4b6c978aa73bc4d2bce09b4c2b954ddc6c32e4383a6abd976892196c21957a97e2ef05dfde0acb7e
+EBUILD libjsonpp-0.11.0.ebuild 462 BLAKE2B db4cd93290e5f644994fc2856cbf07b5adc12fc28cf7ba5a8307216d2318e007ca75d61b7c34d061d42004e4d0d5b449c91832c7c748aac3603e4a593eed48da SHA512 602fac755ddd68e0aa1d92c26d1a784b095998f01dd7e36f364eb0be2e8f2e89f086438931deeb64fc3b42c71bd2a380702e0f9d47f577d31b9ccfa12da00e08
+EBUILD libjsonpp-0.11.2.ebuild 444 BLAKE2B bd6d06b4226de5a853a751337c364b9fa2e0fe44f31475987755ac1516daf37863c26d7795614677adf180f1c0c8d0c8a56f4fa5627a23b683167d91ad13668f SHA512 5bd49c9ee7f05a0ac1d1e88c4867a086be1759d1c2510bca0507fe6259f87d9751d2f1dde101d15edfe981f6973f5040ffc68c97fee29585c18ecba138af963d
+EBUILD libjsonpp-0.12.0.ebuild 444 BLAKE2B bd6d06b4226de5a853a751337c364b9fa2e0fe44f31475987755ac1516daf37863c26d7795614677adf180f1c0c8d0c8a56f4fa5627a23b683167d91ad13668f SHA512 5bd49c9ee7f05a0ac1d1e88c4867a086be1759d1c2510bca0507fe6259f87d9751d2f1dde101d15edfe981f6973f5040ffc68c97fee29585c18ecba138af963d
diff --git a/dev-cpp/libjsonpp/libjsonpp-0.11.0.ebuild b/dev-cpp/libjsonpp/libjsonpp-0.11.0.ebuild
index b591096..da12331 100644
--- a/dev-cpp/libjsonpp/libjsonpp-0.11.0.ebuild
+++ b/dev-cpp/libjsonpp/libjsonpp-0.11.0.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="Lightweight native C++ JSON library"
diff --git a/dev-cpp/libjsonpp/libjsonpp-0.11.2.ebuild b/dev-cpp/libjsonpp/libjsonpp-0.11.2.ebuild
index d77c2f9..153cf96 100644
--- a/dev-cpp/libjsonpp/libjsonpp-0.11.2.ebuild
+++ b/dev-cpp/libjsonpp/libjsonpp-0.11.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="Lightweight native C++ JSON library"
diff --git a/dev-cpp/libjsonpp/libjsonpp-0.12.0.ebuild b/dev-cpp/libjsonpp/libjsonpp-0.12.0.ebuild
index d77c2f9..153cf96 100644
--- a/dev-cpp/libjsonpp/libjsonpp-0.12.0.ebuild
+++ b/dev-cpp/libjsonpp/libjsonpp-0.12.0.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="Lightweight native C++ JSON library"
diff --git a/dev-cpp/slicer/Manifest b/dev-cpp/slicer/Manifest
index e17a27c..5f80f33 100644
--- a/dev-cpp/slicer/Manifest
+++ b/dev-cpp/slicer/Manifest
@@ -2,5 +2,5 @@ DIST Ice-3.7.2.tar.gz 9427121 BLAKE2B 08c87ce6aa773374871779f025108accb295e2df23
 DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
 DIST slicer-1.9.2.tar.xz 41304 BLAKE2B 408688edc8b234ec5c41a843f16b10aa1f40311c38be180af26edadb125080561b6fd09506468a7f58c72f02185eb9556848684148acb36d233e675c6509e372 SHA512 f0be8870f7d8c5ce231a1691f7fd889ddc7ef8146e4b27e11d3dc3a888b993c2d704cd18ca0496dc9bb8c0dfb29cec069c5372d9f555917c81369b224ff1be87
 DIST slicer-1.9.3.tar.xz 37900 BLAKE2B 1f8ca1d06503763d5a1d2b948f81d50847655f2e196de9d00464c3416175e278e44a276d5768835a8f66403f4cd8e040da410269c5a743c8ff916400886cfd9b SHA512 5527133bca61424b20bb05e6cbf1308a105cf14a59750aecd3a59f0dfc949e826993164bc3214aeb2cda00eef7bcb65ac95c0091fd5c464f35ea352bd70a980f
-EBUILD slicer-1.9.2.ebuild 1178 BLAKE2B 107321cb2599ada6c73aa239a1c32cd40f2998d9c85cdb6364a49ed01efb03f231b926b7c8f181a01d69ff21349e6a44ad3f17ab1e43891846cc71b97d65f0a7 SHA512 e6ac67c1d115ab73bd5f9f11be25f314c88960c9bc2dc28550acf16dacaf106987b727daf08c71e6a126a1fedee9b87ea917c683acf621cebee97d23c022fc1a
-EBUILD slicer-1.9.3.ebuild 1180 BLAKE2B 9084873214d662b276584f7cfa820f2216b1c16eb0b8b4bbe3ff09d3036f0aef951017cbe59866c8f822316edbd3a7dd635a80f7dab05145f141a4acf91b2e19 SHA512 c101ac9a58589a2bfe6a68885bc78f404af095daa9538221c76c1993c4630c36834af97c44df0ff6fce01bbbf626617b782f132d468f695529e973b925ab2a19
+EBUILD slicer-1.9.2.ebuild 1178 BLAKE2B c9340d518bbcdb2cfc8631c39c597814246075a521b972a7bf6963924e24968fdc8669e01ca9f5889544f8352a51c1e9ec081a602db645fea108bfc539e40e70 SHA512 4c7efe8143790ace86f2fb3398928588dd9e7ec9fd0a8064f3157dde6b3d9da5657b3c0c6106945431f45b1d43e0846483b99e988902e41d2adb167028fb3cf8
+EBUILD slicer-1.9.3.ebuild 1180 BLAKE2B e7dc6a97da96ff4886931411e3b1a429ffed1efd1ebc33968e9580a80ff26f71ff7137968f2b79c875ccff6078ef44f1bb5c6cb7f1341b9bd86359eb5fdc8c37 SHA512 da26305b23e1279fbf3a119b291e914526b8197c2c41dc191fe36919f9a0ecfd5f49efc38d073b15440fbe288a2971cc79e8e3cc45cd44cde8edc9e897e260bf
diff --git a/dev-cpp/slicer/slicer-1.9.2.ebuild b/dev-cpp/slicer/slicer-1.9.2.ebuild
index 3c1bea8..591ba75 100644
--- a/dev-cpp/slicer/slicer-1.9.2.ebuild
+++ b/dev-cpp/slicer/slicer-1.9.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-cpp/slicer/slicer-1.9.3.ebuild b/dev-cpp/slicer/slicer-1.9.3.ebuild
index ced97a2..16c25ca 100644
--- a/dev-cpp/slicer/slicer-1.9.3.ebuild
+++ b/dev-cpp/slicer/slicer-1.9.3.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-db/postgresql-fdw-mysql/Manifest b/dev-db/postgresql-fdw-mysql/Manifest
index e89e751..c206fee 100644
--- a/dev-db/postgresql-fdw-mysql/Manifest
+++ b/dev-db/postgresql-fdw-mysql/Manifest
@@ -1,4 +1,4 @@
 DIST REL-2_5_1.tar.gz 42615 BLAKE2B 54e7162a2740ee15bf060e443317d23954b9ed7809c782dc8953982fcbad815aa08876340e4c5085cbecab551116bd297b2894575f6d81633f1cae60b5d26d0d SHA512 a3b10f165b15ca4bfdefabb4f4d173b7fc94012278fb718737e18d6d7a5bcc1be6fb9e0f97626e0ab444e33f3b2426b35f7b9986c625c09977535d8e5fcb6951
 DIST REL-2_5_3.tar.gz 42804 BLAKE2B abefcaf890453ec842e80ace850b0faaf1468bda3717c50a4ef6e39324bc9c1a4a6997a6f057a33bfe4db313b84011ebc8a9e7b581678128676b57c6991ae58a SHA512 d9e74ac98003215d8a2e27e955c2d82faca6d1bf22884c9b3ed998fe88513d4a9003a8fe6e2eafb9d6df4e99a5a92db9612426afae27f1692d8807d478cfc912
 EBUILD postgresql-fdw-mysql-2.5.1-r1.ebuild 592 BLAKE2B d6b33c57d39450b3b45a9c77f893863cda6f9443649ce3690aef1bbac97ab0013867a13fb5a31738efc96f3788071c098de56fbc01440e808b846cc3a5958927 SHA512 1c65d9ef97f3642e42ac05f2152661b68321de395a946c93b23c1950b078a0e6d8b6105ba6725ecac3d01c6a07edcf5d317f0ccaa0e2497ef1916209d4a8c3a2
-EBUILD postgresql-fdw-mysql-2.5.3-r1.ebuild 590 BLAKE2B 57f92e2c28ed557a3a4d39bd6838e3ee959612e5c629d155b1b2908da4e411639488d6e00e26635c2e08f4c4917d4b7b448083f4b261bc094b2e40feae8459cd SHA512 c599e32b17564b192dbaf5346bc08df0114d098172f29abdc61577f4b36223c2c063a317475303070f44728022e80e8c63db881446b16b293c18ab8134506049
+EBUILD postgresql-fdw-mysql-2.5.3-r1.ebuild 594 BLAKE2B bfe9eeef574e3aa9f469fb22dd5fcdf65c85529bbab5dda008840c1d3e48a97fc6c9e1cfd24c54437eb5fdf60cad607c6013e1dc53b92e920fcc80e083619f54 SHA512 4cd380d2c08694157447f0861da6e9402ac513a7c19ebcc7242429568be436da79ee471d2eac0fed256f39b92512031c90a3f9046c2d0249c3734bd11688b6ce
diff --git a/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild b/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
index 94d3017..197e5ce 100644
--- a/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
+++ b/dev-db/postgresql-fdw-mysql/postgresql-fdw-mysql-2.5.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 DESCRIPTION="PostgreSQL foreign data wrapper for MySQL"
 HOMEPAGE="https://github.com/EnterpriseDB/mysql_fdw"
@@ -22,10 +22,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	make USE_PGXS=1
+	emake USE_PGXS=1
 }
 
 src_install() {
-	make USE_PGXS=1 install DESTDIR="${D}"
+	emake USE_PGXS=1 install DESTDIR="${D}"
 }
 
diff --git a/dev-db/postgresql-fdw-tds/Manifest b/dev-db/postgresql-fdw-tds/Manifest
index 1d1d9d9..d882135 100644
--- a/dev-db/postgresql-fdw-tds/Manifest
+++ b/dev-db/postgresql-fdw-tds/Manifest
@@ -1,2 +1,2 @@
-DIST v1.0.7.tar.gz 22290 BLAKE2B 95df7f8aa68a99f70025c4e404a2f99d13bf58fd4cf215384ccba7034207a817540e609172701d0e0650ef240de416d60b3f6961a67c571968a67e4330fa19f0 SHA512 55ec6cb5028055851170e9409b268ae2b23bddd38d0e4227b034b086384bfc4621f88219c6f9482203785600993bcfb4b132e1e3dca1e6a2222cb79ed65da4be
-EBUILD postgresql-fdw-tds-1.0.7.ebuild 554 BLAKE2B 2a67c0118d5ada8db7205cc5f3347910395c9e178d783778868e14938fcbc3edd28a6468237d537c355b189aad835d09524db524b20baf76c9152dded4d02077 SHA512 5f30554dece3f6cc1d2ce3af685e515530cbbdd732a7d27469b9f024283c3bbb5eda965bffc505a0585c5aaa6a71a1c838f76ed9d755ea17c55564ba8a9955d8
+DIST v2.0.1.tar.gz 62848 BLAKE2B 842ef665ab2f88eb16dfc4463d1cc1821a86b366030d68b7d216ebb7a05259c02f42b00ac349f360b5934af778e2ecd0ec2d83eaaee6ffb82ede8bb62b80618f SHA512 f76d0e226a2b783067f48c52c8c4489d889075395050ab3bed6f1050b8e5bf2361caf918d93673bd7b476f15643a24519e066f92cb1fee114f0bf162dc755fb6
+EBUILD postgresql-fdw-tds-2.0.1.ebuild 558 BLAKE2B fd23356e15d6a56bbd85e90ae3b42e7e208d787edb16aeb660954ba34e95b74a59c86ac8c2e67610919d671afea5ff82cc178e291cf3a4627cd96b14ac172ab3 SHA512 20c918ca6555ef7ea9dc35d1df6a646fc64217ea0070f68f853fe982fd4ea3abe5d39272ec9daed7b8cfc6d4a5460da93c9c9f393b062270082fe5a0333e5657
diff --git a/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-1.0.7.ebuild b/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-2.0.1.ebuild
index 435d032..37a2f4b 100644
--- a/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-1.0.7.ebuild
+++ b/dev-db/postgresql-fdw-tds/postgresql-fdw-tds-2.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 DESCRIPTION="PostgreSQL foreign data wrapper for TDS"
 HOMEPAGE="https://github.com/GeoffMontee/tds_fdw"
@@ -17,15 +17,15 @@ S="${WORKDIR}/tds_fdw-${PV}"
 
 DEPEND="
 	dev-db/freetds
-	>=dev-db/postgresql-9.1
+	>=dev-db/postgresql-9.2
 	"
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	make USE_PGXS=1
+	emake USE_PGXS=1
 }
 
 src_install() {
-	make USE_PGXS=1 install DESTDIR="${D}"
+	emake USE_PGXS=1 install DESTDIR="${D}"
 }
 
diff --git a/dev-db/postgresql_autodoc/Manifest b/dev-db/postgresql_autodoc/Manifest
index 8743388..553f438 100644
--- a/dev-db/postgresql_autodoc/Manifest
+++ b/dev-db/postgresql_autodoc/Manifest
@@ -1,2 +1,2 @@
-DIST 11c3c47ae009360d7633ba24c130285fbca18277.tar.gz 32894 BLAKE2B 7fbaf9ada60ebf153dc666c2410d7985b95d9a1b33f6a87304f7409f89c771bcb3af13778879c725d4f8b244e2df7aec24db2f1f77211a5a986b10dfb05434d9 SHA512 4820bdfc8c54cc5244fafd75e589d2bd7d60620dcba10ca21775c6267620583f6f859e32aa70b372cc2e99d3e7dc9515989026dccd9f4c8939cdd0340e71eb6e
-EBUILD postgresql_autodoc-1.41.20171101.ebuild 752 BLAKE2B 34e272b752b4e254f2e60f80debfb78a43decb06b72ea79469eea3ad1f5285b06ea9dc763524f648508e7979d4449b1caed7a20af8716108e52c3716a4394a3b SHA512 9a3632c948eb51686832672d39b13206bb8994027fdf55fece559753d05c8c9df307551680c1fe895ceab07c83f9bf159dec90cd63758f1e57a87355a4f4ff43
+DIST postgresql_autodoc-1.41.20171101.tar.gz 32894 BLAKE2B 7fbaf9ada60ebf153dc666c2410d7985b95d9a1b33f6a87304f7409f89c771bcb3af13778879c725d4f8b244e2df7aec24db2f1f77211a5a986b10dfb05434d9 SHA512 4820bdfc8c54cc5244fafd75e589d2bd7d60620dcba10ca21775c6267620583f6f859e32aa70b372cc2e99d3e7dc9515989026dccd9f4c8939cdd0340e71eb6e
+EBUILD postgresql_autodoc-1.41.20171101.ebuild 811 BLAKE2B e2b565d110201b19d1deed8cd45a6e4291f7e276660aa2ff2222eda5e68d66ffea7b118c89162e34c01063e7cb99a64cb849f8ac12692c18b36b6468a523caa5 SHA512 58e292bd7d29a6e92714e42efb88d56f6eddeac32bb3d90ad4ba7bb41a7c1d446394c872150f849baef9e71beb73814d570e1b8671be62fa926f1f6c931fb592
diff --git a/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild b/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
index c0adc27..f92f35c 100644
--- a/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
+++ b/dev-db/postgresql_autodoc/postgresql_autodoc-1.41.20171101.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvs/lportage/dev-db/postgresql_autodoc/postgresql_autodoc-1.31.ebuild,v 1.1 2008-11-13 19:20:50 dan.goodliffe Exp $
 
+EAPI="7"
 DESCRIPTION="PostgreSQL Autodoc"
 HOMEPAGE="https://github.com/cbbrowne/autodoc"
 COMMIT_HASH="11c3c47ae009360d7633ba24c130285fbca18277"
-SRC_URI="https://github.com/cbbrowne/autodoc/archive/${COMMIT_HASH}.tar.gz"
+SRC_URI="https://github.com/cbbrowne/autodoc/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 
 LICENSE=""
 SLOT="0"
@@ -20,9 +21,10 @@ DEPEND="
 	sys-apps/sed
 	dev-lang/perl"
 RDEPEND="${DEPEND}"
+S="$WORKDIR/autodoc-$COMMIT_HASH"
 
 src_install() {
-	make \
+	emake \
 		PREFIX="/usr" \
 		DESTDIR="${D}" \
 		install -C "${WORKDIR}/autodoc-${COMMIT_HASH}"
diff --git a/dev-db/squirrel-sql/Manifest b/dev-db/squirrel-sql/Manifest
index ce90583..3f75553 100644
--- a/dev-db/squirrel-sql/Manifest
+++ b/dev-db/squirrel-sql/Manifest
@@ -1,6 +1,6 @@
 DIST squirrelsql-3.7.1-optional.zip 53858852 BLAKE2B 55fdbb0427f69d0545850810f24d3b3e9c1db74425e2e4382dd96ead0ecaececa52a48566090fb85b374dd7f540c6579dd598cde92fcfdfda24442e1f9de38a2 SHA512 88b4b7bc41fd42914489b7a0e14b10213612fee3268705e2c4aa9de56f12855aabed4fc5a178f3f6f7e2c9ab1607d64cfc42ade5c9f0b0ce5403d27d03a9f005
 DIST squirrelsql-3.8.1-optional.zip 57206115 BLAKE2B 258c3c047df8ff48b1a19c139dc123b3f9154143d500c52fb1e8735a06f214e03f34ea65ae652f5ba0fd9970bdff1fe9471d4c2d4d0d22702932a5d7c23fa782 SHA512 9dbbf22287e369c5b42f9c20002659efb0fd32b7f9eae0cc51b92cde884e815f746caad205d3dfb042a3551b202ce2c4a82a5e060a61f6ee4ae1ce8931dc6f98
 DIST squirrelsql-3.9.1-optional.zip 57129398 BLAKE2B be7ffa18a4c6a6899f5e43f399200324423164dbfc05ad89b3fa95fd2d0ad98d1972aa2db00e61aaaaa9fec222dd74fa33bff2a5fd19939dbf9bd476ffbe81bc SHA512 b1c5cbdb255c328e4d61763398b4908a130931a5de3333acb5098b505627020900e70b260b3d626ff532611419faf63e9cf37b950b8ea5fed4972ae7aa0b50e0
-EBUILD squirrel-sql-3.7.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
-EBUILD squirrel-sql-3.8.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
-EBUILD squirrel-sql-3.9.1.ebuild 872 BLAKE2B 034c02fce6d2f1ca350a391d61c4fbde61fcabf026c84ea8ca395915623219c08def58d34424e4f120f62c422a757fa37125bc4679e02a9613a5d88b41c15c16 SHA512 d1a45595d148e910b04816e59d83a73541a1baada27f607524656268165344517e262e878ea77753e7ab6f0bf3b84dbce0317680c4a461d33f651222c9569708
+EBUILD squirrel-sql-3.7.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
+EBUILD squirrel-sql-3.8.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
+EBUILD squirrel-sql-3.9.1.ebuild 874 BLAKE2B 501b4534cefb15ff3252db1adbe4c2d816e46eb00aea15f561689d7b5768306e82c2842c2ad1ce81d6c35df59a5f85d5e6f7ae6528f69a45dcd2b77148c2231b SHA512 9b05d81cd767d827644d37015247a65eac81106b7bab7a2bfdd9b4c904fcdddb2f2572a02c222a260f2d3dfa43d819277b7a95f8ae4dbb0f21ae0a551f119d4a
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.7.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.8.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
index 14b9518..57462a3 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.9.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="SQuirreL SQL Client is a graphical Java program that will allow you to view the structure of a JDBC compliant database, browse the data in tables, issue SQL commands etc"
 HOMEPAGE="http://www.squirrelsql.org/"
diff --git a/dev-libs/Ice/Ice-3.7.3.ebuild b/dev-libs/Ice/Ice-3.7.3.ebuild
index f45229c..3ed4032 100644
--- a/dev-libs/Ice/Ice-3.7.3.ebuild
+++ b/dev-libs/Ice/Ice-3.7.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 
@@ -21,11 +21,10 @@ USE_PHP="php7-0"
 # db:6.2 breaks the build process
 BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
 
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
+inherit db-use eutils mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
 HOMEPAGE="http://www.zeroc.com/"
-ICEVERSION="$(get_version_component_range 1-2)"
 SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV/_/-}.tar.gz -> ${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/37"
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index e741a60..74d332c 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,2 +1,2 @@
 DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
-EBUILD Ice-3.7.3.ebuild 7480 BLAKE2B e0246d601da7b05a1858b4c8318e0b0abf56afc97cda1cb8b38cbdce48b2e6d831c49965591e5cec96cce123b24c5e49ffe135371ea23e3426f289f3e95f25a9 SHA512 9b79d11d5c90d429589e84e7380aa99cb8e7ea9a1cbfe764c83f9d7784c2fa071dc5870089752aea06a057209d5afcf8d3c76b77301aaf811734e1ce65f80cf9
+EBUILD Ice-3.7.3.ebuild 7422 BLAKE2B 9bdf902c7700350b6f44761f4b37a42753509dc0098bf7b6eeaaaa34852f2d0217f621bd22c6e4a05dc669b03d9ef9f87be2fb2b8087f7dc331342dc3189d495 SHA512 b17afda5baf33020eda7563a550790f1a35d361542cda603c567395be470156f9101400aa78ecc37c27f930bd0d4abd89738b9a93f43218099467b6e5c5d673a
diff --git a/dev-libs/icetray/Manifest b/dev-libs/icetray/Manifest
index da47875..a119c80 100644
--- a/dev-libs/icetray/Manifest
+++ b/dev-libs/icetray/Manifest
@@ -1,6 +1,6 @@
 DIST icetray-0.4.1.tar.xz 24528 BLAKE2B 6837fb3a20593207f9abcc195edefe478dfd1cbf8ac0b57c5e2f8459ec445cf8e44d42d7b8ccc91d83c7dc5df2b4d23c6ab8cb82a1989694740f57638acb4114 SHA512 343cbfa8665bbb7d1a3c256c53a4018b4ab5a61183b69d1aaba6d1bbaeb4cfa54d9652da47aa7182b75d5003985addef319b83aabab9cbdf2dee8729cb1a98f7
 DIST icetray-0.4.2.tar.xz 20900 BLAKE2B 50b59fbebb36e5af57a06f533fc75027b6f771acd13aca9f9d9da87a7b27f2f6bfc86add7d8a05eb1b2ebac9b9f51f7fffaa6ec7978729f37aeceb22e7d668a1 SHA512 1bd627e52a883e7a583dfcba3098773fe100c020401659edd95f43f30bbf1fe66fd0eb243bb6d5781859a258532b71ef91d2eabfca185ae0ffef3cee43b9c3ca
 DIST icetray-0.4.tar.xz 24292 BLAKE2B ddcda821aa77553169cb37e36b5763a15d682a05006c5432095a1422b4b9274f284316b130847aeac80f9acda2d81588c43470e9090471b266f5de45f8602d66 SHA512 e8470d74595106945039f3763f63e6145fbf3b777680dc5b2d3c08547d4488621696b6bc1b64149768d7c7f0b33b64c6cb1f1ae58b22d9413e80bbb18122ab15
-EBUILD icetray-0.4.1.ebuild 816 BLAKE2B 9495dd04945d5efdf65818089893999ce411471584d6401349b48281afca2543a63138e29488777d98710e84c4446455bcc8e049552ea701bcc8934d3454a4bb SHA512 5f0f9eee890edd7ca7b4a27d7da1ba09a983c75f3352562f34869d4f622f140471ae89ed1c1f1270a582cb97d33eaec5c010a27af79f0f9d385cd3402e3aea88
-EBUILD icetray-0.4.2.ebuild 823 BLAKE2B c96fbc7fe19b697105111cac5c7e1f5682a731242d47f581e87f44cad73427acd219be4124a7f1cad2b14eda5a726f9d955669f9686205845419eac464db8f65 SHA512 488017c3a8ab4376a5ac80ec43a7e07ccfdc521897b9882eff20a73044b21395fe9f830df904814d016b6a2d4a46738caab8ade4a2299a51a57bbacac7ce2058
-EBUILD icetray-0.4.ebuild 816 BLAKE2B 9495dd04945d5efdf65818089893999ce411471584d6401349b48281afca2543a63138e29488777d98710e84c4446455bcc8e049552ea701bcc8934d3454a4bb SHA512 5f0f9eee890edd7ca7b4a27d7da1ba09a983c75f3352562f34869d4f622f140471ae89ed1c1f1270a582cb97d33eaec5c010a27af79f0f9d385cd3402e3aea88
+EBUILD icetray-0.4.1.ebuild 818 BLAKE2B d61f8135086ed1b1d2dde989c275848253aae024b703dc158287debf77d6b8d1cb241801718bc9ccbce72076b4db6e33279e13de47adde91297854ad3aba382f SHA512 69f6f29d02dacb757a393347ae022443d540c863db6b687b2ee1a89b02ccc3c600e0e026058e1aa20698a2e57a94e8f03924daf399cc0f5be0597154787f41fb
+EBUILD icetray-0.4.2.ebuild 825 BLAKE2B 4a6abdb06a2aaab589ffda7974464ff07503839b6525a4835a8d13fdee5fac181955c1337baf205fbe67acb35920dbb5ea07109c0a48af53277fa1f5b16f129f SHA512 e48ac76e4d0f60a1559a26decabc57d58185b890838a3e3effaedc1a08e62149203e3eed6bdcd679396d53e0a1f3500e8b2d0d7d682e284246329ef29993aad9
+EBUILD icetray-0.4.ebuild 818 BLAKE2B d61f8135086ed1b1d2dde989c275848253aae024b703dc158287debf77d6b8d1cb241801718bc9ccbce72076b4db6e33279e13de47adde91297854ad3aba382f SHA512 69f6f29d02dacb757a393347ae022443d540c863db6b687b2ee1a89b02ccc3c600e0e026058e1aa20698a2e57a94e8f03924daf399cc0f5be0597154787f41fb
diff --git a/dev-libs/icetray/icetray-0.4.1.ebuild b/dev-libs/icetray/icetray-0.4.1.ebuild
index a4a5fe1..5fa9853 100644
--- a/dev-libs/icetray/icetray-0.4.1.ebuild
+++ b/dev-libs/icetray/icetray-0.4.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=5
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/icetray/icetray-0.4.2.ebuild b/dev-libs/icetray/icetray-0.4.2.ebuild
index e236fd2..151e130 100644
--- a/dev-libs/icetray/icetray-0.4.2.ebuild
+++ b/dev-libs/icetray/icetray-0.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI=5
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/icetray/icetray-0.4.ebuild b/dev-libs/icetray/icetray-0.4.ebuild
index a4a5fe1..5fa9853 100644
--- a/dev-libs/icetray/icetray-0.4.ebuild
+++ b/dev-libs/icetray/icetray-0.4.ebuild
@@ -1,4 +1,4 @@
-EAPI=5
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest
index d5be6f6..00c28e1 100644
--- a/dev-libs/libadhocutil/Manifest
+++ b/dev-libs/libadhocutil/Manifest
@@ -1,4 +1,4 @@
 DIST libadhocutil-0.7.5.tar.xz 47824 BLAKE2B 7c006f59cedb47a80393d5a39e35183c11b1fd12ad39d2a06bc7bf4475fea1190b8915958296d2bbc9e96fe46bb98b2abe7a98d9325318eec47b5d2ca82debcc SHA512 3dea9001061be7d1880a4c0c7fb9336bbae9c4f798a0aa2c667bce9b68fd8df3c42da72a4cf45bcef6b8ca6176cf7bdb5a81a24a9dd9d8ff72a52a47307a11af
 DIST libadhocutil-0.7.6.tar.xz 44188 BLAKE2B b72dfd7436799c8f0e2905cf1f755a66de3abcdab6144da53c606a8f8e60b127a64cd4467cdef7e0024d1b0a3ab7f752f63fa39922d978cfc4b4610d305e0d41 SHA512 fd8b2ba0e52a9850fc151b8e02b653f6cac57c0724d298289abbc9ba9bfd8ee5287ba804c1b617bd70300cc154f1957ca6d87a6f1e84a3222907d2a31ac601e2
-EBUILD libadhocutil-0.7.5.ebuild 630 BLAKE2B 09161ac06aec9a0c6f6e5418429fd4bcbb3ddeffb7e93f5293f18735bd869d3d5154cbeccf4f76db1cee16ac28bac39e80ae8102de3ac1d52313e1bd5031aa43 SHA512 d95efab18c915badd301993d7d9626645914e757a8934fc13007f0840650c1c4f6798be3663872afe80bfcb0b5fc20a921a92e34a8f4718c8813f7f1cbc587a5
-EBUILD libadhocutil-0.7.6.ebuild 630 BLAKE2B 09161ac06aec9a0c6f6e5418429fd4bcbb3ddeffb7e93f5293f18735bd869d3d5154cbeccf4f76db1cee16ac28bac39e80ae8102de3ac1d52313e1bd5031aa43 SHA512 d95efab18c915badd301993d7d9626645914e757a8934fc13007f0840650c1c4f6798be3663872afe80bfcb0b5fc20a921a92e34a8f4718c8813f7f1cbc587a5
+EBUILD libadhocutil-0.7.5.ebuild 630 BLAKE2B 32cd5faf7f49a825230f334282ae3830f96fb8237a41444a2b7e9a541d59283cc4b4494e2b3f9355f31945a919ab82acd685a94bdc775d4021a3e6f7830847ff SHA512 1d4912886d8b3e3c8f8ba4b5aab08f7a58031bf4fa1ccd6f5d277e62eb8c222ea1d9a609110cad6b708ad70f383f4781ba890c25c7ab8e70b9327e7b032945b6
+EBUILD libadhocutil-0.7.6.ebuild 630 BLAKE2B 32cd5faf7f49a825230f334282ae3830f96fb8237a41444a2b7e9a541d59283cc4b4494e2b3f9355f31945a919ab82acd685a94bdc775d4021a3e6f7830847ff SHA512 1d4912886d8b3e3c8f8ba4b5aab08f7a58031bf4fa1ccd6f5d277e62eb8c222ea1d9a609110cad6b708ad70f383f4781ba890c25c7ab8e70b9327e7b032945b6
diff --git a/dev-libs/libadhocutil/libadhocutil-0.7.5.ebuild b/dev-libs/libadhocutil/libadhocutil-0.7.5.ebuild
index c6f0f43..321c3e0 100644
--- a/dev-libs/libadhocutil/libadhocutil-0.7.5.ebuild
+++ b/dev-libs/libadhocutil/libadhocutil-0.7.5.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libadhocutil/libadhocutil-0.7.6.ebuild b/dev-libs/libadhocutil/libadhocutil-0.7.6.ebuild
index c6f0f43..321c3e0 100644
--- a/dev-libs/libadhocutil/libadhocutil-0.7.6.ebuild
+++ b/dev-libs/libadhocutil/libadhocutil-0.7.6.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libdbpp-mysql/Manifest b/dev-libs/libdbpp-mysql/Manifest
index 8adeecf..951241d 100644
--- a/dev-libs/libdbpp-mysql/Manifest
+++ b/dev-libs/libdbpp-mysql/Manifest
@@ -1,4 +1,4 @@
 DIST libdbpp-mysql-1.4.1.2.tar.xz 16420 BLAKE2B acd3f535fcb6fdec90b5452007e9de725174c6e18f402286865387a250869010bc8868c8363820b5d95b8ba07a95513d869a80ed34f4d0a0100b43aa3efa26ea SHA512 4ae24a96dfcb8472250b8ee9bbabd03a64db55004419d737d9f954ddd8161d6ffaa03275a26bb326abf83fc404accbaea6bc4bf862daeea886f2d5d96f558741
 DIST libdbpp-mysql-1.4.2.tar.xz 12724 BLAKE2B 07fb6147cfd583506c069d84f18e269f2a0ce144b1108970dc21fa0c1402d62a14df361639cc5fef71be4621a6c22dc1ea83acc054d381f44ef9163a234b4ac8 SHA512 c41d0e77b0b85349f59971565c6658a41af7df45bb36ccae28cf7d3be6d58c66258c2e27325cdb9ea5b73bc6f50855407f167d7d6ff80c4b7a9caae5e665930c
-EBUILD libdbpp-mysql-1.4.1.2-r1.ebuild 562 BLAKE2B 6f04e5cb51b848a0796b7f41550e3fa67b7141047b6e87b81bba52227c0630dcaf4548df4cfc874a15a6efafd27e3274b38d5230986393eb035b41da7cbd0920 SHA512 251747b40ac41c271c2a2f26c853a32a2788a6eb608f705001be5d6b910c2b1ab2f9aef1cada80305c5ebde2fb677fa2d89b412c345ad1345abd0957176db425
-EBUILD libdbpp-mysql-1.4.2.ebuild 562 BLAKE2B 6f04e5cb51b848a0796b7f41550e3fa67b7141047b6e87b81bba52227c0630dcaf4548df4cfc874a15a6efafd27e3274b38d5230986393eb035b41da7cbd0920 SHA512 251747b40ac41c271c2a2f26c853a32a2788a6eb608f705001be5d6b910c2b1ab2f9aef1cada80305c5ebde2fb677fa2d89b412c345ad1345abd0957176db425
+EBUILD libdbpp-mysql-1.4.1.2-r1.ebuild 562 BLAKE2B 70771648cabd37196597549576c82066717f909e542ef8c6677a8356b13906ff1eac72c69382793bda1ba1b565c649bca000e4d395abbfc2f2a87c7f9ff8f3c3 SHA512 3efa3677b38c44b62b3ea7eda02c5409fac9efa66967a90ed4ede5ba9e8909cffd0089b6ffefdbc509fac55ef3bd9d08c8eae80b644afbe05089d11b9be4dfca
+EBUILD libdbpp-mysql-1.4.2.ebuild 562 BLAKE2B 70771648cabd37196597549576c82066717f909e542ef8c6677a8356b13906ff1eac72c69382793bda1ba1b565c649bca000e4d395abbfc2f2a87c7f9ff8f3c3 SHA512 3efa3677b38c44b62b3ea7eda02c5409fac9efa66967a90ed4ede5ba9e8909cffd0089b6ffefdbc509fac55ef3bd9d08c8eae80b644afbe05089d11b9be4dfca
diff --git a/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.1.2-r1.ebuild b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.1.2-r1.ebuild
index e6e2b10..0bfbc19 100644
--- a/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.1.2-r1.ebuild
+++ b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity MySQL components"
diff --git a/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.2.ebuild b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.2.ebuild
index e6e2b10..0bfbc19 100644
--- a/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.2.ebuild
+++ b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity MySQL components"
diff --git a/dev-libs/libdbpp-odbc/Manifest b/dev-libs/libdbpp-odbc/Manifest
index 5f232b8..1412766 100644
--- a/dev-libs/libdbpp-odbc/Manifest
+++ b/dev-libs/libdbpp-odbc/Manifest
@@ -1,4 +1,4 @@
 DIST libdbpp-odbc-1.4.1.1.tar.xz 18252 BLAKE2B 50b5b27d4b9794ae8c371dd8cfe7751551d9c10437e6077ed305cf9a22bd3ec309a738040961ef86dfa0a7314a84ff00329190b87fc66a15ca0c20576f2bca53 SHA512 e11ed47a083260c673cd9c9cbcf1682de94b6a695d290871812644861851d662d6be116bc2a83c8cb800a29e6f828d8a48de3ac9c8417763bceae11b2163690e
 DIST libdbpp-odbc-1.4.2.tar.xz 14568 BLAKE2B 8a4a2ac38e8f9b6ea533aac4f127d7977a0b5cd49acc07348bbbc6b50716d26aa55bd8935afca793d0f2af94144c865b26a663af25ed40bb4cbc20f15b69e594 SHA512 6bbe01b08ba6856bb51c6b5f13a2b1d09bd0c784f59cfb7b604612055c49c0a464238609e0117a404dc8aea32a5910e5b9ae8605327b85686a178b760b78aff6
-EBUILD libdbpp-odbc-1.4.1.1.ebuild 537 BLAKE2B 7e560fcf2048146160f5cdc0e570cccc71f0cbd3f8737e49b18f3f09aa569e4a88d7c84508f9cb0a19edc4f6ac55b0622698c36e70cb939b79f98fd39019f9a2 SHA512 5cbe06fde7adf12fbb1ae180b85b9baccb57d38bf6451b86a6c5f42ed91ac752bfe0d3849b85de0a9ee2f84acdec216f82ec39e180a6bcb84f8b05be26bc078e
-EBUILD libdbpp-odbc-1.4.2.ebuild 537 BLAKE2B 7e560fcf2048146160f5cdc0e570cccc71f0cbd3f8737e49b18f3f09aa569e4a88d7c84508f9cb0a19edc4f6ac55b0622698c36e70cb939b79f98fd39019f9a2 SHA512 5cbe06fde7adf12fbb1ae180b85b9baccb57d38bf6451b86a6c5f42ed91ac752bfe0d3849b85de0a9ee2f84acdec216f82ec39e180a6bcb84f8b05be26bc078e
+EBUILD libdbpp-odbc-1.4.1.1.ebuild 537 BLAKE2B 8066448d288f9d05e03caed95ba27ed265e77301e2067380d0ca1efcca4085354440f77986745c96ff64e952480eb4a519a545d4d51b42fa3dc55d72a542a7d9 SHA512 325b62e839bdce7c5535fd21d006fc852cd954a2af04861d99c5c4d0c83a956b2e52fe947c79bae6bd79ac55a601d3b740ff5c792c4ea047ca2fab1846c18b36
+EBUILD libdbpp-odbc-1.4.2.ebuild 537 BLAKE2B 8066448d288f9d05e03caed95ba27ed265e77301e2067380d0ca1efcca4085354440f77986745c96ff64e952480eb4a519a545d4d51b42fa3dc55d72a542a7d9 SHA512 325b62e839bdce7c5535fd21d006fc852cd954a2af04861d99c5c4d0c83a956b2e52fe947c79bae6bd79ac55a601d3b740ff5c792c4ea047ca2fab1846c18b36
diff --git a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.1.1.ebuild b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.1.1.ebuild
index 6a58f15..5a1f339 100644
--- a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.1.1.ebuild
+++ b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.1.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity ODBC components"
diff --git a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.2.ebuild b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.2.ebuild
index 6a58f15..5a1f339 100644
--- a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.2.ebuild
+++ b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity ODBC components"
diff --git a/dev-libs/libdbpp-postgresql/Manifest b/dev-libs/libdbpp-postgresql/Manifest
index c820265..0fc6140 100644
--- a/dev-libs/libdbpp-postgresql/Manifest
+++ b/dev-libs/libdbpp-postgresql/Manifest
@@ -2,7 +2,7 @@ DIST libdbpp-postgresql-1.4.0.tar.xz 16020 BLAKE2B 44fa2a404ecbf7e293d4c2d464910
 DIST libdbpp-postgresql-1.4.1.tar.xz 16116 BLAKE2B 8c01dbfd28aed25f6ea98c3407810895de59cbf824fdf0d64f7b53276c284d62fc84a73bf1d8cc86689bd53418b5ed3d1f0a8013e12e96615009fc19d0e14bc1 SHA512 4695a9ebbd20714b97cce609f41e81d9e7a7a2c6abe80218bae44a38bb91090f484cc22d21c63191406046109f4e9cec1344db864519173324f0a008279a02ae
 DIST libdbpp-postgresql-1.4.2.tar.xz 20064 BLAKE2B 339713f122c6209e9a60e8a02b2f6c547ba5c44c4c05840b29e974077a6010fb67f5d907a6d918352539c28e3950b088e9fcc7421b419b75710943f2cd6910f7 SHA512 9e8289de9878266da56a60ce5f1d8a5ce4bf132658aa3ff6154e28ff64820821d28d259fa9ec6743ea498ba7149d77c94059efc02a6d9c4f3ace917173160b47
 DIST libdbpp-postgresql-1.4.3.tar.xz 16608 BLAKE2B 1a9e43084b1a2f7bb02abad90ee5900696810b70e9cc188fe27299ea6047910db053a574fedc63b4cb38bd7c129f4adcd1216c78337e11cf2bf0946741dd0b34 SHA512 f44443b0346b0efd6bc941dce65591e9803ebd0a3048bc566b53c124f460c39185448479feb8b61467c42f1e8614ddf7540a9f7fa07b8f0813430af3388fddfb
-EBUILD libdbpp-postgresql-1.4.0.ebuild 547 BLAKE2B 58ed364a20ef309867b78017c00891411912f50ce283d127eb6e5ca5008423e8c5941e251bc20ac83f6e4f6a46153f477a239da7898537ce626270455e26c536 SHA512 b36f171410681cedf60b13547f51f0e4b396d422292b80044b3e05e6b9ca6b44f28a05dd93788372c64a1ca1a1fc5b83be1e3dbfd0421a0e682b5808aadd84bd
-EBUILD libdbpp-postgresql-1.4.1.ebuild 547 BLAKE2B 58ed364a20ef309867b78017c00891411912f50ce283d127eb6e5ca5008423e8c5941e251bc20ac83f6e4f6a46153f477a239da7898537ce626270455e26c536 SHA512 b36f171410681cedf60b13547f51f0e4b396d422292b80044b3e05e6b9ca6b44f28a05dd93788372c64a1ca1a1fc5b83be1e3dbfd0421a0e682b5808aadd84bd
-EBUILD libdbpp-postgresql-1.4.2.ebuild 567 BLAKE2B b54c0857cf069e186de2719aac02f77e8c5538c0979ed31103cc2bcc0ec71cc68894d61e30c19f74a77d6f6aa66fb717391638baa4d63eb96b3e3c955d623926 SHA512 983a3735a5a2153cb8a0df88819ef013d8492eaeae9bcdcce5a4a57f93a389a621c9190decb1d4cf77a1f4b265fdd0096b956c1026b55758668f109365a7811b
-EBUILD libdbpp-postgresql-1.4.3.ebuild 567 BLAKE2B b54c0857cf069e186de2719aac02f77e8c5538c0979ed31103cc2bcc0ec71cc68894d61e30c19f74a77d6f6aa66fb717391638baa4d63eb96b3e3c955d623926 SHA512 983a3735a5a2153cb8a0df88819ef013d8492eaeae9bcdcce5a4a57f93a389a621c9190decb1d4cf77a1f4b265fdd0096b956c1026b55758668f109365a7811b
+EBUILD libdbpp-postgresql-1.4.0.ebuild 547 BLAKE2B afaf201b024138d72852b601b9139d1f55e7045d67a5449f8f60a0118b1e2cf814894a45ef08119172bac12a3840e130ce9f42d6191a7e0e514590b932d7a088 SHA512 eefcc601c02420f6f7fc8fec4efe16de44239672dac48604f888d39bf0d94fa6c48d5b966816d0c367e44077ce58cd9f4894f025470f83087c2d5f34e86b48a6
+EBUILD libdbpp-postgresql-1.4.1.ebuild 547 BLAKE2B afaf201b024138d72852b601b9139d1f55e7045d67a5449f8f60a0118b1e2cf814894a45ef08119172bac12a3840e130ce9f42d6191a7e0e514590b932d7a088 SHA512 eefcc601c02420f6f7fc8fec4efe16de44239672dac48604f888d39bf0d94fa6c48d5b966816d0c367e44077ce58cd9f4894f025470f83087c2d5f34e86b48a6
+EBUILD libdbpp-postgresql-1.4.2.ebuild 567 BLAKE2B 83ebf1514bea7625c45cefbf02acbebfb4e879cb3eeda1c674e08f9d0b5c8130d15d65d3096c7d024aa9e71bece25cc1a07acd35de466ae61e14321a915b71ca SHA512 d85970fe77e2cff7dcd4af3f05777c046359bf9079fad8c101f3b1987a23bdc8ae7c13f3cebd8ab27dfce3ddc7384930e6f21b928261f103a8a344a23d2a0f0f
+EBUILD libdbpp-postgresql-1.4.3.ebuild 567 BLAKE2B 83ebf1514bea7625c45cefbf02acbebfb4e879cb3eeda1c674e08f9d0b5c8130d15d65d3096c7d024aa9e71bece25cc1a07acd35de466ae61e14321a915b71ca SHA512 d85970fe77e2cff7dcd4af3f05777c046359bf9079fad8c101f3b1987a23bdc8ae7c13f3cebd8ab27dfce3ddc7384930e6f21b928261f103a8a344a23d2a0f0f
diff --git a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.0.ebuild b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.0.ebuild
index b4f1538..4bfee0c 100644
--- a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.0.ebuild
+++ b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.0.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.1.ebuild b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.1.ebuild
index b4f1538..4bfee0c 100644
--- a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.1.ebuild
+++ b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.2.ebuild b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.2.ebuild
index 4a7edf8..0fc389d 100644
--- a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.2.ebuild
+++ b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.3.ebuild b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.3.ebuild
index 4a7edf8..0fc389d 100644
--- a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.3.ebuild
+++ b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.3.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/dev-libs/libdbpp-sqlite/Manifest b/dev-libs/libdbpp-sqlite/Manifest
index 8334f0c..d444b7d 100644
--- a/dev-libs/libdbpp-sqlite/Manifest
+++ b/dev-libs/libdbpp-sqlite/Manifest
@@ -1,4 +1,4 @@
 DIST libdbpp-sqlite-1.4.1.1.tar.xz 13448 BLAKE2B 4f723af789e15d8dac548087b8f72381e3ff6d1b40808015a485298a51dc625d99ea6e7ebeec0ba41485ff3443c430518f9863f77fa05093e7f6efbf9d388232 SHA512 da06d37f8ea379518750e151d015c163e176a834fc2caebde91ec024f38a210acf7ab078558235288c92c99136eae3bcbf40758d869d952661988e2a75668f57
 DIST libdbpp-sqlite-1.4.2.tar.xz 9744 BLAKE2B e20b9114760e5b115451764201adf34475b36eabdc92daa525e2c65f6e77f13e73b480ba4c06981edd6f487a3c158b8370f866c877736bf015356d5774d683c2 SHA512 dd5a6e51639ae0d18d0c6243bf3e2afbeec39cb9701cf547b6f6f6cdd6ff8022ab7f89550582f3f4b620336ec0a00aa96dc0077aece7047cd6f6d26f01b2f22f
-EBUILD libdbpp-sqlite-1.4.1.1.ebuild 548 BLAKE2B 0ebf24240e217d0d213a8e93eda49bb74fe5f9dce1ee51b6f928a16daaabd3fc9345c8b4dc3ed6c60381d1f5ec727d67125e766fe8b239b43cf33d70f444e5e7 SHA512 7cda85b858f6b05578fbe89e8bf54bef50a461240c137d8d2eba4c75a8fdab044df9a098ca6eb65a77c4b6a7b09b69a765a2900f712e57f7de71ab2d5670df5e
-EBUILD libdbpp-sqlite-1.4.2.ebuild 548 BLAKE2B 0ebf24240e217d0d213a8e93eda49bb74fe5f9dce1ee51b6f928a16daaabd3fc9345c8b4dc3ed6c60381d1f5ec727d67125e766fe8b239b43cf33d70f444e5e7 SHA512 7cda85b858f6b05578fbe89e8bf54bef50a461240c137d8d2eba4c75a8fdab044df9a098ca6eb65a77c4b6a7b09b69a765a2900f712e57f7de71ab2d5670df5e
+EBUILD libdbpp-sqlite-1.4.1.1.ebuild 548 BLAKE2B 3400a98cc7a071b93b12b5f16436a9bdc25009bc4b6c4b1a1da7117d486c29124e51e269d903f6f6c4272794b82f1b3aa252580fd38ab024e5ab857a0315f803 SHA512 97d4fa672c1ec1d92eadcb5f32e6f7b9f39bbf2ec51dae9e20e8bcdd3461e9dfdef48069a99414222595d8c74b200b53d81862a226c5447a9c74c86a8ec1c981
+EBUILD libdbpp-sqlite-1.4.2.ebuild 548 BLAKE2B 3400a98cc7a071b93b12b5f16436a9bdc25009bc4b6c4b1a1da7117d486c29124e51e269d903f6f6c4272794b82f1b3aa252580fd38ab024e5ab857a0315f803 SHA512 97d4fa672c1ec1d92eadcb5f32e6f7b9f39bbf2ec51dae9e20e8bcdd3461e9dfdef48069a99414222595d8c74b200b53d81862a226c5447a9c74c86a8ec1c981
diff --git a/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.1.1.ebuild b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.1.1.ebuild
index 788f251..fb0bd16 100644
--- a/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.1.1.ebuild
+++ b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.1.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity SQLite components"
diff --git a/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.2.ebuild b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.2.ebuild
index 788f251..fb0bd16 100644
--- a/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.2.ebuild
+++ b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit bjam
 
 DESCRIPTION="C++ database connectivity SQLite components"
diff --git a/dev-libs/libdbpp/Manifest b/dev-libs/libdbpp/Manifest
index d0016ed..aeebed0 100644
--- a/dev-libs/libdbpp/Manifest
+++ b/dev-libs/libdbpp/Manifest
@@ -1,6 +1,6 @@
 DIST libdbpp-1.4.0.tar.xz 24900 BLAKE2B 81d2bbb62823c48b233fb13e28a6525f44e6ae362e6eb797bfc138a165e7ab0dc522d155fcfbab9bc17dfa37db6da3e0b5afe3fc9cb281b49290383c83b731d4 SHA512 a54ac943f04198692430d609f414cc7b28369404a2d325fe2ddaa18637cc4b55684b9674a0fdd2abdde5538f9d601477e30bc87980d5e87d8531149ab52322fd
 DIST libdbpp-1.4.1.1.tar.xz 29600 BLAKE2B 3c5e80a52354ca76c3a65f24e9f0de585dc80bf91fccc38c87df47e637b4b6c1430c9d1e016d6e81c2d8fe49c8b175960141c2594ce02ff150097ee0041076f2 SHA512 0264fcc5f14712355ef5089fa4b03c779e4cfaae1b5cdcd92e6acf6d7e496a3841eb2a98ec88a018846c9f36d753e7cc51d697e1db8baf71e41273b08ecf3b68
 DIST libdbpp-1.4.2.tar.xz 25952 BLAKE2B 80af69e55896aa8e88d32a61168a74cbfa285db7a6fd8acd52aa843cf7aeeb3f19b3d0e1109e3eb336b3050661de5ac789f43141cb1d562578ce4a2872de2d71 SHA512 55dd66dffa9853a0c4de44f8d35a9789f20de066d91791743de8bdcc4863a21b6a2b114912254c9a24a02f68bc60dff1e6e8ec5fe6d69ad82fac1d47e5ced9f7
-EBUILD libdbpp-1.4.0.ebuild 684 BLAKE2B 64fab1df39fe32a247616a276d52724b942ce187afacf2e1484bd100a3736df616725aab9a858f92f48d93eff2b4379d82d15b3c78291f00e2a366d7e6ec74da SHA512 a4d795816c305e0ad5eea7a1b12a579f9d7aa432220cd42dac1b5e6a73da660983f8e2399ae89347b525f4050d277d9e47ffb2f69e85cb4170f8354893cdc59e
-EBUILD libdbpp-1.4.1.1.ebuild 704 BLAKE2B 0bc7ea61d479bf389c93226c21df70dee6a762858feed308cf528100ea045e9e6196df38f5bccbd9dc9acec4300bf4f1a035ebc689b03d5432ef93bc7b9a3c32 SHA512 a7074ec5e55d488dbde6a0f70fd5a330ac670f10a642c5f4b18122f51c5e03e6230173d967341762486402f2b4ccd3f5abe81100e0970591ab36848959fa4e16
-EBUILD libdbpp-1.4.2.ebuild 704 BLAKE2B 0bc7ea61d479bf389c93226c21df70dee6a762858feed308cf528100ea045e9e6196df38f5bccbd9dc9acec4300bf4f1a035ebc689b03d5432ef93bc7b9a3c32 SHA512 a7074ec5e55d488dbde6a0f70fd5a330ac670f10a642c5f4b18122f51c5e03e6230173d967341762486402f2b4ccd3f5abe81100e0970591ab36848959fa4e16
+EBUILD libdbpp-1.4.0.ebuild 684 BLAKE2B ce56315b994a926a74f799f78655f8fb099c9cabce094ff72e79a17f93673c925ff28b55cdc17248c29e8f11beb943b0bbf73cced13a3673b54345675e32e35e SHA512 9dcc8aa1362c44917d407ffb6f1a334ed739587908540441619c835a6963dc742200015629c60ffe371300e1e16728ed00227de6b31789f618861be9e23ec181
+EBUILD libdbpp-1.4.1.1.ebuild 704 BLAKE2B cd7f3fbdc73a3c2cb6397cc877a0e77b4eaa903d262d496d18f01a801272061f6590237d789f52ebd43eaf7575edf629403a077402d92f7131e7a3e70ae60fb7 SHA512 f3554e61ea241309c08638544763a93411455e5b251a84375c7e0028295dd0dff3dde778b3564c02b11bd8c7d37a2c3c68cf1d740347170097b76be923f5131d
+EBUILD libdbpp-1.4.2.ebuild 704 BLAKE2B cd7f3fbdc73a3c2cb6397cc877a0e77b4eaa903d262d496d18f01a801272061f6590237d789f52ebd43eaf7575edf629403a077402d92f7131e7a3e70ae60fb7 SHA512 f3554e61ea241309c08638544763a93411455e5b251a84375c7e0028295dd0dff3dde778b3564c02b11bd8c7d37a2c3c68cf1d740347170097b76be923f5131d
diff --git a/dev-libs/libdbpp/libdbpp-1.4.0.ebuild b/dev-libs/libdbpp/libdbpp-1.4.0.ebuild
index d832c58..9ee267d 100644
--- a/dev-libs/libdbpp/libdbpp-1.4.0.ebuild
+++ b/dev-libs/libdbpp/libdbpp-1.4.0.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam eutils
 
diff --git a/dev-libs/libdbpp/libdbpp-1.4.1.1.ebuild b/dev-libs/libdbpp/libdbpp-1.4.1.1.ebuild
index a87c578..9f42517 100644
--- a/dev-libs/libdbpp/libdbpp-1.4.1.1.ebuild
+++ b/dev-libs/libdbpp/libdbpp-1.4.1.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam eutils
 
diff --git a/dev-libs/libdbpp/libdbpp-1.4.2.ebuild b/dev-libs/libdbpp/libdbpp-1.4.2.ebuild
index a87c578..9f42517 100644
--- a/dev-libs/libdbpp/libdbpp-1.4.2.ebuild
+++ b/dev-libs/libdbpp/libdbpp-1.4.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam eutils
 
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.08-r1.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.08-r1.ebuild
deleted file mode 100644
index 57a75cb..0000000
--- a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.08-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/CSS-Minifier/CSS-Minifier-0.10.0.ebuild,v 1.1 2011/09/01 11:47:30 tove Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=GTERMARS
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="XS based CSS minifier"
-DEPEND="virtual/perl-Module-Build"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.09.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.09.ebuild
index e5e9faf..4767743 100644
--- a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.09.ebuild
+++ b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.09.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # This ebuild generated by g-cpan 0.16.6
 
-EAPI=5
+EAPI="7"
 
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="0.09"
+DIST_AUTHOR="GTERMARS"
+DIST_VERSION="${PV}"
 
 
 inherit perl-module
diff --git a/dev-perl/CSS-Minifier-XS/Manifest b/dev-perl/CSS-Minifier-XS/Manifest
index e5f23ca..7d1b53a 100644
--- a/dev-perl/CSS-Minifier-XS/Manifest
+++ b/dev-perl/CSS-Minifier-XS/Manifest
@@ -1,4 +1,2 @@
-DIST CSS-Minifier-XS-0.08.tar.gz 12113 BLAKE2B 02696f4d19ee98bb5b60fcd1d7c8e53eb0f4c6ee92d71ad52fb7227cb54e146e721c9e0ca02a610f7f00670ef0a56af778301d1a61f3e68c35b5e9d70d956611 SHA512 f9aaf1f035d23dfa42af5251ff66193c40685b50cdf3716a0d10796311d11f9f4da72efb8661924814450de79e782b952a845564a4e4871c61be89a07b017b91
 DIST CSS-Minifier-XS-0.09.tar.gz 14363 BLAKE2B e7dd8c24ef30c98146ec4bce1c0299fcf83c7c7696b8ffed96100b02654a313d826cdbf87cb9c60f08ac850b7cc5389f8cc38e2ff50d544237084dd84f2ed105 SHA512 520e40fa4a6d70bd7692880f3bc5c813a8648dfe12946426dedf0874e180ccd98e703d67ed8b502a7b00489aa2404edce844d80b1eccc48f94156a0d5c36ad51
-EBUILD CSS-Minifier-XS-0.08-r1.ebuild 426 BLAKE2B 42e00bcc3da746ef2b8fc41fd23068999f721a15799e3f536b9f23ab199a3ecfc05643724ae623312cc265e8851f6394942dabbe50c11a46b94d2c6a3df17342 SHA512 7d84af8117baa234cb0ea7327668c2c39feef7ddaa7bafbf79100bf7e3d60843389bd2ad89169a3284b436009c0fb328cb3c84ec623a3b80758a726edbe6c21c
-EBUILD CSS-Minifier-XS-0.09.ebuild 397 BLAKE2B 943a33f2504670ca3a534115559d1333b4caa71fd8b3ee4ade20e40c62af49f023221fa55301a0bffc4257a8b0fbec1854591fa9785abf3d053581dcd6701094 SHA512 3c9cd27e3187f85333e9c2a525a21e437e7da886dabf6fef3de8e54fd172fcdd65b86eeb8fadd4a06acc3bdc3b23d0472a540bd083aae5606f96b792fd17da76
+EBUILD CSS-Minifier-XS-0.09.ebuild 396 BLAKE2B eedfc60f261e07e20f95caef410fb5e8c288637a84fb04d5fddf0dcc0f0f7cef806dd2b5c59b3a2582a856ec83c31b4f3c62b00187ecad75ad9c0bf338f04619 SHA512 1f79a5fba1ae79e2b64c7fe3d0e2837dfde7564d278d073e449d523d86470fedb16da20f3ebe3c0b73714e8e0ba89d48794ef634dc6fe5ef083715c41f3a1aed
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild
deleted file mode 100644
index a51c27e..0000000
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.50.0.ebuild,v 1.1 2011/08/30 11:36:08 tove Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=GTERMARS
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="XS based JavaScript minifier"
-DEPEND="virtual/perl-Module-Build"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
index 6df879d..e83fdd8 100644
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
+++ b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # This ebuild generated by g-cpan 0.16.6
 
-EAPI=5
+EAPI="7"
 
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="0.11"
+DIST_AUTHOR="GTERMARS"
+DIST_VERSION="${PV}"
 
 
 inherit perl-module
@@ -22,7 +22,5 @@ DEPEND="
 	dev-perl/Module-Build
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/copyright-only-functions.patch"
-}
+PATCHES="${FILESDIR}/copyright-only-functions.patch"
 
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild
deleted file mode 100644
index 02f3545..0000000
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# This ebuild generated by g-cpan 0.16.6
-
-EAPI=5
-
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="0.11"
-
-
-inherit perl-module
-
-DESCRIPTION="XS based JavaScript minifier"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/JavaScript-Minifier-XS/Manifest b/dev-perl/JavaScript-Minifier-XS/Manifest
index 8edbeca..b8a9e06 100644
--- a/dev-perl/JavaScript-Minifier-XS/Manifest
+++ b/dev-perl/JavaScript-Minifier-XS/Manifest
@@ -1,6 +1,3 @@
-AUX copyright-only-functions.patch 946 BLAKE2B f87e6ac1a76d4e27eca25372cc1ef64cf092cdc1945da8ba27473e7c71a53a34a74d572f62dea3df4dad03042b4fa72b5f18d9e90e691126a29e0b6c96ae1788 SHA512 e0e79668b69d2aee48945a82292c67712928c6174750e1a76df38ccaed9201db4ee6cf02ca8bd60afd45b813e9a520beef4b90927eb0dcb36d8c538b28b74004
-DIST JavaScript-Minifier-XS-0.09.tar.gz 14509 BLAKE2B db8fab071b3654958c54be92add362cdfb2636d2715a1287ff0080a09a92dfb2611fb4e6a22b6488b6466138d20f275dcb73161df33ff03e1cb3bdc754e2ba79 SHA512 b46e5e0fc70d6a28829f9e6878c0a8285b6b4ba680de85ffa6d567ca00d8aaced66d4e8bf800c96b923fb261095fe0722648ce930925bb55c47e549c8ef574c8
+AUX copyright-only-functions.patch 945 BLAKE2B cc43b7a416226277021dcea7e97ca07eb6a8988cc985a18fa4a0e0d45c167c8666569e694379fecf3e48cad44e691465e4edeb0cee5da77665e79a93cbd11d4a SHA512 95fd67663668ecfe533887fbb25247debfa07bb3fd89211557ab1ceccabe3782dfdf140195c4987b8df31aace99061e4cc340fc8e0c16b9241cd28b4fbf5f7a1
 DIST JavaScript-Minifier-XS-0.11.tar.gz 17517 BLAKE2B 9d6ad360311f50a256c8edff87ed01b405b3e5eb50b6ad81b998928f21563bf7f7a1b1e17f1aeece1132d8037b2fab1d7c21565e6de3b67050924ebc84f4a9dc SHA512 736294c898d7806eae509b0d0c14cfcbb783ac335fe6c08bed9c00a52643b3e6d0ade124735d7de8d2203bf404448889e0e84b3097e316d0ef444f1603cbbdef
-EBUILD JavaScript-Minifier-XS-0.09-r1.ebuild 447 BLAKE2B f418546a370dfd4ee2fe65654d2cb511174e58ce45804549d9830aab8553e99bff9e193b22d180d0b6beca7fff43f8c68915626b3a433c7f94313f180d84adb4 SHA512 4be0f9a44e20f7d7181536b698745488bf00f141d269786413a642b2bd4d658cd89ebf39c8e2dede32fdea6c1c322fb20fd2c4cace04b5c9dc213b324b9d2c59
-EBUILD JavaScript-Minifier-XS-0.11-r1.ebuild 476 BLAKE2B d9f384a6635fa415d55c708fba701f07b15615ca5b0753adb32d1b966772b0a21846c6901019e610b544f7a65ef93c0d4416dd4967c20ed24af8c6644fe2ca26 SHA512 9675884ae0ab8003a9405462e19594d0fe85429d7f67da8bf6fbc9f11c5a22f2c305882f540e9987522811e5932d8cf0a59d0ee83567d1ff7ea3d620f6751ab8
-EBUILD JavaScript-Minifier-XS-0.11.ebuild 377 BLAKE2B c9d9b2afa4805ae4cb9ff2e9c10a9b4dc9ec5a00a2cb5193783f9e49107891badd3e2d3046c4e6cd55fa07cc8ce8bf5dcdb39b3230477aeeb7d10dc4e7b32185 SHA512 22720df2cdf1725eef2a668240880c7270b5ba59b33fd3416f611ed724a8e5b51bc10ae5488f16fdd9a466f022075d8cb6d8f2b01d754597595d9ff1e0dfd02c
+EBUILD JavaScript-Minifier-XS-0.11-r1.ebuild 457 BLAKE2B 56c4b948868d0e43b3f933843a7274d86bc9b8f17c87acc6e6ca7714759510931eda851bd9dbd0c78698e2d042a90a4a3fd5b66552e677a159f748a780d6a467 SHA512 615f5af397630c22a36e4622a0e2f75aa7f0617e09147b4f11acc8bbf6ee7b74c2c71c223af2bc4c94b2cecc6e1283e47b7506f891f795e3b56d7b45fccb5255
diff --git a/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch b/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
index 762c39b..3c40db0 100644
--- a/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
+++ b/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
@@ -1,5 +1,5 @@
---- XS.xs.orig	2015-11-10 21:30:27.751894189 +0000
-+++ XS.xs	2015-11-10 21:30:34.653899658 +0000
+--- a/XS.xs	2015-11-10 21:30:27.751894189 +0000
++++ b/XS.xs	2015-11-10 21:30:34.653899658 +0000
 @@ -554,6 +554,7 @@
  };
  int JsCanPrune(Node* node) {
diff --git a/media-tv/mythfs/Manifest b/media-tv/mythfs/Manifest
index 8c878c6..b43dd5e 100644
--- a/media-tv/mythfs/Manifest
+++ b/media-tv/mythfs/Manifest
@@ -1,5 +1,3 @@
 AUX service.conf 22 BLAKE2B ea8f574cac96db71e31fb292fa086451c8272eac4cf19c5cd9992e1bde0b38e9aa04da4c3a8f136e5ddbe814b11b2e09cf956976edcf1c54ab21f16d37001533 SHA512 2bf694aed9c0394df930c2558a7cb8f6d91a224dbdba9b0feae0d1b829d96c598e1da315413b9b13c791c2154f98d746fd7e0dfd7865ef6b54929f2ec9538bea
-DIST mythfs-0.3.2.1.tar.xz 21884 BLAKE2B 9dc8a92789ec9757f806c96c2bdd716e467904b7021544a3397ae376d8b59bf6e0341e1ed56c45038424007e36573766601ac2988319a8496a7b5b697ae981e9 SHA512 573cfea11ee7cee6d7898bb2148a1481a8dbbb0e7e51a81dc56a49aafe504375de3cec0f835414c6a0e4b612ed7d856845ec238c5f9b8c099295ec7ebc545b21
-DIST mythfs-0.3.2.tar.xz 18300 BLAKE2B 739f27c9b16442dadc953609695fb79aa9dc9446de2a57f99dc1fd286b3bc55200c0c1dcabb41927a96a066740628d526cd5696461dae9b47f0134c7af4f40c9 SHA512 c258eaafe40dd3eb46354ae4998f684cc9360fb5504e83a24feb7cc606b6cc004b75d371234498f6b9be03ff8cfe8345cb6746325c0861f92da183dc80242693
-EBUILD mythfs-0.3.2.1.ebuild 850 BLAKE2B 12b8233e5d21c38c6ecc705bbfc359d2ba00e55a4f8dbca3d8775dd9a6ff00a929b14e451737124e2e8461f79d08ea7a450ec72b03afef0ad79cd22075585c40 SHA512 e9765e1685cbb1eb0e9f4448ad9f10d69e6e0e65df3b180267687c45ab0b81ea03a4fd19c7586640b1644d9c123dc919fe6b72e4c8cb2037124c63f595293de4
-EBUILD mythfs-0.3.2.ebuild 829 BLAKE2B a7b533febf2cf2ee42ad9eb0ce215c8d745847b89d80f2d00e3ba490725b52e7ce061526da43ae8ff2584fe0033dbfaf5de8a5399405f6fdc27f5f827399e333 SHA512 42fdf8a773219ec49b684f19aecee4c0fa3636b25c9922898740bd992744ad983babed1d710ad595b1a21809fd6b16045a444082ce9bf6b04e64443461d38d2a
+DIST mythfs-0.3.2.2.tar.xz 18212 BLAKE2B 29ec1a3adc67043387c50224becbf26d332d3eb1ae1660392c99e04916fbf6d5bfc63312ed21b3cdb3122a95a175774678bdc8b51b91186333da4d2dd7db500a SHA512 4cce00c8cc194b18f2c4c0fb92736c0009dfae989cca598b46fb08a1816dab0a59b8d8c4f66025ecacf534d5e1754a5a7236f71101b02932701821c386ff44c6
+EBUILD mythfs-0.3.2.2.ebuild 852 BLAKE2B 984947735b2250999916821282b6610c2cb28ad3af816e654bf0b721abad0af2083187a7c52fcfbfe4052b340ce5502b6e680fb84d196d0da6c50c1607addccb SHA512 2259454b6ef257351f240d0d6839b702af64eb1fea7dada1c8034e90e7dc0b46adbd6310f674e1be5ec1d4ff8e1c8b17110ab5687ed1c80f30d231aca43c9189
diff --git a/media-tv/mythfs/mythfs-0.3.2.1.ebuild b/media-tv/mythfs/mythfs-0.3.2.2.ebuild
index a54e486..a131a3f 100644
--- a/media-tv/mythfs/mythfs-0.3.2.1.ebuild
+++ b/media-tv/mythfs/mythfs-0.3.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 inherit bjam systemd
 
 DESCRIPTION="NetFS daemon module for MythTV"
diff --git a/media-tv/mythfs/mythfs-0.3.2.ebuild b/media-tv/mythfs/mythfs-0.3.2.ebuild
deleted file mode 100644
index 6e0a32c..0000000
--- a/media-tv/mythfs/mythfs-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit bjam systemd
-
-DESCRIPTION="NetFS daemon module for MythTV"
-HOMEPAGE="http://mythfs.randomdan.homeip.net/"
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="
-	=sys-apps/icebox-service-1.11
-	>=dev-cpp/slicer-1.9:=[db]
-	dev-libs/libdbpp-mysql
-	dev-libs/boost:=
-	>=dev-libs/icetray-0.3:=
-	>=sys-cluster/netfs-1.3
-	dev-libs/libadhocutil:=
-"
-RDEPEND="${DEPEND}
-	dev-util/boost-build"
-
-src_compile() {
-	bjambuild mythfs//service
-}
-
-src_install() {
-	bjaminstall mythfs//install
-	insinto /etc/mythfs
-	doins mythfs/etc/icebox.config
-	insinto $(systemd_get_systemunitdir)/icebox@mythfs.service.d
-	doins mythfs/etc/service.conf
-}
-
diff --git a/media-tv/mythtv-bindings/Manifest b/media-tv/mythtv-bindings/Manifest
index d5d98b2..5c46fd2 100644
--- a/media-tv/mythtv-bindings/Manifest
+++ b/media-tv/mythtv-bindings/Manifest
@@ -1,4 +1,4 @@
 DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
 DIST mythtv-0.29.1.tar.gz 105656634 BLAKE2B 8b9dfc6b1e1178bfd1b35e8d499afe570edeb1f07cefa64fc91c2ed74f8155f5ca00cee49a024848f715c0bb782fc22f3c4d04fd8eac8562d108e105d3a41421 SHA512 c80d84c40c019d093d44487fb4cd07d9ce3174781ff8f24a4709fd10294cb8f6186b3e480dad3a09f7a496835fa0cffcc9eca114f807794b693ffcd57acd4e39
-EBUILD mythtv-bindings-0.28.1-r1.ebuild 840 BLAKE2B b62caccb8b58c6b47c69b7e2328136ac55a1c92a5c902f83dd232fa43ff2fb819eca8e8d9b453239224f044780e57fa04413dd01c56eba60b6f8f218753153f2 SHA512 c581b02d8153427a5d0a8c77e1c2ac5a86cb1cb433318d1d5c7e746ded22691596b020c7c6c4c9c5bee0ccefbde77ea87865f013ea47307c1215120b0dbdae61
-EBUILD mythtv-bindings-0.29.1.ebuild 840 BLAKE2B b8bc14cb09f04f69b8b01c39a650623e54177c250b0d9ea06f15adeac0faf097987ec458db910b16b7057cc3bc9e88f184c2589b61acc9c02296fb6c6be468dd SHA512 329cb0980df0dae0370e89597cd495367af754853a3513484a6319e750a39fd53d808d8c4d88213b7c08cc6f205c2dce21049c5a847446092245b93bd74aa1a2
+EBUILD mythtv-bindings-0.28.1-r1.ebuild 842 BLAKE2B 70db79369f21f16d00c90b7ec114683304c8a7d852d97f0d9aa10ae68fc8ab0e385b9d1a6dd28d29029ea72a66461af895821da68757c3bb579189ead2d3b9c3 SHA512 bf485fe56e434d3d8014832beddf9e314f7b433664650f07fad69d9b42016ec5fa773c4814d65e893d4e77ecd608ef41152744376df9fc5c5d7f32c38295c843
+EBUILD mythtv-bindings-0.29.1.ebuild 842 BLAKE2B d8deffc35e93e7294c2490fd771776cdaf40b22c8779c0572ea50665fc3d14e830581a0336f8765431d4d91d4a44e57e4e2d2cf731faa432ddfd4c0225db36bc SHA512 49ebe7a1a9e3a5bb8530b4f6944ccb4c0888a70608c467a6cbdde1114cf452140af41d4c7fe550db0ea23702242e66ac4765c3c4e0691fa34ad5bbeafa840333
diff --git a/media-tv/mythtv-bindings/mythtv-bindings-0.28.1-r1.ebuild b/media-tv/mythtv-bindings/mythtv-bindings-0.28.1-r1.ebuild
index 127c718..e2e3d25 100644
--- a/media-tv/mythtv-bindings/mythtv-bindings-0.28.1-r1.ebuild
+++ b/media-tv/mythtv-bindings/mythtv-bindings-0.28.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
 BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
 MY_P=${P%_p*}
diff --git a/media-tv/mythtv-bindings/mythtv-bindings-0.29.1.ebuild b/media-tv/mythtv-bindings/mythtv-bindings-0.29.1.ebuild
index 3a6e78b..789fc69 100644
--- a/media-tv/mythtv-bindings/mythtv-bindings-0.29.1.ebuild
+++ b/media-tv/mythtv-bindings/mythtv-bindings-0.29.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
 BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
 MY_P=${P%_p*}
diff --git a/media-tv/p2pvr/Manifest b/media-tv/p2pvr/Manifest
index b77159e..5e4e815 100644
--- a/media-tv/p2pvr/Manifest
+++ b/media-tv/p2pvr/Manifest
@@ -1,4 +1,4 @@
 DIST p2pvr-0.3.3.1.tar.xz 8084028 BLAKE2B 14fe9c766537dccd3663e9398789dff347ab595a8b62d6154d512c3c7f2fe599b7f797dad412e73c1d57a701a22b8ee50043719acfe9629085dba5b9c0893c09 SHA512 a04a0cfd7cf196581382d9ade5d2c257281d70218fef0acc8e607ab2bd625608d71738a508d5275dd0aa9b7462182386ded7b5a494c3226537c9ecbce366e594
 DIST p2pvr-0.3.3.2.tar.xz 8087628 BLAKE2B 6ca5fdb7918f6e7f02cb8625ae511d3bf4f4c38284196ea717e0eab2f2b419178ebacd5cbe0406f38ec191fa4d19ae6ef7c6b49c4cdea7a981eafc03af5cf70f SHA512 17bd0a47b75eaaf7f691bfa83fcb0aeca5c28059778f9ef0fa77868dd4ec472678607d4eb784beeac149ef23afdfbc699a4e5aadbfac698074fda1bfd0adbe27
-EBUILD p2pvr-0.3.3.1.ebuild 809 BLAKE2B 8e0147caa72b735499b2ea43753276eb3b1408b49120e1609af9679533ba4ce86d4ae25fe6d53d55600603f7633208945ba413b943dc7c76d96edd7c8fdec787 SHA512 33b00b2e223b3551265df2cae0601b3c412ced9bc6bc4699d9b28b47cdf3371939516083af81c410672d490f8052153e434e767f196e0d82beb4d045cab9d1e6
-EBUILD p2pvr-0.3.3.2.ebuild 828 BLAKE2B dd5694d44bf0e66d80fab4f31f51f2701fbefa06b5bbcfb6b294703cb0b68e59ed7501438a42eb931fb5fa800abb10976861789c73c32f6cb9e776a7b437facc SHA512 5f7efbd64339d45d679c09655c0645898a6e57530444d7f6e70c8e8531efc1771a82d96e89a8cabea4e39c6b5e26367a7d83f4878c07ccb6b780483229999f43
+EBUILD p2pvr-0.3.3.1.ebuild 811 BLAKE2B 1a577c85463214a5d2e2c543fc25a40dd2b5ba380d6bacee3336e131764cb85a22a077f5e265eaf1c9eab70acae5e24c1d3eaab2062777d3455db93174ef90f0 SHA512 0e541ddc5d897a94e654aa116c4cc70f9735a2b9048abb40b734e952b314e940911262bbb0e2b30e1b7e44ccfa190c4495c093a2853ee36ca87bf116a14ad5d8
+EBUILD p2pvr-0.3.3.2.ebuild 830 BLAKE2B 884910c28bfa08ff2bad317a35fdea57bde2e039d9f152bb6500d806f4a20981446e8de8a232e05d1a78f6b43a3fdefe474d8f8b5f539b75511bdbfa22d3a179 SHA512 9ee6ff9385b5466f237004e3c3e5946bfa416f781b8fc1b55531a90098c1d140d6b7d243e1cd20bd6a3ad596d4ef2411d77e6e1fccbcf79a3933d511b2f0e68a
diff --git a/media-tv/p2pvr/p2pvr-0.3.3.1.ebuild b/media-tv/p2pvr/p2pvr-0.3.3.1.ebuild
index 3a7815f..0c60e55 100644
--- a/media-tv/p2pvr/p2pvr-0.3.3.1.ebuild
+++ b/media-tv/p2pvr/p2pvr-0.3.3.1.ebuild
@@ -1,4 +1,4 @@
-EAPI=5
+EAPI="7"
 
 inherit user bjam
 
diff --git a/media-tv/p2pvr/p2pvr-0.3.3.2.ebuild b/media-tv/p2pvr/p2pvr-0.3.3.2.ebuild
index ec432f5..b78b1e2 100644
--- a/media-tv/p2pvr/p2pvr-0.3.3.2.ebuild
+++ b/media-tv/p2pvr/p2pvr-0.3.3.2.ebuild
@@ -1,4 +1,4 @@
-EAPI=5
+EAPI="7"
 
 inherit user bjam
 
diff --git a/net-misc/gentoobrowse-api/Manifest b/net-misc/gentoobrowse-api/Manifest
index 4af6470..cab9057 100644
--- a/net-misc/gentoobrowse-api/Manifest
+++ b/net-misc/gentoobrowse-api/Manifest
@@ -1,14 +1,6 @@
 DIST gentoobrowse-api-0.10.0.4.tar.xz 888432 BLAKE2B 1a0c4319d985ef64294ce8502ea89dd15173d7f056d70fe0c796cc1cf1cf9ded189901f3e15d0725691318132c3c9b53319cb2c76786ce3c8e6dd8dadf21132b SHA512 a43c42a8846a03afdfb723fee3c3bd6aea14e5e10e3d7f61553533f7d928403f4c8a2d2d9d356db292c656a9df2f8dc7c7d47414a98bdbcd635d4ed99ad0f320
 DIST gentoobrowse-api-0.10.1.tar.xz 888624 BLAKE2B 9d7bf578a387acbbfb3f367d723b0e234c94edfaa81312248bf07716b18bfd68f5cf749156518260547f7e0f4e7be6e8a98e756ea83f41005169f65640dd631d SHA512 18902a86d030e90485dabb9091292b5b8badd35322a2c0de00c3f721b6ae2f04a9b0f2e22bcea6e40bc2e5749d7231591208a544477c97e1aa1b873a882e87fc
 DIST gentoobrowse-api-0.11.tar.xz 889728 BLAKE2B 7a9c3f00595edf8526eaa08581945402f029f581cb4b2603be4eb3c50354a378005d4fa5dac82b1eccc9d69dde71fc4ce3c275e52dde8fbdd3da481158d0e4b8 SHA512 c352d6d728601a9abeb1a8882ab9805a0af2ad6c74c9b256d25cd20d0235e66887d768f8e8d9cfddd5fe42769c0b0c2a72e3cff6ce6def7f3f2bd72927799609
-DIST gentoobrowse-api-0.9.4.tar.xz 886816 BLAKE2B 8d4629a3f8768b5e0257c18c5c61e67ac391a139e5e4169383b8920c734ca8fe746cae8ef9bdc6e88ce1b5a57f7fc45ef8e90d5d72abf5dc752ebca702a28131 SHA512 14a842645aaa812f923f5e45017267b4e79803aed2659d086a6092c51cca61cbb4896ba55d956151f4aa9edf3b1825d8372b470a436df908c18b7d122cd98a78
-DIST gentoobrowse-api-0.9.5.tar.xz 886848 BLAKE2B 89ca67d535ab1fcaf6ac1414b30a9565a5e334259ca2a8c4a33464613562daa4b7d5d9e8dc2f6ebddee87ea40cdc8a6152f6a2e7d2faee93e79b40e2b8bcb206 SHA512 b6ef6a411966ff60a13cf33d70a743df1139b066b78e1739918fb2e39f94b824d555d62a3f560e70c3c1e4bf75f388128bcfafcc04148095b45872c39f0b14d0
-DIST gentoobrowse-api-0.9.6.tar.xz 887764 BLAKE2B 091c5f810c68b7f98f37cde4114d2b5c6d8e6dd2e2f21ca379685fd2a2ce9691b8df3d43bfda1019fa41b545f55d1c01587ac827ecd966070e2d4496e1a58b94 SHA512 da1e63b458bd1433c684519b559a653f1a0fd762935aa2906249ed78cf9e7256041a5410200edf3828bbbb3d9fc39f9613ba488cca89f05b854de679c1478165
-DIST gentoobrowse-api-0.9.7.tar.xz 888140 BLAKE2B 8bd7cf6afade0d9d99e50623c21c41ac0eaf197d98a1fc214997c5a4c8ff994a196ead41c4504e094f56ab6c425f2140819b0c664ad0a8e02370b35147aff803 SHA512 070160115410a9eeb12ff9722b676c89ca82b9dfcdf10023c0418c7e2a148b1dd5f9ea199169b1fb1f6cc86544d4f4926b2a1b791abe486b58571ab91db4d71b
-EBUILD gentoobrowse-api-0.10.0.4.ebuild 1400 BLAKE2B 2091bc9f45ab32b28b2165b32e0fc11cfd8e5825caad76df9a84408422930aee82fad1e8920f45812edb125130339392064a65cb2af72dea1aa488a294a2d59a SHA512 49248b53e88d959057ef02198c9680dec4718f29bfa06785cd82a553553236b48a02f18ed5df7e31965e21133b17e0651361e720bc27c9ff8e81f80e38faf965
-EBUILD gentoobrowse-api-0.10.1.ebuild 1400 BLAKE2B f72063dacb492224c87fd98e0ff517702b5768229acd14b6808f63e82c071c610d9ef78a3a528b481f78e04ed6967520161e60073203430d6e4725043ed2297d SHA512 750a1e9a1485873c2abb9ac89f5c8793f90cb30d25a2edce4885fd04c89966a7fdd4a6f396170427b78834adbe3b2ef52f0fdda95889c24585cfe3667f650b53
-EBUILD gentoobrowse-api-0.11-r1.ebuild 1489 BLAKE2B e0428cb52b6f48992e2dc3b50127f2e567569de77809dedf898a4ab1156224a1fb6b9416840b536d5df5a15fe1a9c6fa80323d509e867c668192e696ce88b734 SHA512 dc21734a3a0790fb9d20f02f47db1b304eb9dbaa8f7cadaddec31dd6abf0ace49e1c2d685255f8c693ed67c581d07dbe5eda8d24c06a414c0f9365712576bc3c
-EBUILD gentoobrowse-api-0.9.4.ebuild 1394 BLAKE2B d5ca40514a5cce8d3a6e7d9c7910b98a73a2afba701d58e7e56b56692b6db416e40d52d788f084aa4cdbdbcba7a773980d921dd0e4c53cb3642e70a9c9a55ecf SHA512 cd6f1e441c3dad000a18a86bd0a4ad6c0128c15f33f47f23721820209e7b5310035466506d87ea5e3110d2282c4fe13afbb8e249368d8275e7858fa0eb985ce9
-EBUILD gentoobrowse-api-0.9.5.ebuild 1394 BLAKE2B d5ca40514a5cce8d3a6e7d9c7910b98a73a2afba701d58e7e56b56692b6db416e40d52d788f084aa4cdbdbcba7a773980d921dd0e4c53cb3642e70a9c9a55ecf SHA512 cd6f1e441c3dad000a18a86bd0a4ad6c0128c15f33f47f23721820209e7b5310035466506d87ea5e3110d2282c4fe13afbb8e249368d8275e7858fa0eb985ce9
-EBUILD gentoobrowse-api-0.9.6.ebuild 1394 BLAKE2B d5ca40514a5cce8d3a6e7d9c7910b98a73a2afba701d58e7e56b56692b6db416e40d52d788f084aa4cdbdbcba7a773980d921dd0e4c53cb3642e70a9c9a55ecf SHA512 cd6f1e441c3dad000a18a86bd0a4ad6c0128c15f33f47f23721820209e7b5310035466506d87ea5e3110d2282c4fe13afbb8e249368d8275e7858fa0eb985ce9
-EBUILD gentoobrowse-api-0.9.7.ebuild 1394 BLAKE2B d5ca40514a5cce8d3a6e7d9c7910b98a73a2afba701d58e7e56b56692b6db416e40d52d788f084aa4cdbdbcba7a773980d921dd0e4c53cb3642e70a9c9a55ecf SHA512 cd6f1e441c3dad000a18a86bd0a4ad6c0128c15f33f47f23721820209e7b5310035466506d87ea5e3110d2282c4fe13afbb8e249368d8275e7858fa0eb985ce9
+EBUILD gentoobrowse-api-0.10.0.4.ebuild 1400 BLAKE2B cc28467685a30178b6a7f680cc0eb6f77b4991fa321d84057e1644d7aec28c67913ad59662dffceec3738181acfb18b65d4b264a12166a2e7039b2aa66d31c14 SHA512 ab7dbdf5d459817356b399be0fae61847fbf2a84576b5e571d182e2392c9d91aeb3136938c68c5b99d68baf6279af5c28ef92da17940aa2176f4b932210e11d2
+EBUILD gentoobrowse-api-0.10.1.ebuild 1400 BLAKE2B 9a1845ab9d19af44b7ec21fbabca18895eea9f0a679f3751360ff37fc5276e2bb551f8b4697eff1d0f2e511eded5568308a2bacd77c12f4407193f4aeedfbbd2 SHA512 08b7a74db0425b2ee77a039d7dabf69cec11e9eed2f7ed473651c3762eb28887f75a8a52416895ec85df17f83d32c395543ce6312eb7e2d054d95b08de0b2623
+EBUILD gentoobrowse-api-0.11-r1.ebuild 1489 BLAKE2B e74e7d8e6415acda10cc6a3cc1b96219e02c6bcf7ea4c27bdaf018c32f69d25f2b63bb194ff63a8e66c1d9c56d6a173b230e833ee141d801631a020142df7802 SHA512 31290f079b4a707e0908e2c3bd07e31f564f1b071174bfff5a285abd911ec023fdafc2d69200b3c96039bed68977428a4a47049e43a48fdd595ee17f89bd9208
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.0.4.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.0.4.ebuild
index a27773b..fc10eea 100644
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.0.4.ebuild
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.0.4.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit systemd eutils bjam
 
 DESCRIPTION="ICE API and client for Gentoo Browse"
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.1.ebuild
index 06d786a..6fbb698 100644
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.1.ebuild
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.10.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit systemd eutils bjam
 
 DESCRIPTION="ICE API and client for Gentoo Browse"
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11-r1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11-r1.ebuild
index ce9cbf2..128e7d3 100644
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11-r1.ebuild
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 inherit systemd eutils bjam
 
 DESCRIPTION="ICE API and client for Gentoo Browse"
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.4.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.4.ebuild
deleted file mode 100644
index 1072e6f..0000000
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI="5"
-inherit systemd eutils bjam
-
-DESCRIPTION="ICE API and client for Gentoo Browse"
-HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
-
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="client server"
-
-RDEPEND="=dev-libs/Ice-3.6*
-	server? (
-		=dev-cpp/slicer-1.7*:=[db]
-		sys-apps/icebox-service
-		>=dev-libs/libdbpp-1:=
-		>=dev-libs/libdbpp-postgresql-1.1.2
-		>=dev-libs/icetray-0.1.4[tools]
-		>=dev-libs/boost-1.60:=
-		>=dev-libs/libgit2-0.24.0
-	)
-	>=dev-libs/libadhocutil-0.3.6:=
-	dev-libs/boost:="
-DEPEND="${DEPEND}
-	sys-devel/flex
-	dev-util/boost-build"
-
-src_compile() {
-	bjambuild \
-		gentoobrowse-api/api//gentoobrowse-api \
-		gentoobrowse-api/domain//gentoobrowse-domain \
-		$(use client && echo gentoobrowse-api/client//gbcli) \
-		$(use server && echo \
-				gentoobrowse-api/service//gentoobrowse-service \
-				gentoobrowse-api/util)
-}
-
-src_install() {
-	bjaminstall \
-		gentoobrowse-api//install-libs \
-		gentoobrowse-api//install-slice \
-		$(use client && echo gentoobrowse-api//install-client) \
-		$(use server && echo gentoobrowse-api//install-service)
-	if use server ; then
-		insinto /etc/gentoobrowseapi || die
-		doins gentoobrowse-api/etc/icebox.config || die
-		insinto $(systemd_get_systemunitdir)/icebox@gentoobrowseapi.service.d || die
-		doins gentoobrowse-api/etc/service.conf || die
-	fi
-}
-
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.5.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.5.ebuild
deleted file mode 100644
index 1072e6f..0000000
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI="5"
-inherit systemd eutils bjam
-
-DESCRIPTION="ICE API and client for Gentoo Browse"
-HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
-
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="client server"
-
-RDEPEND="=dev-libs/Ice-3.6*
-	server? (
-		=dev-cpp/slicer-1.7*:=[db]
-		sys-apps/icebox-service
-		>=dev-libs/libdbpp-1:=
-		>=dev-libs/libdbpp-postgresql-1.1.2
-		>=dev-libs/icetray-0.1.4[tools]
-		>=dev-libs/boost-1.60:=
-		>=dev-libs/libgit2-0.24.0
-	)
-	>=dev-libs/libadhocutil-0.3.6:=
-	dev-libs/boost:="
-DEPEND="${DEPEND}
-	sys-devel/flex
-	dev-util/boost-build"
-
-src_compile() {
-	bjambuild \
-		gentoobrowse-api/api//gentoobrowse-api \
-		gentoobrowse-api/domain//gentoobrowse-domain \
-		$(use client && echo gentoobrowse-api/client//gbcli) \
-		$(use server && echo \
-				gentoobrowse-api/service//gentoobrowse-service \
-				gentoobrowse-api/util)
-}
-
-src_install() {
-	bjaminstall \
-		gentoobrowse-api//install-libs \
-		gentoobrowse-api//install-slice \
-		$(use client && echo gentoobrowse-api//install-client) \
-		$(use server && echo gentoobrowse-api//install-service)
-	if use server ; then
-		insinto /etc/gentoobrowseapi || die
-		doins gentoobrowse-api/etc/icebox.config || die
-		insinto $(systemd_get_systemunitdir)/icebox@gentoobrowseapi.service.d || die
-		doins gentoobrowse-api/etc/service.conf || die
-	fi
-}
-
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.6.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.6.ebuild
deleted file mode 100644
index 1072e6f..0000000
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI="5"
-inherit systemd eutils bjam
-
-DESCRIPTION="ICE API and client for Gentoo Browse"
-HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
-
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="client server"
-
-RDEPEND="=dev-libs/Ice-3.6*
-	server? (
-		=dev-cpp/slicer-1.7*:=[db]
-		sys-apps/icebox-service
-		>=dev-libs/libdbpp-1:=
-		>=dev-libs/libdbpp-postgresql-1.1.2
-		>=dev-libs/icetray-0.1.4[tools]
-		>=dev-libs/boost-1.60:=
-		>=dev-libs/libgit2-0.24.0
-	)
-	>=dev-libs/libadhocutil-0.3.6:=
-	dev-libs/boost:="
-DEPEND="${DEPEND}
-	sys-devel/flex
-	dev-util/boost-build"
-
-src_compile() {
-	bjambuild \
-		gentoobrowse-api/api//gentoobrowse-api \
-		gentoobrowse-api/domain//gentoobrowse-domain \
-		$(use client && echo gentoobrowse-api/client//gbcli) \
-		$(use server && echo \
-				gentoobrowse-api/service//gentoobrowse-service \
-				gentoobrowse-api/util)
-}
-
-src_install() {
-	bjaminstall \
-		gentoobrowse-api//install-libs \
-		gentoobrowse-api//install-slice \
-		$(use client && echo gentoobrowse-api//install-client) \
-		$(use server && echo gentoobrowse-api//install-service)
-	if use server ; then
-		insinto /etc/gentoobrowseapi || die
-		doins gentoobrowse-api/etc/icebox.config || die
-		insinto $(systemd_get_systemunitdir)/icebox@gentoobrowseapi.service.d || die
-		doins gentoobrowse-api/etc/service.conf || die
-	fi
-}
-
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.7.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.7.ebuild
deleted file mode 100644
index 1072e6f..0000000
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI="5"
-inherit systemd eutils bjam
-
-DESCRIPTION="ICE API and client for Gentoo Browse"
-HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
-
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="client server"
-
-RDEPEND="=dev-libs/Ice-3.6*
-	server? (
-		=dev-cpp/slicer-1.7*:=[db]
-		sys-apps/icebox-service
-		>=dev-libs/libdbpp-1:=
-		>=dev-libs/libdbpp-postgresql-1.1.2
-		>=dev-libs/icetray-0.1.4[tools]
-		>=dev-libs/boost-1.60:=
-		>=dev-libs/libgit2-0.24.0
-	)
-	>=dev-libs/libadhocutil-0.3.6:=
-	dev-libs/boost:="
-DEPEND="${DEPEND}
-	sys-devel/flex
-	dev-util/boost-build"
-
-src_compile() {
-	bjambuild \
-		gentoobrowse-api/api//gentoobrowse-api \
-		gentoobrowse-api/domain//gentoobrowse-domain \
-		$(use client && echo gentoobrowse-api/client//gbcli) \
-		$(use server && echo \
-				gentoobrowse-api/service//gentoobrowse-service \
-				gentoobrowse-api/util)
-}
-
-src_install() {
-	bjaminstall \
-		gentoobrowse-api//install-libs \
-		gentoobrowse-api//install-slice \
-		$(use client && echo gentoobrowse-api//install-client) \
-		$(use server && echo gentoobrowse-api//install-service)
-	if use server ; then
-		insinto /etc/gentoobrowseapi || die
-		doins gentoobrowse-api/etc/icebox.config || die
-		insinto $(systemd_get_systemunitdir)/icebox@gentoobrowseapi.service.d || die
-		doins gentoobrowse-api/etc/service.conf || die
-	fi
-}
-
diff --git a/sys-apps/autorestart/Manifest b/sys-apps/autorestart/Manifest
index e8045f8..86cc0ac 100644
--- a/sys-apps/autorestart/Manifest
+++ b/sys-apps/autorestart/Manifest
@@ -1,2 +1,2 @@
 DIST autorestart-0.1.1.tar.xz 5288 BLAKE2B 8ad92d75585d67ff716cbd3343d79832fd6a03514ef30e97dd5a6365708210ce0536c920bb8235bd5b45ef31f8087d214c2119c52d6b3b0d94e185572dfb9df9 SHA512 ce585efd01cc50868e2c46136f098b38535aa3571da72fed6313726683fc3e01f30c8805dd8aa414ec7175d2b3e84ef1af383c38619cd8e854bf8db1b3314094
-EBUILD autorestart-0.1.1.ebuild 772 BLAKE2B 993935c2a92b6cc4fcba5cd20f06d0ca227e2ed7be3fba016ce27bba73c4aca614e5eb6cf0962995c769a579d5ee17ad52464ed0ddb5298e57c509ce56f5b640 SHA512 974c00ba59a62b738da9e75aed0bc864f07f1a63e3598122c6b97f81056f02aa5c535885223957b139f753f00872300b94524013ca8ba2f0f9a7767e2249f984
+EBUILD autorestart-0.1.1.ebuild 774 BLAKE2B 04e8f919f0b4d595c1b866838e50fd533ca0365fcf2482c11e30472234c93c86322ef8fd6842547a76e1b0d3295ecf921f60d05cf43312735b02926bde449d04 SHA512 df94a581f44d304c9bae98bda97d6e4384e24776d431553adeb7e69aa5506c4b127404583fb481c0a099eec76986408e560a70edb0c58eee9d1ca162c3ca1189
diff --git a/sys-apps/autorestart/autorestart-0.1.1.ebuild b/sys-apps/autorestart/autorestart-0.1.1.ebuild
index cff3667..f0cd5b6 100644
--- a/sys-apps/autorestart/autorestart-0.1.1.ebuild
+++ b/sys-apps/autorestart/autorestart-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="7"
 
 DESCRIPTION="Automatically restart systemd units as required."
 HOMEPAGE="https://git.randomdan.homeip.net/cgit.cgi/util/tree/autorestart"
diff --git a/sys-cluster/netfs/Manifest b/sys-cluster/netfs/Manifest
index 180aeef..a817b98 100644
--- a/sys-cluster/netfs/Manifest
+++ b/sys-cluster/netfs/Manifest
@@ -1,4 +1,4 @@
 AUX icebox.config 147 BLAKE2B 52dce197f018c50740716cd0ff1210cdd371583fe60d5aede3fc3703b61442e63a8c6560893aacf4c604210d527c7551b9fc919482063b5630466e1210078ffc SHA512 0f03533c737935d2a4f08158a312478ad16a8fe0a3aa5117f50b0200b2d83f9d8e8fc5bcc7ccc3dddf7fe66d68e5c015f72f282c891d576421317deebc6c1562
 AUX service.conf 29 BLAKE2B b516d5c184da102bda9b1e9c940b7fc50e062b418cdb25bab278a1e130707c4bb90394701b34525eabea9ce019c677fc641b83e00fa784d98b9a53192e7c0269 SHA512 0b78e9051294ff11abe938ddc0759284dc0eb0ad4a37f90396605248b86c4bb7685ff303c5fda6ee80d95c50c21e0d122fe93914da48ca9ec2e1c5c36ca32507
 DIST netfs-1.3.3.3.tar.xz 26020 BLAKE2B 10ce5e704b99ec699ea07403bcdac95e0ebfe0315c3351f62f8ecd99fb746ebdb286c06148a1abcd2fc9348a6348031d1520a11b60ed356778dc02871cc5a36e SHA512 25d6b42888a721a23c72d72f94b8c9b339e5ec82f70942739949583946972731f2d50bcd65411d27ac89bde40603d50e6e0c2316a72ac8f4c81e2ae1578d5475
-EBUILD netfs-1.3.3.3-r1.ebuild 1071 BLAKE2B 33ea8425996f4e708e1f8a4d0cc40a6fd30c1c8b172c9b75fc7027e212abb59fc0b0f58976567ef9ce06115a5678911704e9392ef33e7150a773ac61aaac1b42 SHA512 4f355b71361631ae54ba4f6ddf486ed65d0378a53982e95092e1b27698f269202fe4725557c3b1ada1aa79e5dc160f5cba934af9641d88930d77f402c43f2a92
+EBUILD netfs-1.3.3.3-r1.ebuild 1071 BLAKE2B d3a6529630670847a99ae8f4499b2c6cfbc08bfec0a715fed94bca3cd99e55e8cddc2fea7a07f3fb5864d29acdf278da50f64505696305b630a1d746b952a0ca SHA512 4cdbaee40e5adafc2dba10aaefa2c20c58befedad1870c40da385cd8403740a8fd909710042b681b96256b19c13a98567d6baf548eebc3b227de0b65e1976842
diff --git a/sys-cluster/netfs/netfs-1.3.3.3-r1.ebuild b/sys-cluster/netfs/netfs-1.3.3.3-r1.ebuild
index efd17fe..aa02182 100644
--- a/sys-cluster/netfs/netfs-1.3.3.3-r1.ebuild
+++ b/sys-cluster/netfs/netfs-1.3.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit eutils bjam
 
diff --git a/sys-fs/netfs-gitfs/Manifest b/sys-fs/netfs-gitfs/Manifest
index fae9330..401a1de 100644
--- a/sys-fs/netfs-gitfs/Manifest
+++ b/sys-fs/netfs-gitfs/Manifest
@@ -1,2 +1,2 @@
 DIST netfs-gitfs-0.1.tar.xz 8180 BLAKE2B d353760906f75422ff82d63c6542764370cb56b74bff36f68b3234c4ff20b6cec98800b256c5f8b5433aee415153b96b102782960be465a300515b07841a330f SHA512 1903bec7d660d5ff2345a80a90658fce137218ce4e9446e12b7e53860eaa0b103cc031ce3ba44e7daf13dc7050d7f70fe42e2d9a3ace46d3b0d1734039e42cbd
-EBUILD netfs-gitfs-0.1.ebuild 519 BLAKE2B cbb44353c7cacf0566d7c05e1623d840050d5a80fe9ccd60a9ba3461b9479fdae2e1e4f0e3729ae74c529061c7c31ee8b5d4a4b242f0579b0f846c49165aad57 SHA512 fe9a7ad97af13a68e801d8082e8fd3993d2a95981d10503107eb84d6fa99a8b0954f24163597786c7075adea5da7154de49fce756af62407a9924753adb8730c
+EBUILD netfs-gitfs-0.1.ebuild 519 BLAKE2B cb0d7315bb0263cf7f0ab39c2b815c3c0f2df06e66d3f3d1dedcaffd5c9da32759b30c671e5576dceec56b9539ce6ec4f9721b7ec990f2b2b8c3f87b458cba9c SHA512 478e73e70b13f5e355ec5c951348be4f1ff20524df821e9560d73faf0dc3363655191933620c0c74947c77b01203599707b765fe29e9ba37e6376fb76b86c8ed
diff --git a/sys-fs/netfs-gitfs/netfs-gitfs-0.1.ebuild b/sys-fs/netfs-gitfs/netfs-gitfs-0.1.ebuild
index 89b5d90..4e752aa 100644
--- a/sys-fs/netfs-gitfs/netfs-gitfs-0.1.ebuild
+++ b/sys-fs/netfs-gitfs/netfs-gitfs-0.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest
index f175cc3..c806599 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -3,6 +3,6 @@ AUX ocfs2.initd 4004 BLAKE2B 8d9f839d9ad7607b45e768b95ebc589c0e6fb729d2fff3afac0
 DIST ocfs2-tools-1.8.4.1.tar.gz 1481310 BLAKE2B 58ed030055003f60707be342ee23bd1ac0630d9300c351b58789009627dc276740293b9584c4502264f13b77f51fa59dfc6b18b5a4aa618f38f4bf4fffc95721 SHA512 2f7131cd8595e8f495f9321d0ed3370c1355b0795766dc868602b02bc7cf675d131b0fcab27c5cc249f7e92a683b914a566f5f410b4f6b01ec06e7b761a9a2f3
 DIST ocfs2-tools-1.8.4.2.tar.gz 1481445 BLAKE2B 056b84eceb374662ee036c57005879238cbc72deed3d8d4a57116bf039f7e1a05f492f934011eee5efff429215eef281c986ce11c56e601109a431aa365d5b8e SHA512 4d8ad9c6e7f7fc4c298d3a025530d2a567db0b60cc6845161b37d0ce583c62282a04f13b0d76c4a106d16cef9bf0b05d1ab939597b250ebbadecfdccb947d9cc
 DIST ocfs2-tools-1.8.6.tar.gz 1492057 BLAKE2B 0275d10d4b07c20cb99920bc522331f9c51f77e6d978807b02c32ae732eeb1b1ab666e26afe70ead2c029d17e3aa0b0347d80e808458fbea1e32783a1a942f7b SHA512 71abe46152b065b9ba7db192b9f14ed28a1fbf0fa68822d4e8188c6f1654dfaaa29ae72ea4219bd68e7fade7791a08d36cbd5af5a16a2ee96e194ecb6f0d950b
-EBUILD ocfs2-tools-1.8.4.1-r1.ebuild 1471 BLAKE2B b382709910e243c0dfa2fd80814e0acaa64aea319e38f24df4b9efe729b9461d5517ec359f1119adcdbe0f0ebb9d3ad27c5b2b0f0bd206f7c420ebacb5a30ef3 SHA512 db35f8ca34c27bff9ecad3b0d742f97b38fa94571007c6cbc7d848444bbef4bcaaaa680bd201ab70318231f0b2133c3a2ea0fcf7d1816d173196ace486714f26
-EBUILD ocfs2-tools-1.8.4.2.ebuild 1471 BLAKE2B b382709910e243c0dfa2fd80814e0acaa64aea319e38f24df4b9efe729b9461d5517ec359f1119adcdbe0f0ebb9d3ad27c5b2b0f0bd206f7c420ebacb5a30ef3 SHA512 db35f8ca34c27bff9ecad3b0d742f97b38fa94571007c6cbc7d848444bbef4bcaaaa680bd201ab70318231f0b2133c3a2ea0fcf7d1816d173196ace486714f26
-EBUILD ocfs2-tools-1.8.6.ebuild 1472 BLAKE2B f44678f4bd21083d6b8232c96b35dbed548cbb91f02ac57c62e42c71bdeb96fdf9192b12534409080776482ef08fc69c766e78a8ca6f484cbf1adac202de0c2f SHA512 224423cece1c07dcfca273951544eb65f2d3efa784797cbbabe40113db8fb51a5c3debf83c1bb51d35654237f06bf179a19cf2a8ccb0d6d43e92e88824edd2a6
+EBUILD ocfs2-tools-1.8.4.1-r1.ebuild 1473 BLAKE2B 6596a4513f00a689d59c0140b62b353ae37c35c3ab6377ef52c2dc73bef822e99e79c9c81ec3ee299a94c4f45abf1a17fd3bc30a3d3ef9fd08407da627205a8e SHA512 da1df0bc34b6629987010e308c7c9413c231982f5a10d8921907b9aff6b93dcd6c041996e562b307c3f396b8fdb005799a25c458abf3bf75a5ca27c1ecb24bcd
+EBUILD ocfs2-tools-1.8.4.2.ebuild 1473 BLAKE2B 6596a4513f00a689d59c0140b62b353ae37c35c3ab6377ef52c2dc73bef822e99e79c9c81ec3ee299a94c4f45abf1a17fd3bc30a3d3ef9fd08407da627205a8e SHA512 da1df0bc34b6629987010e308c7c9413c231982f5a10d8921907b9aff6b93dcd6c041996e562b307c3f396b8fdb005799a25c458abf3bf75a5ca27c1ecb24bcd
+EBUILD ocfs2-tools-1.8.6.ebuild 1474 BLAKE2B c6bacd581f3a891b28dd5dcf9af87a32f5149a45e92571894171584c0c03275b3616f7bf0704ed5f0935f925e290469bb3dcb3145d708b764048115ebc92f90b SHA512 9083976bb24785f327e260a1708b0a7146ef185cf9b18d023d3b764f177c24db03a90301e99924da9d31da85586e2cd9aebb1a6abbb6751c87feb12a35d0b419
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.1-r1.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.1-r1.ebuild
index a7ad94b..246b551 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.1-r1.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.2.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.2.ebuild
index a7ad94b..246b551 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.2.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild
index c417397..94e5992 100644
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
diff --git a/virtual/ci-server/Manifest b/virtual/ci-server/Manifest
index b3f167a..2ad461c 100644
--- a/virtual/ci-server/Manifest
+++ b/virtual/ci-server/Manifest
@@ -1 +1 @@
-EBUILD ci-server-0.1.5-r1.ebuild 979 BLAKE2B 9183936834e01871521c8566cf936908fdd7f30bf89e041a8539483946388cf460e976b2e79c01c5231ea7996f8fcfa81c3a6df47e6acc561429f0c5b4549c77 SHA512 76702038af8a30494a9f02e92b6bbbe324fed6c5e5bde49a0cadf4a6b02b532574f6407e57b63dad84f710bae4b44f4d202b7911b8e921b8c1d96c970742d88f
+EBUILD ci-server-0.1.5-r1.ebuild 981 BLAKE2B afbe7db40f0a8dac051b734add3dee36d31b8d87d364ac5cad7c4fc76b242fa1a78b3eb1003a0428d62ecad8d158e8573a2fac33a5f3e7387c31b9f5465365e1 SHA512 5878a9589c74dd7e85822879d02a50a9c00b6524b6d26df42b93becc159f66a79b9bdb53a3e01a370fbe5b3126933dcc228c425c6363f2e0af9c3ae634e47c4c
diff --git a/virtual/ci-server/ci-server-0.1.5-r1.ebuild b/virtual/ci-server/ci-server-0.1.5-r1.ebuild
index 8200523..0fa204c 100644
--- a/virtual/ci-server/ci-server-0.1.5-r1.ebuild
+++ b/virtual/ci-server/ci-server-0.1.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="Dependencies for running CI builds"
 HOMEPAGE="http://coverage.randomdan.homeip.net/"
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index e7080e6..e375ece 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -12,4 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
 AUX weekly-av-scan.cron 1591 BLAKE2B 8262ff9f7c8aadf503b8fbf0c283f87d619f1ee174bd52762cd421064e3ef6ad301dbfbfdf557334e76c11adc963976417c3275e8c1167d7c609cbdda201ead9 SHA512 6d5ca06bfdb020d1435b51837b4f2f8676cab808e7ffdf39be40e822858f0b7150d16d5fce991fab026c236fd3a32e1ff9a0f7eca62a679e77d1799ed15e2366
 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.8.5.ebuild 3846 BLAKE2B 64ac6f01920ba4b18bf5571125e33750435ebfad539ccddb07409a5df4edf6a869f484ea874e9abeca21c4627218e395a49d80124b93a0fab75249c0417ba02b SHA512 4d7c566f4003cefac7d1cfdeca40c8b943f02f05ac2d8b14d73a52167a21dc306366bcef1f3f996bd01fd1622cfe4cbae8f319131482bfd5da8076e0bc7d9169
+EBUILD miller-base-10.8.5.ebuild 3846 BLAKE2B 52626a20d18f44b159aee2f686dd95f7f85114278433e3fc5a6002d8e9fa47c22dd611fdbb54178fed99f6dee4a7c089817b6747c580d182fe5c8c2e3e73fbd8 SHA512 abe1618ccc5ce27c59a8ef0624170becf6433a5aa2e7d9e234790b6f092b941ba112244a7c16570d15c1fb7479983dedae6616b55e7be7e2e8dc4175a6a5e67c
diff --git a/virtual/miller-base/miller-base-10.8.5.ebuild b/virtual/miller-base/miller-base-10.8.5.ebuild
index 7684761..67ca219 100644
--- a/virtual/miller-base/miller-base-10.8.5.ebuild
+++ b/virtual/miller-base/miller-base-10.8.5.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 inherit systemd
 DESCRIPTION="Virtual for base systems"
 
diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index 4699a74..94bd267 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10-r10.ebuild 2287 BLAKE2B db1fb136b8077942ddb20ec61d7edc694e46fcae5ebcc5164b3f8051d54cb5573ec2b571100f8971e721867fd33b051fc76718ba7e2a2e55fa425bf7139da04e SHA512 d6a303a533b26aa3d10a6a4699a47f872047cb85765e2fa7cb704844b0feefb7b6c35699723f807d93f5622b421f98b0145c3539a0744a21ca4281e5d04e1d9d
+EBUILD miller-dev-10-r10.ebuild 2287 BLAKE2B d56f615cfda393158eb6fcb41297aa0323b7c0097dba1681f77ffb1b1ef7ee2704d2e07605bb849417a7d995744c2e755a1e769fdff9460db7100976bebc3198 SHA512 3b4ace38ba80fe5a1231ef2972035891a71630e6b924287a51d90721736676bbd6e6f1846d7e4b14b35d6de0222194e593b940b837a8b527e22d7425a76b41db
diff --git a/virtual/miller-dev/miller-dev-10-r10.ebuild b/virtual/miller-dev/miller-dev-10-r10.ebuild
index c76df02..eb783cd 100644
--- a/virtual/miller-dev/miller-dev-10-r10.ebuild
+++ b/virtual/miller-dev/miller-dev-10-r10.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 DESCRIPTION="Virtual for Miller development workstations"
 
 SLOT="0"
diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest
index dc0cf6d..b28003a 100644
--- a/virtual/miller-postgresql/Manifest
+++ b/virtual/miller-postgresql/Manifest
@@ -1 +1 @@
-EBUILD miller-postgresql-12.ebuild 227 BLAKE2B af29c2d9fdafd42bf3a1de8d9c940fcc6c9c653c51c95f773fdb2c49c654b44f12e14530ea79c7737bae4079b2006c5f94f58b0edc2bbebe830bb728aaf5cfc2 SHA512 c4c35006f15d38725ad6f138ba98dc4f3c0db940c98747738b0a8578919e373d45886ea4e6bd54a2ffa9c59257a316e8625e4858cfd440034a3105568d6af828
+EBUILD miller-postgresql-12.ebuild 227 BLAKE2B 5ed26f3be15e4d6ee2c47c7fefc3d7b7c3470690087a89a3314b009b85e44407bdf456c0f256cceef40868ea1b85d73b1a1f072c0c073516c974221ae4f280de SHA512 0a5016a06d37c25cd4b84c2d86730357906d768593c3aaa5f690e02d2ceb339e01123c89c0eac3e90d19c14539dc3237f99fefcdefe62f065f046f3d0ced6ed2
diff --git a/virtual/miller-postgresql/miller-postgresql-12.ebuild b/virtual/miller-postgresql/miller-postgresql-12.ebuild
index b745531..b662584 100644
--- a/virtual/miller-postgresql/miller-postgresql-12.ebuild
+++ b/virtual/miller-postgresql/miller-postgresql-12.ebuild
@@ -1,4 +1,4 @@
-EAPI="4"
+EAPI="7"
 DESCRIPTION="Virtual for Miller PostgreSQL servers"
 
 SLOT="0"
diff --git a/virtual/miller-webappserver/Manifest b/virtual/miller-webappserver/Manifest
index 372942d..6662e68 100644
--- a/virtual/miller-webappserver/Manifest
+++ b/virtual/miller-webappserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD miller-webappserver-3.2.ebuild 358 BLAKE2B 50eb6d7c8e2a53d88a0e687bf9cae8a4969304bf671e3e1fde51648cc256baca7328968ba9f7dc995ec45d1d4c40b952485add980cb35b21109c19f71399e621 SHA512 e833ec81c8c4ef55c6f7b33eeb7cca61053421e54336b4701671ab20dc5d6647205cb878d61bcc672a2b012d0700646d3d97e43e4c6d12dfe3dfd921190e1f31
-EBUILD miller-webappserver-3.3.1.ebuild 399 BLAKE2B c22bde96e332ad829bfe7c9b5c1060955335a47f07bf730515b7b28500490fcfad3f38ce642b2e0d2e1cae03cb61366213b00428c87f4bc2c2489fc9ac3dbd66 SHA512 fbefdaa5a5b4128e2355c3c26a73f87162c9c188aadb8827b4bf2bff144869757e6421b6539cbe81b88349f1b4f76fa3e436e9d52a2d993dd2adcb7b62c21fad
+EBUILD miller-webappserver-3.2.ebuild 358 BLAKE2B 84e8169acf739b84cda25a2b73f2ba9f717efe890be719822663af531631686646dfe64d7acf3fb9daf2b0d78c17c814de744a08a2c5fed3c2d8424bcbc62e78 SHA512 bc7e578b68fca6b3f4706950e26d92b8d1be319f15170b466002276c899798fb8d4244becbf53d0277ab827d0b2f2cf453537f0ae0b43d2b24adb196b9245ec4
+EBUILD miller-webappserver-3.3.1.ebuild 399 BLAKE2B 18506bd0196341f63d858500062aac3d42c7319fd3012c98fb922a6c83ceb8d535f0b1b62042695616b79db91885e85c6ee8102f881a910bb5f1fd86f1746dbc SHA512 be2dec93d6000c7c17fec49852b8bfe0da7536fcd8c84ca85f1c6dce85958403a3d32b0d291ecd76aa50d1c4001de0b1d1a6033f55ba2aab19b1f0321de4c3c5
diff --git a/virtual/miller-webappserver/miller-webappserver-3.2.ebuild b/virtual/miller-webappserver/miller-webappserver-3.2.ebuild
index 1d3a705..c111219 100644
--- a/virtual/miller-webappserver/miller-webappserver-3.2.ebuild
+++ b/virtual/miller-webappserver/miller-webappserver-3.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 DESCRIPTION="Virtual for Miller webapp servers"
 
 SLOT="0"
diff --git a/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild b/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild
index f87bc70..41022f0 100644
--- a/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild
+++ b/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 DESCRIPTION="Virtual for Miller webapp servers"
 
 SLOT="0"
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index 2185a8a..e8df4a5 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -1 +1 @@
-EBUILD miller-workstation-12.1.ebuild 1429 BLAKE2B e0296d67a1ed147068fa61d82a4f0a3d3fe2e7e42cc85a37fb0dcbdb7d2c7efb17dcfe26f29f40e9dc24b0b573161738ff105261721a1008a377ba0a23166f3b SHA512 d8c22b2aff671e4f8971b032ef719ed405eec0dd51841feb790b70d8156cbee7ded7e2fb1c8abb7c9de8949e56c8947c78556d942f1c0d600c02fbd0af893216
+EBUILD miller-workstation-12.1.ebuild 1429 BLAKE2B ec0b8be2e4393a116d71749083aad016a8462fa1238ee79e6dfd24df00af8813c61f57175e1e2c38fc53b842735b9b9a164d987b8178321dbdd0bc5d7a1b7b69 SHA512 4a390eeca12aabbd346e67bbe337926da8aa37a82188878dfa7f49a3f77beb4b60f3bc5b7fc483e2f6e7df141949439bf9a8607be62f8d5fda98c5456376794d
diff --git a/virtual/miller-workstation/miller-workstation-12.1.ebuild b/virtual/miller-workstation/miller-workstation-12.1.ebuild
index 2d2ad25..2dd9908 100644
--- a/virtual/miller-workstation/miller-workstation-12.1.ebuild
+++ b/virtual/miller-workstation/miller-workstation-12.1.ebuild
@@ -1,4 +1,4 @@
-EAPI="6"
+EAPI="7"
 DESCRIPTION="Virtual for Miller workstations"
 
 SLOT="0"
diff --git a/virtual/virtualization/Manifest b/virtual/virtualization/Manifest
index 085f4ca..2caf1a9 100644
--- a/virtual/virtualization/Manifest
+++ b/virtual/virtualization/Manifest
@@ -1,2 +1,2 @@
-EBUILD virtualization-0.ebuild 417 BLAKE2B aa8b90d5346072f9278894785a99cffc0ada635acd05fef2e1c2118ad24b9820c8d58aa14ddc37c1d0ec6e1496d8fc1711e3a6e5b14ebcfcd4194bbf324cfd95 SHA512 d7c4a465678ce8ac582420b438ec1f1ea6de83272cbfb329e436e0d7096452a9f497d65de98df5d817c5c4f4b3932be8aa6076b951a07bd63fd237be435d351e
-EBUILD virtualization-1.ebuild 526 BLAKE2B 76bfad0fddee98543def417d58236841a7bb6b4f0717a7f09e4f0917b1fc91cd2aae0bdd392b456ed1c226f8d70e6f9c09d0912e3329f53e68f82a621f515826 SHA512 4529c1f183d4509a19733bdd46a06dde888d9972a546f3d5643ac10f85f9d710918e06d9f77b46c1f5865d24b08babc2099e4f69ebe420ac1e80db1c259f00b3
+EBUILD virtualization-0.ebuild 419 BLAKE2B 4fd14a219ad62449f2b94d81c2d8246ab10f68972b551a9a8511595c7654c1e284a45fda3742dc0a945057243db282a23aa919ca0de7210ff1b68f7f67308902 SHA512 a9d34c357710dd0bc25475ecabd3905d3e1e9f5d4dc772484eec4c71a436a59fd680eb269bec6e2d1b30a2f8a0cd44b3944a19ae4c2aadc8ac08757c00b0d632
+EBUILD virtualization-1.ebuild 528 BLAKE2B 0d7b253434657e582ea50eec2b80590af0c7d4751ae58a147186923c9d4d3845729366578cecefaf733a1a79c0e7b2ade0ec24f5258fa9c0606d2431ad1ac7b5 SHA512 76b71aedd86ebfbe0413f76089927e7d140dcae83099a6069b64946cb673dc6fac94238f33f014ddb6aa846c78faf709e1be1f6112cd29157b34fc6f2059c968
diff --git a/virtual/virtualization/virtualization-0.ebuild b/virtual/virtualization/virtualization-0.ebuild
index 354bc63..454d34b 100644
--- a/virtual/virtualization/virtualization-0.ebuild
+++ b/virtual/virtualization/virtualization-0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="Virtual package to pull all the bits for hosting virtual machines"
 HOMEPAGE=""
diff --git a/virtual/virtualization/virtualization-1.ebuild b/virtual/virtualization/virtualization-1.ebuild
index 8a6490b..893b833 100644
--- a/virtual/virtualization/virtualization-1.ebuild
+++ b/virtual/virtualization/virtualization-1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="Virtual package to pull all the bits for hosting virtual machines"
 HOMEPAGE=""
diff --git a/www-apache/Apache2-Filter-Minifier-CSS/Apache2-Filter-Minifier-CSS-1.05-r1.ebuild b/www-apache/Apache2-Filter-Minifier-CSS/Apache2-Filter-Minifier-CSS-1.05-r1.ebuild
index 1fee256..bec382c 100644
--- a/www-apache/Apache2-Filter-Minifier-CSS/Apache2-Filter-Minifier-CSS-1.05-r1.ebuild
+++ b/www-apache/Apache2-Filter-Minifier-CSS/Apache2-Filter-Minifier-CSS-1.05-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # This ebuild generated by g-cpan 0.16.6
 
-EAPI=5
+EAPI="7"
 
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="1.05"
+DIST_AUTHOR="GTERMARS"
+DIST_VERSION="${PV}"
 inherit perl-module
 
 DESCRIPTION="CSS minifying output filter"
diff --git a/www-apache/Apache2-Filter-Minifier-CSS/Manifest b/www-apache/Apache2-Filter-Minifier-CSS/Manifest
index 92358da..267cb37 100644
--- a/www-apache/Apache2-Filter-Minifier-CSS/Manifest
+++ b/www-apache/Apache2-Filter-Minifier-CSS/Manifest
@@ -1,2 +1,2 @@
 DIST Apache2-Filter-Minifier-CSS-1.05.tar.gz 8109 BLAKE2B ea52d3abbfb3a30f93f21bf1cf9761155ca73e3e5734c47c9b7823dd9ba7efdf63204b003ba738962a1fa7efc5ca32520dca8812cd15b921d81aa80e4542d78c SHA512 8dfe85ca9324af627451db71e910508f3534be0bea43f4edba9b962269f0ed0b5da37af698f406588d163f7c380b25a1fc3ea09411bae9c945be2f189d6dc237
-EBUILD Apache2-Filter-Minifier-CSS-1.05-r1.ebuild 526 BLAKE2B b230579b0d4694cd57ae9b29a92f79b8b0c995007f3a4b5dba0b38968f309b28ece9a2458031544376545836154185cf3de5d77f8cc1938c693d3c198c6a5df6 SHA512 8eb3dcdbb77464fe9f6c2c64ce14fc960111df0a48e3f6355915c738fc7ceafb30ee659518808ff61e4737017281bb9d9e7c30802b706e1c0a8d4a8c0ab8c937
+EBUILD Apache2-Filter-Minifier-CSS-1.05-r1.ebuild 525 BLAKE2B e98569f286a93d02abb1f1ba3a4939968f8dd6167e39c017f368631db941c69fdf4be950e5efd1ce530dc0f219f7af8872cbbf78bfa5f164b7fc3c368dfe1012 SHA512 45dacece7d4d94fe6a3e7ca3d58b73a31a0efc71233f6160f1687b125fd81baf4dfbc21b8b0f16cb01996db06ee56b280746fc476a668ecae50b1bd3ff4c3c44
diff --git a/www-apache/Apache2-Filter-Minifier-JavaScript/Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild b/www-apache/Apache2-Filter-Minifier-JavaScript/Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild
index 5b0b9ae..92f6673 100644
--- a/www-apache/Apache2-Filter-Minifier-JavaScript/Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild
+++ b/www-apache/Apache2-Filter-Minifier-JavaScript/Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # This ebuild generated by g-cpan 0.16.6
 
-EAPI=5
+EAPI="7"
 
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="1.05"
+DIST_AUTHOR="GTERMARS"
+DIST_VERSION="${PV}"
 inherit perl-module
 
 DESCRIPTION="JS minifying output filter"
diff --git a/www-apache/Apache2-Filter-Minifier-JavaScript/Manifest b/www-apache/Apache2-Filter-Minifier-JavaScript/Manifest
index 1093ddf..449f9db 100644
--- a/www-apache/Apache2-Filter-Minifier-JavaScript/Manifest
+++ b/www-apache/Apache2-Filter-Minifier-JavaScript/Manifest
@@ -1,2 +1,2 @@
 DIST Apache2-Filter-Minifier-JavaScript-1.05.tar.gz 8233 BLAKE2B 040ffd2ef14cd9193b9592eb61fe4f35b56f6030ce80372e2a2a63070836162355cf75b38643ef81b70daaf82c2d73f972da1519a10e3aedee2a192160f7204c SHA512 3e127bbd1772b452564a8d8f20bd032ce910157ea43bd139b76cbcec10ffd6e2826f5a1390e99460540a51ddb74411dfe4e8cf1b683f52c2e3ed4c38732c54c4
-EBUILD Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild 538 BLAKE2B 0ba19d6e244f586c3c163cad5984fca5a189c9b734074987c86993d332979698a1d974761250c9635eaf9bf42c4be83d9df033c243df581baa0da95ed0bedf08 SHA512 c912c00390ef9c69b06f5a7eeb6b8d1f15776aa04ed377888f4d65d42bbe5e6a1b03f9c0b42a79e4e326f2ec71d5f11fd6f1eb72d1fe34de6faa9df5ff805b3f
+EBUILD Apache2-Filter-Minifier-JavaScript-1.05-r1.ebuild 537 BLAKE2B b4597e444afda1cdcbd6d5fcc432d4833fd93e28fceab02fbaf13e1e1d7556a6910b191406e85faf1ad67daa4945e3e034108f0524a6d054783c3f6182bfa830 SHA512 9d76a10f6cdcd62d209ed3d4acb93ad179c6d9c41da5f6c8de9b961ba92876ec1b9e0ce2af065d3bca437b9fb983c7126fed2a921892e8206705fae0ed49aa14
diff --git a/www-apache/apache-mod-markdown/Manifest b/www-apache/apache-mod-markdown/Manifest
index b14d746..3e3c728 100644
--- a/www-apache/apache-mod-markdown/Manifest
+++ b/www-apache/apache-mod-markdown/Manifest
@@ -1,2 +1,2 @@
 DIST apache-mod-markdown-1.0.3.tar.gz 14765 BLAKE2B 55d584c038e526cffaa7a0263c45d067c0f2db0d1b99cb0271ea0e4fe2a2c40a8e30be7902cbe6df3efe2fd18f483d6dbb2eb26eb1df8a1d102d610ded3e1276 SHA512 7ea98a69b4b9e9914f42fa4fb5eac744a02fa1ad277abb90e6f313e2a3e729de8b9b959bb45684b589c4198d0d0ef7e8ed7d1eab90cb410294b0b6e8ece54998
-EBUILD apache-mod-markdown-1.0.3.ebuild 667 BLAKE2B 2b5fafc925690d3e432ee5d41a54384d0444ae8456af10c5a9537db46e9762b7d4631fc06d3713f5f42cb11b3c84b1fed5b02c76a7451e4237cdf328c99adfa6 SHA512 ea38fd834a02e09a32429ef530c72c034c3cea57f6fe9b55806643b87bd796c4da23051ae520eae11f8d78a4bb9538e6219b2b91caa7d21daa2848184c9af851
+EBUILD apache-mod-markdown-1.0.3.ebuild 676 BLAKE2B 873cf19210cfd0c2410dd66bcae38a15e134a8086116dee054797e5740394ce2859e0a7dab97b01388fc15adfeb8ea9b3649d197b094e9cf35063ebf5a66a540 SHA512 08f63c227f03f71ca620fb99ff5999abd07cf741c80ad935bb74b4491ecefce11eca3ca92eda650aaa497ff1d5efdac811de4ae58fbea04330e2228c6975a8ce
diff --git a/www-apache/apache-mod-markdown/apache-mod-markdown-1.0.3.ebuild b/www-apache/apache-mod-markdown/apache-mod-markdown-1.0.3.ebuild
index c76c345..1be3fad 100644
--- a/www-apache/apache-mod-markdown/apache-mod-markdown-1.0.3.ebuild
+++ b/www-apache/apache-mod-markdown/apache-mod-markdown-1.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit apache-module autotools
 
 DESCRIPTION="mod_markdown is Markdown filter module for Apache HTTPD Server."
@@ -21,6 +21,7 @@ need_apache2
 
 src_prepare() {
 	eautoreconf
+	default
 }
 
 src_configure() {
diff --git a/www-apps/gentoobrowse/Manifest b/www-apps/gentoobrowse/Manifest
index 6e4f50a..c0ce2a0 100644
--- a/www-apps/gentoobrowse/Manifest
+++ b/www-apps/gentoobrowse/Manifest
@@ -1,4 +1,4 @@
 DIST gentoobrowse-2.1.3.tar.xz 65540 BLAKE2B e2b527db3e7da220ef6cf0365818059521e466892e197b43327ea4c300b986ff51da5d81137a228f183c7ea85c2b18c140b933dd34df1e937bb228607056775e SHA512 17eae1c2f254dfee98508c8c771d7963cc4d252538115f67c4cf22d887b2584b5f32f1465bc1160a8a8f6f4e0bbbe5ebf9f852e8c40a0b77a04a6cfcbc085d37
 DIST gentoobrowse-2.1.4.tar.xz 61908 BLAKE2B 192f831b2a2fa611b4a06db98b3fda0db474d6496de6486438d0c50baa06cf2d31761e11ab73d1d1046db47cd526b3d6eccfe112af73b50e49004551e46768be SHA512 4ed947aa82e9da180b978cf10bf8a7a6186a962b888a77b8ad1df39962154f08176feb1cfab6f2ba05c4cc6bd77e3846fac0633ce38b45720033cc7b7dd6d86b
-EBUILD gentoobrowse-2.1.3.ebuild 808 BLAKE2B 86885a85aaeeeec0f42f88aa1119e76ba188367fc0e897f016613e392f26ce3e42eb7639b4cb9923c6a5fbd2dae82e3999e70ab0faa2cfab6f06c15fb887cfb9 SHA512 dda24d6b0a60225c298d4671eb2613f47c494c8440b448cdadee71e6f042553678e58b16ec6a2a565c32527e9d66a27c389d3a37928fe96dba975039069733ea
-EBUILD gentoobrowse-2.1.4.ebuild 808 BLAKE2B 86885a85aaeeeec0f42f88aa1119e76ba188367fc0e897f016613e392f26ce3e42eb7639b4cb9923c6a5fbd2dae82e3999e70ab0faa2cfab6f06c15fb887cfb9 SHA512 dda24d6b0a60225c298d4671eb2613f47c494c8440b448cdadee71e6f042553678e58b16ec6a2a565c32527e9d66a27c389d3a37928fe96dba975039069733ea
+EBUILD gentoobrowse-2.1.3.ebuild 796 BLAKE2B e07892e9e286849959794db6b282737694c42b8960a825403f4f1d8cab9bd646ec0b8d1b19b9a9909ec52c75c35d11aafbd0dce1112a3706ff275b85c1cdf80c SHA512 33ed0b33d9475b08dab9c51cfdfe50a6c7833510116f4d1038ad7e48833ccd2267dc919514971e71b1042b41261f778b33234b8e8a505c0a26a0a1c663195c23
+EBUILD gentoobrowse-2.1.4.ebuild 796 BLAKE2B e07892e9e286849959794db6b282737694c42b8960a825403f4f1d8cab9bd646ec0b8d1b19b9a9909ec52c75c35d11aafbd0dce1112a3706ff275b85c1cdf80c SHA512 33ed0b33d9475b08dab9c51cfdfe50a6c7833510116f4d1038ad7e48833ccd2267dc919514971e71b1042b41261f778b33234b8e8a505c0a26a0a1c663195c23
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.3.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.3.ebuild
index 7e98aa1..99ad42d 100644
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.3.ebuild
+++ b/www-apps/gentoobrowse/gentoobrowse-2.1.3.ebuild
@@ -1,6 +1,6 @@
-EAPI=5
+EAPI="7"
 
-inherit webapp depend.apache eutils bjam
+inherit webapp eutils bjam
 
 DESCRIPTION="Gentoo Browse is an IceSpider based web site for viewing Gentoo content"
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild
index 7e98aa1..99ad42d 100644
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild
+++ b/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild
@@ -1,6 +1,6 @@
-EAPI=5
+EAPI="7"
 
-inherit webapp depend.apache eutils bjam
+inherit webapp eutils bjam
 
 DESCRIPTION="Gentoo Browse is an IceSpider based web site for viewing Gentoo content"
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
diff --git a/www-apps/mirrorsearch/Manifest b/www-apps/mirrorsearch/Manifest
index fd839d5..38b2b45 100644
--- a/www-apps/mirrorsearch/Manifest
+++ b/www-apps/mirrorsearch/Manifest
@@ -1,2 +1,2 @@
 DIST mirrorsearch-0.2.1.1.tar.xz 14416 BLAKE2B e18b091d07bea8955b1fc30eb78571943fcdfc1fb85d09c4a47e8d6018d6917f2ec091c07c01afc6956206ccb78c6618f30576679262d59c3964453c1985975f SHA512 e9edb4ff452b6cfbd40c2bb1fc51ee54a1b9ba746a7f4e2df22385d399b0594bb003d6ac10dceeb89d2302631c62e1ea044123b9f6bf95e995fe40732a75b077
-EBUILD mirrorsearch-0.2.1.1-r2.ebuild 940 BLAKE2B ff884fb419f1676842eb0e7d305c2bd8c14d257a93bb959c42e42a7b570993cf1587df628882def17dff5c58788d4b6487e881667e94986f4685a90dd5232da5 SHA512 1b39d8102384b169930d72f40fd76bbacea16ab4d6b85f72d1209ffe7e7cb9724c1e708ba0111cb31a3ea92367da46906c5c6bb827b59444742347b0cc136b4a
+EBUILD mirrorsearch-0.2.1.1-r2.ebuild 928 BLAKE2B e43fdf2137ed293a1899e0354d48a180af7bdcfb14dcd9fc028016a6441a2028618391ad8d3d28d0792407721b48d2fe4589b8fd15a0654e4257eec230e61dce SHA512 9d99382c416d45807c55ff15b6df9ddebda4940905d820081ec3e5524f689c9c5db95ba285c6ba6787737c72dbd10ff90104409741130491dd056bb80a9aec74
diff --git a/www-apps/mirrorsearch/mirrorsearch-0.2.1.1-r2.ebuild b/www-apps/mirrorsearch/mirrorsearch-0.2.1.1-r2.ebuild
index da5af74..397216f 100644
--- a/www-apps/mirrorsearch/mirrorsearch-0.2.1.1-r2.ebuild
+++ b/www-apps/mirrorsearch/mirrorsearch-0.2.1.1-r2.ebuild
@@ -1,5 +1,5 @@
-EAPI=6
-inherit webapp depend.apache eutils bjam
+EAPI="7"
+inherit webapp eutils bjam
 
 DESCRIPTION="ICE and web service for locating files for download."
 HOMEPAGE="https://git.randomdan.homeip.net/repo/mirrorsearch/"
diff --git a/www-misc/icespider/Manifest b/www-misc/icespider/Manifest
index 3ff5db4..63ba871 100644
--- a/www-misc/icespider/Manifest
+++ b/www-misc/icespider/Manifest
@@ -2,5 +2,5 @@ DIST Ice-3.7.2.tar.gz 9427121 BLAKE2B 08c87ce6aa773374871779f025108accb295e2df23
 DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
 DIST icespider-0.6.1.1.tar.xz 31052 BLAKE2B 9ee2ac779af341aad5b00998d23b95353e974e2932f934f31e211eca92eb683b1e6a238faaf230c53408813e04d8ea4b7e9a8cfe6ddcb322831bafbf5e68c31f SHA512 f3db4e30edf1bd866545eed742c214e1db666a37be28a4159cfcd9e9eda16453bc0a8bf085f0f97c513966ab21a5f4032105c6595443c33769dca8c6017375f0
 DIST icespider-0.6.2.tar.xz 28112 BLAKE2B 9064e5ce8c62a0ad4be8012891a0ad2f846d8ea6bdc975cf1fbcd592058503011af3f9382bbda7b254d199d02474bb988d4c05ae13cfb91ca532d21e0e445d5e SHA512 809ed2ab75b2388a54709d30c6be6c5b469a027db90907bf93ad8646652c65996e42b320a57c75e8f52cfbd96c75d6bbc00b4a413e17fc48e09492b1ce2ab7eb
-EBUILD icespider-0.6.1.1-r1.ebuild 1059 BLAKE2B 201d24e802c19717f9dbca61d3e226fcb21c7445b7fd75bd880da29809f8e270932b931aee55937e001b63e5d05536fa0be9604bb496277c4cd29e4557a7d929 SHA512 2c6758cee29c8b86c0680222cbc999c1495a102b0e203c9ba810660af673f9dbda46b3caca4c9f9903acd004d7016161802a800ef2af57be92a0169365600f23
-EBUILD icespider-0.6.2.ebuild 1059 BLAKE2B 0b51750f19103cbfe15f6861c4a8a8333e880a3cd0046b926e8adcfa6549f653c41600779b84a212ef9745249acd2ec72e00b67d0399a45ea910c7b60c33193f SHA512 292d359ceb793ba609960c43c2c5fa396c7112b0a14a80dd39f7d6b899e858f28d9ddcde043a835dcbfedeb8047465c897e8269a24d245bc8393719ae27c6f86
+EBUILD icespider-0.6.1.1-r1.ebuild 1059 BLAKE2B 2e003d19482d16cabe66a8ee108c79b1112fba4556432abc9279b072bd0c847713397ceeb7ef45b94f3c29f4bc63881d3e15773f6b0c7e7e86394f0f867fe9fa SHA512 a8d981a3fcb18dc826e580b99d13a29429cf62f7efe845a5fd8b75f35df2602f60828af93cb07bbf97c00f7f9c2703b3d8f29197f194174b97d14286818b79d0
+EBUILD icespider-0.6.2.ebuild 1059 BLAKE2B d81e15d0fda181f97e3452ec595ad63aa0ef85cccf17effead823cff591d748d6c5531b83bedc667a851c6b597eedf60d59a9189c159b5977d6ebb5571c891f8 SHA512 a3a80861f4877007fc9adf9e4c735e8f7b51bd2effc61fa5584e0df0bbb897f037a82bd66342f3246a19efdd07a59957de097d066de957910bf445c95eadf6e2
diff --git a/www-misc/icespider/icespider-0.6.1.1-r1.ebuild b/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
index 86bbd00..c231948 100644
--- a/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
+++ b/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam
 
diff --git a/www-misc/icespider/icespider-0.6.2.ebuild b/www-misc/icespider/icespider-0.6.2.ebuild
index c722ce8..eba6309 100644
--- a/www-misc/icespider/icespider-0.6.2.ebuild
+++ b/www-misc/icespider/icespider-0.6.2.ebuild
@@ -1,4 +1,4 @@
-EAPI="5"
+EAPI="7"
 
 inherit bjam