Get tests building again.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 29 insertions, 21 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 7e2cb2d8a1e7..3bd20d1b8a14 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.291 2014/08/05 09:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.292 2014/08/05 09:32:43 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.10.ebuild,
+  e2fsprogs-1.42.11.ebuild:
+  Get tests building again.
 
   05 Aug 2014; Mike Frysinger <vapier@gentoo.org>
   +files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.10.ebuild,
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ba0a0d70cf02..521952de65fa 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -22,25 +22,25 @@ DIST e2fsprogs-1.42.11.tar.gz 6353078 SHA256 4bd8a770b6925c3f4ec5dce82c55774e456
 DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 SHA256 8bf16f0634e1fa357fc2235f22c619328c10f8d37ba22d75889ab6a1309c5a14 SHA512 cad0f30208422b49221dca0c8c31287f011b2f7a992efa265a53220f6304e0f81f5214ca03e3b885963462f5618257662f68c73b342fe9bfe4d2c27aff1722b6 WHIRLPOOL 8ea704eb90382e405092fb03564b9a947be0139d4dd09974d1838e1525c5cb5ecb976a3789c6a73eb83f3c817731ee7d5fa9d8435024109580307749a1cbc83a
-EBUILD e2fsprogs-1.42.10.ebuild 3686 SHA256 5bf49dc2600af472e87e729831b2b1568ebf899ca77766a40ca13b4a2f0ca78b SHA512 0f179953e83c568887f29d5bccaa35e30cef2320cc2648701652c0532993e1585ac168b39193ff94bbc8e0b7054fbaa830eda216fff8e7208b90fbecf703be47 WHIRLPOOL 24ecf7559bab9827d362633bf8e31c80998c6e7355c4cb8f9e0a5f1a8983e32f5ad6cf54559d31bb9e6fc6301851fa90c3dc5759f78a3b68ab3882dbd6f55679
-EBUILD e2fsprogs-1.42.11.ebuild 3856 SHA256 92367a433077dbebd865b772123f3a4763660f6232ee96c15ac6377a6b877758 SHA512 bcf64b085cae51eca6766ad0663e3bc6932cb1921fc391e2bff2710a18e05b0c9b6b9e460d471e5cbf026f72b72d4704259ecb67431c6dccb5d14e219b86c7a9 WHIRLPOOL 40005286265245fd08109a95f8217a33c5a1848e9cd43b97c1a54233f62b26fd354df0cbbe4b3999c0c8dcdf0ae07d88c50d2da4863c8d429e4bd89e00cb2505
+EBUILD e2fsprogs-1.42.10.ebuild 3757 SHA256 5f389f444072ae821169944239fd188bab37ff4b2b8df82af39b5d5b987df5c1 SHA512 d23fdbf0ea3e4efbf1257cf2a50a1026b0bafca09c368772ca602f4532ec62967d0b1f9c315dc11c7527976de1c187476c517de3046a536b7930006c57e8ce37 WHIRLPOOL c51bf2c61d0c5717ca1f299fd101eaba0d2d2abe688e275f65eed27a09cad55f435e5f3e1a94334cab0c64d35da6d8c399ffafc206b6adaef57c3a7eb1c3e873
+EBUILD e2fsprogs-1.42.11.ebuild 3927 SHA256 ba3c218b98ade04c4d98dd74a457c811e2431ccf812af6810354adac1f6c9c42 SHA512 03e339cb7def10323b7d0b9d82ef53ccf78afc09ccab71112b613acfc32e077aed8d31c0c8f1bc18a4aadfc1c894ec1431b72ffa62928b96bfcd7917fb7d65dc WHIRLPOOL 68e9cc8039d15940867b961ee8ba1f6b9afdf005d4f6ef27a902ef1b44205d7270431bf77f384604a8be3631db079b7be7ad98d1b7b72f1b1676f66fe1f06a27
 EBUILD e2fsprogs-1.42.7.ebuild 4352 SHA256 3a94e1adf66909468588c7c9ad908abc5dbf7e0c70f8da277e7b1f0066c69d9d SHA512 97df9b66620fde3242968e507da4e9d05ceb878abe7d01291d7198eec481c8e7a60869dde11b595d0d392bd5184e9b336fd1f831aaa563452ea9a98ebe6e4a8e WHIRLPOOL af0744c81d58e4392011266776839d9def671cdd8943ab74cd2e99f2f551a3924d0cf4b50d4163d7ce592582269128b3945516e8cb3551473220849dfc73e471
-MISC ChangeLog 43595 SHA256 455b4401538e20a0a9e3c52a9f3c08a6e332caa52a1f0bc8152aaa2c8f432f36 SHA512 cba5ae674e4c5c6713eb4b5d7d5b366936e6b4351e9442496d97d993811d875f84c71d27981ff72012edf1893f299e62a86ad6625e4aa69fc0c8c21caba1bfd1 WHIRLPOOL b16fbd3a3dfc8f6953c3d8aa2d9114ec1bdce3dc76510fed6cab5a9d7596bbe93ee3615d6468757c628bbed9b51a77596897e89c2d5492b3d87165fb728173fe
+MISC ChangeLog 43728 SHA256 3084ee824a0e180912cb0d46f8014d5a2efb7797f8b374026f45f26aad87f4c0 SHA512 4a49e54ef15d61729b1f1857aa287fe149c38a1aa406517b7ddd75edde1b674cb4bfe186022e7088b00bd9a51e1e7d670bee1d0105cb8ab0040312c47ee91717 WHIRLPOOL 79ff913313a729e2b5a074721afd52257c13ce9dc6e938f5d694b596da3966438064dab8e914a6bd72bc5d263c67ee23d4e04e50e0dacfb5ec85c8d9dd0e68ce
 MISC metadata.xml 267 SHA256 b88609559861f59092d42a34388b78e59a1eeae8324a6f79c94fd24598c2b5a3 SHA512 979da7eb8495724d938e6445cc7878b2b484373e750a82a48cdf11b6e46257a1c1ab1cd85b08b854789ffcea5c54120cc5aaabd2f830cce2b2d0bea9de7011ee WHIRLPOOL b671ec8a7c10856e977c7cbb5b7d55b8463f0cf86ded627d9407e1099e376d6381c1a23ec5aabae788419db3187b6737f008ea7c6f2ed714c8dce2d773b8df4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4KGQAAoJEPGu1DbS6WIAn78P+wdx2fuvd+LY/dAJ3UL9Nh4K
-NXnjsFSS0Z5+NIQDShLcgUReBy8G56bvOB8OaQW4UaVfaRjtFFvDQACb8fUwmJrF
-2zIq2kkh6zsnAmEl3Q8dvDWGXpny9STak4gDpeO/L6Wlrdhu0818qAiGnoeXmnun
-9dDWLjmScZqGQubbEWQAHTuHPqCGt5iS4gYOSwI/LhfcYI8JgaL2Hxp8kYlTZQmE
-YCtBPF18gSQ5YhHfxvzqSHMooQxbVQ7zarmBDUjyzxz+HdsjI6EGWu/6dbLJpToY
-sBgliRj1/7KECR9bCzutVlIwaMnYCtvocq41dwTgWieLtdDF1QXEDTOs96IordbG
-oGd7WYqNTmWtnoWFHr1KMWC2B2/enxD821NOacWzPhIWQqiOdXxVSh4F/G7uZCLY
-a+OH7FcNEL3jkEqYCFrO1nUeukVxUKps9CkNznvyr1E3I5+vml6HEktooOPzWenk
-edD3ok444bgRdxvpgI3n7GxIrtMXOOyPsPPJ3hz6TxKbNb8E4lVMxiURgilKL1pa
-z9ffWphgnfBNcPRv5p+j4XV28ipknlfY5Wkp1SWWw+YL3rI/3w69D9cFOXF2V8Li
-eJ91AFQkCfipARWRpQu9KTkYffyDkNeZepg2SBBxzV9bo0Jw6fEnqZIYq1s+xKbO
-cn5pZ60IVOZ4jZ88m6lL
-=C1zQ
+iQIcBAEBCAAGBQJT4KS9AAoJEPGu1DbS6WIA2i4P/jqngu/gHiIaN6V7jPwoAAOG
+6w8iFANOtE9mRtFpr4ue/CHCljx8gWJSuebJ853mN8Fs4QhwS9B1JOZ542J/FAP+
+I3YLZ/z1Z9EGGHtZQSlA3NsNM/fZGtqsB2Oyi2MFF1u2f66tcXglVlvUngj/yvoT
+8Z7YEUKsROu0w5FGs9ESpZQovoNZC/WzmWZBZw5tTJht6yj8s1cLxrzG6m9Np90n
+rJglQAdN88Den8GGRnH3hBLMK2xBqd0Jth3CUGnAdVBaZmzVOMdnui7WiQsur1JO
+ob0XiNPWkYnnsu9Ur8v/EfdpVBWLPZuWcuTMQKDh0LoQkrrdbaoq1r45xheYqBtB
+Z9w05uizNc5l8NsLwCCUs4I9bFnmiS5elgZJ5dy5Snopibrk6I7hSnXXX71/TXhR
+NA9Eor6qWZvb9UhDUiL36NXBJVK7DxEtG+10OVUCEMC3wey9JSIUDzFgli/NaYXl
+knPR9UMrrIefVybzcAybm1bj8OHMfb1Afg/ACQrDZUqyuKn5KcaeUxFfDZB4p993
+9LvbZtpF9cTo9x+VXG9MLEiJojP3Usqt5E2iW/j4qZnmWfnBARNx9OnXiwmyEa5B
+EwlHX9EBe6ckSGUJNSyn07EdkAmNVuPM7tc7aJam2KHUXp+U2wJDUyzVlrt56HEY
+vCz2XwizhprU686LMIpu
+=Oh7k
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
index 85b53b76b1de..ed12406e5d34 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.14 2014/08/05 09:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.15 2014/08/05 09:32:43 vapier Exp $
 
 EAPI=4
 
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
 	epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
 	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
+
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
 	sed -i -r \
@@ -45,9 +46,10 @@ src_prepare() {
 	sed -i -r \
 		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
 		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
 
 	# Avoid rebuild
-	touch lib/ss/ss_err.h
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
 	eautoreconf
 }
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
index 3e077f8e19ee..07f36a46ef02 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.4 2014/08/05 09:01:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.5 2014/08/05 09:32:43 vapier Exp $
 
 EAPI=4
 
@@ -39,6 +39,7 @@ src_prepare() {
 	fi
 	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
 	epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
+
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
 	sed -i -r \
@@ -49,9 +50,10 @@ src_prepare() {
 	sed -i -r \
 		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
 		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
 
 	# Avoid rebuild
-	touch lib/ss/ss_err.h
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
 	eautoreconf
 }