Snapshot bump. Improve sanity checks a little.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 37 insertions, 84 deletions

diff --git a/dev-lang/ekopath/ChangeLog b/dev-lang/ekopath/ChangeLog
index f78fc9cfd951..a86031948a73 100644
--- a/dev-lang/ekopath/ChangeLog
+++ b/dev-lang/ekopath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ekopath
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.28 2015/05/27 10:12:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.29 2015/06/06 11:46:50 mgorny Exp $
+
+*ekopath-6.0.396_p20150605 (06 Jun 2015)
+
+  06 Jun 2015; Michał Górny <mgorny@gentoo.org>
+  +ekopath-6.0.396_p20150605.ebuild, -ekopath-6.0.357_p20150511.ebuild,
+  -ekopath-6.0.383_p20150526.ebuild:
+  Snapshot bump. Improve sanity checks a little.
 
 *ekopath-6.0.373_p20150526 (27 May 2015)
 *ekopath-6.0.383_p20150526 (27 May 2015)
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 51c6eb9550c4..09cb6b193762 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -1,34 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ekopath-2015-05-11-installer.run 49721830 SHA256 754827572dc6a41870de5074e9da4f40fd1a10ce5887df3c293700604f928cfa SHA512 a042fb3b8dc31f46033c6b42ed00cc7eb0a9a9111ee284099bab8259d0cef9c13a942d41e34955b0ad6a7d16bda1c1f7ff48d5fdf9d9fcd8ff6bd782fea49768 WHIRLPOOL ba7c24b341637f20b91b26120c7cc92b817ab63699db131820901ee3d6a48f175c3beb7cafc7e14ec077f6ebaa35b4e089ec2899a835a6a44f2d32f89f1c5572
 DIST ekopath-2015-05-19-installer.run 55419050 SHA256 689f35cf49738ddb2f4c0bb0a089fc3984242fdee422b6a1462e090beee5b15d SHA512 531d05bf53867ab77c99b8c6769c5c6b5be8ae76388762f2373c42c528ce9ab38c2f951e3ffa7d9ad7405ffa3976878311f4ca2a3ee6738f0bd8c0ca3a09e802 WHIRLPOOL 9167fab113de824f4cbdaba465f6abccf5a119656f60af43b9f29fdad8cfaf10ec7ba744fe52f6e707fafe67540efb987686a190ed9fad79922188c85b044b99
-DIST ekopath-2015-05-26-installer.run 63474442 SHA256 cd08526dcb9ffe4934600f1284a3c18958490cf4785290b2c96c558cfef45502 SHA512 fb0b82ce9141bfd03fed7e615a0a8c70bae049c96e0309c85bb274cf32fdd6585d7db6d998869950a6dfc350fee23de9f68e77474599f4cb01ce3d8433060888 WHIRLPOOL 41166635732ca6c7843c1bf06f64cf58f637643ae53d37ce734015cae5d33805c697d22fcab870b9fb1a4b8d3a336f6bf280c92cc31fedaf09b79665f11cbe34
+DIST ekopath-2015-06-05-installer.run 61589381 SHA256 014e6b161a4305ca3241b5ab328bb2b7e132dc6a4e68333aaa9eb3b494b38d17 SHA512 4a8eda3f2ceaf76d5302135c85e5662b08409152d00e86ebb117c7d6a732a9ccf9e674b81446d4c4a3c55d58a937eba14901dc6f9080baad57e2c2bc8a49e717 WHIRLPOOL 985db7a5063cae72ccec2af795a2bb48dd9d12369b409e13e5eade03bcc4be630c5f1155f4f7a2cf2f654c0864f4c075b053ff620d16d587e753aba4026aa760
 DIST ekopath-5.0.1_pre20131115.run 49693707 SHA256 8db9733adb8a60626f7fce806a943743485cd4e733e284bdb557b384c519c3f2 SHA512 306664b1874801d89d9add46b13d63f4d0f26e008c71091ba25ab9cec78f559be438d8089e5df6df3ede553e2178fdc17150b9b26a7dcddfbeb3975e8b04a2d8 WHIRLPOOL 78705fadecd0990b98582394dce5494728e3a56ff8f20f43dad9da2cd6ae5e97ef435e13dae62da5e127df4ef6a5ae923b95243d2d240e5fc579eccd6abdf390
 DIST ekopath-5.0.5_pre20150226.run 46800428 SHA256 aa5f5f4124338631b92ef4067539305c354a537369e07ed72e84977d5ff558c4 SHA512 d4871287fa65d65404246a3524640bf479897b5faa87452b570312a6e2231d1d8ce56f741e944d9fb500c1e787a4622d48027dff86c58f32bde0504d2c8649d4 WHIRLPOOL 9fcddafe0b06ffe85c6bf98ae35e331de70a01f93bdd0c6506be8dec2549adbb6804ac135b27a32603028af263e3d2088aaef8afaab3eff095ee0bf869d0f9b5
 EBUILD ekopath-5.0.1_pre20131115.ebuild 2418 SHA256 5a56f0b4fbfa307c4e99bd0970908a91310bd18383bc9966b1d4085569948b90 SHA512 e42671ec0ab16612230875b42c5395a663d51bfecbd686d0a3835ba0bc4408c718769e24cc09f2963a76d45ce25056bd75a9166e6b5d27561bc81c8843da1963 WHIRLPOOL 831dddc128d650eded992a52e519015e4cf89d7159849d5f669faf8522e30e4800d3280e7912fabe62ec1105518e61bc29b72da0bcdc42afa1b798a934ce94db
 EBUILD ekopath-5.0.5_pre20150226.ebuild 2487 SHA256 95a470081322c7968225c05610b67a3910d54d9216aa8b5c797c64c5762c481f SHA512 8cf06684675128ad065f90b408cfc5031a9a120cfc98ac360010a26454545245411750963c3e0356d7bcbcdcfa2aa06512b99be1162af3cffbfd193768f4ccbb WHIRLPOOL 8fad89cc5913ff07f59b3ece67213a905f23b56af7081c81a2fad26b306e57b5d0c7f2adaadac99a3cfb017eaaaea19e83c91fe7bd2bed18b26e1724493ca634
-EBUILD ekopath-6.0.357_p20150511.ebuild 1513 SHA256 f9c76348a07c367e782a6db0845e85423230006b7d7d2c9acddea0761a4b523b SHA512 387729672f3460f071fe6150ecd21e47f1d780cc15f470b98f81471bd6cc6561edfc432837a2a611c4341db62f1d78e756c05a57fddb3639fa4a30a471eda8b1 WHIRLPOOL 6d78ed36111f27b924bcf2bc52ddf8b29c68f57219d0d592754134b01550916790dbe3c77c68625ca17de63873128aded556ad129517db2d167b2186f7bb4fde
 EBUILD ekopath-6.0.373_p20150519.ebuild 1596 SHA256 a0a2ba46796935017b456caecc5d7ab21d711497d8cf5467df9b44073fa65b4f SHA512 341016554e3f4dd576711f1ea2ccf57b8c9f91f8794be80cf4fd1cfc99e9919196dcc30d03dbd978e90994bf734e8857002c246dc6d16b210d4b965593285b5e WHIRLPOOL b940b407cb2ec291e99eb43126991dc5563720aa6e32194966c5042dc47e60b54eb1ecbe52e7fe7e158c3fe36df5f6a5f88a1bf2aaf89254e8d713a5e35a2f8e
-EBUILD ekopath-6.0.383_p20150526.ebuild 1596 SHA256 f1fbf26759215c1e7c45a01ca73cafd040c6cf2cb95e8a669e12251d5bcbc1dc SHA512 c6d48e1f6d442c5658074bcb888ee102d8f1445038a2404bad97d1abc143f95ebf3838805f36b726bad98b7b8d428079cedf9e2de00c79befef34a7cde5f7b3a WHIRLPOOL bb8a3ae7ee13fd444b0363f73048cb5b78e3aac1a615211284ea9bb005a96a2990477f803bfec2c1a6ca5a35e8a8c9120af93df915701e16c82772c60ae994fc
-MISC ChangeLog 6569 SHA256 74c2c8d410694408cee77fe226eeaadd5c1cab84fd2c62720b7105397f1c6813 SHA512 5e8dd1950d2cbd6f449139dff857922dcec61def6b375a73d3097d7323b4a30e8bb7d018272da3acc7076fa18379869506ecdb6f0c1dafbd6c48f96447cf553b WHIRLPOOL 1225b160dee325845bf2cf21fdfb4632bdb6e8f05abab4a47010683cd3df62aa6f2ac35a8939da5a2205b3029620d86f1e5c16d6df65ef94c8559f2bb7fe9622
+EBUILD ekopath-6.0.396_p20150605.ebuild 1900 SHA256 f4ffea3fe19882f2b5649e1b284c92c3734eff433d0778058617c928527161be SHA512 24e4a39d7783dddd66b15da805bf902ba3c4a97e7896f79cb14d54f853b7ffcdaf8b0a25a86e8670a6c16d0ef24a98bde5627a28fb773e2f78ec552bfbec66d6 WHIRLPOOL 32ba8fb845f0748ee780cc0331a4fc2145428984217000c8ae0535b0bb00930664f52df0071c71719234a4c3125393d2508575ac509a5f82707b2832b7a67d90
+MISC ChangeLog 6820 SHA256 d7000329a0917633c50fbdf7343f80333bef8a5fe6bc7f6564d8be6e92f26a01 SHA512 507f2176d71053a1f3efdcdf93283807ac2c214366f5685889b07e249eb682462f425fd127c25d854f39fe8941c5ca741516a5bae27a6e3fb3077db037499734 WHIRLPOOL e46746e5eceda33b35737de1834057275fe5dffc5011e45230171b645120a9067baf118b7d6dede851f9ec4f4f4faae84e6e9105f00daec1f6a0afabaa5bda52
 MISC metadata.xml 633 SHA256 c3ec9cb61bd7512d9bde8b9ad0cd3cec8d9b4aedf63e0353878e4548eac2394d SHA512 f9948067dccfc2b359d4c18fd24d10df86f1236c7cb18526932f7a60a410529dcc258205f8cd32d04fe1e0e1effc21e3f1ce151c4e842293086bcdf0e3bc5c5e WHIRLPOOL 1631ce7e58ec258a526bc0c2f4c67fade2f1040730d23cdf3e278068d72dfb568b37b3379a03e18a82dd0f88f29ab56d60b995c82f7750569da93c88d6a462a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVZZiSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVct2rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONQUQALouw8XMmOcnkI4KBYPh8Bjx
-vKh3/xiSVmOaWCekWPYwRCKYgaQrO+VB8aaVNy2KKNZW7KriE3Tz0wsgXkHwyR5V
-XxWWl+USiEvTBNkMqEf+b23mZaBAM7eAB/FGRVm4Cf5m+dy6BiJ3VIFKtheRBYJk
-tYzyaZoxwEOw82wfHn605dpMyimQ2xlWFQ+7UVi524cJlvBvDtU3qVMUvLB/JDit
-mLLmqwSjl1Yr6wbO8Wvzk2ORth6NhD9fw2/UPqVzyIZfCOxAppF1/yWFSEvgFdgM
-eXStdCnvHuMq+17QvVmxExbJ4rkgGc2DBJf8eqL8G2YHIGg9GI00S0G6tBFy/cq7
-xQu6+8uo584OEw5/rV9XsYM+0atsBbmJUsJKrR6aiyel8j8GiAjmRL5JJI4/qnHd
-J9G0PgPaApcWyuIApvZm8Vmx+j+Z4VtsRnowwIYpfTKSHuDrn15A1qO7BcDTkinf
-ynFejunWmSgDD+AP2LnGKcxH2cKPQimx9S48MmYE24DEoKJGVKGSa2jdR+HKdpyj
-dFnd+/J9tCli6W0RQZfjzzIK1QN6qggYMCHn0dS6KavC6Yk0NftJM0TOOzvvot1G
-PwZyL+e8dWQ1AYrKsZs45AnUiO5+kUPXYTO3czWvjHLTdCWxpj8as7JM6CFV+tNf
-kmOpN+pG4C7wGKOAk5QB
-=+1xH
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLWoQAJgf2A+46U8m/ongfFI9l/lN
+XI6LLJRB97w5oySJP12jl3C41AU0+RALHtd2d2MMFMR/bQP0SOFvzyZ3riVTsnQT
+ow5GjkItq4ql+D7dqjIP9hNMZ35SNHGbzYtHN3C5I6UCiPDiziYM86xhMfkrBEpC
+mfInI0PBbSQGYt/vTc9Sd6lJHsNho8BuJXXSg+9XxCLvWI3kowsvmNroL5UCLrpJ
+fT+CYeuvl4DsQHIZypZlZY+GuNL5DZytitnZOke79yNV2WVJ75HOW6FkQlMFNTyW
+R9GPSIGpS7/N2Y8rYMeB0EKiLP2aZ9wc3DuPcdMcSOyiQIgPivO1F/vOQcbecVM4
+p3pKeRcWqKE7DeyPN5/mowp70g0envFyFLZa61Ny75dVdtNQpx3kLcOGe45MWg/y
+QXNTjglB5qxopzYyGmWswEJxihD2HU0q5t2viQbi1NWdxQ6zKmRqmvch3fh56ZWD
+KVh5KODdmjyzYGkEf55HxYcA8kJiBQnDB4C3APYLbws4qMm1NYrwY1IU7L2GfQwt
+U2h5VX/GGJiNP0RbvkZiWnMTp0k3l5MdfCulSI2xrzJ6BJF17Xft5BhK3KDGxD1j
+UbpZ2W6SusJfvvp1s7bz6OgvraRB+k+ajIPcOAdeJA7o89x4e7DAwwS/omlw7GPK
+0HnMA1hEBokCfqNYkch9
+=K8/O
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ekopath/ekopath-6.0.357_p20150511.ebuild b/dev-lang/ekopath/ekopath-6.0.357_p20150511.ebuild
deleted file mode 100644
index 3011ede53d9d..000000000000
--- a/dev-lang/ekopath/ekopath-6.0.357_p20150511.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-6.0.357_p20150511.ebuild,v 1.1 2015/05/12 17:51:40 mgorny Exp $
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-	chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-	cat > 99${PN} <<-EOF
-		PATH=${EROOT%/}/opt/${PN}/bin
-		ROOTPATH=${EROOT%/}/opt/${PN}/bin
-		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-		MANPATH=${EROOT%/}/opt/${PN}/docs/man
-	EOF
-}
-
-src_install() {
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
-	# We must use XT_PAX to run the installer.
-	if [[ ${PAX_MARKINGS} == "XT" ]]; then
-		pax-mark m "${INSTALLER}"
-	fi
-
-	./"${INSTALLER}" \
-		--prefix "${ED%/}/opt/${PN}" \
-		--mode unattended || die
-
-	rm -r "${ED}/opt/${PN}"/uninstall* || die
-	doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.383_p20150526.ebuild b/dev-lang/ekopath/ekopath-6.0.396_p20150605.ebuild
index 3c3140ffbd2a..9dcc96c86ae4 100644
--- a/dev-lang/ekopath/ekopath-6.0.383_p20150526.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.396_p20150605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-6.0.383_p20150526.ebuild,v 1.1 2015/05/27 10:12:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-6.0.396_p20150605.ebuild,v 1.1 2015/06/06 11:46:50 mgorny Exp $
 
 EAPI=5
 
@@ -57,7 +57,17 @@ src_install() {
 		--prefix "${ED%/}/opt/${PN}" \
 		--mode unattended || die
 
-	[[ -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]] || die "Incorrect release version in PV"
+	if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
+		local guess
+		cd "${ED%/}/opt/${PN}/lib" && guess=( * )
+
+		if [[ ${guess[@]} ]]; then
+			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+		else
+			die "No libdir installed"
+		fi
+	fi
+	[[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
 
 	rm -r "${ED}/opt/${PN}"/uninstall* || die
 	doenvd 99${PN}