summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-12-19 23:02:01 +0000
committerJustin Lecher <jlec@gentoo.org>2011-12-19 23:02:01 +0000
commit341d9ef4cb62b566a4e571310bcb87d6af7da5d2 (patch)
tree7ef8c057ee5dba15543183f0d6bfb1e82d9c323e /x11-libs/qwt
parentMerged zlib fixes from sci-visualization/qtiplot, #395139 (diff)
downloadgentoo-2-341d9ef4cb62b566a4e571310bcb87d6af7da5d2.tar.gz
gentoo-2-341d9ef4cb62b566a4e571310bcb87d6af7da5d2.tar.bz2
gentoo-2-341d9ef4cb62b566a4e571310bcb87d6af7da5d2.zip
Move to EAPI=4
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qwt')
-rw-r--r--x11-libs/qwt/ChangeLog6
-rw-r--r--x11-libs/qwt/qwt-5.2.1.ebuild14
-rw-r--r--x11-libs/qwt/qwt-6.0.0.ebuild12
3 files changed, 18 insertions, 14 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index b6998596eb98..49e9bde2e956 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.87 2011/12/19 22:02:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.88 2011/12/19 23:02:01 jlec Exp $
+
+ 19 Dec 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+ qwt-6.0.0.ebuild:
+ Move to EAPI=4
*qwt-6.0.1 (19 Dec 2011)
diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index 5891a23f615a..9ce6ba9305ea 100644
--- a/x11-libs/qwt/qwt-5.2.1.ebuild
+++ b/x11-libs/qwt/qwt-5.2.1.ebuild
@@ -1,8 +1,8 @@
# 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.7 2011/06/15 06:15:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.8 2011/12/19 23:02:01 jlec Exp $
-EAPI="3"
+EAPI=4
inherit eutils qt4-r2
@@ -49,8 +49,8 @@ src_prepare() {
src_compile() {
# split compilation to allow parallel building
- emake sub-src || die "emake library failed"
- emake || die "emake failed"
+ emake sub-src
+ emake
}
src_install () {
@@ -58,10 +58,10 @@ src_install () {
insinto /usr/share/doc/${PF}
if use doc; then
rm doc/man/*/*license*
- doman doc/man/*/* || die
- doins -r doc/html || die
+ doman doc/man/*/*
+ doins -r doc/html
fi
if use examples; then
- doins -r examples || die
+ doins -r examples
fi
}
diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
index efaf5d9769d4..2cce62548813 100644
--- a/x11-libs/qwt/qwt-6.0.0.ebuild
+++ b/x11-libs/qwt/qwt-6.0.0.ebuild
@@ -1,8 +1,8 @@
# 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.ebuild,v 1.1 2011/05/23 09:01:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.2 2011/12/19 23:02:01 jlec Exp $
-EAPI="3"
+EAPI=4
inherit eutils qt4-r2
@@ -73,17 +73,17 @@ src_prepare() {
src_compile() {
# split compilation to allow parallel building
- emake sub-src || die "emake library failed"
- emake || die "emake failed"
+ emake sub-src
+ emake
}
src_install () {
qt4-r2_src_install
if use doc; then
- dohtml -r doc/html/* || die
+ dohtml -r doc/html/*
fi
if use examples; then
insinto /usr/share/doc/${PF}
- doins -r examples || die
+ doins -r examples
fi
}