1 |
yngwin 09/06/02 21:14:33 |
2 |
|
3 |
Modified: ChangeLog PyQt4-4.4.4-r5.ebuild |
4 |
Log: |
5 |
QtDesigner is triggered by USE=X, so hide sed behind X useflag |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.59 dev-python/PyQt4/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.59&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.59&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.58&r2=1.59 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
18 |
retrieving revision 1.58 |
19 |
retrieving revision 1.59 |
20 |
diff -u -r1.58 -r1.59 |
21 |
--- ChangeLog 1 Jun 2009 19:33:34 -0000 1.58 |
22 |
+++ ChangeLog 2 Jun 2009 21:14:33 -0000 1.59 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-python/PyQt4 |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.58 2009/06/01 19:33:34 hwoarang Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.59 2009/06/02 21:14:33 yngwin Exp $ |
28 |
+ |
29 |
+ 02 Jun 2009; Ben de Groot <yngwin@g.o> PyQt4-4.4.4-r5.ebuild: |
30 |
+ QtDesigner is triggered by USE=X, so hide sed behind X useflag. Thanks |
31 |
+ to Davide Pesavento for alerting. |
32 |
|
33 |
01 Jun 2009; Markos Chandras <hwoarang@g.o> |
34 |
+files/fix_license_check.patch: |
35 |
@@ -12,8 +16,7 @@ |
36 |
files/configure.py.patch, metadata.xml: |
37 |
Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug |
38 |
235819 , bug 271870 ). Thanks to Davide Pesavento <davidepesa@×××××.com> |
39 |
- for |
40 |
- the ebuilds and the rpath patch. |
41 |
+ for the ebuilds and the rpath patch. |
42 |
|
43 |
20 May 2009; Ben de Groot <yngwin@g.o> -PyQt4-4.4-r1.ebuild, |
44 |
-PyQt4-4.4.4-r1.ebuild, -PyQt4-4.4.4-r3.ebuild, PyQt4-4.4.4-r4.ebuild: |
45 |
|
46 |
|
47 |
|
48 |
1.2 dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.2&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.2&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?r1=1.1&r2=1.2 |
53 |
|
54 |
Index: PyQt4-4.4.4-r5.ebuild |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v |
57 |
retrieving revision 1.1 |
58 |
retrieving revision 1.2 |
59 |
diff -u -r1.1 -r1.2 |
60 |
--- PyQt4-4.4.4-r5.ebuild 1 Jun 2009 16:30:48 -0000 1.1 |
61 |
+++ PyQt4-4.4.4-r5.ebuild 2 Jun 2009 21:14:33 -0000 1.2 |
62 |
@@ -1,6 +1,6 @@ |
63 |
# Copyright 1999-2009 Gentoo Foundation |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.1 2009/06/01 16:30:48 hwoarang Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.2 2009/06/02 21:14:33 yngwin Exp $ |
67 |
|
68 |
EAPI="2" |
69 |
|
70 |
@@ -85,8 +85,10 @@ |
71 |
${myconf} || die "configuration failed" |
72 |
|
73 |
# Fix insecure runpath |
74 |
- sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/QtDesigner::" \ |
75 |
- "${S}"/QtDesigner/Makefile || die |
76 |
+ if use X ; then |
77 |
+ sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/QtDesigner::" \ |
78 |
+ "${S}"/QtDesigner/Makefile || die |
79 |
+ fi |
80 |
} |
81 |
|
82 |
src_install() { |