Migrate to EAPI 2 use deps

3 files changed, 16 insertions, 33 deletions

diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog
index 5a17e4f07fcb..fdd4247ecd3f 100644
--- a/sci-mathematics/dataplot/ChangeLog
+++ b/sci-mathematics/dataplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/dataplot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/ChangeLog,v 1.5 2008/08/06 20:23:22 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/ChangeLog,v 1.6 2009/02/20 17:36:44 gentoofan23 Exp $
+
+  20 Feb 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  dataplot-20080225.ebuild:
+  Migrate to EAPI 2 use deps
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest
index 5db978ea7152..fbaa6a09c71f 100644
--- a/sci-mathematics/dataplot/Manifest
+++ b/sci-mathematics/dataplot/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MISC ChangeLog 4478 RMD160 b17bcda64623a34399209698a16a86482eb2b841 SHA1 6abe8e1023db41aa8c16b5ff14aa2bc37294898d SHA256 de78c889f0f004dc2239be178c795e410d07c3c249751055bf2092ef0df09e4f
+EBUILD dataplot-20080225.ebuild 2375 RMD160 332bfaa67cd76dd87903b8d71404aaa1bd08a1cb SHA1 c4488de097e5b5771e7a9d1e11aad2ece2855959 SHA256 0408fd242dadd64133b374bd355efea4d2550cae8fd766d9a60794fb526563d1
 AUX 90dataplot 75 RMD160 d561beb32d6b98a1809fa46a103beaa115450585 SHA1 160b11d262ee4aac6d1af48dc96af905d1724a55 SHA256 a0e547d52eca3ec872bd996712e93d550d65f66a693416ce6944504cab78df6c
 AUX Makefile.am.20080225 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef
 AUX configure.ac.20080225 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85
 AUX dpsrc-dp1patches-20080225.patch 3003 RMD160 e3480165e3ce77e8f74bb8b1f20ba4beecc54d76 SHA1 16616bd81b6e91dcf3a105d97d593794711c4901 SHA256 3279e55fafa3e43700f5f7df3f8422b0f124d1e12cd356f344f85cb33a0b3551
 AUX dpsrc-patchset-20080225.patch 4587 RMD160 a582f14dbe92cb3802b641b737d726ed2d39d527 SHA1 3aa03d5d53135ca9ac1464f26a3eceae4a8a9d3a SHA256 4a1c7ca2418558a857bd7d55d0815c5caa6fbe911bd4bf320b8460aa917effbb
-DIST dplib.02_25_2008.tar.gz 5340447 RMD160 51b5892c83bb5d420f324e3dab5edec24925f728 SHA1 3a77ed5e1e49f377083a11b8a177f678284b91f2 SHA256 7f9a30ae8ab029e0eeca4fbe08e665b572ec98a05ec001a67f95e4857d2a5b05
-DIST dpsrc.02_25_2008.tar.gz 6399167 RMD160 ed14f8ceb225e86f25026916ab4934a140f602ae SHA1 f1023d99ec7d2a64611dabedfbc5ad6f16e67cf7 SHA256 794bedcc48cf444c5813f864f4bacb158474d450337279edaf7fba1055c552c6
-EBUILD dataplot-20080225.ebuild 2742 RMD160 d724c74fb064e40dd598fdad905a0804bc5f6e2a SHA1 38312eb3112b3d162f1a4e844a7ebb30e952e09b SHA256 088b8a2c6c3681a792d3f8d57d584789e36e5f4cbae19f4438d1acd9e62f1dfb
-MISC ChangeLog 4356 RMD160 85ce14cf193826f02beea7dbf4dbadabb0241ed0 SHA1 8343c4e340f60c31ac49fc45aaf44bec1e705193 SHA256 64fa6ec63c7825bb1f39faa626686d3ea023684ce7ad09a5f6a87ded0beae66b
 MISC metadata.xml 818 RMD160 19c23b2a9664cdcd4eda633c34f46b8cb1f4807e SHA1 8dcf927409ef36ee75de83588adc27a051672fe6 SHA256 f0929ccd5bb5297d6d3b7a3a54b7dec7020594228abf2ff2cedc6f34f2ac4a58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaCEoACgkQOeoy/oIi7uwajACg3kUV2ej+p/zvMc05p7excvLc
-kXIAn1GMZsSt5B6bei59vW4bVPsRfvB4
-=MQIg
------END PGP SIGNATURE-----
+DIST dpsrc.02_25_2008.tar.gz 6399167 RMD160 ed14f8ceb225e86f25026916ab4934a140f602ae SHA1 f1023d99ec7d2a64611dabedfbc5ad6f16e67cf7 SHA256 794bedcc48cf444c5813f864f4bacb158474d450337279edaf7fba1055c552c6
+DIST dplib.02_25_2008.tar.gz 5340447 RMD160 51b5892c83bb5d420f324e3dab5edec24925f728 SHA1 3a77ed5e1e49f377083a11b8a177f678284b91f2 SHA256 7f9a30ae8ab029e0eeca4fbe08e665b572ec98a05ec001a67f95e4857d2a5b05
diff --git a/sci-mathematics/dataplot/dataplot-20080225.ebuild b/sci-mathematics/dataplot/dataplot-20080225.ebuild
index 9c29323d32b9..31302ccb8c14 100644
--- a/sci-mathematics/dataplot/dataplot-20080225.ebuild
+++ b/sci-mathematics/dataplot/dataplot-20080225.ebuild
@@ -1,7 +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-mathematics/dataplot/dataplot-20080225.ebuild,v 1.4 2008/07/01 23:17:05 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/dataplot/dataplot-20080225.ebuild,v 1.5 2009/02/20 17:36:44 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils toolchain-funcs autotools fortran
 
 #     DAY         MONTH    YEAR
@@ -20,8 +21,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples gd gs opengl X"
 
 COMMON_DEPEND="opengl? ( virtual/opengl )
-	gd? ( media-libs/gd )
-	gs? ( virtual/ghostscript media-libs/gd )"
+	gd? ( media-libs/gd[png,jpeg] )
+	gs? ( virtual/ghostscript media-libs/gd[png,jpeg] )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
@@ -30,19 +31,7 @@ RDEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/${MY_P}"
 S_AUX="${WORKDIR}/${MY_P_AUX}"
 
-pkg_setup() {
-	#Dataplot requires media-libs/gd to be built with USE="png jpeg"
-	if use gd || use gs; then
-		if ! built_with_use -a media-libs/gd png jpeg; then
-			eerror "media-libs/gd is not compiled with USE=\"png jpeg\""
-			eerror "Please recompile media-libs/gd, ensuring USE=\"png jpeg\""
-			die
-		fi
-	fi
-	##FIXME: Just gfortran for now, I'll get to testing g77 later
-	FORTRAN="gfortran"
-	fortran_pkg_setup
-}
+FORTRAN="gfortran"
 
 src_unpack() {
 	# unpacking and renaming because