diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-14 14:07:15 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-14 14:07:15 +0000 |
| commit | d01edbdc949be11ca0e8ead104785a09d4eabd3e (patch) | |
| tree | 93e2acad1e3c13f0c2bad1dddb7f84eff866187c /dev-python/PyQt4 | |
| parent | Disable gpg-agent in favor of pinentry[gnome-keyring] (#547456) (diff) | |
| download | gentoo-2-d01edbdc949be11ca0e8ead104785a09d4eabd3e.tar.gz gentoo-2-d01edbdc949be11ca0e8ead104785a09d4eabd3e.tar.bz2 gentoo-2-d01edbdc949be11ca0e8ead104785a09d4eabd3e.zip | |
Use the new --no-python-dbus configure option.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-python/PyQt4')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.11.4.ebuild | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index bd0e2569de27..1a92044d314f 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.289 2015/06/14 13:52:01 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.290 2015/06/14 14:07:15 pesa Exp $ + + 14 Jun 2015; Davide Pesavento <pesa@gentoo.org> PyQt4-4.11.4.ebuild: + Use the new --no-python-dbus configure option. 14 Jun 2015; Davide Pesavento <pesa@gentoo.org> PyQt4-4.11.4.ebuild: PyQt4 became GPL-3 only. diff --git a/dev-python/PyQt4/PyQt4-4.11.4.ebuild b/dev-python/PyQt4/PyQt4-4.11.4.ebuild index cb29df82aa79..01bfb70c8b88 100644 --- a/dev-python/PyQt4/PyQt4-4.11.4.ebuild +++ b/dev-python/PyQt4/PyQt4-4.11.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.4.ebuild,v 1.2 2015/06/14 13:52:01 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.4.ebuild,v 1.3 2015/06/14 14:07:15 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -72,9 +72,6 @@ src_prepare() { # Allow building against KDE's phonon (bug 525354). epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch" - - # Avoid automagic dependency. - use dbus || rm -fr dbus } pyqt_use_enable() { @@ -97,6 +94,7 @@ src_configure() { --enable=QtXml $(pyqt_use_enable X QtGui) $(pyqt_use_enable dbus QtDBus) + $(usex dbus '' --no-python-dbus) $(pyqt_use_enable declarative) $(pyqt_use_enable designer) $(usex designer '' --no-designer-plugin) @@ -144,7 +142,7 @@ src_install() { } python_foreach_impl run_in_build_dir installation - dodoc NEWS THANKS + dodoc ChangeLog NEWS THANKS if use doc; then dodoc -r doc/html |