[gentoo-commits] gentoo-x86 commit in sci-chemistry/sparky: ChangeLog sparky-3.113.ebuild

[gentoo-commits] gentoo-x86 commit in sci-chemistry/sparky: ChangeLog sparky-3.113.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    09/09/18 14:50:12

  Modified:             ChangeLog sparky-3.113.ebuild
  Log:
  Migrate to EAPI 2 in order to remove built_with_use call.
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.13                 sci-chemistry/sparky/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/ChangeLog?r1=1.12&r2=1.13

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog	3 Jun 2008 02:07:38 -0000	1.12
+++ ChangeLog	18 Sep 2009 14:50:12 -0000	1.13
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/sparky
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.12 2008/06/03 02:07:38 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.13 2009/09/18 14:50:12 betelgeuse Exp $
+
+  18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> sparky-3.113.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use call.
 
   03 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> sparky-3.113.ebuild:
   remove reference to app-shells/csh which has been removed



1.4                  sci-chemistry/sparky/sparky-3.113.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild?r1=1.3&r2=1.4

Index: sparky-3.113.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sparky-3.113.ebuild	3 Jun 2008 02:07:38 -0000	1.3
+++ sparky-3.113.ebuild	18 Sep 2009 14:50:12 -0000	1.4
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild,v 1.3 2008/06/03 02:07:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.113.ebuild,v 1.4 2009/09/18 14:50:12 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs multilib python
 
@@ -14,7 +16,7 @@
 KEYWORDS="~ppc ~x86"
 IUSE=""
 RESTRICT="mirror"
-RDEPEND="=dev-lang/python-2.4*
+RDEPEND="dev-lang/python:2.4[tk]
 	=dev-lang/tk-8.4*
 	app-shells/tcsh"
 DEPEND="${RDEPEND}
@@ -27,10 +29,6 @@
 	python="/usr/bin/python2.4"
 	python_version
 
-	if ! built_with_use dev-lang/python tk; then
-		die "Rebuild python with USE=tk"
-	fi
-
 	arguments=( SPARKY="${S}" \
 		SPARKY_INSTALL_MAC="" \
 		SPARKY_INSTALL="${D}/usr" \
@@ -49,10 +47,7 @@
 	#	PYDIR="\$(SPARKY_INSTALL)/$(get_libdir)/python\$(PYTHON_VERSION)/site-packages" \
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/fix-install.patch
 
 	sed -i \
@@ -66,7 +61,7 @@
 }
 
 src_install() {
-	make "${arguments[@]}" install || die "install failed"
+	emake "${arguments[@]}" install || die "install failed"
 	# Make internal help work
 	dosym ../../share/doc/sparky/manual /usr/lib/sparky/manual
 	# It returns a weird threading error message without this