* [gentoo-commits] gentoo-x86 commit in x11-libs/qwt: qwt-6.0.0_rc5.ebuild ChangeLog qwt-5.2.1.ebuild
@ 2011-03-05 11:34 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2011-03-05 11:34 UTC (permalink / raw
To: gentoo-commits
jlec 11/03/05 11:34:43
Modified: ChangeLog qwt-5.2.1.ebuild
Added: qwt-6.0.0_rc5.ebuild
Log:
Version Bump
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.81 x11-libs/qwt/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 21 Oct 2010 19:19:35 -0000 1.80
+++ ChangeLog 5 Mar 2011 11:34:43 -0000 1.81
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qwt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.80 2010/10/21 19:19:35 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.81 2011/03/05 11:34:43 jlec Exp $
+
+*qwt-6.0.0_rc5 (05 Mar 2011)
+
+ 05 Mar 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+ +qwt-6.0.0_rc5.ebuild:
+ Version Bump
21 Oct 2010; Jeremy Olexa <darkside@gentoo.org> qwt-5.2.1.ebuild:
Add ~x86-macos, tested in bug 339524
1.5 x11-libs/qwt/qwt-5.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?r1=1.4&r2=1.5
Index: qwt-5.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qwt-5.2.1.ebuild 21 Oct 2010 19:19:35 -0000 1.4
+++ qwt-5.2.1.ebuild 5 Mar 2011 11:34:43 -0000 1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-5.2.1.ebuild,v 1.4 2010/10/21 19:19:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.5 2011/03/05 11:34:43 jlec Exp $
EAPI="3"
inherit eutils qt4
@@ -14,16 +14,17 @@
SLOT="5"
IUSE="doc examples svg"
-DEPEND="x11-libs/qt-gui:4
+DEPEND="
+ x11-libs/qt-gui:4
doc? ( !<media-libs/coin-3.1.3[doc] )
svg? ( x11-libs/qt-svg:4 )"
RDEPEND="${DEPEND}"
src_prepare() {
cat > qwtconfig.pri <<-EOF
- target.path = "${EPREFIX}"/usr/$(get_libdir)
- headers.path = "${EPREFIX}"/usr/include/qwt5
- doc.path = "${EPREFIX}"/usr/share/doc/${PF}
+ target.path = "${EPREFIX}/usr/$(get_libdir)"
+ headers.path = "${EPREFIX}/usr/include/qwt5"
+ doc.path = "${EPREFIX}/usr/share/doc/${PF}"
CONFIG += qt warn_on thread release
CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
VERSION = ${PV}
@@ -33,8 +34,8 @@
include( qwtconfig.pri )
TEMPLATE = app
MOC_DIR = moc
- INCLUDEPATH += "${EPREFIX}"/usr/include/qwt5
- DEPENDPATH += "${EPREFIX}"/usr/include/qwt5
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt5"
LIBS += -lqwt
EOF
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
1.1 x11-libs/qwt/qwt-6.0.0_rc5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild?rev=1.1&content-type=text/plain
Index: qwt-6.0.0_rc5.ebuild
===================================================================
# 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.1 2011/03/05 11:34:43 jlec Exp $
EAPI="3"
inherit eutils qt4
MY_P="${PN}-${PV/_/-}"
DESCRIPTION="2D plotting library for Qt4"
HOMEPAGE="http://qwt.sourceforge.net/"
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"
IUSE="doc examples svg"
DEPEND="
x11-libs/qt-gui:4
doc? ( !<media-libs/coin-3.1.3[doc] )
svg? ( x11-libs/qt-svg:4 )"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MY_P}
src_prepare() {
cat > qwtconfig.pri <<-EOF
QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt5"
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"
EOF
cat > qwtbuild.pri <<-EOF
QWT_CONFIG += qt warn_on thread release no_keywords
EOF
# don't build examples - fix the qt files to build once installed
cat > examples/examples.pri <<-EOF
include( qwtconfig.pri )
TEMPLATE = app
MOC_DIR = moc
INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
DEPENDPATH += "${EPREFIX}/usr/include/qwt5"
LIBS += -lqwt
EOF
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
sed -i -e 's/target doc/target/' src/src.pro || die
qt4_src_prepare
}
src_configure() {
use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
cp *.pri examples/ || die
eqmake4
}
src_compile() {
# split compilation to allow parallel building
emake sub-src || die "emake library failed"
emake || die "emake failed"
}
src_install () {
emake INSTALL_ROOT="${D}" install || die "emake install failed"
dodoc CHANGES README
insinto /usr/share/doc/${PF}
if use doc; then
doman doc/man/*/* || die
doins -r doc/html || die
fi
if use examples; then
doins -r examples || die
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qwt: qwt-6.0.0_rc5.ebuild ChangeLog qwt-5.2.1.ebuild
@ 2011-03-05 11:42 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2011-03-05 11:42 UTC (permalink / raw
To: gentoo-commits
jlec 11/03/05 11:42:42
Modified: qwt-6.0.0_rc5.ebuild ChangeLog qwt-5.2.1.ebuild
Log:
Moved from qt4 -> qt4-r2 eclass
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-libs/qwt/qwt-6.0.0_rc5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild?r1=1.1&r2=1.2
Index: qwt-6.0.0_rc5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-6.0.0_rc5.ebuild 5 Mar 2011 11:34:43 -0000 1.1
+++ qwt-6.0.0_rc5.ebuild 5 Mar 2011 11:42:42 -0000 1.2
@@ -1,9 +1,10 @@
# 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.1 2011/03/05 11:34:43 jlec Exp $
+# $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 $
EAPI="3"
-inherit eutils qt4
+
+inherit eutils qt4-r2
MY_P="${PN}-${PV/_/-}"
@@ -24,6 +25,8 @@
S="${WORKDIR}"/${MY_P}
+DOCS="CHANGES README"
+
src_prepare() {
cat > qwtconfig.pri <<-EOF
QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
@@ -39,7 +42,6 @@
QWT_CONFIG += qt warn_on thread release no_keywords
EOF
-
# don't build examples - fix the qt files to build once installed
cat > examples/examples.pri <<-EOF
include( qwtconfig.pri )
@@ -51,14 +53,10 @@
EOF
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
sed -i -e 's/target doc/target/' src/src.pro || die
- qt4_src_prepare
-}
-
-src_configure() {
use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
cp *.pri examples/ || die
- eqmake4
}
+
src_compile() {
# split compilation to allow parallel building
emake sub-src || die "emake library failed"
@@ -66,8 +64,7 @@
}
src_install () {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
- dodoc CHANGES README
+ qt4-r2_src_install
insinto /usr/share/doc/${PF}
if use doc; then
doman doc/man/*/* || die
1.82 x11-libs/qwt/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 5 Mar 2011 11:34:43 -0000 1.81
+++ ChangeLog 5 Mar 2011 11:42:42 -0000 1.82
@@ -1,6 +1,10 @@
# 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.81 2011/03/05 11:34:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.82 2011/03/05 11:42:42 jlec Exp $
+
+ 05 Mar 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+ qwt-6.0.0_rc5.ebuild:
+ Moved from qt4 -> qt4-r2 eclass
*qwt-6.0.0_rc5 (05 Mar 2011)
1.6 x11-libs/qwt/qwt-5.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild?r1=1.5&r2=1.6
Index: qwt-5.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qwt-5.2.1.ebuild 5 Mar 2011 11:34:43 -0000 1.5
+++ qwt-5.2.1.ebuild 5 Mar 2011 11:42:42 -0000 1.6
@@ -1,9 +1,10 @@
# 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-5.2.1.ebuild,v 1.5 2011/03/05 11:34:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.6 2011/03/05 11:42:42 jlec Exp $
EAPI="3"
-inherit eutils qt4
+
+inherit eutils qt4-r2
DESCRIPTION="2D plotting library for Qt4"
HOMEPAGE="http://qwt.sourceforge.net/"
@@ -20,6 +21,8 @@
svg? ( x11-libs/qt-svg:4 )"
RDEPEND="${DEPEND}"
+DOCS="CHANGES README"
+
src_prepare() {
cat > qwtconfig.pri <<-EOF
target.path = "${EPREFIX}/usr/$(get_libdir)"
@@ -40,14 +43,10 @@
EOF
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
sed -i -e 's/headers doc/headers/' src/src.pro || die
- qt4_src_prepare
-}
-
-src_configure() {
use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
cp qwtconfig.pri examples/qwtconfig.pri
- eqmake4
}
+
src_compile() {
# split compilation to allow parallel building
emake sub-src || die "emake library failed"
@@ -55,8 +54,7 @@
}
src_install () {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
- dodoc CHANGES README
+ qt4-r2_src_install
insinto /usr/share/doc/${PF}
if use doc; then
doman doc/man/*/* || die
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-05 11:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-05 11:34 [gentoo-commits] gentoo-x86 commit in x11-libs/qwt: qwt-6.0.0_rc5.ebuild ChangeLog qwt-5.2.1.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2011-03-05 11:42 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox