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
commitaf03206aa3136ca68256a3cfb7b45eefb4b013b9 (patch)
treef162ddb1b09fb9358debe07f4e7b1d4d7dfc4ae7 /dev-python
parentversion bump, convert to xfconf eclass (diff)
downloadhistorical-af03206aa3136ca68256a3cfb7b45eefb4b013b9.tar.gz
historical-af03206aa3136ca68256a3cfb7b45eefb4b013b9.tar.bz2
historical-af03206aa3136ca68256a3cfb7b45eefb4b013b9.zip
Fix QtCore rpath logic. Install full html docs ( bug #280055 )
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/PyQt4/ChangeLog7
-rw-r--r--dev-python/PyQt4/Manifest4
-rw-r--r--dev-python/PyQt4/PyQt4-4.5.4.ebuild10
3 files changed, 12 insertions, 9 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/Manifest b/dev-python/PyQt4/Manifest
index 1057b7b05d0d..47131fb2462c 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,6 +8,6 @@ DIST PyQt-x11-gpl-4.5.4.tar.gz 6970552 RMD160 0f7a48edb65116c8fb23357f66d164ff1f
EBUILD PyQt4-4.4.4-r2.ebuild 2057 RMD160 c53d76a3cc8a0b39b167ee0f95b375d10ec64bcb SHA1 cd4c7d73f4be8fd082a8ebd95ab29ea2a4482f9c SHA256 62846add2eeae19473391d0c5fa172dd3f227b3f65d830854cb04667dd9d57c7
EBUILD PyQt4-4.4.4-r5.ebuild 3017 RMD160 c24de59cc3495ab1216eb546684a94bcded224ae SHA1 257df1054de3026db18166f7b72bc0a00875b001 SHA256 36d7007749c13f9db29f119e4421253e26ff8f45d1f04d6ddd773b1c61c96abf
EBUILD PyQt4-4.5.2.ebuild 3173 RMD160 8dc1fe362621b1f1eaa04769bea19f4643c2af95 SHA1 94f78aabbe3f9bf08753270ff4fb5af2c25f2bc5 SHA256 c92953611c34214330a63891d3d9a8cdfa9ae09978960e45d20cabc0650d680d
-EBUILD PyQt4-4.5.4.ebuild 3499 RMD160 06c06ed8b508f7b6db106ee037e39ac50cd083f4 SHA1 1f4af0dacb0c769a21eff22f45d67baa0db17c70 SHA256 eda21aeaf40c1f22abc21fccefe4abe588c3bd13bdd20b04c1df3343889c51c5
-MISC ChangeLog 10296 RMD160 97b24a2cb3fb9cb99ed045c6f87abaf23e22d5d2 SHA1 f6ebed92fc4dbafdc8526f3183559260f355c2e6 SHA256 15cf7fdff98907508522323ff6b7e30e59fd398a41be6268e4896cf3f71ad5a7
+EBUILD PyQt4-4.5.4.ebuild 3492 RMD160 37d047f4ef55fb2b4283615a2b69a1fb9a94453c SHA1 9931eac9daf1ecddb5a7caa4fa66e33471daa100 SHA256 c9b3b0782d314056c6e37f369203bcda4dad6b3f570ef7f464872fe410b7a68f
+MISC ChangeLog 10469 RMD160 ba7df902502218e487f5fe36c52b11638e95523e SHA1 a72dd5910e4e637c7d6a018de33896b2774c3b03 SHA256 d76ec7ead70bad2e0423fc1ef695797c37a88ca21803c477a69dfe4b42ea70fb
MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
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
}