diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-03-06 09:10:55 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-03-06 09:10:55 +0000 |
commit | 6143b1ae5682f2160346671951b6d92a90a043a3 (patch) | |
tree | b082d5cabc2f08e1aa0d2c623b838d296495698d /x11-libs | |
parent | ppc stable (bug 320687) (diff) | |
download | gentoo-2-6143b1ae5682f2160346671951b6d92a90a043a3.tar.gz gentoo-2-6143b1ae5682f2160346671951b6d92a90a043a3.tar.bz2 gentoo-2-6143b1ae5682f2160346671951b6d92a90a043a3.zip |
Versio 6 slotted to 6
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qwt/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild (renamed from x11-libs/qwt/qwt-6.0.0_rc5.ebuild) | 21 |
2 files changed, 19 insertions, 10 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index c703b148432f..5fbd2144db8a 100644 --- a/x11-libs/qwt/ChangeLog +++ b/x11-libs/qwt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qwt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.82 2011/03/05 11:42:42 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.83 2011/03/06 09:10:55 jlec Exp $ + +*qwt-6.0.0_rc5-r1 (06 Mar 2011) + + 06 Mar 2011; Justin Lecher <jlec@gentoo.org> -qwt-6.0.0_rc5.ebuild, + +qwt-6.0.0_rc5-r1.ebuild: + Versio 6 slotted to 6 05 Mar 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild, qwt-6.0.0_rc5.ebuild: diff --git a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild index a248498f0673..03899ba1e533 100644 --- a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild +++ b/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild,v 1.2 2011/03/05 11:42:42 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild,v 1.1 2011/03/06 09:10:55 jlec Exp $ EAPI="3" @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-beta/${PV/_/-}/${MY_P}.tar.bz2 LICENSE="qwt" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos" -SLOT="5" +SLOT="6" IUSE="doc examples svg" DEPEND=" @@ -30,12 +30,12 @@ DOCS="CHANGES README" src_prepare() { cat > qwtconfig.pri <<-EOF QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" - QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt5" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner - VERSION = ${PV} - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features" + VERSION = ${PV/_*} + QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6" + QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6" EOF cat > qwtbuild.pri <<-EOF @@ -47,12 +47,15 @@ src_prepare() { include( qwtconfig.pri ) TEMPLATE = app MOC_DIR = moc - INCLUDEPATH += "${EPREFIX}/usr/include/qwt5" - DEPENDPATH += "${EPREFIX}/usr/include/qwt5" + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" LIBS += -lqwt EOF sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die - sed -i -e 's/target doc/target/' src/src.pro || die + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:qwt:qwt6:g" \ + -i src/src.pro || die use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg" cp *.pri examples/ || die } |