Use blocker for app-arch/rpm rather than pkg_pretend/ewarn. Thanks to Diego Pettenò <flameeyes@gentoo.org> for suggestion. Remove hardcoded PV

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 26 insertions, 30 deletions

diff --git a/dev-lang/ekopath/ChangeLog b/dev-lang/ekopath/ChangeLog
index 57ce35f5e495..060c14cd3bdf 100644
--- a/dev-lang/ekopath/ChangeLog
+++ b/dev-lang/ekopath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ekopath
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.14 2012/06/14 17:53:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.15 2012/06/25 14:16:20 xarthisius Exp $
+
+  25 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  ekopath-4.0.12.1_pre20120530.ebuild:
+  Use blocker for app-arch/rpm rather than pkg_pretend/ewarn. Thanks to Diego
+  Pettenò <flameeyes@gentoo.org> for suggestion. Remove hardcoded PV
 
 *ekopath-4.0.12.1_pre20120530 (14 Jun 2012)
 
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 3d41ee5bacda..92a9e53025ed 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -6,23 +6,23 @@ DIST ekopath-4.0.12.1_pre20120430.run 50818242 RMD160 3b512fecf9e9fff6a28ea1545e
 DIST ekopath-4.0.12.1_pre20120530.run 50816268 RMD160 0db42c951334eb8d144a84e0b46fd791e7e2e39b SHA1 01247dc01936be727b566d581e17f4b8179c72e2 SHA256 c32d59b0cd8f808b15aba492848d1ef4e05f9890d9abbe52a2ed7b893e83e381
 EBUILD ekopath-4.0.12.1_pre20120308.ebuild 2367 RMD160 da8004b984f6cb802e4ef0e942f760d0c1b9893b SHA1 bf0039ac42a7cde1ca917d3493975246f2cb523b SHA256 d24bba8cdde2951564d59fa4c0288d5b7e460d7d8ebe05d99460759b9fd12f63
 EBUILD ekopath-4.0.12.1_pre20120430.ebuild 2414 RMD160 b8675e7c0d2c516a7b49f90c5399e710fb9c5484 SHA1 14a1fe9cf2b1f1579f4e368150fcc64def74e60e SHA256 422d597812c8accd0191319ae4e785727a20220bc46e34eef5449d5c46478342
-EBUILD ekopath-4.0.12.1_pre20120530.ebuild 2414 RMD160 4d114910495d131f80990dfe023a6b6c6ef4c86a SHA1 c566f9298129e0dc0babacc58cffe83789e00532 SHA256 a9920347f22569b830e5bdc290ab47471395e19e9dbbbfdff422af0c085c83e2
-MISC ChangeLog 3565 RMD160 d60e1971de647b595c4653067b3eac12f37b176e SHA1 365762ecbc3f1cfcbe0e60dc44b0a988b957f203 SHA256 23db3e01b9b757836d4dd23dff3d72af58aa403de711717af9caa2d278a08b91
+EBUILD ekopath-4.0.12.1_pre20120530.ebuild 2047 RMD160 e11dbda9ac159dd1a40b358a81f64f78cde69a43 SHA1 90f78d77fbec044512b8e9b1ace94e2a461a6717 SHA256 90e019fe050a1514e5ce379613086fef80784b3b2bfa86cd6c0e10edf4ad36ca
+MISC ChangeLog 3807 RMD160 76a2813a07113796450e75b720a8c627675f331b SHA1 9805af60cf6ff4316a4f902e1a4e50aa04103939 SHA256 5ee3dda048ea38995c05dd05822b2e31958f88e49a7053108011df9205b9434e
 MISC metadata.xml 595 RMD160 0511b409a0d8423fabc6cb3f70c34a2138a7cb6b SHA1 daab1fb73ebf67abf36f1131014d0bd1ea7bd0d7 SHA256 18598a62f173c7cbe97b0c970c180e6202d17075d1455bafd8aab4c39ab8d45d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP2iUlAAoJEF0huFKJUZL53PgP/0NBv2AycGZ+O6lNGP9lycQh
-M/zPpP2S5SxmrOpPLtg7bivzyZ2HS6ezWpsIijdoJdHbzlTppjfyhy2w4QBPNGDH
-qC5i2YjCuSdjrKBLX0dgUJtrFo/06+r8xYDbhc2WmHss6yhJpPYnGzeSL7DNwXNm
-E31CZupjk8BPLfhoCaruPWdjUNxwwL/tz11N8etr+c6UHuZ6hTEIW6K7zpkwlHiJ
-y0449xuv083kdYMYOYHfA2HkF/4LpTT9yhApLd3ffDMbau9hoZ5XibMX0LxV9vQv
-fFedewlqUrUpr5sSoRZMu7lfix0tBF77N778yOt87/q5uMECEArd+pLFzHsM+ohq
-+BjrHE1lRDXsKKDj0/pzQmj57cCgacFgJtCJJCtwQBvShs33k8mvvL2ubgiq1iAn
-MJQItXGaoIzJKbR87kZ+xM59pgu7zgQzQXCmQuPx56JLQAKdctKeQN9H1qyQty1A
-KTajOyNcyC4xXLGgCYPvZFXndpOeyKbjEH0tlnARURs/MVNQf1xkTbrY348XS8F/
-VZEKz/B6COS2Fkuvc3bd18hReoad6XntTupzqZV3k+Xek23WvQ3HB82//2gBYXiL
-b7Xm8IBObsp0tR9NYjuEri98p0krE/7VKk4oszr74x2o3HodOMbYWRIJzKtI4UyE
-/B0wvPS/LYibJGOkOwTp
-=HLUF
+iQIcBAEBCAAGBQJP6HLrAAoJEF0huFKJUZL5WXQP/32adf/MS01qxfAvDGbj3nnn
++v/Uv1Eyzlx0L/pqrEJS+Tqeyw8PXYzkKzlD4usis6iVGorNDNnDS0WsqYVjUgYg
+fISMYQcYtYZu3FJRZPiVTrcpflwNEROqcaZCIhjhTtXRJYT7+xXQrQ8LtwVus0jd
+gKVedajcBwRxveQX7+qFOcO1b8HmSeGUPQGkzp9YZYkx+YpRShMVHQkofAHOp+8C
+aC57rUy/xUo0p4kv7Q9yonpi5dqhJ0DHqJ9+0gCBhl8OlJKz4WQPIxgS0vjHnKIx
+k0c2dMim89DWVXXWyhrEWqmhnVkS8WRSmiI+9Y9JCPCDC2JPg7zhJQijkhcZm8L7
+Sclr4i2vWxQG9hUcTjoMkfVaNiGliN229GXHg+M7oYuoMaweSxF+HGixNhiaTe9V
+ZEWE+52uNT2H+Lq5fLsxR4PykP5+F2Z7RLOoe84+jJcXIKc8bS6W6so1mY19tZmF
+6ajiULlcMmHIIvWtQbrGDZZfUcdwGb2C4Gji+VZVz11q5TsoIxarfYpL/sF8AOIo
+Os1NMzrohuOMvwue+Ruzh4R1cd/6bV2KTsjNFu7fLSlczyUnwqmT+PCYMep1fLIT
+1G50K0ycN4Ttakym9f8hUyG1TW78DQkfMOd2UGaCW5/GvTAY2QyHpLgfN65HSoU8
+fJV8IAJCNwKGJy2QDN8e
+=xrMF
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild b/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild
index 31a2985de393..6392399e716b 100644
--- a/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild
+++ b/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild,v 1.1 2012/06/14 17:53:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild,v 1.2 2012/06/25 14:16:20 xarthisius Exp $
 
 EAPI=4
 
@@ -21,6 +21,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+DEPEND="!!app-arch/rpm"
+RDEPEND=""
+
 RESTRICT="mirror"
 
 S=${WORKDIR}
@@ -34,18 +37,6 @@ QA_PREBUILT="
 	opt/${PN}/bin/subserver
 	opt/${PN}/bin/assign"
 
-pkg_pretend() {
-	if has_version app-arch/rpm ; then
-		ewarn "You have app-arch/rpm installed on your system. Therefore"
-		ewarn "${PN} will fail to install due to sandbox violation."
-		ewarn "As this cannot be fixed on distribution level, please use"
-		ewarn "following workaround:"
-		ewarn "  emerge -C rpm && emerge -1 ${PN} && emerge -1 rpm"
-		die
-	fi
-	echo opt/${PN}/lib/${MY_PV}/x8664/64/libeh.so
-}
-
 src_unpack() {
 	cp "${DISTDIR}"/${A} "${S}" || die
 	chmod +x "${S}"/${P}.run
@@ -74,7 +65,7 @@ src_install() {
 	# The correct fix is in the assembly atomic-cxx.S, which we don't get
 	#   See http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
 	#   Section 6.  How to fix the stack (in practice)
-	/usr/bin/scanelf -Xe "${D}/opt/ekopath/lib/4.0.11/x8664/64/libstl.so"
+	/usr/bin/scanelf -Xe "${D}/opt/ekopath/lib/${MY_PV}/x8664/64/libstl.so"
 
 	rm -rf "${D}"/opt/${PN}/uninstall || die
 	rm -rf "${D}"/opt/${PN}/bin/{pathdb,funclookup} || die #libtinfo