diff --git a/sys-apps/abi-wrapper/Manifest b/sys-apps/abi-wrapper/Manifest
--- a/sys-apps/abi-wrapper/Manifest
+++ b/sys-apps/abi-wrapper/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX abi-wrapper 779 RMD160 e16fe52ed4222c2feb237cd9f0e49ae3e9ad2caa SHA1 5ba8f7f9fc8d7544a21d214ba025ae46f9a91cf2 SHA256 2aa383dbf31fb6abaab14d3861d90a0086ac8cc7548cad363cf7a537b9997b17
-EBUILD abi-wrapper-1.0-r3.ebuild 474 RMD160 1f555f96e9c8bc454b408c3795a939dfab2f73e8 SHA1 81e1deef575b7f11829018e18f13775a08e3de11 SHA256 340b608295e960e8ba5a341ce35516e8814ceeffb8aeb115e099223baf6274b2
+AUX abi-wrapper 784 RMD160 efd5bf798a91cdc2f2fb4fef2cf10a66ca6dec74 SHA1 5d42071135ccb277ab96b327f5f9fa2898aa1863 SHA256 8028833a6312557aae10927858b95a25c45844d54844e3b93d1966c0782185d2
+EBUILD abi-wrapper-1.0-r3.ebuild 474 RMD160 0dea63e423d9afe6f03526fc291d6b8ed78b8861 SHA1 a4be2e1205ae1fc05f6c76e4dd08bbe059d4d4f9 SHA256 7e8ad7c27d54da87366b9535a2207082d22ad5a1085e2ddfb18791ecb34c5a6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNH610AAoJEHQ6UuhrqBBQumQP/iwO6xu6OMsR3jxk/2ZdbcPX
-zDKdHPKZ54KFSH/Fx6u8cdR9+NRKgdQjC+iqQmZHcSSg1QmF05d/zszOCx4RVMYp
-yiSV59EUr17suGG9SrLJAZxx8DD9HYkCsfZLWhWypQnfLOGMiC9zpB5uM6HMUTNU
-qLiFzJeoX4G7VmP3hdcrq5sY7M4w6iRFJJ8STvx9pvOImKvSnZMqKosBXCv4AWjO
-H6+1pGONGuEbGThtyRlj1SU5rfKSg7w9iCp6JPVJ7dosU2ClE/iMiDyLJf8/ouYv
-rGPC3N8dj9NoJDrMdaczXY77lYcjFw1w4P5/GB1r/d7STE9HUjjcZITnVZqv1KxL
-IQrGcFBUBoV5FWfROgVN1HgbR4AngkNPSgqwgl2mkQHGb8VczbOB2yyEdbA/N+fD
-Hjrr6nvphcUYVo7LRcT1s8JlyrwxKLb1/ZhDGTQey5CV/nvZX69ZOo5CfbczWtms
-EvBqq99YXxQ14dDKbd3qimi1GO2LWNq2DDee9wCiGOsQcvZTL9JWEucJ5iiP/jqG
-gDBg9Yviday6QcPI1Y3hnUFkSDYW/i796qppssV59CBczBravCT7NfiLXOa+ibrr
-U7o1rofZ0C74hSmcLiUkIglbQyDSrhpQfM/ch+BKyNPzPWOavY5NKOV5gFQbUvRj
-OQnk1MbgPsuFVTIXRp9n
-=+GDG
+iQIcBAEBCAAGBQJNH9h6AAoJEHQ6UuhrqBBQ+cYQALWiQVrZUWToZKIZUlhMLhOp
+6Aw8mJomwPpxayyQSbqiHaewcrxLrVCuIAPr/UmREhYM9TzHVD1iNhZbFShilS2m
+kXwXjks8he+SqS3z0NAs9GMPyRJqBykAj/RvTwtUrFwqDJ/Pq49kblTiNf+f5aZx
+cMAvHHdSR3ccSCvikdlxZF428XF+AZcqahJcxkQmoMKU6SwWYxvHCEwqKt6oFqRb
+keXYzSP04fpzYPxSqA+lcJU9o3jxh8WO9fAgdsPmikJOd5kEGyruWHmdmuAu7Zca
+8BHA2MWNyqL6x4QHHkRUsFFd+IWitwpxTA71Mq6AARSRcveV8sysTSscPB4nB6Nc
+8baiOWkAZ+/OmE5AtlrPigyQ0cp1pFBpckhSkUpqJG80B0T+84nHdcT1vJhbUSLp
+F9CKB3Hsri8JLLNZm6qp7sNKpQmXFJs4PUUhKDHKCDm13zIQIrK+tabq+86Me7f7
+bbDULm4YRDiyRzyJumG8+ab6my2yZzlXP3ncq29ovh8/HLEFQKoWIcYnu8RYOxDr
+c7sul1+yEeq8pnChw2EjrCxDm4QR5TS8VUoz7ZplvZOeAsrzDVMf+hlxLvhVz8Ig
+UH0ERb+L3aKvAzAKbH3nAw62E552nhbtN0ik7hbsKPOuny9vEcBq4w+n3xElyosX
+o+otcGru5Xmz2Q+6frAO
+=ejsr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild b/sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild
--- a/sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild
+++ b/sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sys-apps/abi-wrapper/files/abi-wrapper b/sys-apps/abi-wrapper/files/abi-wrapper
--- a/sys-apps/abi-wrapper/files/abi-wrapper
+++ b/sys-apps/abi-wrapper/files/abi-wrapper
@@ -3,6 +3,7 @@
 # Please be careful to keep this file sh compatible
 
 hardcoded_abis="@HARDCODED_ABIS@"
+abi=
 if [ "${ABI}" ]; then
 	for abi in ${hardcoded_abis}; do
 		[ "${abi}" = "${ABI}" ] && break