From 492bf6b53019723c80c6c413c7a9cb61793b8c12 Mon Sep 17 00:00:00 2001
From: Kacper Kowalik <xarthisius@gentoo.org>
Date: Mon, 25 Jun 2012 14:16:20 +0000
Subject: Use blocker for app-arch/rpm rather than pkg_pretend/ewarn. Thanks to
 Diego Pettenò <flameeyes@gentoo.org> for suggestion. Remove hardcoded PV
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
---
 dev-lang/ekopath/ChangeLog                           |  7 ++++++-
 dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild | 19 +++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'dev-lang')

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/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
-- 
cgit v1.2.3-65-gdbad