sci-mathematics/drgeo: Moved to EAPI=4, dropped unnessecary die

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 33 insertions, 31 deletions

diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 7058c0cd0006..dc33d23d4315 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX axiom-200711-gcl-configure.patch 445 RMD160 c62109a2198b19d0770de49c08107cd884dc4c82 SHA1 569117c5ec07f2dfd6edeefc5af499b66e202b45 SHA256 1e56780436eae1f9c31e55ac3c2903a62837cd957fe323f995922e2a4629c4f9
 AUX noweb-2.9-insecure-tmp-file.Makefile.patch 439 RMD160 16cdc72fab65bab45c7728d374da60f7b4cccc65 SHA1 428d4380a17535939a59b5efd12556ab4cafde06 SHA256 3c4b5bea61620cb545e576d2e82dd8daa0478fc6c40ae0a93dbdac432aa9531d
 AUX noweb-2.9-insecure-tmp-file.patch.input 4819 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af SHA1 23aff1cf0862618c7450704d0d47fcec2497de0b SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9
 DIST axiom-may2008-src.tgz 207172456 RMD160 496c91f00d3b8623c13ea82ee5a95698899a5406 SHA1 51949340f754104c0fa72e269737538829cd9062 SHA256 c91cc50a9a6b9d66b398f8b96236249db72b6ce280d51c188db1805a4534380e
-EBUILD axiom-200805.ebuild 3126 RMD160 1e9bfccf09391096d19ab727c9da6b99944bd3fe SHA1 92a4a4dc7ea795db681f362214853a5ee5905368 SHA256 f343a877fb00b978cda85fc77a5f33975f90c664a14b3b673feaa6aa9ca3037c
-MISC ChangeLog 3770 RMD160 6802db912464284c86801b5295af28009226f04d SHA1 75922ad19c8e6bb4f08bba1c249cc425bebee8b2 SHA256 7163d1d9dc36c4456d34594f964bdd1a6ec2390f1a7618de438765874acb406d
-MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
+EBUILD axiom-200805.ebuild 2970 RMD160 99fe3b031e0057b36b973b70aa47d4f9e39dc6d0 SHA1 c6d519d1f2a5c58c42ff562c9eff7a9e3f506d49 SHA256 273b115c8560f05bbda4b4713039f5e164c5562ae524015593f6adf2fc2ab7b9
+MISC ChangeLog 3894 RMD160 9861348e22386c42acedbfbac0a3fea738e8614e SHA1 e07fad9cc1c001f4a7b4b8a00aa0224071d02135 SHA256 40443558447fd878b4fb783d352773bf692e7508acd5565d981a7f26d386ba42
+MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkwjlCYACgkQ1ycZbhPLE2Ch8QCfRdZpl3Dcevd1KfNViReiI1VN
-NYcAn21wGR0xACXQ3XqOXbn0+HBw+I7K
-=tn+/
+iEYEAREKAAYFAk+YR8MACgkQgAnW8HDreRY/TQCgoPrB4haoxIyU6Udo1LzQI8l0
+xBkAoLu1irsiysVAN0/DBsrV1dmXi7FK
+=r7UF
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/drgeo/ChangeLog b/sci-mathematics/drgeo/ChangeLog
index 3954f07a6526..bfbb43089703 100644
--- a/sci-mathematics/drgeo/ChangeLog
+++ b/sci-mathematics/drgeo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/drgeo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.21 2011/07/20 16:04:45 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.22 2012/04/25 18:47:43 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> drgeo-1.1.0.ebuild,
+  metadata.xml:
+  Moved to EAPI=4, dropped unnessecary die
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #70723
diff --git a/sci-mathematics/drgeo/Manifest b/sci-mathematics/drgeo/Manifest
index 343ebc254bb8..02dfe2d3b57b 100644
--- a/sci-mathematics/drgeo/Manifest
+++ b/sci-mathematics/drgeo/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX drgeo-1.1.0-gcc45.patch 1099 RMD160 be2a3288516d1866c93afeaeb73245085902e2a0 SHA1 2c8d4352a6423b7072390e01eddc374479554ae7 SHA256 971c5a4e4341f70125cb969caea9ff01c242f82ce29ae83a0b2437740befcfb8
 DIST drgeo-1.1.0.tar.gz 1608361 RMD160 94859c622cf9a48f6134d7e348e6f5e94a43ed6c SHA1 7b988233fbcaac8002bd20e4e61c37240a739c29 SHA256 8c93bb637c11ca1647f90e0d97ea03d5938efddc36c2d73b40f15ff8df672216
 DIST drgeo-doc-1.5.tar.gz 2730242 RMD160 4a39bd3faac08728f2221bd1a69320bf53cc7bf6 SHA1 5a504e4b80e97c51851772a00c83db226120d19e SHA256 a6453dc630a40dd1c84ed90a7b7ff4fa3806e4e3ce01d149b59df29318255cb2
-EBUILD drgeo-1.1.0.ebuild 1361 RMD160 032860e8be5c4dae93ec2712a0ed0fdd5bd457d1 SHA1 5f4442bc0bdf42f0ab55b694778842ae2ffc282e SHA256 e880336d4b165bc0cf134e3003503ca84c9907d1c4865ed1da201ef00c00686e
-MISC ChangeLog 3518 RMD160 c8ea1431a74b2be12b4e3f05b0a4747304ff4c3f SHA1 f38babaeef659d9334350eb15d088001dd9139b2 SHA256 98ad75e094894adfd479615a690ad771e469f103d6b058cbd5b1500fbd428f6d
-MISC metadata.xml 606 RMD160 3c33b3e285ffada5effba0d970efa8a6c179515f SHA1 2f531c64acd87fb6d8b3035afe5dbb0797dd164d SHA256 3142b6841a5b9e1d9f8980c77cf1aa9a9a5aa76c67aa209d80836d117276d179
+EBUILD drgeo-1.1.0.ebuild 1190 RMD160 c2df5d08b59e1bad53f7ddeba366f6ae1af987ac SHA1 16c1a82dfc27775fe8e4c6ae8364ffe80a4771d7 SHA256 d8a901519def340bd5433ad1432199a2a202dee3f85cef564259f3a9f039cf54
+MISC ChangeLog 3644 RMD160 0b633b2ad7fc23bd93060ef5d2743211949e61f9 SHA1 d0623fe54d812386c7d7eb6c3c50a2268a351439 SHA256 d393481af2d76248caa5b48f3010d5b359f6735235902d351dc75758086a9100
+MISC metadata.xml 604 RMD160 a217e9d861cb32699ba608e339d175cf4b6271d9 SHA1 775e1e0d788ae2c769cfc73b9d9e0be45eb3bdd8 SHA256 fee96ec1a4fc0015d636addfcef05df979b75a64b412c230a2e6f3b9419aefa6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk4m/KIACgkQCaWpQKGI+9SrMQCeKA1sISg8Fu+pPzEknmzlxRNU
-7ZEAnj6sunpE9f70if/BfLTsA/cCKXgQ
-=+y+n
+iEYEAREKAAYFAk+YRtQACgkQgAnW8HDreRYsIwCgwM1ToCqXjRHwRd1MJbMiCAJZ
+q+8AniftJQgVyyhochKGkz/Mpd5FHRcb
+=nLdq
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
index 0955f17e2a4c..b00b156e71b3 100644
--- a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.8 2011/03/02 13:55:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.9 2012/04/25 18:47:43 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils
 
@@ -11,12 +11,13 @@ DOCV="1.5"
 DOC="${DOCN}-${DOCV}"
 
 DESCRIPTION="Interactive geometry package"
-LICENSE="GPL-2"
 HOMEPAGE="http://www.ofset.org/drgeo"
-SRC_URI="mirror://sourceforge/ofset/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/ofset/${P}.tar.gz
 	mirror://sourceforge/ofset/${DOC}.tar.gz"
 
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
@@ -28,7 +29,6 @@ RDEPEND="
 		>=dev-scheme/guile-1.8[deprecated]
 		=dev-scheme/guile-1.6*
 	)"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -42,17 +42,15 @@ src_configure() {
 	# yet in portage. Fortunately HTML is already compiled for us in the
 	# tarball and so can be installed. Just create the make install target.
 	cd "${WORKDIR}"/${DOC}
-	econf || die "docs econf failed."
+	econf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS ChangeLog README NEWS TODO || die
+	default
 	if use nls; then
 		cd "${WORKDIR}"/${DOC}
 	else
 		cd "${WORKDIR}"/${DOC}/c
 	fi
-	emake install DESTDIR="${D}" || die "emake docs installation failed"
-
+	emake install DESTDIR="${D}"
 }
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
index de906e3a2ec8..4eed29af3f63 100644
--- a/sci-mathematics/drgeo/metadata.xml
+++ b/sci-mathematics/drgeo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <longdescription lang="en">
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
     Dr. Geo is a GTK2 interactive geometry software. It allows one to
     create geometric figure plus the interactive manipulation of
     such figure in respect with their geometric constraints. It is