diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-05-30 07:38:42 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-05-30 07:38:42 +0000 |
| commit | 4f99b83ecb54b79f921c611566ea9868f4f4dc9f (patch) | |
| tree | e5fba61d3ddf6fb6ae1a602869a1da164d6b1866 /dev-python | |
| parent | Remove old. (diff) | |
| download | historical-4f99b83ecb54b79f921c611566ea9868f4f4dc9f.tar.gz historical-4f99b83ecb54b79f921c611566ea9868f4f4dc9f.tar.bz2 historical-4f99b83ecb54b79f921c611566ea9868f4f4dc9f.zip | |
Add fix for prefix, missing rpath for qt4 installation
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/shiboken/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/shiboken/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/shiboken/files/rpath.cmake | 10 | ||||
| -rw-r--r-- | dev-python/shiboken/shiboken-1.1.1.ebuild | 8 |
4 files changed, 28 insertions, 7 deletions
diff --git a/dev-python/shiboken/ChangeLog b/dev-python/shiboken/ChangeLog index 87135c57bca6..d4010ef37a69 100644 --- a/dev-python/shiboken/ChangeLog +++ b/dev-python/shiboken/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/shiboken # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.26 2012/05/29 15:41:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.27 2012/05/30 07:38:42 jlec Exp $ + + 30 May 2012; Justin Lecher <jlec@gentoo.org> shiboken-1.1.1.ebuild, + +files/rpath.cmake: + Add fix for prefix, missing rpath for qt4 installation 29 May 2012; Justin Lecher <jlec@gentoo.org> shiboken-1.1.1.ebuild: Added ~-linux keywords, tested by me diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest index a71af77ac932..bc345f574246 100644 --- a/dev-python/shiboken/Manifest +++ b/dev-python/shiboken/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX rpath.cmake 393 RMD160 51a6cf4a7f8d6c55f2debcf28cb23129ec6a785b SHA1 31f4a5c481724abdd620a37d87103a38dcab4c39 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d DIST shiboken-1.1.0.tar.bz2 628866 RMD160 c99179381511e16cf1fd68fc8581e9c612d1d5b9 SHA1 c16300f72ea717e17e54bccd90d9494058c3f9a1 SHA256 99d26ee5982580a76826ca4c523736aa7853c694943d56208185ea62c6dc76c9 DIST shiboken-1.1.1.tar.bz2 1065920 RMD160 4a0997c9474f433a6b0998d68eb84e98613bd010 SHA1 d24efc1e7499e9d7db4dfc85a975291e3cb3f311 SHA256 1cedad65d5d12e1b81a487b6aa7a1cb0a494934cb39c34f3cffcbc6c645d7e3f EBUILD shiboken-1.1.0-r2.ebuild 2010 RMD160 6c65928cacf3fc90727928d9f6d5c0afd1f47d25 SHA1 c7d350aef11f5eadb50463a58727be8c22bda086 SHA256 5ca6fbe653a86a844c8a92d48bf34c7a93c3e0c05ea3d26845abe609e9b1edc7 -EBUILD shiboken-1.1.1.ebuild 2156 RMD160 c0aabde561d4de330b33afcb7e255a215a74c50a SHA1 ac8554058206f7b3da5f5ac858f33a3e5ea2cb88 SHA256 e5e579773b3411d03b1087ae569264bdff1ec83b30dff7fd240a324e43c8960f -MISC ChangeLog 4705 RMD160 8ab4534321441398d6154e7c1a59df12081e35d7 SHA1 31d090dc60f282ad8e564196eceb237874f64a99 SHA256 db50a948f6bcaeda4834a7cf1879e6a827fce053bceb748974e1e881ed7cb0c4 +EBUILD shiboken-1.1.1.ebuild 2280 RMD160 0d3513f2d4c59771bc7f035c3907fb8721e8f031 SHA1 ca6a1689abc8babcbdda6788286d89c435ecf790 SHA256 14c6acb7f506d63f8dff11784b59df2f5807a46aa346dd590a57b470f3363579 +MISC ChangeLog 4855 RMD160 78a40c4da9b2228e23896c800bebfc2e1b08bbb5 SHA1 dc8c3b5cbb67d5c921081a7e7e57fe2d490491cd SHA256 97362fc7d3eb5785b64dd6fe0bcac6a18fc20a0b9539439225dc7be2f89f3094 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk/E7kgACgkQgAnW8HDreRYevACffwr5g6Tj22y/YsCMYznY7CbW -kzsAoI4XYFWfRafYWEzeKMNAx2LJ0i5P -=HWZl +iEYEAREKAAYFAk/FzocACgkQgAnW8HDreRZcNACeJN3aNNhDIvD98FYnisQbYazW +t70AnjWuopmyDSvertPDv7pA5bswA69i +=hovi -----END PGP SIGNATURE----- diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake new file mode 100644 index 000000000000..b896c8789185 --- /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-1.1.1.ebuild b/dev-python/shiboken/shiboken-1.1.1.ebuild index 723e61516da2..098e47b1ad85 100644 --- a/dev-python/shiboken/shiboken-1.1.1.ebuild +++ b/dev-python/shiboken/shiboken-1.1.1.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-python/shiboken/shiboken-1.1.1.ebuild,v 1.2 2012/05/29 15:41:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.1.1.ebuild,v 1.3 2012/05/30 07:38:42 jlec Exp $ EAPI=4 @@ -40,6 +40,12 @@ src_prepare() { # 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() { |