summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-06-02 21:14:33 +0000
committerBen de Groot <yngwin@gentoo.org>2009-06-02 21:14:33 +0000
commitf60f586a7ef2500a46d718a8182b901719e562dd (patch)
tree39ebe41b47b67b3b45283924527859cc403db3f5 /dev-python/PyQt4
parentRemove unneccessary and misplaced openmp USE flag masking (diff)
downloadhistorical-f60f586a7ef2500a46d718a8182b901719e562dd.tar.gz
historical-f60f586a7ef2500a46d718a8182b901719e562dd.tar.bz2
historical-f60f586a7ef2500a46d718a8182b901719e562dd.zip
QtDesigner is triggered by USE=X, so hide sed behind X useflag
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r--dev-python/PyQt4/ChangeLog9
-rw-r--r--dev-python/PyQt4/Manifest4
-rw-r--r--dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild8
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 7d81ae49c606..d626763504c5 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.58 2009/06/01 19:33:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.59 2009/06/02 21:14:33 yngwin Exp $
+
+ 02 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild:
+ QtDesigner is triggered by USE=X, so hide sed behind X useflag. Thanks
+ to Davide Pesavento for alerting.
01 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+files/fix_license_check.patch:
@@ -12,8 +16,7 @@
files/configure.py.patch, metadata.xml:
Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug
235819 , bug 271870 ). Thanks to Davide Pesavento <davidepesa@gmail.com>
- for
- the ebuilds and the rpath patch.
+ for the ebuilds and the rpath patch.
20 May 2009; Ben de Groot <yngwin@gentoo.org> -PyQt4-4.4-r1.ebuild,
-PyQt4-4.4.4-r1.ebuild, -PyQt4-4.4.4-r3.ebuild, PyQt4-4.4.4-r4.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 1d2f348ca365..1c21abcfd6d5 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -5,6 +5,6 @@ AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97
DIST PyQt-x11-gpl-4.4.4.tar.gz 6982063 RMD160 970bca082a93402b1986b4e8a14738575732e8ae SHA1 6b91a8020de10e807fa0d3db6b7a92029a17cf0b SHA256 fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a
EBUILD PyQt4-4.4.4-r2.ebuild 2053 RMD160 2e558121c9279e447a7d81c30343e05f66584343 SHA1 b128d8cc5e13de8326a7743b9c0c7b24455227bf SHA256 88ae962727bf120178c1ee79c314848df812934b71ba908a1ff4a12dc5027535
EBUILD PyQt4-4.4.4-r4.ebuild 2221 RMD160 92a4e87f17f59f5cdb8ca7035bc4918ad58a4082 SHA1 7ab7ab501043dae45d2a60547425a70bef4a4ad8 SHA256 7cf7b42efb1482ee1522fabd2d0813b62bafb00d3c22214ebb6c99f8b0030596
-EBUILD PyQt4-4.4.4-r5.ebuild 3057 RMD160 17ae90906de41cd5952725195d19b98668fda97a SHA1 5a458d1c629d144314da6de4f7c0dccba0fb6074 SHA256 e839cfd2f923eb3f8508a853c9eb56f61a3c38604df8ec1d6a0cc8402be2c648
-MISC ChangeLog 8008 RMD160 4fec1b9606f7fd6d162ff0504c02a7a9b50c6a67 SHA1 26ec8944c1bf6338b99d8ace151f7b110029e6dc SHA256 4786b520e5b21b343e2ab727a4876c54fd726fa1ab04ca46c38155790d5b8c92
+EBUILD PyQt4-4.4.4-r5.ebuild 3078 RMD160 26c21518c29639640a8ab5df7f6c466393e489de SHA1 468439634df246e06be0d6ba2f0af50a923215e8 SHA256 78abe7649f9cf802037be7840960e7ea8639454b5e5259ef12bf5e444995b237
+MISC ChangeLog 8185 RMD160 9e4c453cd3e25fe7b4b56f15e591826b8d0ee338 SHA1 05a98ff5f54181ee99fe69c1f95b4f7ee951a391 SHA256 f2dc747b5c6afe54ea31a3d2ea0d0d5a13c3a2d2bf87297c4489c01d49630666
MISC metadata.xml 714 RMD160 8c740e56449b2453948683d998ac1eab67d1c329 SHA1 4ed693e5a1c25d8368933d70ba988da9b88d1122 SHA256 a42986a5a8e383a0931783fd49fb6bd0e79533ded138e15d4fbbdc5e355509c6
diff --git a/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild b/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
index d3e47508c7fa..5107eaf1ee8c 100644
--- a/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI="2"
@@ -85,8 +85,10 @@ src_configure() {
${myconf} || die "configuration failed"
# Fix insecure runpath
- sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/QtDesigner::" \
- "${S}"/QtDesigner/Makefile || die
+ if use X ; then
+ sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/QtDesigner::" \
+ "${S}"/QtDesigner/Makefile || die
+ fi
}
src_install() {