3 files changed, 23 insertions, 72 deletions
diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index ec78ac0926f3..68b161d38f4c 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2010/10/21 23:53:07 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.28 2011/03/05 09:39:11 jlec Exp $
+
+*liborigin-20110221 (05 Mar 2011)
+
+  05 Mar 2011; Justin Lecher <jlec@gentoo.org> -liborigin-20100420.ebuild,
+  -liborigin-20100630.ebuild, +liborigin-20110221.ebuild:
+  Version BUmp
 
   21 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   liborigin-20100903.ebuild:
diff --git a/sci-libs/liborigin/liborigin-20100420.ebuild b/sci-libs/liborigin/liborigin-20100420.ebuild
deleted file mode 100644
index 68e36fdf2c75..000000000000
--- a/sci-libs/liborigin/liborigin-20100420.ebuild
+++ /dev/null
@@ -1,56 +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-20100420.ebuild,v 1.4 2010/07/12 20:11:10 hwoarang Exp $
-
-EAPI=2
-inherit eutils qt4
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="http://soft.proindependent.com/liborigin2/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	x11-libs/qt-gui:4
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}/liborigin-20100420-build-parsers.patch"
-	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
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-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-20110221.ebuild
index 03c0d91e3ea7..b87694be57c4 100644
--- a/sci-libs/liborigin/liborigin-20100630.ebuild
+++ b/sci-libs/liborigin/liborigin-20110221.ebuild
@@ -1,28 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.3 2010/10/18 16:03:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110221.ebuild,v 1.1 2011/03/05 09:39:11 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/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://berlios/qtiplot/${PN}2-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	x11-libs/qt-gui:4
 	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 +39,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 +50,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"