Version Bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 94 insertions, 6 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 2952611f7bf7..5678530e6c6e 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.18 2010/05/05 16:49:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.19 2010/06/30 06:45:14 jlec Exp $
+
+*liborigin-20100630 (30 Jun 2010)
+
+  30 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  files/liborigin-20100420-build-parsers.patch, +liborigin-20100630.ebuild,
+  +files/liborigin-20100630-gcc45.patch:
+  Version Bump
 
   05 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
   liborigin-20100420.ebuild, +files/liborigin-20100420-gcc45.patch:
diff --git a/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch b/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch
index 92b8dce3d25b..91527af9e95d 100644
--- a/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch
+++ b/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch
@@ -1,7 +1,19 @@
-=== modified file '3rdparty/liborigin/liborigin.pro'
---- 3rdparty/liborigin/liborigin.pro	2010-04-22 17:58:49 +0000
-+++ 3rdparty/liborigin/liborigin.pro	2010-04-23 04:34:41 +0000
-@@ -22,5 +22,10 @@
+Index: liborigin.pro
+===================================================================
+--- liborigin.pro	(revision 1751)
++++ liborigin.pro	(working copy)
+@@ -17,10 +17,20 @@
+ HEADERS += OriginFile.h

+ HEADERS += OriginParser.h

+ HEADERS += OriginDefaultParser.h

+-HEADERS += Origin750Parser.h

++SOURCES += Origin600Parser.h

++SOURCES += Origin610Parser.h

++SOURCES += Origin700Parser.h

++SOURCES += Origin750Parser.h

++SOURCES += Origin800Parser.h

++SOURCES += Origin810Parser.h

+ 

  SOURCES += OriginFile.cpp

  SOURCES += OriginParser.cpp

  SOURCES += OriginDefaultParser.cpp

@@ -12,4 +24,3 @@
 +SOURCES += Origin800Parser.cpp

 +SOURCES += Origin810Parser.cpp

  

-
diff --git a/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch b/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch
new file mode 100644
index 000000000000..be63b7f2ce39
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch
@@ -0,0 +1,13 @@
+Index: OriginDefaultParser.cpp
+===================================================================
+--- OriginDefaultParser.cpp	(revision 1751)
++++ OriginDefaultParser.cpp	(working copy)
+@@ -73,7 +73,7 @@
+ 	int i;
+ 	FILE *f, *debug;
+ 	if((f=fopen(fileName.c_str(),"rb")) == NULL ) {
+-		printf("Could not open %s!\n",fileName);
++		printf("Could not open %s!\n",fileName.c_str());
+ 		return false;
+ 	}
+ 
diff --git a/sci-libs/liborigin/liborigin-20100630.ebuild b/sci-libs/liborigin/liborigin-20100630.ebuild
new file mode 100644
index 000000000000..57411e173e49
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-20100630.ebuild
@@ -0,0 +1,57 @@
+# 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 $
+
+EAPI="3"
+
+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 += "${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
+	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 || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/html || die "doc install failed"
+	fi
+}