Drop old; Bump EAPI

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 36 insertions, 88 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 8a92c995e940..94cd07cef41c 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/liborigin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.33 2015/04/07 14:41:52 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.34 2015/06/24 10:19:59 jlec Exp $
+
+  24 Jun 2015; Justin Lecher <jlec@gentoo.org> -liborigin-20110323.ebuild,
+  liborigin-20110829.ebuild:
+  Drop old; Bump EAPI
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> liborigin-20100903.ebuild,
   liborigin-20110323.ebuild, liborigin-20110829.ebuild:
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 5c32a1debb5f..bbbbf637bab6 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -6,29 +6,27 @@ AUX liborigin-20100420-build-parsers.patch 781 SHA256 035cb9386bdc33e92a3dfd22c4
 AUX liborigin-20100420-gcc45.patch 345 SHA256 fb13c17e62de8beaf8c9bc91e403c915ebe1e18d855b90b04a0a1e4265b32343 SHA512 8bab75a9d7a23137cf8f2a9236812e536505548b6e80af1316f83e3e8f5e9304ecf8ee6f402d45600932994450cecbd7e1d3f315e7003513d593d9f7a238e2cf WHIRLPOOL 982df2ecf146dffb5b5e456dd4e4bf963a173d4ea5450263bea4a30d588bb2aa0e9e4b3344cb19b8f410cfcd705adda338b04d0628fbc4d9d7560b72070f6e2a
 AUX liborigin-20100630-gcc45.patch 401 SHA256 d655d83f60250ffb2ef5d6f35fabe3812f7a5aadc5d330d9d825c06170202dd1 SHA512 6eb49747ee18120dae699f5a5f55755491a279245ea78f8638fae1a3faf52c45bb19d17b78aa8e7bc72da8a7f1f04fb6c5ac8e6d20f450019c6626f8c65c1a7d WHIRLPOOL 11eef56e95b4ab5c2b3c02b56d5b206fc5890b7a1c30a684f76d17d9421b462e3af355c004a79144245fbba36153490fa029270642c16ea932a67eecaabf97f2
 DIST liborigin-20100903.tar.bz2 121681 SHA256 4d566c169d86a818452c5492af09e92c770f481ef8dea3280795191d1dd262cb
-DIST liborigin2-20110323.zip 568911 SHA256 aba6b715f222b6a254e8587e250e4a577970d03ebae78e380c9692066e2ecbfb
-DIST liborigin2-20110829.zip 158364 SHA256 51ebf6de57d2b44cd6f5ab772ed92154eec9598a14a6655967ebcf2d7f8da0a2
+DIST liborigin2-20110829.zip 158364 SHA256 51ebf6de57d2b44cd6f5ab772ed92154eec9598a14a6655967ebcf2d7f8da0a2 SHA512 d0e4013a686fbc61c58b1f39e98aace91978bcadffbb2ef9d32576a3b2f19cc2443d595da2d3ecc19298ec6e29c20717db94e1fda6a64d71f3763841228a01c0 WHIRLPOOL 6828990a46643e7eb838ebda425d2a0d4477945552afe10b18048edaa104b94b43ea428700417c3701251646add3e45a4c4bcd1076b1740e42fa145c816200a2
 EBUILD liborigin-20100903.ebuild 1269 SHA256 d138f9698465077a28146c2d165640734c7ae585dbb2bd32a8b9d43198c7e822 SHA512 1376aaa9e5bedb2d0a984d24b0854ddf3d0167b1619148539a3fbbda54c1e900c7e8d06d2555a118bf94ff99928198e1178bc63bef9bee5c9717f98d403cb80d WHIRLPOOL 69c619bd822731ed4a02cef0b71660cfdc87a7041d1ee49428ef6c3641ba66f409cf49e50224ef90b3894c7b19f93681997de9762b70fff7e63f2f87033f42a7
-EBUILD liborigin-20110323.ebuild 1231 SHA256 24d058ddd02ce1e835e5df4869cb7dcc846f228fae7dcea1a28d96d3d8674709 SHA512 8d4d7ea3eec1e05be1e582e8710dd384dbe5e0e2a08e2aa1e3b896b3573cfa5912bc99f8c1600d4cbf6dcc9f81ff42edab805396c4b20954c37cb1ef36fa2315 WHIRLPOOL f21cec1baf02f09c1d175d6ad26e76ad6343b50c7bc7770245b24e7980a78ee8d41a11b36a0dca5aadf1d2e5b8f58dcd2b74825c7e2482a66b976e697e893537
-EBUILD liborigin-20110829.ebuild 1249 SHA256 caf609974c751b13d59034701269dcf7be8153edb8ac893f99ece522043b57c5 SHA512 ccc29cb22706d9ac30a61c63910c2a709300669b082c7f3311d7b392b89dee792f5384fff1224004fcbc75967764b43dd729294e01a05cab7c5826ec6c4fdf70 WHIRLPOOL 44fa41eae8fad1f819bc6744b02ce6be9670af28e302b5b0b59463ec64f11b634c24f4ef2aca818019477382e270a632c7662e2061ef4a4a76661b6e43b9edb8
-MISC ChangeLog 5353 SHA256 398dba2d37dc12ad0efb3536d972e8c2c21ab8d6975ab824782ebc36a7f953a2 SHA512 e0028668bc28b687cd280471aa32eb76a5dc3d5a798c2d2e75523ba0d7e00965f002025706c6a7680233cf7dc9227f8f58cfc55f4beb847502dce27d4a0b0e6f WHIRLPOOL 66cc6b1b108c2f7ce2de472b3f699781bdea5bb65837bea3d1ee3b3632deae65a6f26e394a83540199538fa001a059e1253e5942afa6a2b3663c40d0bbb3b05b
+EBUILD liborigin-20110829.ebuild 1278 SHA256 578a1ae705eb55afb2d1b6dd60b007e5cc28bd945f4d6e46a78d0964a5046f7c SHA512 3c9cb5daed707174746e2661304e8d5dafeaeb863b37b0c9db330dbe6c5b6674733683ab65ac8b493036a8adfd72f59ba5ba07b53c9562e0c9b91c1d92e3fc63 WHIRLPOOL 871711fc3efc15b278d2e49368740a3f1865fd9a2199d267e9274f28be74f5a51e805a04b4c0dd48930520e22b351439caeb56d6a547d10e26c9be468bac68af
+MISC ChangeLog 5480 SHA256 bf19a1ea294eb217315bc80d5fb769444a87b865f9f43851b6659f819341976e SHA512 eca4215c0ad4eac4146157827759c94f2c77fcbe616ffaae357db77604dab7341d445620a08fdcf3193915e8e898dbc1b62d5672575deb96acb2c3afb7222118 WHIRLPOOL ab586a250bce244acc2e7540c6bac1e9fdf0d525eabaf25e83dfc6161960529e5782bc3e3ce9fdbc5c71c119970c3082c863ba8184f41fde91286b35a71dcd52
 MISC metadata.xml 253 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0 SHA512 855795b1c13dc65890be4899764fb381cf5398f8d32a9dbd4ab5fb852810713831375b47a5d905c75415745812dee387a587d888574f4a1250098883cb1d85c0 WHIRLPOOL e9006072bce3b59e40115b5157c53e3d1f591c262f7381dfd9401a56e76a696a55a286a6c894933ca046db2cd083eac0f00ba50f0d8ef38da7883c8c0ea42077
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVI+yxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViraP4P/RfZ9zGzk8LNFiZhGouPtovE
-55b7rqkwNCEgHMgkfDaF/yr+QtcPhRKb6xXow2kbgB5p+l3Ytu968d7Tz/ucQwAB
-3QtsdFgKDFmSOZMuPOoRk+KxD0GVMOwA4UjJYpoJLQU96SqjmQO/5dx9yZnoyi1H
-1RgIEuEIRk1zjiBxryUXAuRg8Xi2HAEed6y7+rSwWGV3ELGyqsLNBVCnBFdIxKiB
-WEUwKkG4jQDvVi9AT1fob5ELS39q22bZvxy3lvgaPK23PpmCmRXFrAwrZBp9XtED
-jvx6XtZmjIs9eIur3EtWp54cyGwYn+mgj9r6PYdd4znEG0BB0OHecGXACApiPI+l
-iGhwn7JZnpQpxivPHYNw3THdpGsUoCCqj4DQ/q00UJzSxhTPc9t9Oht5dvPyn67E
-g1yEWxgPLav28o3wILFxbnEMSnFhmMYOD5u+6SO6WhEaQ3LUTZMFLxM7rwkYoIdH
-rPV0Y89KtiMxqZ6dgW9GS8MZ/C0aeucAHVXJQQISjC4/ZMpuQ3iUKd1XNhJaffMP
-QVfvfhmmGMQfQN18Yo0Jbq/z1VhhTqLBCJWBVwxX6RuLzvhu99Gd2GKG4tWet22+
-+xY/+N+tu0ZmCI+hvG6dS7/gmwAlsexpNe4Go5JMbwnG3TP3ZGlhoZ776VF4i2fF
-qCpyq4SbP3QER4PLQno4
-=yjdZ
+iQJ8BAEBCgBmBQJVioRQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiY+4P/iKnDEVCQnh0QfhrlvY8rB1H
+mYze/goTenw0NfcC8NLAdZWF+LvHlubXvmfHPyTxJJTWlsC1YvfvU2uc9jvVLPUn
+EfSWa9VuAfF4TfwydxQpWeBpMBJI+PH39+r9/pfJzZdSsr+QEbM6OhxuKYKyLiPX
+HH35ljQV1jb1Z1Kk4OkHlAKxhYSNS60hl/yFeT9Y/06FEqKJgCZKXNp9KKSEx+8g
+b/4uCN3Ob013rKFqGv9wv+TfXvpyFe+SKjRTR1GLb82Lv96UB0CmmUgIe6fyQ8DJ
+0YeaMAJbgcPhljmjJ3V6/vom3unwk01caohO9Th/PQbYGtri+Tbq65Ng9wRZZ4Fq
+LQL8fO2ePNJHJ10NSqjOyNDUzwLMkw5bP+taK5raNSkc29IkAPMU3ROGYnqqBhVs
+raZHg2ktmdd62Sb22LgpJgiQgcUV8do+KCE3nHMquVk/DRFEOBk7/ihITqZ/aRKm
+GjAKF1C6dL6pHBB7NSoyHJ6xzyAWD+/2k4a4fd1PhiWIhtaxKAXTa1chJKPLrDyv
+A/MkZbnHsl3QWKBakU63+NgpwhQ7BBy6zww5+vGgsGAURIwEj50ifXeFdNEPACz0
+/3WMjameqRqIFyNB4Pz8WRC8tW+cVXQ+DGlqb+C5mxAJNsCjmgfLcHeMVJH6w1hM
+8zJiZQCOR6jjUjOlfLy2
+=KWQx
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/liborigin/liborigin-20110323.ebuild b/sci-libs/liborigin/liborigin-20110323.ebuild
deleted file mode 100644
index 4ed3a92bc3b0..000000000000
--- a/sci-libs/liborigin/liborigin-20110323.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110323.ebuild,v 1.2 2013/03/02 23:23:00 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="http://soft.proindependent.com/liborigin2/"
-SRC_URI="mirror://berlios/qtiplot/${PN}2-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-qt/qtgui: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
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/liborigin/liborigin-20110829.ebuild b/sci-libs/liborigin/liborigin-20110829.ebuild
index 5ce798aef3af..236b939c3273 100644
--- a/sci-libs/liborigin/liborigin-20110829.ebuild
+++ b/sci-libs/liborigin/liborigin-20110829.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.3 2013/03/02 23:23:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.4 2015/06/24 10:19:59 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils qt4-r2
+inherit eutils multilib qt4-r2
 
 DESCRIPTION="Library for reading OriginLab OPJ project files"
 HOMEPAGE="http://soft.proindependent.com/liborigin2/"
@@ -15,15 +15,14 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-RDEPEND="dev-libs/boost"
+RDEPEND="
+	dev-libs/boost
+	dev-qt/qtgui:4"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-qt/qtgui:4
 	dev-cpp/tree
 	doc? ( app-doc/doxygen )"
 
-DOCS="readme FORMAT"
-
 S="${WORKDIR}"/${PN}${SLOT}
 
 src_prepare() {
@@ -43,12 +42,13 @@ src_prepare() {
 src_compile() {
 	qt4-r2_src_compile
 	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "doc generation failed"
+		cd doc && \
+			doxygen Doxyfile || die "doc generation failed"
 	fi
 }
 
 src_install() {
+	local DOCS="readme FORMAT"
+	use doc && local HTML_DOCS=( doc/html/. )
 	qt4-r2_src_install
-	use doc && dohtml -r doc/html/*
 }