Version bump

(Portage version: 2.1.10.10/cvs/Linux x86_64)

3 files changed, 11 insertions, 64 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index df3f9c81804f..2a4819508e79 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/liborigin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.29 2011/08/07 00:09:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.30 2011/09/01 04:57:10 bicatali Exp $
+
+*liborigin-20110829 (01 Sep 2011)
+
+  01 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -liborigin-20100913.ebuild, -liborigin-20110221.ebuild,
+  +liborigin-20110829.ebuild:
+  Version bump
 
 *liborigin-20110323 (07 Aug 2011)
 
diff --git a/sci-libs/liborigin/liborigin-20100913.ebuild b/sci-libs/liborigin/liborigin-20100913.ebuild
deleted file mode 100644
index 4a5d9f902bb2..000000000000
--- a/sci-libs/liborigin/liborigin-20100913.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-20100913.ebuild,v 1.1 2010/10/18 16:01:44 jlec Exp $
-
-EAPI="3"
-
-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"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	x11-libs/qt-gui: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
-	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-20110221.ebuild b/sci-libs/liborigin/liborigin-20110829.ebuild
index b87694be57c4..9c2cca0fde4b 100644
--- a/sci-libs/liborigin/liborigin-20110221.ebuild
+++ b/sci-libs/liborigin/liborigin-20110829.ebuild
@@ -1,14 +1,13 @@
 # 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-20110221.ebuild,v 1.1 2011/03/05 09:39:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.1 2011/09/01 04:57:10 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 
 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://berlios/qtiplot/${PN}2-${PV}.zip"
 
 LICENSE="GPL-3"
@@ -51,8 +50,5 @@ src_compile() {
 
 src_install() {
 	qt4-r2_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html || die "doc install failed"
-	fi
+	use doc && dohtml -r doc/html/*
 }