[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/files/, dev-python/shiboken/

[Davide Pesavento]

commit:     9b02dad224fac496af03ccfbc2d001346206a2e8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun  3 16:33:11 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 16:33:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b02dad2

[dev-python/shiboken] Sync with portage.

(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)

---
 dev-python/shiboken/files/rpath.cmake    |   10 ++++++++++
 dev-python/shiboken/shiboken-9999.ebuild |    9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake
new file mode 100644
index 0000000..b896c87
--- /dev/null
+++ b/dev-python/shiboken/files/rpath.cmake
@@ -0,0 +1,10 @@
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index f078161..b882d41 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -33,13 +33,18 @@ DEPEND="${RDEPEND}
 		>=x11-libs/qt-test-4.7.0:4
 	)"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
 	# caused by the usage of a different version suffix with python >= 3.2
 	sed -i -e "/get_config_var('SOABI')/d" \
 		cmake/Modules/FindPython3InterpWithDebug.cmake || die
+
+	if use prefix; then
+		cp "${FILESDIR}"/rpath.cmake .
+		sed \
+			-i '1iinclude(rpath.cmake)' \
+			CMakeLists.txt || die
+	fi
 }
 
 src_configure() {