diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-09-23 21:33:21 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-09-23 21:33:21 +0000 |
| commit | d13da782a43dd6b766af22a445258934704d712c (patch) | |
| tree | ab6b611700278643a6c6a937cde00cc338578e0b | |
| parent | EAPI 3, prefix, other improvements (diff) | |
| download | gentoo-2-d13da782a43dd6b766af22a445258934704d712c.tar.gz gentoo-2-d13da782a43dd6b766af22a445258934704d712c.tar.bz2 gentoo-2-d13da782a43dd6b766af22a445258934704d712c.zip | |
EAPI 3, prefix, other improvements
(Portage version: 2.2_rc85/cvs/Linux x86_64)
| -rw-r--r-- | x11-libs/qt-demo/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-demo/qt-demo-4.7.0.ebuild | 41 |
2 files changed, 26 insertions, 20 deletions
diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index f598fb9d0716..013b6a636bea 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.51 2010/09/21 14:45:36 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.52 2010/09/23 21:33:21 wired Exp $ + + 23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-demo-4.7.0.ebuild: + EAPI 3, prefix, other improvements *qt-demo-4.7.0 (21 Sep 2010) diff --git a/x11-libs/qt-demo/qt-demo-4.7.0.ebuild b/x11-libs/qt-demo/qt-demo-4.7.0.ebuild index 8df1aa86385d..3df53fdc49cb 100644 --- a/x11-libs/qt-demo/qt-demo-4.7.0.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.7.0.ebuild @@ -1,28 +1,31 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v 1.1 2010/09/21 14:45:36 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v 1.2 2010/09/23 21:33:21 wired Exp $ -EAPI="2" +EAPI="3" inherit qt4-build DESCRIPTION="Demonstration module of the Qt toolkit" SLOT="4" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT} - ~x11-libs/qt-core-${PV}:${SLOT} - ~x11-libs/qt-dbus-${PV}:${SLOT} - ~x11-libs/qt-gui-${PV}:${SLOT} - ~x11-libs/qt-multimedia-${PV}:${SLOT} - ~x11-libs/qt-opengl-${PV}:${SLOT} - || ( ~x11-libs/qt-phonon-${PV}:${SLOT} media-sound/phonon ) - ~x11-libs/qt-script-${PV}:${SLOT} - ~x11-libs/qt-sql-${PV}:${SLOT} - ~x11-libs/qt-svg-${PV}:${SLOT} - ~x11-libs/qt-test-${PV}:${SLOT} - ~x11-libs/qt-webkit-${PV}:${SLOT} - ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}" +IUSE="kde" + +DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-core-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=] + !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] + media-sound/phonon[aqua=] ) ) + kde? ( media-sound/phonon[aqua=] ) + ~x11-libs/qt-script-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-test-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]" + RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" ) @@ -40,8 +43,8 @@ pkg_setup() { } src_install() { - insinto ${QTDOCDIR}/src - doins -r "${S}"/doc/src/images || die + insinto "${QTDOCDIR#${EPREFIX}}"/src + doins -r "${S}"/doc/src/images || die "Installing images failed." qt4-build_src_install } |