Drop old; Bump EAPI

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

3 files changed, 17 insertions, 67 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 8a92c995e940..94cd07cef41c 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/liborigin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.33 2015/04/07 14:41:52 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.34 2015/06/24 10:19:59 jlec Exp $
+
+  24 Jun 2015; Justin Lecher <jlec@gentoo.org> -liborigin-20110323.ebuild,
+  liborigin-20110829.ebuild:
+  Drop old; Bump EAPI
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> liborigin-20100903.ebuild,
   liborigin-20110323.ebuild, liborigin-20110829.ebuild:
diff --git a/sci-libs/liborigin/liborigin-20110323.ebuild b/sci-libs/liborigin/liborigin-20110323.ebuild
deleted file mode 100644
index 4ed3a92bc3b0..000000000000
--- a/sci-libs/liborigin/liborigin-20110323.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110323.ebuild,v 1.2 2013/03/02 23:23:00 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="http://soft.proindependent.com/liborigin2/"
-SRC_URI="mirror://berlios/qtiplot/${PN}2-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-qt/qtgui:4
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )"
-
-DOCS="readme FORMAT"
-
-S="${WORKDIR}"/${PN}${SLOT}
-
-src_prepare() {
-	mv liborigin2.pro liborigin.pro || die
-	qt4-r2_src_prepare
-	cat >> liborigin.pro <<-EOF
-		INCLUDEPATH += "${EPREFIX}/usr/include/tree"
-		headers.files = \$\$HEADERS
-		headers.path = "${EPREFIX}/usr/include/liborigin2"
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		INSTALLS = target headers
-	EOF
-	# use system one
-	rm -f tree.hh || die
-}
-
-src_compile() {
-	qt4-r2_src_compile
-	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	qt4-r2_src_install
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/liborigin/liborigin-20110829.ebuild b/sci-libs/liborigin/liborigin-20110829.ebuild
index 5ce798aef3af..236b939c3273 100644
--- a/sci-libs/liborigin/liborigin-20110829.ebuild
+++ b/sci-libs/liborigin/liborigin-20110829.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.3 2013/03/02 23:23:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.4 2015/06/24 10:19:59 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils qt4-r2
+inherit eutils multilib qt4-r2
 
 DESCRIPTION="Library for reading OriginLab OPJ project files"
 HOMEPAGE="http://soft.proindependent.com/liborigin2/"
@@ -15,15 +15,14 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-RDEPEND="dev-libs/boost"
+RDEPEND="
+	dev-libs/boost
+	dev-qt/qtgui:4"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-qt/qtgui:4
 	dev-cpp/tree
 	doc? ( app-doc/doxygen )"
 
-DOCS="readme FORMAT"
-
 S="${WORKDIR}"/${PN}${SLOT}
 
 src_prepare() {
@@ -43,12 +42,13 @@ src_prepare() {
 src_compile() {
 	qt4-r2_src_compile
 	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "doc generation failed"
+		cd doc && \
+			doxygen Doxyfile || die "doc generation failed"
 	fi
 }
 
 src_install() {
+	local DOCS="readme FORMAT"
+	use doc && local HTML_DOCS=( doc/html/. )
 	qt4-r2_src_install
-	use doc && dohtml -r doc/html/*
 }