[xenial] 2nd round of build fixes

shiznix · Apr 14, 2016 · 7bd9d6d · 7bd9d6d
1 parent 8d628cd
commit 7bd9d6d
Show file tree

Hide file tree

Showing 29 changed files with 123 additions and 38 deletions.
diff --git a/TODO b/TODO
@@ -2,6 +2,7 @@
 * Audit DEPEND and RDEPEND lists
 * Convert all ebuilds to EAPI=6 and remove use of base.eclass
 	('autotools-{multilib,utils}','gnome2','kde-4' and 'qt4-r2' block EAPI6 upgrade)
+	- See dev-libs/libwacom ebuild as example converting from old 'autotools-{multilib,utils}'
 * Swap around ebuild naming convention so that for example:
 	trust-store-2.0.0_p0_p01_p2015083103
   becomes

diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
@@ -1,3 +1,4 @@
-DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55 WHIRLPOOL 722ea3f8bd4130662386810ae0270baafcecb6b7066e8a361388d530e7a2bad4e10787c921c6bb5cefb15a640f4302d288d07deea58acf8c5f5ca84d82722c8e
-EBUILD gmock-1.7.0.ebuild 1047 SHA256 577066e30b06ec3d37e50a8bd0e72d831b9c044f642a4164fa7547f3bc0d3069 SHA512 748e977d872fd5716c0f1f4ed9a25d8d78b8f71e0df8d6c01e3393c17364a69dccde7e4ea83cf2fc924f4fc1d5824f1af2c3be2e8507923f888bf01e24db4bb3 WHIRLPOOL 7d1b66fbecbee6d3cde716841fc6582593991add96a683db55fccbe0151a737db826f5b9290aa0711a268237c7140256cef41fddfaf3fd48faeaa540c4d26b58
+DIST google-mock_1.7.0-18092013-1.debian.tar.xz 5408 SHA256 19c6eb45039de1ec94ffb0e97f46950e864750fa53b8ab44598811fc79a69871 SHA512 bbdffd449215ee84bef325f2689c9fc24eec61cc15f7da72f08d08a8e0a0c8b4566822ae5d59900e3ce3812bf97e182b518b29d351a4816d042bd51862b94cac WHIRLPOOL b9c7c6b9a170f568900eba7d5dece4a972fe04fc188ac6b8f3f2861478404e4b1ef1fbd4c1315b509700169c277545dcbd23148129953f140acf70600ddc8ec8
+DIST google-mock_1.7.0-18092013.orig.tar.bz2 1490983 SHA256 91b1f35431fde037eb833fb19d6af27d23f88055a1ce6c5bad6ddfc6c3308a4e SHA512 7ecc1a84a579326f766a4260eb31e836ccd00822e2f91a3632f38230831f5978c2f485ed93f11f855355153e9beb0c0e51b2416b2f8fb052e23599123b4bde27 WHIRLPOOL 7e5018aaaec694092f40df354213eba8260b2efb0d093aa03cdc4093cf2905285884c7779cf5b44e01b767b7d4605873dbb0ae1a87de014338b1108b26e88995
+EBUILD gmock-1.7.0_p_p1_p18092013.ebuild 1341 SHA256 3112f8762b90e7f35c7e832ecdbbc510f8078f1a87ca881a31ff9d5e21704127 SHA512 ce5306d2a268aab67ffe4e50c150ddc27b1c313299587aeb4fe7d10ec3daf70e3813555b66cb36ad294b076119a04c809ae2fdc530088ae3e8a36acff7df9a96 WHIRLPOOL f87f128f7f8fc1f3f0fec82b1c1260e15c3c09a3293f83d1844956ca9b04b751ea1ff3334d735d729b07d451bcbc9fd1d50f663af2133672421fccd43a8affd0
 MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
diff --git a/dev-cpp/gmock/gmock-1.7.0.ebuild → ...p/gmock/gmock-1.7.0_p_p1_p18092013.ebuild b/dev-cpp/gmock/gmock-1.7.0.ebuild → ...p/gmock/gmock-1.7.0_p_p1_p18092013.ebuild
@@ -5,11 +5,19 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
+URELEASE="wily"
 inherit libtool python-single-r1 ubuntu-versionator
 
-DESCRIPTION="Google's C++ mocking framework"
+MY_PN="google-mock"
+MY_PV="${PV}"
+UURL="mirror://unity/pool/universe/g/${MY_PN}"
+UVER="-${PVR_MICRO}"
+UVER_SUFFIX="-${PVR_PL_MINOR}"
+
+DESCRIPTION="Google's C++ mocking framework patched for the Unity desktop"
 HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
+SRC_URI="${UURL}/${MY_PN}_${PV}${UVER}.orig.tar.bz2
+	${UURL}/${MY_PN}_${PV}${UVER}${UVER_SUFFIX}.debian.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,6 +28,9 @@ RDEPEND="=dev-cpp/gtest-${PV}*"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	${PYTHON_DEPS}"
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}${UVER}"
 
 src_unpack() {
 	default
@@ -31,7 +42,7 @@ src_prepare() {
 	ubuntu-versionator_src_prepare
 	sed -i -r \
 		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
-		Makefile.in
+			Makefile.in
 	elibtoolize
 }
 

diff --git a/dev-libs/libhybris/Manifest b/dev-libs/libhybris/Manifest
@@ -3,5 +3,5 @@ DIST libhybris_0.1.0+git20131207+e452e83.orig.tar.gz 512128 SHA256 9af011759c0d3
 DIST libhybris_0.1.0+git20151016+6d424c9-0ubuntu7.debian.tar.xz 73864 SHA256 251ba56be8aaed6c7c6291f2a724c0f3630d6d9a79abb1517683e7c4e637381b SHA512 63202360e2189c65536a813e16831ea83e0320dd41357a2987c36cdac32ed2bf1463825ad5f7e7c4e53dfccc09df565e8dbac7d1dc93c40ef5fe43c8aa478e93 WHIRLPOOL 21e47c2318c8df04c52cbc730258fcbba187be834edac9ee4b33a0f1640fe09619c8d9ac45c090e545ed0f409e2dcebb43905523a419468e970deae9dae9bc7b
 DIST libhybris_0.1.0+git20151016+6d424c9.orig.tar.gz 521098 SHA256 d57f0bbf5a51ab9180b9ad7a440498da0a2608b92970d23beb368a91946addba SHA512 ca690af8f3f1fa5201824ee9c45bd6719b7950d496fd3f9be9dedd1ff206b607f2f9805fa5cbe26bdd7f5ca5c6980f762c83e39c091bc1044caa3ac7188dd2e8 WHIRLPOOL 97591b3e5d7b33aba4c20d05d35fda52dd11146f418619df34ead0305ff711275b014e7d8dd5f366e8522cc1999009a4681eb2f85f6efc832bb58b1016674794
 EBUILD libhybris-0.1.0_p0_p40.ebuild 2088 SHA256 c6d3755fef405c0ea454baf366acc02eeacff3a450ea04c8305d675ed4de9a52 SHA512 541e838e95bf28b2682d8353065eb4314f8a45886e999dea67b77c8e1b871724b11afa95fa1388c13142a2ef004d52360d4d72c0814466ce0acb074ddfda369f WHIRLPOOL 0f892c67f450d8d1c59c654868eb3618f4e13d53efa8071a81f4ed561aa36673f09d524e69a6c74ed41dafbbf7014f77b9c084b75b50dd07e9f28e3a4d0bc899
-EBUILD libhybris-0.1.0a_p0_p07.ebuild 2069 SHA256 86a452cda17efb3b0ac9c12052b87b4f9aeb4c4fc8e3569d95b1e2894928fc3c SHA512 6a0581c99bb9b7c41c3b7e3af1f311f856d56f00658c83440d3a3f1797793887fd1fdea77b317c36c4be928abb23a9b70563caf091bd6e347a4c29de5fd72ac2 WHIRLPOOL c3d3455477f163e724d51c1fa37dd0e8365a07fc649aa907c9c30ac135cc2d0a451a464ba78d87dea3b255b7abaa8f918ff642134587ebb36275e380bfc2f882
+EBUILD libhybris-0.1.0a_p0_p07.ebuild 2072 SHA256 fe388b3d4f644ba4efc308329f4b738b129dac038029c4d0fc06ec2231f0917f SHA512 2cdf78288aafe6d5cadc388267006ce0eefbb5258ffaef595cb3e74da4ae32a79c0b7534b7c7dfb3bd0ed4e7497bbd8bbdba8505fc4b46b7d251b72b7df1b00f WHIRLPOOL ef0499197a509f009520fd4a6ec0c61918e3655434096618574e81e2cee2d06462b70ec34efbc4a7f483bd26a8e6a041a473fbb5a8b83d23c964607bcb10f3b7
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/dev-libs/libhybris/libhybris-0.1.0a_p0_p07.ebuild b/dev-libs/libhybris/libhybris-0.1.0a_p0_p07.ebuild
@@ -7,6 +7,7 @@ EAPI=5
 URELEASE="xenial"
 inherit autotools autotools-multilib base multilib ubuntu-versionator
 
+MY_PV="${PV}"
 UURL="mirror://unity/pool/main/libh/${PN}"
 UVER_PREFIX="+git20151016+6d424c9"
 
@@ -18,7 +19,7 @@ SRC_URI="${UURL}/${MY_P}${UVER_PREFIX}.orig.tar.gz
 LICENSE="LGPL-3"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
-IUSE="wayland"
+IUSE=""
 RESTRICT="mirror"
 
 DEPEND="dev-cpp/gflags[${MULTILIB_USEDEP}]
@@ -28,31 +29,29 @@ DEPEND="dev-cpp/gflags[${MULTILIB_USEDEP}]
 	media-libs/mesa[${MULTILIB_USEDEP}]
 	sys-apps/dbus"
 
-S="${WORKDIR}/${PN}-${PV}${UVER_PREFIX}/hybris"
+S="${WORKDIR}"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
-	# Ubuntu patchset recreated here due to odd ${S} path #
-	pushd "${WORKDIR}"
-		for patch in $(grep -v \# "debian/patches/series"); do
-			epatch "debian/patches/${patch}"
-		done
-	popd
+	ubuntu-versionator_src_prepare
+	mv ${PN}-${MY_PV}${UVER_PREFIX}/hybris/* "${WORKDIR}"
+	rm -rf ${PN}-${MY_PV}${UVER_PREFIX}
 	eautoreconf
-	ln -s /usr/include/android include/android	# ./configure usually does this, but pushd/popd used by multilib breaks it
 }
 
 src_configure() {
 	# Wayland is non-optional #
 	local myeconfargs=(
 		--enable-arch=x86 \
 		--enable-wayland \
-		--with-android-headers=/usr/include/android
+		--with-android-headers=/usr/include/android-latest
 	)
 	autotools-multilib_src_configure
+	econf "${myeconfargs[@]}"	# Non-multilib ./configure run for 'make && make clean' command below
 }
 
 src_compile() {
+	make && make clean	# Generate needed headers (egl/platforms/common/wayland-android-client-protocol.h)
 	autotools-multilib_src_compile
 }
 

diff --git a/dev-util/android-headers/Manifest b/dev-util/android-headers/Manifest
@@ -2,6 +2,6 @@ DIST android-headers_23-0ubuntu2.debian.tar.xz 17320 SHA256 f5215eb148f614b2d117
 DIST android-headers_23.orig.tar.gz 1593335 SHA256 4e323822e5823896dd3e81305810f93806b72e5c6685bb56fa58d678f1ff3d51 SHA512 abee206a68986d4fe27b8bbbbf94cc3086831cbaab2421d784daf5a5b1c5de806faa64b16c05c7b6e7df70b683d583a71f455ac82046f56088032fd698d39de2 WHIRLPOOL b536449ef898ce12ef0c2b0cb7670620ece02e6aa47c3e1b6a4f04fa58c0cc4857338c472e3da5c2611f2530f64cc13d301846fd3eb81d5a5b331af37cba9bce
 DIST android-headers_4.4.2-2-0ubuntu4.debian.tar.xz 9844 SHA256 dcb88a636fa62695645abf62dcd4e496f1dcbc1ba15be3fff738d37fc4c018bc SHA512 b8444f6ac0466e87ad1474857198dc9db1634d5fca73bed84bb7a6ae2b89b8fa66f8f7bfa440da43d9c771e82805adac06191c4b3d8d5fc5fc6a1ec60ec5e636 WHIRLPOOL 5858bb89eb4de1667d76a23f12f1a6b98cde8aeeeb361f76d46174484c7dfc0b72a9c94c75a29f9078ed8af77e37813b0bbe11c6a935f42a1f5953d003a5a975
 DIST android-headers_4.4.2-2.orig.tar.gz 177714 SHA256 bc9e28a3325753d8d177737d1a93189f33503800d0caab9da4d3b11a0d7414c3 SHA512 2e65313df57163e4c9d8bb8eb0e92f48006c516724c84a39084903b19617326f7eb81700884fcd892a5cb497c5dc0e7bc0c04e1faeaea780abdc2d362b45ffdd WHIRLPOOL b06c76811719ff37c96bf5770229ec5eeeca72b7aa2e5012f0683032fc24333e54113f76d1f68b4c3e5bcec783b74045f7b87aace208122ec34973840938daf9
-EBUILD android-headers-23_p0_p02.ebuild 870 SHA256 8042a23bc9df044904f0ddff02d8172152da76b00043d4f75965f9225a7108e5 SHA512 6185cd03c4640944531c46ee59350bcf95323ebe46b2a199dd85bcee8a1a03ad0ef63569040f88cb721c720afca66f197a3a853bbd1b4686ba27090c4575bebc WHIRLPOOL a201ac59a6c52ff5a58253c2e913c83db9e299981d0edaeee7f03b5c10d9fca111cc51b2cd7709e7c2609626a54274ef67440f81ac22703e76aa86121e62a17f
+EBUILD android-headers-23_p0_p02.ebuild 1071 SHA256 e877420113d59d4cbcfa9f966a23b57f8450012cce28819e2404444bf0c425e6 SHA512 c3a5db31b1e862b491db6cc8672659015e0830d38a6b20ac186184bae3b5a56b23f1553fc4e6b63fde9d6ad506bfce3d78d5ac2ae241b807a33570c01ccc90c6 WHIRLPOOL 2a31fa093d725c3bb009da7250b8af58be61171fb5d9de6e5076375babc8936876d05d388a22eb1276a7deda2f749c04cf7713b1283443e42184d66c33c4f456
 EBUILD android-headers-4.4.2_p0_p04.ebuild 928 SHA256 5b1343654adf3949b6e91d34d05edf4ae69d9ad3bb8ca58a486c6cb26a0ad974 SHA512 86e6396dac369c6449991866e2b5e73be2e53ff58f4a48d15a72c72180040c37061bc5ab83f10df409e1028cd425442b114f928c89d2eb7332f723dcdfdb232f WHIRLPOOL 74eff35f46406e8f30f2a70bca6f812c1b67fc380b1fe4834c6c6a751ba8aca2721357efb8a246ecf3a8b30beedc799d04bcfe23f5e64fe9399f50e1ba324793
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/dev-util/android-headers/android-headers-23_p0_p02.ebuild b/dev-util/android-headers/android-headers-23_p0_p02.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 URELEASE="xenial"
-inherit eutils multilib multilib-minimal ubuntu-versionator
+inherit eutils multilib multilib-minimal ubuntu-versionator versionator
 
 UURL="mirror://unity/pool/main/a/${PN}"
 
@@ -38,9 +38,12 @@ src_install(){
 	insinto /usr/include/android
 	doins -r *
 
+	# Need to fudge in the current headers version so dev-libs/libhybris knows which version to use #
+	dosym /usr/include/android/$(get_version_component_range 1) /usr/include/android-latest
+
 	multilib_src_install() {
 		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins "${WORKDIR}/debian/android-headers.pc"
+		doins "${WORKDIR}"/debian/android-headers*pc
 	}
 	multilib_foreach_abi multilib_src_install
 }
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
@@ -7,5 +7,5 @@ DIST nautilus_3.14.2.orig.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291
 DIST nautilus_3.18.4.is.3.14.3-0ubuntu4.debian.tar.xz 75656 SHA256 0210ac3cbdd7ce56458508a5fa47fbe298175996c0f0cc281bf6fcd6a46d239c SHA512 2de3fe48f487cac96339067287d98ebf6970f030075cc374a42271bc620a3a1f6b8a482c3cf797c3fe8dcf4df847f7950fc9b52e5fbe7b254ab79ab4d35ffa0a WHIRLPOOL ee88a50700d0bb500ac1259a3a7d7eb6ae12a35f6b209197005275acd7cc12a92fbc5ffc8db9e4ad55920f5e456139d48f13052d54b70c297e1dbf1e4b335338
 DIST nautilus_3.18.4.is.3.14.3.orig.tar.xz 3301940 SHA256 09d4736c89e8770dc9cdce5e1ef8dc1059c5b21adb479ff79408585757a0790f SHA512 83f92b9cd620e26f0d4b97a81068fde1810d787193c8b340c61b14887c33b53e4b30ab3968cfb511c87cb6a72e5cc2a631ea2b3dbf29d53dd6fe647ceb1ad50d WHIRLPOOL 333fd1c97c8dffb33895e8922ba0feb3d584f9dd0efd2c99bc5abb4b0545358ee77e7fd82f76aa5d81cb03ad908897ffc0f415734692fd987bb5b476fa0bfb3f
 EBUILD nautilus-3.14.2_p0_p13.ebuild 3715 SHA256 97d2d8b11d1a33e00d9d1a1d85e3aa317c2ea739596b1496242142e131343878 SHA512 138d4583fa15cae8e17cd4e62d1d96b72f70bcdb14335c71be19b542a28583d51f217e772f2f25aa3c81221cbc376a20997139aef6b9b0fb7fb6d3c908e42327 WHIRLPOOL 25c7ac42d0fe7bcbf594cb2526c0ec6b50df1accd7f3254528265889c6c442f62206059ab61280a92485d74aa8cd45210fb43304f09c6ea78f02b371cb7b1167
-EBUILD nautilus-3.18.4_p0_p04.ebuild 3763 SHA256 455b3471186ab9ae09864e2f4ea93b3059783ca6a7a7d455cc80e48eb1e78808 SHA512 58df19e2a7f06929acb1bc60faa555158521767cb22d3f61177251cfe094926168a7032ed11043e2b3e5090903d7c4d83c9e394f061044555a403d7db57e9031 WHIRLPOOL c02f1b0cd9b8bd8177b5f44667530fd08ceb2c5b41b7c470023931819bc9a8a928c781bccdd6be4e9ccbb9cd3dc3a3aad40cacb35d6cb7c600d932847ae55755
+EBUILD nautilus-3.18.4_p0_p04.ebuild 3792 SHA256 b35fe01ee6db2b73d8d007cc12b6cfa404c6cfa4226cdf3527113a503194f03f SHA512 e56e0f61bbf0e45579b6d993c19885e56c3e176d82462370cfb2023b6f93685f211fc4d959bc66d7f9e7d8cfd65dae4c2c237f025b9b325552b369086f1eb265 WHIRLPOOL 21fc35b204d5e82c5e268bc6e7f8ce4ce338f88c0584635800bcdba405f99eecc3d127c1a64b5c15c398efb0632f047ab44c760d51f92d9d31ba5591ff7d3bd9
 MISC metadata.xml 779 SHA256 489197e4d7fcf1edb20700c2a592f7db3b24f08fcd42a26cee9008ac055589cc SHA512 55f8f26f9961afd69dceacbf2cadb35784f9f4172d4fd07fcefb7af72cddbf43ac9dd692dc56648c69826d2af80eff278acd50d259a1ccc9e465d341c6fb94aa WHIRLPOOL afea16d595f3eaad075e486b9ccdc67d3fc7ea570630f8f2ee9df3dd33b5dcef2e9fa8dd73d1c32414ff7f261d3663ac591d52cea3e6fc11466f8ec7b9d5b256
diff --git a/gnome-base/nautilus/nautilus-3.18.4_p0_p04.ebuild b/gnome-base/nautilus/nautilus-3.18.4_p0_p04.ebuild
@@ -77,6 +77,8 @@ PDEPEND="
 	>=gnome-base/gvfs-1.14[gtk]"
 # Need gvfs[gtk] for recent:/// support
 
+S="${WORKDIR}/${PN}-3.14.3"
+
 src_prepare() {
 	ubuntu-versionator_src_prepare
 	eautoreconf

diff --git a/media-gfx/thumbnailer/Manifest b/media-gfx/thumbnailer/Manifest
@@ -1,5 +1,5 @@
 DIST thumbnailer_2.3+15.10.20150915.1.orig.tar.gz 16371176 SHA256 3d45e4a960fc8af1d2abb3ac5a20009408a2445160c586440f527300e1a40706 SHA512 108b6caa71805e507d1018519d49c81c871c27d0088e9c2548e8b7df0b8900baf9c9a46fa4004e6f654eef80cabd4c20884ffe8f3facdd8f4140a7e390a859fa WHIRLPOOL cad9efc4f44ff81f88420d35f886713e088845be2176c8c2709c9f774ca2065a70dd21b0966356918dd90b067d0f1b0b823506d21391907c4cb957b926c48b6e
 DIST thumbnailer_2.4+16.04.20160321.orig.tar.gz 22943575 SHA256 182555b7aa30e8d97b54fac5de2e69e6b83fd3b0a1a2d52fb3911f2a9a290ae0 SHA512 35877ccb4aaec6f851bc181fe9bba7f1e1f6e63a36d068cecfd66c0f97425b5de125cfa900e8621a36d066303dc65f59e1e730d36132f17d9e1937f05c05ad56 WHIRLPOOL ce024b200145f6e9a310afd6f4c5abaedc06a056cc6e7e650fc58e8ae9c5b57b2f018dd61ac066f80d9da3ee13832e9eb0c479c6a09e2931d746e583ae93b709
 EBUILD thumbnailer-2.3_p0_p01_p2015091501-r1.ebuild 1492 SHA256 bee3c4cd6441215d13039856c168938f5771906bb51ec90e2d6c437db1699905 SHA512 9be4f8f31dd640bb4fdecece53ac9d687956ff4b97095912c678d01691197fbbf1550523004b86d31b9078263d208a0a0cd449ee795d94b8adb6eb3e1c4768a8 WHIRLPOOL 7d7ff44fdbd374008628fcf43c56464a871cc3130089f63c2a4b685ad487f2eacf79b7800105d43acf241dd1bf025a01f92f7ee1ca4db4aaa7b29b36ecb45212
-EBUILD thumbnailer-2.4_p0_p01_p20160321.ebuild 1500 SHA256 766ce2492b8014725572aa515badb304232375e335001ca6ed01652d951c89c8 SHA512 e302055dc021edce04f824eccfc9604169e274ab64a9d4abd27304f9f4600d1fbd45396d1d12bae3129c81ea8a28b70da83e5e9cdc8ee818c00dbee69b87170e WHIRLPOOL 6640d87c9be0df3f27095a0012757c31b06928685457718835dec2bde59216ecd0617e75dd3ebdce9bbfbfbba232f7311eb2e1618c2265c6869fa1320f2333aa
+EBUILD thumbnailer-2.4_p0_p01_p20160321.ebuild 1905 SHA256 dcb625f42caaf76aca8e81a8a7159760cb8bd0796d747b530ed0cafb2d4a3cb4 SHA512 bdd0a7702985f5901ce34c927e64a14c08f3a3b260ee0af62bb33013df2630174372d927a73ba18967107c6197459d575b8633489f62667f3199dfbd053a87ab WHIRLPOOL 2e745523e886ed7298df4aaa1af863b0ecfa8ab56595d220a7ddf59eedbf1b7c8c0e658cfb3b95adb3489e7360d3fcb390ce3a16f6c5bb9bfb56158687e7e203
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/media-gfx/thumbnailer/thumbnailer-2.4_p0_p01_p20160321.ebuild b/media-gfx/thumbnailer/thumbnailer-2.4_p0_p01_p20160321.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-CMAKE_BUILD_TYPE=release
+CMAKE_BUILD_TYPE=none
 
 URELEASE="xenial"
 inherit cmake-utils ubuntu-versionator
@@ -50,11 +50,19 @@ src_prepare() {
 		sed -e 's:O_TMPFILE |:O_TMPFILE, S_IRWXU |:g' \
 			-i src/service/handler.cpp
 
+	# Tests are totally broken and don't even pass the configure phase #
+	#	Incorrect use of CMAKE_LIBRARY_ARCHITECTURE means the variable is never fulfilled
+	#		tests/qml/CMakeLists.txt:12 (if):
+	#			if given arguments:
+	# 				"STREQUAL" "powerpc-linux-gnu" "OR" "STREQUAL" "s390x-linux-gnu"
+	#					Unknown arguments specified
+	sed -e 's:add_subdirectory(tests):#add_subdirectory(tests):g' \
+		-i CMakeLists.txt
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs+=( -DCMAKE_INSTALL_SYSCONFDIR=/etc )
+	mycmakeargs+=(-DCMAKE_INSTALL_SYSCONFDIR=/etc)
 	cmake-utils_src_configure
 }
 

diff --git a/mir-base/mir/Manifest b/mir-base/mir/Manifest
@@ -7,5 +7,5 @@ DIST mir_0.17.0+15.10.20151008.2.orig.tar.gz 1661959 SHA256 738e47d315d7b3a92c7e
 DIST mir_0.21.0+16.04.20160330-0ubuntu1.diff.gz 63846 SHA256 e54101057aaf8dd1906c5713b376b444158e3f8048632a0a6938a56acd2da267 SHA512 3ec50ce3b2b3d8e55ce502a534ea5947b6b02eb7319d6a4c15602a1d117ccfda0fe33ff52367aa1b116a075897eed5d18afdd95045b149a294bab6b5ad6a9463 WHIRLPOOL 5f7055b077b3d9e1b4998a4ca0ed55348ce7c208d45a9135f38537af3c133e93d0c2b7baf62513cd3aa094de0f649a23f8dd0ff55162bd87983a3ac04f5f1465
 DIST mir_0.21.0+16.04.20160330.orig.tar.gz 1642320 SHA256 8b219213602ba2ada7b8c7b3c25cce3a6f051a1658363a791a652042d01f815c SHA512 db2dfd0b8163d72303be20318ec41409579071e8f56a471c445202b4d0d903e620917e71b58eba684f5bc29d5c525955d28cd18bad555ad2914136afca8fa87d WHIRLPOOL 116b12356ef851eee2f6e48e55df1c71892ccb20a829afc0f1d14e9c5e7cc9b7870358047e469642e39f5da3f2ad0ee44d048e25478c12ed2460eb18e7212491
 EBUILD mir-0.17.0_p0_p01_p2015100802.ebuild 2368 SHA256 d9c741c90385ac250ce0d0e16b268c00a2aed8a22250b616546a806ff5583faf SHA512 339c4c01b67083f00609a4e4de960e55725627db9c4b74d0cb2d95104313ff42902941e58977c8485c2a97905ac29a91b8b2502f4529a6fc3dcc3534f28a717e WHIRLPOOL b8e769162ade3d5162b13a7dbd38dfce1bbf209b34cff1dfd9b765e3a158c2d7e803212f65ed26ac18cdba85f9926116ba375d06d99271177f94fed1dae939f9
-EBUILD mir-0.21.0_p0_p01_p20160330.ebuild 2371 SHA256 d79a0203eb0c778e514c77daad223c4151f2e9e394c7bd3f2be827dbb04f1e13 SHA512 e89972b76cee8e27c60063bffe65720a259a3ac902de7778e2052de8dee64dcf8c1c8e7297cbb2996cb79193050c8a590b5813297aaa9b9179c0cd4344673155 WHIRLPOOL 0d622cc3a166740de45b6276f5d8695f887b43bc2cc09155096bf69244562882dc927d16ff0d619caaa6a5a8f14430353f3fcbdcb8a138e846c837354cc72fa4
+EBUILD mir-0.21.0_p0_p01_p20160330.ebuild 2345 SHA256 93bb7023cbc776ce59bcc4fc357832107c9bddfc649e8de3837374b59c5399ca SHA512 e2e7d309d8b8e8fdd0eddb53d0308cf9e5607ef2eaa109ab35466d5a07fd53422e8a2edd51aaf69b9a3a53940289fa6c563dd7d14f9e0a32f544313ae4969d1c WHIRLPOOL 79c7a30f2fd1ff2f3783667a67ceed41fdc9284189609ef3f0b46e941ffdda6db55871e8db80a7a57f96d3075dba48646f8f24eb3e486703798e987f759257b6
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/mir-base/mir/mir-0.21.0_p0_p01_p20160330.ebuild b/mir-base/mir/mir-0.21.0_p0_p01_p20160330.ebuild
@@ -38,7 +38,7 @@ DEPEND="!!media-libs/mesa-mir
 	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
 	test? ( dev-cpp/gtest )"
 
-S="${WORKDIR}/${PN}-${PV}${UVER_PREFIX}"
+S="${WORKDIR}"
 
 src_prepare() {
 	epatch -p1 "${WORKDIR}/${MY_P}${UVER_PREFIX}-${UVER}.diff"	# This needs to be applied for the debian/ directory to be present #