Version bump

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 17 insertions, 72 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/Manifest b/sci-libs/liborigin/Manifest
index 208a431da82c..e68ecd6fee41 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -6,19 +6,17 @@ AUX liborigin-20100420-build-parsers.patch 781 RMD160 c5e80e02aa6141ecbadf8518fa
 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-20100903.tar.bz2 121681 RMD160 214e4f4e6315aefa6e8dc8ff786b65af083711ac SHA1 f338f394d76667d5d98f1cbc1fb5e6fc594f723c SHA256 4d566c169d86a818452c5492af09e92c770f481ef8dea3280795191d1dd262cb
-DIST liborigin-20100913.tar.bz2 110187 RMD160 ff42c5a03ef825a3430333846d44df39608fab0b SHA1 0a8070932609a0f36689f195c5076cad9a7d0772 SHA256 89c0dc5fecfc905f2c48dc132a174e6231141c391951b01a2c54d3aff35cda5d
-DIST liborigin2-20110221.zip 721734 RMD160 8e7f3552f4c78d10109b2d3641476c3dd96c3792 SHA1 2cc561adf650439f1883e213cbbc7d493a940503 SHA256 a41305d85e3cf752cd3e057322192096a51eb4d7c431e675b0c0e8736bc754ad
 DIST liborigin2-20110323.zip 568911 RMD160 3d43e2368630541e0f638a48a0f7e8c38fefdf30 SHA1 db1eb40ca724d2c9ace318731bb1631dd28635fa SHA256 aba6b715f222b6a254e8587e250e4a577970d03ebae78e380c9692066e2ecbfb
+DIST liborigin2-20110829.zip 158364 RMD160 48c7c54afe165a49d86860b3adeb3643a06d4539 SHA1 13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be SHA256 51ebf6de57d2b44cd6f5ab772ed92154eec9598a14a6655967ebcf2d7f8da0a2
 EBUILD liborigin-20100903.ebuild 1272 RMD160 e038036fc4946c9a1d3883b41beccaeec17701c9 SHA1 9603dfb580a2ac93d8f340b213dba75591d724b1 SHA256 0d8bfc9d605a69b52e5e05892d333ad27462b291dcdbbd0e4cf174d5f1eaf98d
-EBUILD liborigin-20100913.ebuild 1271 RMD160 78fc88f26319d15ba2b653f18dae2562294fe1a2 SHA1 404acfa0d4c04cde512e56ed6a778bc2808ccb80 SHA256 1ff3b52f788f67f2fb01018eb1afddf11c2807a512ff881b45f7393d63e19da5
-EBUILD liborigin-20110221.ebuild 1340 RMD160 d91118d78738c6cd72eef339b64e819f8c707056 SHA1 f624bea794a430e9e586ff1e3ebefff9f34bc2c7 SHA256 7c2ec48072d82929c9568c3c8ecf66b2e558a1d776ff0884d2f34dfef764f2fe
 EBUILD liborigin-20110323.ebuild 1234 RMD160 fb563e93f8c9ee3ea014c0beb848575a7ade5036 SHA1 57576fcf93ec5bc146b31fcae3874db601aebd4e SHA256 b8bc21bd86069084e322dc684077da67f7a5403ff4b4dbb2ad18128c10f36c45
-MISC ChangeLog 4870 RMD160 a964ce31ac8b0db60a29246f7ace68f139e5ff01 SHA1 779e5bfc8899d27b42cfdf9b361037197f3adfe3 SHA256 37bbee1c7c3993d4f75514ea6ba483e11af681aa974a25f051856129f2311f4a
+EBUILD liborigin-20110829.ebuild 1234 RMD160 fd98a4d38744ecb04e13ba79f5a7bd11c292fee0 SHA1 a130e137e9c9984c5fbf1781010a036070405f0d SHA256 8ad295c3f892e365b15099f2fbbb4b581b62b59043b8a9fcc18df8c6eac8649d
+MISC ChangeLog 5064 RMD160 fa03e9f467f80c33667193e629d70f01150a4746 SHA1 7d87505fb5de21e8ca325d3b2662f461aea6ea7f SHA256 dd9d88fff83ca256c8a941228c9d51b4dddd2a82c1fe7658aa979e64dbae3a65
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4918wACgkQ1ycZbhPLE2ARqQCffPiJrGbQYdust0xnxtKmNFU0
-zw8An1GtI/6Hj8GUtsS1ziZMwFvK53yI
-=075A
+iEYEARECAAYFAk5fEMAACgkQ1ycZbhPLE2ARdwCff+zz64nsCWn6zWkdhhVdvrUC
+W9sAoI1WIzPmJ51QLvvzuEH5DbOPw5Q9
+=k1Cl
 -----END PGP SIGNATURE-----
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/*
 }