4 files changed, 19 insertions, 105 deletions
diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 3cb86b89eb5b..6f91cbe13530 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2010/10/12 12:38:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.24 2010/10/18 16:01:44 jlec Exp $
+
+*liborigin-20100913 (18 Oct 2010)
+
+  18 Oct 2010; Justin Lecher <jlec@gentoo.org>
+  -liborigin-20080225-r1.ebuild, -liborigin-20090406.ebuild,
+  -liborigin-20100630.ebuild, +liborigin-20100913.ebuild:
+  Version Bump, removed old
 
   12 Oct 2010; Justin Lecher <jlec@gentoo.org> liborigin-20100903.ebuild:
   Move to qt4-r2.eclass
diff --git a/sci-libs/liborigin/liborigin-20080225-r1.ebuild b/sci-libs/liborigin/liborigin-20080225-r1.ebuild
deleted file mode 100644
index 563b760d5b1c..000000000000
--- a/sci-libs/liborigin/liborigin-20080225-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20080225-r1.ebuild,v 1.2 2009/11/23 01:57:11 bicatali Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="A library for reading OriginLab OPJ project files"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-cpp/tree"
-RDEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	rm tree.hh || die
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README FORMAT || die "dodoc failed"
-}
diff --git a/sci-libs/liborigin/liborigin-20090406.ebuild b/sci-libs/liborigin/liborigin-20090406.ebuild
deleted file mode 100644
index 5446256e7b7d..000000000000
--- a/sci-libs/liborigin/liborigin-20090406.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-20090406.ebuild,v 1.3 2010/04/26 20:34:20 maekke Exp $
-
-EAPI=2
-inherit eutils qt4
-
-# hardcoded for now until it's back in sourceforge
-MYP=${PN}2-06042009
-S="${WORKDIR}/${MYP}"
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-SRC_URI="mirror://berlios/qtiplot/${MYP}.zip"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-SLOT="2"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	x11-libs/qt-gui:4
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	cat >> liborigin.pro <<-EOF
-		INCLUDEPATH += /usr/include/tree
-		headers.files = \$\$HEADERS
-		headers.path = /usr/include/liborigin2
-		target.path = /usr/$(get_libdir)
-		INSTALLS = target headers
-	EOF
-	# use system one
-	rm -f tree.hh || die
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dodoc readme FORMAT
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html || die "doc install failed"
-	fi
-}
diff --git a/sci-libs/liborigin/liborigin-20100630.ebuild b/sci-libs/liborigin/liborigin-20100913.ebuild
index 57411e173e49..4a5d9f902bb2 100644
--- a/sci-libs/liborigin/liborigin-20100630.ebuild
+++ b/sci-libs/liborigin/liborigin-20100913.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-20100630.ebuild,v 1.1 2010/06/30 06:45:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100913.ebuild,v 1.1 2010/10/18 16:01:44 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/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="dev-libs/boost"
@@ -21,8 +21,13 @@ DEPEND="${RDEPEND}
 	dev-cpp/tree
 	doc? ( app-doc/doxygen )"
 
+DOCS="readme FORMAT"
+
+S="${WORKDIR}"/${PN}${SLOT}
+
 src_prepare() {
-	epatch "${FILESDIR}/liborigin-20100420-build-parsers.patch"
+	mv liborigin2.pro liborigin.pro || die
+	qt4-r2_src_prepare
 	cat >> liborigin.pro <<-EOF
 		INCLUDEPATH += "${EPREFIX}/usr/include/tree"
 		headers.files = \$\$HEADERS
@@ -32,15 +37,10 @@ src_prepare() {
 	EOF
 	# use system one
 	rm -f tree.hh || die
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-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"
@@ -48,8 +48,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"