Workaround ABI settings being put into the environment

4 files changed, 6 insertions, 4 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 3a8a2b8..4e50a87 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -35,9 +35,9 @@ AUX restart/vsftpd 27 SHA256 75ecac8ca02bf650883aecdc5e8d7d4c233ad1d96d4497f9913
 AUX service-check 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289
 AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966
 AUX update-autoshutdown 88 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 SHA512 0f2480fe16ae69279937cab620fa2a4764114659759654b63e844415ba937e1ede8aa3974979c7adec3b8dbb8bf2f68eb80f7da5c97daeccd69df28e8fbf0430 WHIRLPOOL f4619f0bf51faf9d1ab572f32c14b7fc9dec1b8b101f78e8c80e7fa3fb3832567dbeba462f4f27490a3398916aa6f08e1d7e66d69ed4b43c68451bbf15187e00
-AUX update-install2 589 SHA256 f58dc2f6f7c2b97c499e523acc634fc7f450c62ab61d569abd5169f18338a5bd SHA512 0d57be0c17fe06353fc67a1a82711c9d11c7cae5e1b2f1cabd4d9116f9ffe45dd9a0e435bed7dee050af77e415132890dd055ff31c06485d503ccf104122400b WHIRLPOOL 67e55a5c945e9ac83d9c32f2cde6c6b1dd00dd16b00c0f1c210ecfa61cd43e1bd83666cea69c0f6da97ce811bd6ca44ffaf85b23d66b2a84ec6efb0f513126b7
+AUX update-install2 606 SHA256 a1e2b3de4fccc10be1782cb9193dd4c164a714879c1a961452f2b9f46ce19c9e SHA512 0a59330dd46ab280fd997415fbd91f0a8947bb4d49219309485b06988ff17be35268cde2e6065778397d5443dc2df77fd0f5ab17ba9159246148d7cb66f00dc9 WHIRLPOOL c83e9519ebefb4c55b6dbdbc7199764f24418fae4f301c67e0fe3dbad61d9e4a8049314fbe5551d94c98c78b5b39f187e5702145b06b8245216e8efea29efb65
 AUX update-kernel 838 SHA256 5f751d3a567251f0e31134fe18fae7fd1386f73a750061e400a9e4851d1c5432 SHA512 666f0f2bbb4511a70e8b1d8722b8fdc397b46297bdea477ebc5e4c5b0d3f96ca498d90daee6de80302f96386efb7ba96fa6ffc797068fac87d653536e6528c71 WHIRLPOOL 4c9b0f04f77d0a8773358b49d09e2c602deca95a8c91eb2abdbbac9f14971acd1f3861a9d9ca55f7b594d642e08657070ce5095045276ea36310becb9a754e44
 AUX update.portage.cron-2 160 SHA256 7071962974cb5ea9764a83ae7119244c6f26307bec13b962b4f8dba179e89d88 SHA512 50b93b2ab2f0fca0dfa933852a09d1d88d7c9e68c8194e70fe077f44bfab38e7460c8ab34f71d2208770aee8995de2e656985d71da33094032cd36d78d015c11 WHIRLPOOL 1586ef9bc5400319b25eae6736028bf461331de3472a4a1255642c3a6919c2d4eacf36818a11988d80daba1f63d571e319b205baa3f687ce8cf6da3c0b449dc8
 AUX weekly-av-scan.cron 272 SHA256 002866cd461b9452df5aa6cf22ca76a12b4be1d918aeb379a84a09267d84a481 SHA512 725d1813222819fa3b455bb3eeee16fe22106e252138d49f83003e5ec3fdbbe9529df47a9c0d36959ad30a0e8a23e087aa7834dd3724cb9b728203e21a6de4d9 WHIRLPOOL a1c2433dfbf5aa70e9cf3f358379d6ff9776dc31582409b6f0dea98defb1d072fbc071586070330239c3be9a0d630b97f9073cf13be8cea10fce15de1c916c5f
-AUX write-new-updates 228 SHA256 4bb05b34e98686d949d686de00cb0e938c2d4d74b03cb6eb75b2e6ac699f7483 SHA512 08927298594c09175ccccbb67c8f3bb54e00e77532d79e9a28e793e0d83ce9bb5924d33403301376bd085e5e6653fb4dc9e3b45cf7d666aa42a1cdb4ae1d011e WHIRLPOOL cf62f39cfd54e91ae5371a93a8174cbb58b7855d815e6ebd9166a0934b37f7fd0f58a9fe06dd577b0faa9e9b9fff033339fcdf1e0c5704f11e4ff224d567ca42
-EBUILD miller-base-9-r12.ebuild 3541 SHA256 d615c057c15be056043559292fcd8a9fa2b81ab4d71796699677d0abd24aaaed SHA512 6b83195fad6d3db6e0ef3576ddedc09d3f95d346f39cc798fea15373342457286eb52662818f3da337d18ac2f4861f0cec951f0b925c0b6e266132e1757ef690 WHIRLPOOL 214fc13182760adcdf3e1b1c6d71a74f0927c14e687304ac82a9b21adf041754773503ae3a5a4a9e1dfad2e34c0d8ed71704348771190c735a9eda188c21db4d
+AUX write-new-updates 246 SHA256 9edd236f58b30b26de7a3791b2481446d6f5e8245763478a23a9fe3a4e5aff88 SHA512 98093601121bcabd0ca6348660a1c4c2bf0eb175a6c57b6b851c1398a5d5a4ab8d7bcd0308f9ac594ed3c1f6467a6539528a305f78fbc6c06ee5079b209174eb WHIRLPOOL 84186d65556aa9978f82460355b00cf94062d64f57ff476924cf66d619bbf9f084d560f9df3f810ac1f52e5bff000b55ffb05b21dc3cecb331b379ca8b721ada
+EBUILD miller-base-9-r13.ebuild 3541 SHA256 d615c057c15be056043559292fcd8a9fa2b81ab4d71796699677d0abd24aaaed SHA512 6b83195fad6d3db6e0ef3576ddedc09d3f95d346f39cc798fea15373342457286eb52662818f3da337d18ac2f4861f0cec951f0b925c0b6e266132e1757ef690 WHIRLPOOL 214fc13182760adcdf3e1b1c6d71a74f0927c14e687304ac82a9b21adf041754773503ae3a5a4a9e1dfad2e34c0d8ed71704348771190c735a9eda188c21db4d
diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2
index 37edbc1..e79fa02 100755
--- a/virtual/miller-base/files/update-install2
+++ b/virtual/miller-base/files/update-install2
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+unset ABI ABI_X86
 eval $(emerge --info -v | grep '^\(EMERGEEXTRAOPTS\|UPDATESTATEDIR\)="[^"]*"$')
 updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt"
 depcleans="${UPDATESTATEDIR:-/tmp}/`hostname`_depclean.txt"
@@ -18,5 +19,5 @@ TTYTEST=$?
 
 etc-update --preen
 if [ $TTYTEST -eq 0 ]; then
-	etc-update 
+	etc-update
 fi
diff --git a/virtual/miller-base/files/write-new-updates b/virtual/miller-base/files/write-new-updates
index 20a5bc2..7b9b6cc 100755
--- a/virtual/miller-base/files/write-new-updates
+++ b/virtual/miller-base/files/write-new-updates
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+unset ABI ABI_X86
 eval $(emerge --info -v | grep '^UPDATESTATEDIR="[^"]*"$')
 updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt"
 
diff --git a/virtual/miller-base/miller-base-9-r12.ebuild b/virtual/miller-base/miller-base-9-r13.ebuild
index a35da9d..a35da9d 100644
--- a/virtual/miller-base/miller-base-9-r12.ebuild
+++ b/virtual/miller-base/miller-base-9-r13.ebuild