Version Bump, removed old

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

5 files changed, 25 insertions, 115 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 3cb86b89eb5b..6f91cbe13530 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.23 2010/10/12 12:38:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.24 2010/10/18 16:01:44 jlec Exp $
+
+*liborigin-20100913 (18 Oct 2010)
+
+  18 Oct 2010; Justin Lecher <jlec@gentoo.org>
+  -liborigin-20080225-r1.ebuild, -liborigin-20090406.ebuild,
+  -liborigin-20100630.ebuild, +liborigin-20100913.ebuild:
+  Version Bump, removed old
 
   12 Oct 2010; Justin Lecher <jlec@gentoo.org> liborigin-20100903.ebuild:
   Move to qt4-r2.eclass
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 08027b6b60e1..724337557124 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -5,22 +5,18 @@ AUX liborigin-20080225-makefile.patch 1547 RMD160 e1ce040963f3efd852190b3f7bf3ed
 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 liborigin-20100903.tar.bz2 121681 RMD160 214e4f4e6315aefa6e8dc8ff786b65af083711ac SHA1 f338f394d76667d5d98f1cbc1fb5e6fc594f723c SHA256 4d566c169d86a818452c5492af09e92c770f481ef8dea3280795191d1dd262cb
-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
+DIST liborigin-20100913.tar.bz2 110187 RMD160 ff42c5a03ef825a3430333846d44df39608fab0b SHA1 0a8070932609a0f36689f195c5076cad9a7d0772 SHA256 89c0dc5fecfc905f2c48dc132a174e6231141c391951b01a2c54d3aff35cda5d
 EBUILD liborigin-20100420.ebuild 1301 RMD160 59a533094bc3da829bc35185553cec12e0eb2c52 SHA1 6a97b350be3805da77abe12532269ff58997cedb SHA256 16934da289150fc41268513a90d55e977bd8e23e42c795e689ee31cc55504679
-EBUILD liborigin-20100630.ebuild 1345 RMD160 61113fcd31ad6e2152f4fa561340679f99341083 SHA1 5f864a0eed27412fbadd580360b26aa949d3d7fd SHA256 3caffe5c48f316b45cc91c70e0a2e424c922a935c5ed69940466112e253291ab
 EBUILD liborigin-20100903.ebuild 1270 RMD160 59de791d6ce305042c363cba761e1cac4370d78e SHA1 f353b68125b7b6cc5793b913473f3d9e3ed1a9bf SHA256 ef9134db44a7ade1c403c90a914807fade70d3d4eca19a2dd27117b98b20b60a
-MISC ChangeLog 3960 RMD160 7477936804e9960d2b9f902c565e5516217b05d4 SHA1 0044bfa79934cdfc3f8205689195d064e0e8524c SHA256 21efa8b14c31b1ba6c3e2a2556d1fd227ae91a657cae737e54d63374d332461c
+EBUILD liborigin-20100913.ebuild 1271 RMD160 78fc88f26319d15ba2b653f18dae2562294fe1a2 SHA1 404acfa0d4c04cde512e56ed6a778bc2808ccb80 SHA256 1ff3b52f788f67f2fb01018eb1afddf11c2807a512ff881b45f7393d63e19da5
+MISC ChangeLog 4190 RMD160 f161ff27eb8426e1a1fff924ad700385586b5f4b SHA1 86811c662b1b21360c6a09596f8c8c8c64572c9a SHA256 d70192209b295937cf5605cad41ec88c031449811b3b3573142c033da5201b76
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky0VxQACgkQgAnW8HDreRY2mQCfcvtx8oozewqkMgZ04SV9oHjl
-ef4AninQVZCE3c3a6Ap8lg1u44auSvSe
-=W4Cy
+iEYEARECAAYFAky8b3EACgkQgAnW8HDreRZXmACeOLZnK3KbIDaQmtUm7WGvpXqt
+SxkAmwQYs2PVwWYUNcK7YTQCyd3AldIQ
+=gqqY
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/liborigin/liborigin-20080225-r1.ebuild b/sci-libs/liborigin/liborigin-20080225-r1.ebuild
deleted file mode 100644
index 563b760d5b1c..000000000000
--- a/sci-libs/liborigin/liborigin-20080225-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20080225-r1.ebuild,v 1.2 2009/11/23 01:57:11 bicatali Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="A library for reading OriginLab OPJ project files"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-cpp/tree"
-RDEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	rm tree.hh || die
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README FORMAT || die "dodoc failed"
-}
diff --git a/sci-libs/liborigin/liborigin-20090406.ebuild b/sci-libs/liborigin/liborigin-20090406.ebuild
deleted file mode 100644
index 5446256e7b7d..000000000000
--- a/sci-libs/liborigin/liborigin-20090406.ebuild
+++ /dev/null
@@ -1,59 +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-20090406.ebuild,v 1.3 2010/04/26 20:34:20 maekke Exp $
-
-EAPI=2
-inherit eutils qt4
-
-# hardcoded for now until it's back in sourceforge
-MYP=${PN}2-06042009
-S="${WORKDIR}/${MYP}"
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-SRC_URI="mirror://berlios/qtiplot/${MYP}.zip"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-SLOT="2"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	x11-libs/qt-gui:4
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	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
-}
-
-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-20100913.ebuild
index 57411e173e49..4a5d9f902bb2 100644
--- a/sci-libs/liborigin/liborigin-20100630.ebuild
+++ b/sci-libs/liborigin/liborigin-20100913.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $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
+inherit eutils qt4-r2
 
 DESCRIPTION="Library for reading OriginLab OPJ project files"
 HOMEPAGE="http://soft.proindependent.com/liborigin2/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="dev-libs/boost"
@@ -21,8 +21,13 @@ DEPEND="${RDEPEND}
 	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 +37,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 +48,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"