Version Bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 102 insertions, 11 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/Manifest b/sci-libs/liborigin/Manifest
index a1497e402274..d26f523f1920 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX liborigin-20080225-makefile.patch 1547 RMD160 e1ce040963f3efd852190b3f7bf3ed363ddad214 SHA1 16fedf0df0efd79337463e54a1257b0cb19f706c SHA256 cc5b0f3517092e02f0aa2233c466e31fef172f07b152ccd3e2ceaf0df36b35d4
-AUX liborigin-20100420-build-parsers.patch 495 RMD160 b15ca109c8a4fd3d3e7314c2fb4e87164678081b SHA1 1b96a4b06282f44fc7ea62e833b8075840ff28f4 SHA256 1cebbabd2cced95afda0971578856ec1611009ad347fc25b3a76b3d2e7dfb764
+AUX liborigin-20100420-build-parsers.patch 781 RMD160 c5e80e02aa6141ecbadf8518fa2fa936c8efc70b SHA1 c485c25f0a114977951e20cc8fa29d8711671dbc SHA256 035cb9386bdc33e92a3dfd22c419caae25861a50ed01e9a831d3791addf964f5
 AUX liborigin-20100420-gcc45.patch 345 RMD160 11fc8f2825af54785a629e4cd69a923c4505556f SHA1 6eb14d4cd79e7d87f98604e881a64002e3c1a974 SHA256 fb13c17e62de8beaf8c9bc91e403c915ebe1e18d855b90b04a0a1e4265b32343
+AUX liborigin-20100630-gcc45.patch 401 RMD160 da79c069c4a8be4e8c52bccb10b9243cf6321a66 SHA1 69fcc6bcbed3fd46f3907a06ac61e2b588adc4de SHA256 d655d83f60250ffb2ef5d6f35fabe3812f7a5aadc5d330d9d825c06170202dd1
 DIST liborigin-20080225.tar.gz 49326 RMD160 c18339fee71b2b819c95c54f0dfea4a49e44f522 SHA1 0dbbd2f929beaf94600c055fc3b15228354498c2 SHA256 bfa1d8ea617df9ad0c9e3764eefb0c7dc8ba76478735607e6cdd01df9937835e
 DIST liborigin-20100420.tar.bz2 121096 RMD160 ddbe3add0f9bd47b6f1489ab8a50a35b03498394 SHA1 ba4f195a36fd2f97c07655f13764c8113aeecc5c SHA256 797add4425f28fc14695f8216c280887cdc97dfa6daeca4f67526371c42af579
+DIST liborigin-20100630.tar.bz2 121413 RMD160 fe7c0a71d41709205bb2d02217d79e0b0a6f4a29 SHA1 12e6252f9ec6bfc4c5f10a7acd2d03f1b59f6b6e SHA256 ee34d0a84781c3131064fe52cbb42ae679c11406a89096d22ef656cb283e7352
 DIST liborigin2-06042009.zip 739957 RMD160 86a48dc031eb7b3fe5d162901ed07ead6e805a13 SHA1 1763568726bc446bab018946ebd023f5a2ca6fe7 SHA256 53f2638f7ef96cf09fb01ba47c8d7d70739e70620a7a60ce2b28f7a270c9e55c
 EBUILD liborigin-20080225-r1.ebuild 778 RMD160 e2dc052b0fb35988b66878830f28bcea761108a9 SHA1 4d62661936a0257878529d1ebf583b0f7f687bbe SHA256 d5e7c086bf04ea3813674124785da98280e2d3159c65f1698ade05d7148d4918
 EBUILD liborigin-20090406.ebuild 1301 RMD160 85d904eafb7ab246db29a178b0c520301ed758a5 SHA1 d6efe3bbcc4ca2d7531c311d5d8f0162b9df92dd SHA256 0bd952823601b7137b0a26b739659ceccb403c5c0792dacb5fed83f017638079
 EBUILD liborigin-20100420.ebuild 1303 RMD160 508bdf2dca7b08969e2415bfb0ba567950401923 SHA1 f815212c040659d3380544ac716c620dcf161575 SHA256 5c909ae95bf689f834a56ef2e9a09ff252621dc8bcc703bb7dc3d472eb829cf4
-MISC ChangeLog 3297 RMD160 5dc754b195a6963461c5af1c554c14ad321bc62a SHA1 43b5c6b89ae8c2216a5993abbc10bc388b73cbc8 SHA256 87c4bd5363d66c8c80dcdc27fb337d74feea9395003b5446a85b1e9b142a7d8b
+EBUILD liborigin-20100630.ebuild 1345 RMD160 61113fcd31ad6e2152f4fa561340679f99341083 SHA1 5f864a0eed27412fbadd580360b26aa949d3d7fd SHA256 3caffe5c48f316b45cc91c70e0a2e424c922a935c5ed69940466112e253291ab
+MISC ChangeLog 3508 RMD160 cad5ea8a12cd8e2d1e12dd284ba6d6403be23256 SHA1 37d8ac6f36b470831fcfb4ef2d9b06b310d81ad0 SHA256 4459d8f310e61034fbc219cdc8c64fc354929bf625379af11aaee9b8e7d3354e
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvhq9AACgkQ1ycZbhPLE2BhpgCaAv4rKmpAIU5k3ibDpd5GZCs1
-01gAnjyK8IOiO/gzGI25NQwHaX9QKj/h
-=yTeY
+iEYEARECAAYFAkwq6AAACgkQgAnW8HDreRZ4zACfR3Y84NK13Rap8ZRlDWZmtoTe
+s0QAn2RpBl+Xof8vLDIdwBMdPgtes+Fw
+=KexO
 -----END PGP SIGNATURE-----
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
+}