| 1 |
jlec 12/05/30 07:50:16 |
| 2 |
|
| 3 |
Modified: ChangeLog pyside-1.1.1.ebuild |
| 4 |
Log: |
| 5 |
Add fix for prefix, missing rpath for qt4 installation |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.34 dev-python/pyside/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?rev=1.34&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?rev=1.34&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?r1=1.33&r2=1.34 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v |
| 19 |
retrieving revision 1.33 |
| 20 |
retrieving revision 1.34 |
| 21 |
diff -u -r1.33 -r1.34 |
| 22 |
--- ChangeLog 29 May 2012 15:42:30 -0000 1.33 |
| 23 |
+++ ChangeLog 30 May 2012 07:50:16 -0000 1.34 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-python/pyside |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.33 2012/05/29 15:42:30 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.34 2012/05/30 07:50:16 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 30 May 2012; Justin Lecher <jlec@g.o> pyside-1.1.1.ebuild, |
| 31 |
+ +files/rpath.cmake: |
| 32 |
+ Add fix for prefix, missing rpath for qt4 installation |
| 33 |
|
| 34 |
29 May 2012; Justin Lecher <jlec@g.o> pyside-1.1.1.ebuild: |
| 35 |
Added ~-linux keywords, tested by me |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 dev-python/pyside/pyside-1.1.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: pyside-1.1.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- pyside-1.1.1.ebuild 29 May 2012 15:42:30 -0000 1.2 |
| 52 |
+++ pyside-1.1.1.ebuild 30 May 2012 07:50:16 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v 1.2 2012/05/29 15:42:30 jlec Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v 1.3 2012/05/30 07:50:16 jlec Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -73,6 +73,12 @@ |
| 62 |
# library suffixed with the correct python version. |
| 63 |
sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \ |
| 64 |
libpyside/pyside.pc.in || die |
| 65 |
+ if use prefix; then |
| 66 |
+ cp "${FILESDIR}"/rpath.cmake . |
| 67 |
+ sed \ |
| 68 |
+ -i '1iinclude(rpath.cmake)' \ |
| 69 |
+ CMakeLists.txt || die |
| 70 |
+ fi |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
Archives