[gentoo-commits] dev/dilfridge:master commit in: sci-visualization/qtiplot/

[gentoo-commits] dev/dilfridge:master commit in: sci-visualization/qtiplot/

[Andreas Hüttel]

commit:     f97c62f027f5a472de217248589f45727aaa68ca
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jan 22 14:17:32 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 14:17:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=f97c62f0

[sci-visualization/qtiplot] Simplify and keep liborigin bundled

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 sci-visualization/qtiplot/Manifest                 |   22 +++++++++++++++++++-
 .../qtiplot/qtiplot-0.9.8.9-r1.ebuild              |   18 +++++----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 350e7cb..23678b7 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b
 AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff
 AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22
@@ -20,6 +23,23 @@ AUX qtiplot-0.9.8.9-origin-2.patch 1715 RMD160 15cef2683087f8b4f15dcb9798d7e6d03
 AUX qtiplot-0.9.8.9-unbundle.patch 2815 RMD160 f2bbcbd39a44542e46def73a0de258ee683bb9ca SHA1 8a992e612cb781d012f4e9dbced023adb7214905 SHA256 ce41e2af253a25c49a4cb6394d291cf0d5ec0795620cdaacfe524ea19295d807
 DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 RMD160 cbdd313f6054ecce19987be949b381c6210a3dad SHA1 632fbe607af7d2b1a903ef414ccadc4f425f9058 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99
 DIST qtiplot-0.9.8.9.tar.bz2 16202943 RMD160 6f78160aabc94fc8f01d4f5fb65f5cb4a718eae2 SHA1 73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0
-EBUILD qtiplot-0.9.8.9-r1.ebuild 5927 RMD160 5428e757406c9d4bd35035abcd34639e47966027 SHA1 fa40867fef42da0d181576be9a5ce58a94172998 SHA256 91823741ab382a89e53c78716326b1a3fd629c570c3ac07965993805edb20c9b
+EBUILD qtiplot-0.9.8.9-r1.ebuild 5820 RMD160 0296bc303781af28bc5b26a2627607a0dc2d8299 SHA1 9268ae18e7b2f199c54a0081e838c176609a286f SHA256 9c71aa0ee9ec1086ea4840fc2a8e944eb398f4ccb86f30af52501922c912c3c8
 EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28
 MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPHBp7AAoJENwGBM22xffesUQP/jJAb8AqkxhlGQLkLk18hNNo
+eKqoc9PcRQR+eCITA5WSz1WNWNDXKXaSXPAe7sIAShtqnWwktgqnEy2yCNZ1SJXb
+TR08+2vO/5XTyXWJgfMWiN9btYvIoDWWtqO7qNJ+1o1RKwru3kFYRl7XfqvZnShq
+U9/8Qb8meqhiBQLOhG2tfXTfIZwJu4j4PfafN+wqkRMC2+9smjMdm9RrZS33FghX
+WLkZoQqYcIPAtN+ov0oc42AvjfxdvNa+TRLsEiGX4fY50zxAMFpnq5ZCXICvbDby
+zO0b1ZXUFb6qtoaWs+6+UtpfHnwCFUsEU2FN0EwfOkmvgsNrhdlrJpLKslWhBWy/
+KcLmYg0+NccAZkMZ3etKEdhdnkFto8lUP43iusz3i2RoaEekZku45utnTe91LUUI
+BWNL5tbteUmYed2hL49yqTMFXmvYXhByUTYAXk0kXqPRngJFzGEi+m7kBvdQgsO2
+foGaKBfZ9d+bIQffawxPBlOUsuMcLd7BA7ATVs5SrMlEJdoNjJwm1iiP/zjzMLz6
+AYEf4SH1BN7lruhPtS2Z/3rYSZTtER4Etzeefw8I173Adr52ZAeSUN68Ng+EHgnd
+YIssrx9covp+JeqaqZ+D4DxdLicRI4SrWtY5ep/1CbNcuvkcYY9b3HeQthBDQuSf
+uTn/Kq6T8pT3jkEnl/UC
+=x2Gu
+-----END PGP SIGNATURE-----

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
index defb87a..eee3ec6 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
@@ -12,13 +12,12 @@ DESCRIPTION="Qt based clone of the Origin plotting package"
 HOMEPAGE="http://soft.proindependent.com/qtiplot.html
 	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
 SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
-	origin? ( http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2 )
-"
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bindist doc mono latex origin python"
+IUSE="bindist doc mono latex python"
 
 LANGS="cn cz de es fr ja ro ru sv"
 for l in ${LANGS}; do
@@ -30,6 +29,7 @@ done
 # qwtplot3d much modified from original upstream
 # >=x11-libs/qwt-5.3 they are using trunk checkouts
 CDEPEND="
+	media-libs/libemf
 	x11-libs/qt-assistant
 	x11-libs/qt-gui
 	x11-libs/qt-opengl:4
@@ -44,11 +44,8 @@ CDEPEND="
 	sci-libs/gsl
 	sci-libs/tamu_anova
 	latex? ( dev-tex/qtexengine )
-	mono? ( dev-dotnet/libgdiplus )
-	origin? ( media-libs/libemf sci-libs/liborigin:2 )
-"
+	mono? ( dev-dotnet/libgdiplus )"
 DEPEND="${CDEPEND}
-	app-arch/p7zip
 	dev-util/pkgconfig
 	python? ( >=dev-python/sip-4.9 )
 	doc? (
@@ -59,6 +56,8 @@ RDEPEND="${CDEPEND}
 	python? ( dev-python/PyQt4[X] )"
 
 PATCHES=(
+	"${DISTDIR}/${P}-origin.patch.bz2"
+	"${FILESDIR}/${P}-origin-2.patch"
 	"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
@@ -72,11 +71,6 @@ pkg_setup() {
 src_prepare() {
 	local mylibs
 
-	use origin && (
-		epatch "${DISTDIR}/${P}-origin.patch.bz2"
-		epatch "${FILESDIR}/${P}-origin-2.patch"
-	)
-
 	qt4-r2_src_prepare
 
 	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die