diff options
author | Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 21:53:18 +0000 |
---|---|---|
committer | Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 21:53:18 +0000 |
commit | 27465bcb9d900d0f1567eaea10dac6613beb32c8 (patch) | |
tree | 5b8b1158fa84638c13480514479fbe84e483e627 /x11-libs/qwt-qt3 | |
parent | QA: Get rid of deprecated qt_min_version(). (diff) | |
download | gentoo-2-27465bcb9d900d0f1567eaea10dac6613beb32c8.tar.gz gentoo-2-27465bcb9d900d0f1567eaea10dac6613beb32c8.tar.bz2 gentoo-2-27465bcb9d900d0f1567eaea10dac6613beb32c8.zip |
QA: Get rid of deprecated qt_min_version(). Quoting issues
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-libs/qwt-qt3')
-rw-r--r-- | x11-libs/qwt-qt3/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild | 8 | ||||
-rw-r--r-- | x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild | 16 |
3 files changed, 20 insertions, 12 deletions
diff --git a/x11-libs/qwt-qt3/ChangeLog b/x11-libs/qwt-qt3/ChangeLog index ee3eb48b5858..5236a4ed17a1 100644 --- a/x11-libs/qwt-qt3/ChangeLog +++ b/x11-libs/qwt-qt3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qwt-qt3 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/ChangeLog,v 1.3 2007/08/23 18:50:37 caleb Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/ChangeLog,v 1.4 2008/07/28 21:53:18 carlo Exp $ + + 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qwt-qt3-5.0.2.ebuild, + qwt-qt3-5.0.2-r1.ebuild: + QA: Get rid of deprecated qt_min_version(). Quoting issues *qwt-qt3-5.0.2-r1 (23 Aug 2007) diff --git a/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild b/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild index 31b230be126e..c9b3cb255a0a 100644 --- a/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild +++ b/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild,v 1.2 2007/08/23 20:02:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/qwt-qt3-5.0.2-r1.ebuild,v 1.3 2008/07/28 21:53:18 carlo Exp $ + +EAPI=1 inherit multilib qt3 @@ -16,7 +18,7 @@ IUSE="doc" S="${WORKDIR}/${MY_P}" -DEPEND="$(qt_min_version 3)" +DEPEND="x11-libs/qt:3" src_compile () { sed -i -e "s:TARGET .* = qwt:TARGET = qwt-qt3:" src/src.pro \ diff --git a/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild b/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild index c96cea575314..6c8f947fe631 100644 --- a/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild +++ b/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild,v 1.2 2007/08/09 12:01:39 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt-qt3/qwt-qt3-5.0.2.ebuild,v 1.3 2008/07/28 21:53:18 carlo Exp $ + +EAPI=1 inherit multilib eutils qt3 @@ -18,12 +20,12 @@ QWTVER="5.0.2" S=${WORKDIR}/${MY_P} -DEPEND="$(qt_min_version 3)" +DEPEND="x11-libs/qt:3" src_unpack () { unpack ${A} - cd {S} + cd "{S}" sed -i -e "s:TARGET = qwt:TARGET = qwt-qt3:" src/src.pro sed -i -e "s:-lqwt:-lqwt-qt3:" designer/designer.pro @@ -51,11 +53,11 @@ src_unpack () { src_compile () { # -j1 due to parallel build failures ( bug # 170625 ) - ${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwt.pro + "${QTDIR}"/bin/qmake QMAKE="${QTDIR}"/bin/qmake qwt.pro emake -j1 || die } src_install () { - make INSTALL_ROOT=${D} install - rm ${D}usr/$(get_libdir)/libqwt-qt3.so + make INSTALL_ROOT="${D}" install + rm "${D}"usr/$(get_libdir)/libqwt-qt3.so } |