Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-libs/qwt
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/qwt')
-rw-r--r--x11-libs/qwt/ChangeLog6
-rw-r--r--x11-libs/qwt/Manifest12
-rw-r--r--x11-libs/qwt/qwt-5.2.1.ebuild16
-rw-r--r--x11-libs/qwt/qwt-6.0.0_rc5.ebuild17
4 files changed, 25 insertions, 26 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 8ee127ca096b..c703b148432f 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -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)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index d4a4e3706db3..8b9be90d399b 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -5,14 +5,14 @@ DIST qwt-5.2.0.tar.bz2 1371877 RMD160 061319c7b4821c366fd05b68bbc3e134351f9110 S
DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee SHA1 89de7a90b7eddad2989470627baa19d59e348df1 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
DIST qwt-6.0.0-rc5.tar.bz2 2482931 RMD160 8330e5ec74425b0a2f3b8541177a21b47afe0a54 SHA1 435cf30784c789fb5033287f376ac0f6dac3288e SHA256 5a1758105369ca0204142158d4b4d46a0227b8f101f45d129e55effc02dbc16a
EBUILD qwt-5.2.0.ebuild 1798 RMD160 cbabd1cd4f51aa71c8adf4902abb97fc87815c92 SHA1 545d718d84036a9546262f8c6c705ba9fb6edf7f SHA256 260041676fa1a1c032a6cd76df89bfa3044191e5f81fc59276b584a3196d8159
-EBUILD qwt-5.2.1.ebuild 1874 RMD160 43462b8e5891c23cd2ec8188a6503b69726d45e5 SHA1 ce866709b2384d027d0c84ffb6b0ee06563f3224 SHA256 32448fa12b28d2ea427aa3502ab72d4352608d9bd2e3300874bd5e8e6e8e682e
-EBUILD qwt-6.0.0_rc5.ebuild 2161 RMD160 907d5faa14698e64fa9549e7375b91b49252af08 SHA1 0047b02ac904c039600f0a8d8c0cbe626a0d186e SHA256 09dc31b91f222418181151847db98675b398a233930a4186dcf58f5388b3d298
-MISC ChangeLog 10833 RMD160 450714159f91019d2b5cb8d5b1ae21e9cbc4c30c SHA1 d4b6bbb8d58791b048e3c8c4f4e48fc4f351ca8d SHA256 12063e4fb319b46864213fa21a8da059989df5f8594ad0f83c282f1a88448256
+EBUILD qwt-5.2.1.ebuild 1788 RMD160 f27b1381bf52c5d4da8e59833e1d9a63c4cc56d4 SHA1 cb49dc14cdb898ed04dcf5517237d0fd67e835a9 SHA256 6710cac7fa39832dd61a8792b4682bede3d8ed02ca71ce466bed8ee4e7bf3cbd
+EBUILD qwt-6.0.0_rc5.ebuild 2074 RMD160 20744a7bd789e54dd1efb04802735da61d59b411 SHA1 6a5e9bdb28e3999f9f9c6b53a0ae195d1e3ee8ec SHA256 334011132572522a0df94cc09ceb20281dbcf9313c8c34eac42d8e8ce6643d6c
+MISC ChangeLog 10957 RMD160 c365ddce8217981eef31a1abfcb1bcba868f7e9e SHA1 f2a6d68a546f3c0dc8eab8ac20c4c51a746b261e SHA256 314ef3feff26c989f38d2998741b17a52209c3d488ad9ea3fa11d5ddb6c6d434
MISC metadata.xml 510 RMD160 7a1780387ea1057ad0c03ebb0893b8b784dbb240 SHA1 33685ae6f5525901140d7edac99e3f1a0b01d430 SHA256 381cae2dbb6c2d0f63af9aa9f11f51c32cca49c390bf6c89d3b2534f31fd7466
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1yH9oACgkQgAnW8HDreRZHpwCdH4lxtCo7dogQtcMVrP+xssIM
-sPMAoMZ0sF5yP3hVHQU05vvoZsNMlOOC
-=32Xi
+iEYEARECAAYFAk1yIbkACgkQgAnW8HDreRbwdwCfQxWKPEhjxiftRhxpYDSkiuO5
+N6kAoLnkmLXcBTPnqTZNfGwn31EMP5Uw
+=EI/K
-----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index c00e1017bf5a..e0a4d1f11005 100644
--- a/x11-libs/qwt/qwt-5.2.1.ebuild
+++ b/x11-libs/qwt/qwt-5.2.1.ebuild
@@ -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 @@ DEPEND="
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 @@ src_prepare() {
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_compile() {
}
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
diff --git a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
index 93bb9d818113..a248498f0673 100644
--- a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
+++ b/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
@@ -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 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MY_P}
+DOCS="CHANGES README"
+
src_prepare() {
cat > qwtconfig.pri <<-EOF
QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
@@ -39,7 +42,6 @@ src_prepare() {
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 @@ src_prepare() {
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_compile() {
}
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