Fix compilation problems

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 41 insertions, 19 deletions

diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index 2b865df49f9e..351084493aa2 100644
--- a/sys-fs/aufs-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs-util
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.46 2015/04/20 07:53:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.47 2015/04/20 08:25:13 jlec Exp $
+
+  20 Apr 2015; Justin Lecher <jlec@gentoo.org>
+  +files/aufs-util-4.0_p20150420-version.patch, aufs-util-4.0_p20150420.ebuild:
+  Fix compilation problems
 
 *aufs-util-4.0_p20150420 (20 Apr 2015)
 *aufs-util-3.19_p20150420 (20 Apr 2015)
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index d09cd2c2b3b9..079b871c7fc9 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX aufs-util-4.0_p20150420-version.patch 369 SHA256 a170ee4aff98b62fd86cc1de29019303f705d009ccc443f64c1bc12d89681462 SHA512 0ef48129bee4a72372f82e3c3c73379f0f4e55849b3ce2c4ebd930d688bc3878c64582765b5e1dff868d460e5069b9263b3ac998e6cd00fce2b3cdbeef79ffe2 WHIRLPOOL 3f6d90a90a1cc0f73515a32f04926784738f35be383a03880bf269d65994556d3535386978bf8e62be60d17ff7421fb97c544da593bb19de22dc835c0a8c8e35
 DIST aufs-util-3.19_p20150323.tar.xz 97980 SHA256 6a7c342f7cda2abd7ee0eb20c40419c7e34a88cf73d77f4a9a697370a996fe7d SHA512 49f138538ea8997ddb6bedf368815f16a5d42a49b5f72c1548cd9c3718bb00831224e80e9b4dd8c984a6fb40b11223e317757020076d432117541f7d361b892b WHIRLPOOL 59d65f468bbb36ac11f200e45d2449549512a1b2168c4776764a540d22d919969067b551704d55403111a0b68364831152177dda8ace101fe77e158e86d82d25
 DIST aufs-util-3.19_p20150420.tar.xz 97980 SHA256 2ab7f16ee4a67b8ac85903da2e2f6569c8659ee217f060923ba93865a3ff212f SHA512 fe329e9efdbd7b585664b81c2bcd2d63ce5344d013eb2d76c6247e042c1cbe44a4a3ab6e8317734c06c24c1eeffe438d8f91a8e57d95b34e238b21a8b9389e8a WHIRLPOOL 0d3c6aa78e9ecbbb2cabbcddfbf7a9edd1d931b5993047e98f4eaf20e7c60c0077819a2c0b7d0f2e3fd85f6f9eedf86c17c508f3437194e2379295d94e1dc62d
 DIST aufs-util-4.0_p20150420.tar.xz 97924 SHA256 f6d19dad3729da05af9e283e48a4a573b7e00e5e822aa1741e0c225e69171fde SHA512 9a988dcd3640e4797c731ab921161bccbd125fc23475e39681b3a398a238715cb85ac8fe8dfc64053af7478c8c33fe28b7e8cc3a2f97eb31e3c4049305043085 WHIRLPOOL 50baac4fe8bfcc750038e586f9dc3fd2d819ba485951e624c0b07c95c81000fbe7c0b70cf55b61667be7210dff328290cbf95a198680e59549c31c3979d2c471
 EBUILD aufs-util-3.19_p20150323.ebuild 1125 SHA256 4e1876d1f4abcec47b25a310df9ef6b224d22aec6c1af85ab6cb9b10e204a177 SHA512 fe01d5d2b17f4625be1a426af2a17cf09ffb1b2baf22e1638aa7fcbb7d7013dac8a220b675546af1cc0aa97197041afd6d998dbb1303c68355c922f2def02201 WHIRLPOOL 260e6deb9602aa7c4c5e847d8f24246c7f046a8e7b8c66e114d25fcf9b20c27ba95b67c51bf2de5af21603e4ad6db27e18416a26f81bb053c66f0025537bc7dc
 EBUILD aufs-util-3.19_p20150420.ebuild 1125 SHA256 be8ca69849af2efeaafae6f55e801ea0fdabf32e2e356b5684331be3741e07d5 SHA512 d653860e2461f16418ef45cbb8c78e0db51ba02222cb27a2db808607fdfbf9e95aaaee14f298c035c7de92bc20276d23148ea020f9ce60b76c3856ea4df2e2d8 WHIRLPOOL 03e98f8f16eb2821534c1a44bb3ebef65ab47b90df5e7fb0e5f4f8f0a1f733f87f8c0bfed10ed3c675dc10226497b51e8a62f2dd48449256726710cc6fe09e2b
-EBUILD aufs-util-4.0_p20150420.ebuild 1123 SHA256 17ba308606d1122e1991e3388371bb6174b54b16726b8f471f1c63e4ffa593e4 SHA512 f8daf06ab0cf21132e358506a30102a67245714b001c0ecfec3d483152a6aacc27d815a1b6d2dc2a4c7554ae41e4f26444ab4d7921fff200f456ddf8514a0f07 WHIRLPOOL be1249f95ac1999ab43be05e50a8bccc831435b9d76b25559450eeca491c8d28c806c3fab40636b411f10fb7300e6938f1f06345cfd13c1cb81f888a5a93139f
-MISC ChangeLog 7512 SHA256 14fa6cfe2f5001664faae17bf08ee51dc80043152946a20174bc075156b609fb SHA512 266ddd8a14544eef6c82ac39a7b1f02d1a45a3f02ccf0f6d694055279b0561734a89ca791eec505ab34fbc518b8db524ae7394734b9dd371852445e8e8525f05 WHIRLPOOL df2e21f736b7eaa3b7498b15255185bf8ab554d136e8f1f3051166e16186fe203b2e488c9a9c92bc6f47429fc39871ca64bf22f1b046ec4bc40c5d6b15226378
+EBUILD aufs-util-4.0_p20150420.ebuild 1171 SHA256 56f9f7e13bdc7aed80782b1083344464ed621848eafbbd822818bc44520d1e2d SHA512 306cb69e78dc89d21e02be4fa94c997c40fdc61d087317a93c799711e2a08ce27a4f38860da9e9a3c317916923990532e53004857cd8fd8ba35dc35a79b76e54 WHIRLPOOL 4e528009f1cbb16e94a8baec29622030c408510566914e87b479edd47cd05614dfcd849f8e011acdbaa76b9af0b1b2ae7b1439454d9ac21402977704e7a54de9
+MISC ChangeLog 7667 SHA256 83a8337e5df8b0cc8f32e075ef6e50c5d25bdbace6e6afd92b896cdacc51799a SHA512 7195f931b364b0dad33057dd4a1da19bf154705d90bcd9bd39d9885ca7eefa2112e1f7ccbb144da1c12a31d8dd4c04d1e63f82ae1497982740b954908d54a37d WHIRLPOOL a7e0e76afb2170036fabd6f3a861d60feedb4bf40e6575bcb3d4e93067e0dfa6e41d045a81c218891c0ced429fd02cd2a89edebe114844635f89e586b4063bf0
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVNLBiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVNLfpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1sUP/iJi6PcrOaRJN6F4Ue0Cc73M
-P6PDGKBJg36a8HlPegu0IStxSuRas4uT1i6p7eCYx3u/K8ahgPvBlEAY7QSGp44N
-Qier2GpFTJspSKRPeOL3gc08a+eBUapxyXn+G25HZ6OXZdMJ6P7D3/5vXaDYTQ/r
-sdU6KlKrDMNTwfkghwnJgnGQufoXKk9sRvhIm90ItIUhv4UX5Kpc8VUZGYoWqxaT
-wtUI0mHmP1oe38npnX4ANg3M4rvh2Navn13HFHpcjvvutZcSvF9UEjYNWMrsN/Ab
-aHWjReKVx1mhjcX8W8044zi/cKk1x2RG3eI2lTDgxJbXxrVnmpkHY8WI4HM+p5pJ
-fD34xcWh2Au22X2kyMGo9GjDbFimX1ZOVGn2kuuJ2O/8RHnuUrv4HKp+Vdi9A2a1
-EVJ+zDv7j02GkHSl0CtutgcJC0iGZ06N05Ot5S1E7GLZQucRpml1NmiYIfuCaiAc
-Sl0vwtsUult1/AKSyLBkg0YmDN6ABXXRwTHpCAO2ZBRgXLy6zRFssbKCj6kbQwKC
-m1RpSQbSDWuWMbUYufvyCORsIlzCoj2VbWVd6QJBQCMv/QO0/b1/MVuoXttvFZdr
-BEs7mPXtxxXKP4PSmfr1qRxz8CdNBkBxC4/gv4Bgqys66lgAR2sgAT9neKYTp0Ox
-1kVGFby6cfINil2LAuIm
-=U/P2
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViraJ4P/iiMCdb4j7v+hAH3PuvFAqD9
+CaAbQKPBLIavHMcABfQdm60e5WvWPxUSdZ4CI4cqJiaEuvPvVrcu8QLcCXXz05/Z
+GyPGx2+aZVeF5Zml8uw/bfmhXitZYS7hKINYkU14BbccfodGKfKRTQuO80qxsHAc
+5SrmhxpQIhm0x9U4d7QdOGhPihfd7LUrxkKvy6RauWI6WEL+daC5APO2fYOMLQuf
+oyQx+zCEUVpeLk9WDfzwGJlWIXCgFmuIo4MB+9+/czO7sFyP395YZPL35XgZNG9Q
+vJgA6iexC5DRMpWZieeEsOMBquHnxmDEPkWo8iOGYkWgDVXSlSSq4vlS/JYOueAS
+lHypvARp96yxpx2BsRFMm6P4hBFD/SVU38o/IfdTSDCoytY1kOgwA9+CGk0CMIe0
+llDPtpGC7flet5mqBhCqkfYE2W5Dm3GkYBXAUMOygymTnSuFKgHeC+J1DR8FRdv5
+G15Ygz7CSnJTwmJyswas+AVo1EgqE0+GH0K7bs4WTbTQX/jk3UmqQr0/Te3Eq6LZ
+rDNTec1bJX4PPH4xJhb/igaPRoFkSZxtiDJ2ynhM43rCKIKQjLJZWy1kcyqa1R96
+0vRx19IwGmplazerraPdM5ehCAewP3k12Lf5H3dLzUWpWQ1N/8c74bMk9HKAy3gy
+wT3vtKnWsChpgLPFViiC
+=BIDD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
index 32d0170720f8..b8c0a8c8e3ba 100644
--- a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild,v 1.1 2015/04/20 07:53:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild,v 1.2 2015/04/20 08:25:13 jlec Exp $
 
 EAPI=5
 
-inherit flag-o-matic linux-info multilib toolchain-funcs
+inherit eutils flag-o-matic linux-info multilib toolchain-funcs
 
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 	~sys-fs/aufs-headers-${PV}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-version.patch
 	sed \
 		-e "/LDFLAGS += -static -s/d" \
 		-e "/CFLAGS/s:-O::g" \
diff --git a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
new file mode 100644
index 000000000000..b861bb2bb0b7
--- /dev/null
+++ b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
@@ -0,0 +1,16 @@
+ ver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ver.c b/ver.c
+index 200b119..38abdd5 100644
+--- a/ver.c
++++ b/ver.c
+@@ -25,7 +25,7 @@
+ int main(int argc, char *argv[])
+ {
+ 	regex_t preg;
+-	const char *pat = "^4\\.[0-9][0-9]";
++	const char *pat = "^4\\.[0-9][0-9]?";
+ 
+ 	if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB))
+ 		AuFin("regcomp");