sci-chemistry/PyMca: Move to new python eclasses; drop old

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 63 insertions, 62 deletions

diff --git a/sci-chemistry/PyMca/ChangeLog b/sci-chemistry/PyMca/ChangeLog
index f3fff3b122ee..5e52a291471c 100644
--- a/sci-chemistry/PyMca/ChangeLog
+++ b/sci-chemistry/PyMca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/PyMca
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/PyMca/ChangeLog,v 1.4 2012/10/28 21:37:00 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/PyMca/ChangeLog,v 1.5 2013/02/13 20:50:29 jlec Exp $
+
+*PyMca-4.6.2-r1 (13 Feb 2013)
+
+  13 Feb 2013; Justin Lecher <jlec@gentoo.org> -PyMca-4.4.1_p1.ebuild,
+  +PyMca-4.6.2-r1.ebuild, metadata.xml:
+  Move to new python eclasses; drop old
 
 *PyMca-4.6.2 (28 Oct 2012)
 
diff --git a/sci-chemistry/PyMca/Manifest b/sci-chemistry/PyMca/Manifest
index 150f0df76f32..c0ddfbb1e003 100644
--- a/sci-chemistry/PyMca/Manifest
+++ b/sci-chemistry/PyMca/Manifest
@@ -4,16 +4,15 @@ Hash: SHA512
 AUX 4.4.1_p1-gentoo.patch 1127 SHA256 7b4dac4e2cbfb372b4990c5c6cd154a303f72371f03e196c8cbb29b963bfe48a SHA512 fff51dd243bf880df1e029f6396625e0293960801fadd11b1a864401d96934da0b522cf9cf2919ddf2e6d900efd707d2854fe06a3fb769d589866a5355b0d354 WHIRLPOOL 4b687cb9e46a1f69dddb28a3a47f507cda3617ce790ab579df17eaec1518d86bb4d8dc286bb77848fc34e4f4e77d6fdb845546ee3bb36221a8e872325d2ab9f6
 AUX 4.4.1_p1-impl-dec.patch 287 SHA256 7f8bc0f2ef67fe9694c0d8e9d08e0780215cfb7d27e9776b0d151cfb2e12e38d SHA512 696e6d0357cf5df51040f5c75466b122679b75e1d110876cafd85a93266107f75de910ef3eaa4e30b618c426abda0fa12abf38785f26eef78d77dcc5e8bae9e3 WHIRLPOOL 13074d14da36083e83fa734eb28a4e483679097e7591bf8dec2b7cf450bc5cc3ea4adcaec86dc95c582dc9223568fad485a09a3405042d1d4bf21cd2b3604e67
 AUX PyMca-4.6.2-gentoo.patch 538 SHA256 cd9170ba6219c4fb78aed0bbb972da452255a95b361117dc9942e8dce86b381f SHA512 cdc3cbe8264310748ef065cf07b1d1d8c9b39f560a6317924a34c795c4a62fceba7de0847c9a325133fe87acdbedf4ec7b75583402cb1a6aac0b4ff6437337e4 WHIRLPOOL 096b537ee484e447017c3cb846d0eb5875225558c10efed3a9236aa78d55cec8e18f595aba27eb9dfb1fa025792b108340d278e80f7f90c2eef75f5cd78a36cf
-DIST pymca4.4.1p1-src.tgz 9712721 SHA256 5cd1c739bc27f0b36776d8bb65f30745c670fa3a47e24b02a37f528d9c1659f8 SHA512 bdaf86e8a0547bbf329d17c24ea4ecd5c79b0d7e38d3e63b7dfd4219e5c5f0eb792c01678466c3317233c6b65744d7f27fe48e9e8ca6c1cf627ef2a6a97e9b4c WHIRLPOOL 1ff9bf968d1d0a20bbb58f005284396f19ae523e8858e435f3f863ea7b4601bab7820402ea463cfc51efe26d397f847c909968c2a85738c38742d081083db087
 DIST pymca4.6.2-src.tgz 15979581 SHA256 c50d3a54cad633bac3ec361d1b3b63a78292f1ad4ed976e5206665edd76bc32d SHA512 e33188b446c399e50cf65ebca4bfeef34e1b7d99c331f670dc41ca204284fbba996a1c83bd12a2410a9972927aa9c92b42b5374c58c924b3a8583d4f37be6528 WHIRLPOOL 47f0491aa0e470661bea1aa247d1db730f1db7266f1d2be2272d08f203faa2a084bcb40d579861365ace26d2f94abe03485183eed03139ad7b697cf57bfa5324
-EBUILD PyMca-4.4.1_p1.ebuild 1012 SHA256 c48c6af88c71932b919946d857e5a67a97b8b0d18a1d27e77a3fafb8bd499cfc SHA512 532c97048a299e7f70f894e4225178e031146a90111d20b117c9ae5d46b8730b4f84f2a7d619c75da24cab802549f40891f8d98671746fafdc880161d6101bea WHIRLPOOL 7205d794fddd72c9fe7bdf325b727d552d1e9ab47fb805d4f82950192a40c91cbedd35202dbe87b1681ecda6915ece853eec9bac3922e7ebc5852c5bd669c7e8
+EBUILD PyMca-4.6.2-r1.ebuild 1075 SHA256 96e7e61f0a9873236a7ab9035851e5f1cf9849bf2b82633f0b68b589ac8d0a7e SHA512 a29fcbaec71af4dde2b661ee2b4b8897dc7756d0de39c077128aa448a78a5d218de47b11278dbff50a9366bd03600a68c91b4b3c42922b095ea21a8b1c5c83ef WHIRLPOOL d0895532ea5712ae912d7824b2118a38b0652a58c123ad253596e3f1f289f87014c9d3c43261c443ea55160848092ff6fc2178d6a0b5a615374bd44b784596dd
 EBUILD PyMca-4.6.2.ebuild 966 SHA256 7f20bf1459ca8a183541229197534856d54c2e18eaf140adda98feec492887cd SHA512 6d1d8aa9e66ac7fbf59ddca0a2dfa022802c867b79b617a7bd13949f7b864e5abf811b5f7fce25b617b7435ecf81cadbe098868a77edd5743aef4eb4d5e6e8a8 WHIRLPOOL 4604b2fc90ed86ee9ee9db95eda9ceae1ccc4f5b076d55d855272626da0faf4f82df3e3ea082f446881616a190203bc5538d8de1b5211336772bc4883ce968ac
-MISC ChangeLog 864 SHA256 32ab09125f7227f7fd20c38f71d60a37639f0dc318835a7d4b31ebf5cf61d13c SHA512 426aa759cbc16e1cf1c129cab1d676cdb6854038067730adbcd5e542d903d4b524bcb2203afa39c44371c12f56960bf3eff5ddfdbc0044fa34d866ee9ab1c617 WHIRLPOOL f3e31d3080eec961679d3db7378693cec3c9c148b3e25b69ac1f448ecca2bd5baf145bb583542f934bec4e98ce3da963a43a2076eb88c8fb415b6a469ac7e025
-MISC metadata.xml 722 SHA256 b1db5b11454e152be28f6ab52a8585540c1efae461fdf3eaa5a61c16faa71259 SHA512 b218d1ad80b983f4a1a382ef0bbe89f118e0c83ead349bd3bface6744100d8ccec0f330444a7b5c0f741e199deba773a63ea1554881ef2836e7fa61fa0e7fac0 WHIRLPOOL 3425be5b3c6110de61073f97cd964db9ccf93b5d958cc463c454db0b34b97a02317e229dbce34c0d6409cd1054e6c35b1092d1f3e7ae546fb09c70996c41a973
+MISC ChangeLog 1047 SHA256 c84f21cbf77966625b7e26935a49b36a78f90a96c940a6eb8ecf98b07266071c SHA512 c6d401a73cc495e0e49138dfeae8a972fc5b1306692299f2d35b583613b5bd5ab8215855a810b81aa9f10309af822f3d56cd81b928e44dfb18d767a22ec35f9f WHIRLPOOL ae7d4f4739289498369ad85536ebcef343678ba66989322a6fe91d9224701ba88607bc97d28f0ea920e436ff87d5a465edd92ec73fea7c4faba5ca53c4b77404
+MISC metadata.xml 732 SHA256 827b795d2f39d4a86c3423341ffd6ef3ce3a563725c3a4960982961ccfd43e78 SHA512 a562d0d020bb6cc94ffd60d8e401254e1d7eaf8163dff6980336ade862c1d27ca670e47e306917e12ca2a12488871182a9bc2f7bfc6f3a9422253cdb2539eb24 WHIRLPOOL dcd7ce2403d1480841a7e427c69dd2d854fb5ef8e8927fc56baf97870cbc1b3ea97959203ccfcd3509fc4651a389d75fae9fe75cfdee369e6fb0979effd85b1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlCNpX0ACgkQgAnW8HDreRZNaACfcqLuscpMOhR5I1Qw5m8xUk/R
-C18An3rnIuJbQt1FStU279ZW7iM5Qcwo
-=WFne
+iEYEAREKAAYFAlEb/LkACgkQgAnW8HDreRaOIQCbBNpLMh7fYXq62fwcssyN2/Zh
+dFoAoMHpwJwdWfDfS9dqPCHSZUdAfu2u
+=MlWG
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/PyMca/PyMca-4.4.1_p1.ebuild b/sci-chemistry/PyMca/PyMca-4.4.1_p1.ebuild
deleted file mode 100644
index 88ea21e26c23..000000000000
--- a/sci-chemistry/PyMca/PyMca-4.4.1_p1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/PyMca/PyMca-4.4.1_p1.ebuild,v 1.4 2012/10/28 21:37:00 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
-
-inherit distutils eutils
-
-MY_PV="${PV/_}"
-
-DESCRIPTION="X-ray Fluorescence Toolkit"
-HOMEPAGE="http://pymca.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/pymca/pymca/${PN}${PV/_p1}/pymca${MY_PV}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="X hdf5 matplotlib"
-
-DEPEND="
-	dev-python/numpy
-	dev-python/sip
-	virtual/opengl
-	dev-python/pyopengl
-	X? (
-	     dev-python/PyQt4
-	     dev-python/pyqwt
-	   )
-	hdf5? ( dev-python/h5py )
-	matplotlib? ( dev-python/matplotlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${MY_PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-impl-dec.patch
-	export SPECFILE_USE_GNU_SOURCE=1
-	distutils_src_prepare
-}
diff --git a/sci-chemistry/PyMca/PyMca-4.6.2-r1.ebuild b/sci-chemistry/PyMca/PyMca-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..1560a1ce4b3e
--- /dev/null
+++ b/sci-chemistry/PyMca/PyMca-4.6.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/PyMca/PyMca-4.6.2-r1.ebuild,v 1.1 2013/02/13 20:50:29 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PV="${PV/_}"
+
+DESCRIPTION="X-ray Fluorescence Toolkit"
+HOMEPAGE="http://pymca.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/pymca/pymca/${PN}${PV/_p1}/pymca${MY_PV}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X hdf5 matplotlib"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	virtual/opengl
+	X? (
+	     dev-python/PyQt4[${PYTHON_USEDEP}]
+	     dev-python/pyqwt[${PYTHON_USEDEP}]
+	   )
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+#S="${WORKDIR}/${PN}${MY_PV}"
+
+python_prepare_all() {
+	local PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+	export SPECFILE_USE_GNU_SOURCE=1
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-chemistry/PyMca/metadata.xml b/sci-chemistry/PyMca/metadata.xml
index f843ca9d3d30..4edafb672739 100644
--- a/sci-chemistry/PyMca/metadata.xml
+++ b/sci-chemistry/PyMca/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+  <herd>sci</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 The PyMca Toolkit is a collection of Python tools for visualization and 
 analysis of energy-dispersive X-ray fluorescence data. It builds its graphic 
 interface and plotting routines on top of the C++ libraries Qt and Qwt 
@@ -13,7 +13,7 @@ through their respective Python bindings PyQt and PyQwt. Nevertheless,
 the data analysis routines can be used independently of any graphical 
 interface.
 </longdescription>
-	<use>
-		<flag name="matplotlib">Support for plotting through matplotlib</flag>
-	</use>
+  <use>
+    <flag name="matplotlib">Support for plotting through matplotlib</flag>
+  </use>
 </pkgmetadata>