summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-10-12 12:38:59 +0000
committerJustin Lecher <jlec@gentoo.org>2010-10-12 12:38:59 +0000
commitde90fc69f1c577f6d948aef5cd9c7d86736a470a (patch)
tree3148ba9a27a2291209ca7a78e420e3c67f00e7b2 /sci-libs/liborigin
parentRemove old version and cleanup files; add new revision with an alsa USE flag ... (diff)
downloadgentoo-2-de90fc69f1c577f6d948aef5cd9c7d86736a470a.tar.gz
gentoo-2-de90fc69f1c577f6d948aef5cd9c7d86736a470a.tar.bz2
gentoo-2-de90fc69f1c577f6d948aef5cd9c7d86736a470a.zip
Move to qt4-r2.eclass
(Portage version: 2.2_rc94/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/liborigin')
-rw-r--r--sci-libs/liborigin/ChangeLog5
-rw-r--r--sci-libs/liborigin/liborigin-20100903.ebuild21
2 files changed, 15 insertions, 11 deletions
diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index cef1227b0b7e..3cb86b89eb5b 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/liborigin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.22 2010/09/03 05:50:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.23 2010/10/12 12:38:59 jlec Exp $
+
+ 12 Oct 2010; Justin Lecher <jlec@gentoo.org> liborigin-20100903.ebuild:
+ Move to qt4-r2.eclass
*liborigin-20100903 (03 Sep 2010)
diff --git a/sci-libs/liborigin/liborigin-20100903.ebuild b/sci-libs/liborigin/liborigin-20100903.ebuild
index e6244083540a..b6515d538701 100644
--- a/sci-libs/liborigin/liborigin-20100903.ebuild
+++ b/sci-libs/liborigin/liborigin-20100903.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100903.ebuild,v 1.2 2010/10/12 12:09:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100903.ebuild,v 1.3 2010/10/12 12:38:59 jlec Exp $
EAPI="3"
-inherit eutils qt4
+inherit eutils qt4-r2
DESCRIPTION="Library for reading OriginLab OPJ project files"
HOMEPAGE="http://soft.proindependent.com/liborigin2/"
@@ -21,8 +21,14 @@ DEPEND="${RDEPEND}
dev-cpp/tree
doc? ( app-doc/doxygen )"
+PATCHES=(
+ "${FILESDIR}/liborigin-20100420-build-parsers.patch"
+ )
+
+DOCS="readme FORMAT"
+
src_prepare() {
- epatch "${FILESDIR}/liborigin-20100420-build-parsers.patch"
+ qt4-r2_src_prepare
cat >> liborigin.pro <<-EOF
INCLUDEPATH += "${EPREFIX}/usr/include/tree"
headers.files = \$\$HEADERS
@@ -34,12 +40,8 @@ src_prepare() {
rm -f tree.hh || die
}
-src_configure() {
- eqmake4
-}
-
src_compile() {
- emake || die "emake failed"
+ qt4-r2_src_compile
if use doc; then
cd doc
doxygen Doxyfile || die "doc generation failed"
@@ -47,8 +49,7 @@ src_compile() {
}
src_install() {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
- dodoc readme FORMAT || die
+ qt4-r2_src_install
if use doc; then
insinto /usr/share/doc/${PF}
doins -r doc/html || die "doc install failed"