diff options
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.7.ebuild | 19 | ||||
| -rw-r--r-- | dev-python/dbus-python/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild | 8 |
4 files changed, 28 insertions, 10 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index f680e640fa1d..9946673a60a5 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.103 2010/01/15 15:15:44 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.104 2010/01/20 00:13:26 abcd Exp $ + + 20 Jan 2010; Jonathan Callen <abcd@gentoo.org> PyQt4-4.7.ebuild: + Add prefix keywords, support *PyQt4-4.7 (15 Jan 2010) diff --git a/dev-python/PyQt4/PyQt4-4.7.ebuild b/dev-python/PyQt4/PyQt4-4.7.ebuild index 0838d082cdd8..0aa8906351b4 100644 --- a/dev-python/PyQt4/PyQt4-4.7.ebuild +++ b/dev-python/PyQt4/PyQt4-4.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.ebuild,v 1.1 2010/01/15 15:15:44 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.ebuild,v 1.2 2010/01/20 00:13:26 abcd Exp $ EAPI="2" PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" @@ -17,7 +17,7 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz SLOT="0" LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" DEPEND="=dev-python/sip-4.10* @@ -51,12 +51,19 @@ PATCHES=( ) src_prepare() { + use prefix || EPREFIX= + if ! use dbus; then sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \ "${S}"/configure.py || die fi qt4-r2_src_prepare + + # Use proper include dir + sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \ + -i configure.py + python_copy_sources preparation() { @@ -74,12 +81,14 @@ pyqt4_use_enable() { } src_configure() { + use prefix || EPREFIX= + configuration() { local myconf="$(PYTHON) configure.py --confirm-license - --bindir=/usr/bin - --destdir=$(python_get_sitedir) - --sipdir=/usr/share/sip + --bindir=${EPREFIX}/usr/bin + --destdir=${EPREFIX}$(python_get_sitedir) + --sipdir=${EPREFIX}/usr/share/sip --qsci-api $(use debug && echo '--debug') --enable=QtCore diff --git a/dev-python/dbus-python/ChangeLog b/dev-python/dbus-python/ChangeLog index e4413ac87c08..6dd0d10456f7 100644 --- a/dev-python/dbus-python/ChangeLog +++ b/dev-python/dbus-python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/dbus-python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.56 2010/01/11 16:49:22 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.57 2010/01/20 00:11:09 abcd Exp $ + + 20 Jan 2010; Jonathan Callen <abcd@gentoo.org> + dbus-python-0.83.0-r1.ebuild: + Add prefix keywords, support 11 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> dbus-python-0.83.0-r1.ebuild: diff --git a/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild b/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild index 7faf06af89d8..5d08b16ed093 100644 --- a/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild +++ b/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild,v 1.14 2010/01/11 16:49:22 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild,v 1.15 2010/01/20 00:11:09 abcd Exp $ EAPI="2" PYTHON_DEFINE_DEFAULT_FUNCTIONS="1" @@ -15,7 +15,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples test" RDEPEND=">=dev-lang/python-2.4.4-r5 @@ -37,9 +37,11 @@ src_prepare() { } src_configure() { + use prefix || EPREFIX= + configuration() { econf \ - --docdir=/usr/share/doc/dbus-python-${PV} \ + --docdir="${EPREFIX}"/usr/share/doc/dbus-python-${PV} \ $(use_enable doc api-docs) } python_execute_function -s configuration |