diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2007-06-24 20:11:22 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2007-06-24 20:11:22 +0000 |
| commit | 3f91de81c80a50ebb893c692b072cc48e4da510e (patch) | |
| tree | dd332b9a813ae0fb274a063bb97e61d17309bec9 /dev-python | |
| parent | ppc stable, bug #181941 (diff) | |
| download | gentoo-2-3f91de81c80a50ebb893c692b072cc48e4da510e.tar.gz gentoo-2-3f91de81c80a50ebb893c692b072cc48e4da510e.tar.bz2 gentoo-2-3f91de81c80a50ebb893c692b072cc48e4da510e.zip | |
Fixed $ROOT abuse (bug #167271) and some cleanup
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.2.ebuild | 26 |
2 files changed, 15 insertions, 16 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index d67de196db47..d2fcf365667a 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.11 2007/05/30 11:52:44 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.12 2007/06/24 20:11:22 dev-zero Exp $ + + 24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> PyQt4-4.2.ebuild: + Fixed $ROOT abuse (bug #167271) and some cleanup 30 May 2007; Caleb Tennis <caleb@gentoo.org> -PyQt4-4.0.ebuild, -PyQt4-4.1.1.ebuild: diff --git a/dev-python/PyQt4/PyQt4-4.2.ebuild b/dev-python/PyQt4/PyQt4-4.2.ebuild index 98f9217b1113..4b6914a32a91 100644 --- a/dev-python/PyQt4/PyQt4-4.2.ebuild +++ b/dev-python/PyQt4/PyQt4-4.2.ebuild @@ -1,16 +1,14 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.2.ebuild,v 1.3 2007/05/30 11:51:59 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.2.ebuild,v 1.4 2007/06/24 20:11:22 dev-zero Exp $ inherit distutils -MY_P="PyQt-x11-gpl-${PV}" -S="${WORKDIR}/${MY_P}" +MY_P=PyQt-x11-gpl-${PV} DESCRIPTION="PyQt is a set of Python bindings for the Qt toolkit." HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/" SRC_URI="http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/${MY_P}.tar.gz" - SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" @@ -21,6 +19,7 @@ RDEPEND="=x11-libs/qt-4* DEPEND="${RDEPEND} sys-devel/libtool" +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} @@ -34,24 +33,21 @@ src_compile() { distutils_python_version addpredict ${QTDIR}/etc/settings - local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/PyQt4 \ - -b ${ROOT}/usr/bin \ - -v ${ROOT}/usr/share/sip" #\ -# -n ${ROOT}/usr/include \ -# -o ${ROOT}/usr/$(get_libdir) \ -# -w -y qt-mt" + local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages/PyQt4 \ + -b /usr/bin \ + -v /usr/share/sip" use debug && myconf="${myconf} -u" - python configure.py ${myconf} + "${python}" configure.py ${myconf} emake || die "emake failed" } src_install() { - make DESTDIR=${D} INSTALL_ROOT=${D} install || die "install failed" - dodoc ChangeLog LICENSE NEWS README THANKS + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "install failed" + dodoc ChangeLog NEWS README THANKS use doc && dohtml -r doc/html/* if use examples ; then - dodir /usr/share/doc/${PF}/examples - cp -r examples/* ${D}/usr/share/doc/${PF}/examples + insinto /usr/share/doc/${PF} + doins -r examples fi } |