summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-08-02 17:44:36 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-08-02 17:44:36 +0000
commit9cec415f3341e513106936718bb75443dc6d00f8 (patch)
tree9d4e8a18203436ed652e70daabdc97f3586a09f0 /dev-python/PyQt4
parentversion bump, convert to xfconf eclass (diff)
downloadgentoo-2-9cec415f3341e513106936718bb75443dc6d00f8.tar.gz
gentoo-2-9cec415f3341e513106936718bb75443dc6d00f8.tar.bz2
gentoo-2-9cec415f3341e513106936718bb75443dc6d00f8.zip
Fix QtCore rpath logic. Install full html docs ( bug #280055 )
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r--dev-python/PyQt4/ChangeLog7
-rw-r--r--dev-python/PyQt4/PyQt4-4.5.4.ebuild10
2 files changed, 10 insertions, 7 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 412ded9458d9..5ecc6fea52ab 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
# 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.76 2009/08/02 05:17:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.77 2009/08/02 17:44:36 hwoarang Exp $
+
+ 02 Aug 2009; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.5.4.ebuild:
+ Fix QtCore rpath without checking X use flag. Install all html
+ documentation (
+ bug #280055 )
02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
PyQt4-4.5.4.ebuild:
diff --git a/dev-python/PyQt4/PyQt4-4.5.4.ebuild b/dev-python/PyQt4/PyQt4-4.5.4.ebuild
index bb2235f3efcf..b998e1f1e9ae 100644
--- a/dev-python/PyQt4/PyQt4-4.5.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.5.4.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.5.4.ebuild,v 1.3 2009/08/02 05:19:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild,v 1.4 2009/08/02 17:44:36 hwoarang Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -96,11 +96,9 @@ src_configure() {
${myconf} || return 1
# Fix insecure runpath.
- if use X ; then
- for pkg in QtDesigner QtGui QtCore; do
- sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}-${PYTHON_ABI}/qpy/${pkg}::" ${pkg}/Makefile || die "failed to fix rpath issues"
- done
- fi
+ for pkg in QtCore $(use X && echo "QtDesigner QtGui"); do
+ sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}-${PYTHON_ABI}/qpy/${pkg}::" ${pkg}/Makefile || die "failed to fix rpath issues"
+ done
}
python_execute_function -s configure_package
}