Cleaned ebuild, moved EAPI=4

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

6 files changed, 45 insertions, 48 deletions

diff --git a/sci-chemistry/babel/ChangeLog b/sci-chemistry/babel/ChangeLog
index 22dab00a3430..7c424956459d 100644
--- a/sci-chemistry/babel/ChangeLog
+++ b/sci-chemistry/babel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/babel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/ChangeLog,v 1.7 2011/04/30 18:07:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/ChangeLog,v 1.8 2011/06/25 18:08:12 jlec Exp $
+
+  25 Jun 2011; Justin Lecher <jlec@gentoo.org> babel-1.6.ebuild,
+  babel-1.6-r1.ebuild, metadata.xml:
+  Cleaned ebuild, moved EAPI=4
 
   30 Apr 2011; Raúl Porcel <armin76@gentoo.org> babel-1.6.ebuild,
   babel-1.6-r1.ebuild:
diff --git a/sci-chemistry/babel/Manifest b/sci-chemistry/babel/Manifest
index e0732e6eee2d..849d2b1b38a7 100644
--- a/sci-chemistry/babel/Manifest
+++ b/sci-chemistry/babel/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 10babel 27 RMD160 b63901d7aae926d444049c6fa6bac6a09faa6642 SHA1 35bdc79adecc8c2f050a104bec276e1504ef180e SHA256 9635640dab2a697d6a2fa5ea57d43181983de444c021d28e510deecd17a5034a
 AUX babel-1.6-gcc32.diff 549 RMD160 23a188f6a1f9d26b33644e8732c504ee6e9478d1 SHA1 a93852d0a4cb784fe84eda449619fa208d9f7665 SHA256 d6440085242797decf8fa791b74d7c2227c9e01789458a684b054bbfd6d8ce7f
 AUX babel-1.6-gentoo.diff 569 RMD160 031ee771d49346976531d8e2f799842e58589fbd SHA1 80e7be957fdf81debab0204f0d6859a85a1acf10 SHA256 ea7e08b550186358ac4ecfb935d24be339dd52f35119789160fb6aa3bc72a8d0
 AUX babel-1.6-makefile.patch 716 RMD160 59e300ca8ccd6314bc4b913bdb725e97abbc9bd7 SHA1 50e7601e8cbaafa73fedb37b0a76b71b02cf3f9e SHA256 3328dee8ca60a98667c3789899e741cca95aeefd7a67c1211840482ea38ad244
 DIST babel-1.6.tar.Z 242341 RMD160 4a6dbd960ed9eef2088e8b32e627ed563fb6ddab SHA1 a5439d19c696373772f0785474cc7b53226163f9 SHA256 132a800cfe0c15b47391c809481a7ca174bbd1402aac7486e0973da0fd4db948
-EBUILD babel-1.6-r1.ebuild 988 RMD160 5ddf931a2bcf5340bd5d991b2ec48281cba2a077 SHA1 85701e1c0d58fcbf6601922faecf00bf0fa9acd7 SHA256 35f52991cae25f6695edd74f07320a3182cd01adf2ee4be09d1ed130143889be
-EBUILD babel-1.6.ebuild 923 RMD160 a92d23e00710f9e8480259897b3ed1f3261f3839 SHA1 c35162d5cc83ea790b976729e79d67dbd53c1ea9 SHA256 79dc7f23ff556b883d606d47ee85c97427cef7509c552ada2aa0a9bd072b5501
-MISC ChangeLog 2389 RMD160 75ff5450436bbf094b7cb00d4f6fb134d1bcd6ff SHA1 ce8c4f80aedc110a6d029f59fb9d586add8e60f9 SHA256 35a280aa24a5ebbd1901ef12311957058121fed6ed4c28f0bc54691da13e15e1
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD babel-1.6-r1.ebuild 799 RMD160 c490d32d40a9502bbde4e0528f9de999e4a3116c SHA1 9c2f491257a994022aff9dc1b2691342740d11b4 SHA256 c7273d6a9a33cf711477920fe4e25d75db3ecbc9182d786814763559b0faba10
+EBUILD babel-1.6.ebuild 909 RMD160 be1709782d0565a0c500e243c3d0e2220ba7d45c SHA1 7de7a2d282700c2650d5852968955791b958084b SHA256 d6fe000adaa646dd15f5cd34d2b8be2f9038ec949c6dd14f351c2bd684d04e3b
+MISC ChangeLog 2520 RMD160 796686696e4102f9a72a1cfc7c16f70fa1c1b5bc SHA1 bae04c782b01ee77f4db4796d991f247991f970d SHA256 bdd0297be20b351f5c3c54fa90b114a1fa3cc401617e208b9218b4fbc0516fc2
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28T+kACgkQuQc30/atMkDxCQCgwsHdwMSeJTtHgc3FHXtRpflz
-ZrAAnjiESMUay6NG6EoEXaoVjqXjom6F
-=+Fua
+iEYEAREIAAYFAk4GJBIACgkQgAnW8HDreRbS/ACghybuogrAv/D1vv0uRjF9tRy5
+sxsAn14lNeJFft4gwaV13I6n2n/Qrl1+
+=rIV1
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/babel/babel-1.6-r1.ebuild b/sci-chemistry/babel/babel-1.6-r1.ebuild
index db054a0e5bec..0ed81022c92a 100644
--- a/sci-chemistry/babel/babel-1.6-r1.ebuild
+++ b/sci-chemistry/babel/babel-1.6-r1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6-r1.ebuild,v 1.2 2011/04/30 18:07:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6-r1.ebuild,v 1.3 2011/06/25 18:08:12 jlec Exp $
 
-inherit eutils
+EAPI=4
 
-DESCRIPTION="Babel is a program to interconvert file formats used in molecular modeling."
+inherit eutils
 
+DESCRIPTION="Interconvert file formats used in molecular modeling"
 SRC_URI="http://smog.com/chem/babel/files/${P}.tar.Z"
 HOMEPAGE="http://smog.com/chem/babel/"
+
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="as-is"
@@ -15,24 +17,21 @@ IUSE=""
 
 #Doesn't really seem to depend on anything (?)
 DEPEND="!sci-chemistry/openbabel"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc32.diff
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	CC=$(tc-getCC) emake || die "emake failed"
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc32.diff \
+		"${FILESDIR}"/${P}-makefile.patch
+	tc-export CC
 }
 
 src_install () {
-	make DESTDIR="${D}"/usr/bin install || die
+	default
 
 	insinto /usr/share/${PN}
-	doins *.lis || die "Failed to install *.lis files"
+	doins *.lis
 
-	doenvd "${FILESDIR}"/10babel || die "doenvd failed"
-	dodoc README.1ST || die "dodoc failed"
+	doenvd "${FILESDIR}"/10babel
+	dodoc README.1ST
 }
diff --git a/sci-chemistry/babel/babel-1.6.ebuild b/sci-chemistry/babel/babel-1.6.ebuild
index 00c7356faf57..9bafecc8a5e0 100644
--- a/sci-chemistry/babel/babel-1.6.ebuild
+++ b/sci-chemistry/babel/babel-1.6.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6.ebuild,v 1.6 2011/04/30 18:07:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6.ebuild,v 1.7 2011/06/25 18:08:12 jlec Exp $
 
 inherit eutils
 
-DESCRIPTION="Babel is a program to interconvert file formats used in molecular modeling."
-
+DESCRIPTION="Interconvert file formats used in molecular modeling"
 SRC_URI="http://smog.com/chem/babel/files/${P}.tar.Z"
-
 HOMEPAGE="http://smog.com/chem/babel/"
+
 KEYWORDS="~amd64 ppc x86"
 SLOT="0"
 LICENSE="as-is"
@@ -16,32 +15,27 @@ IUSE=""
 
 #Doesn't really seem to depend on anything (?)
 DEPEND="!sci-chemistry/openbabel"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${P}.tar.Z
 	cd "${S}"
 #Patch the Makefile for gentoo-isms
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-gcc32.diff
-
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.diff\
+		"${FILESDIR}"/${P}-gcc32.diff
 }
 
 src_compile() {
-
 	emake || die
-
 }
 
 src_install () {
-
-	make DESTDIR="${D}"/usr/bin install || die
+	emake DESTDIR="${D}"/usr/bin install || die
 
 	insinto /usr/share/${PN}
 	doins "${S}"/*.lis
 
 	doenvd "${FILESDIR}"/10babel
-
 	dodoc README.1ST
-
 }
diff --git a/sci-chemistry/babel/metadata.xml b/sci-chemistry/babel/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/babel/metadata.xml
+++ b/sci-chemistry/babel/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+	<herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
index ec63357b43a0..4ed4f3b46bac 100644
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.4.1-change-default-path-to-usr.patch 311 RMD160 4b953f0f9a8a18a18847cb0aa7ea8a6af25e8236 SHA1 2d0603b9638edf5d41699c322867eabbf50d19a5 SHA256 b6530fe1cb5d3a410c7ba15f1fa618377c4fa14dec04b8778ff0de3ca73faa22
 AUX 2.4.1-change-default-paths.patch 2773 RMD160 9736f1c3ee8f603435b3f2c2f0f620ac1381746d SHA1 d42dbde43ccdfc3bf12f16c37dd12b222e1db50d SHA256 5348896392d5b1ca2f318013792f6791bda11d51b572afa93c78f0491266ab4e
@@ -7,13 +7,13 @@ AUX 2.4.1-look-for-python-in-right-place.patch 866 RMD160 cc62c43ef5a9a84b389b3a
 AUX 2.4.1-remove-icc-check.patch 1214 RMD160 b6e1f7fe33b5d21f9fcffb5da63563b8f7236cdd SHA1 4748df9fe707ad8b200de2a705e0ddab814a3b6e SHA256 4c0f638a44ee74093103a8f3b9e94252b31c0eff875596aade43eb7c2faf06c7
 AUX 2.4.1-use-root-for-app-defaults.patch 827 RMD160 109cf436c73bb732f89c16f206892b2297a20ee7 SHA1 17ce44db692b61c635719f32bc90d8a36f95bb06 SHA256 c7e82343c254a38e61fee72e5e86ecd86339e56e783255a5d882bcff38937094
 DIST viewmol-2.4.1.src.tgz 2229379 RMD160 d63d1a6aa2ab9212874cf9bae82a238a440aba47 SHA1 8e6c55bd1381db076706e19df44fc8e7d3a6b9aa SHA256 dfed3eed6441d89c4bf2be1c13cbe263341c8880edf1742d446fc0f8f4a99e19
-EBUILD viewmol-2.4.1-r2.ebuild 2327 RMD160 602f7114b0c5e7c24cbf7e81786d6d90fca8adad SHA1 587b634d3e36e629fa97bc5e164815b721efe47e SHA256 f1fc04fa1d42a4a61fad040671ca102fa9e432ff09646c456e84717304b1ae42
-MISC ChangeLog 2215 RMD160 0f006baf50434e19a2da477fb141d6558b2cf3bd SHA1 6bfcc40efbf2f029cbca07b3ec0b072c3ae6b2ef SHA256 c3cdfce1d896cf83ba99836000bbda1f91321ab190041756a2a1a36004287433
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD viewmol-2.4.1-r2.ebuild 2325 RMD160 ee367141071ab8179790a81164335f7687c5ded9 SHA1 e964f6e511d713d62ad66f5fe832c49aa0c44424 SHA256 8c01e03d12bcd391ec582b72480fa7879c4f23e1d177f729d66f7dd68da4d228
+MISC ChangeLog 2321 RMD160 ab74479be00e8aadb3ce66b5b1c9d3da75f75052 SHA1 47e297c617d4f43b4774a6bb38702fd9b72b9d63 SHA256 278e052f80fae2a884166f303461ef0f2fabd11334b56d039b9330b32b25906b
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2qxlEACgkQgAnW8HDreRZzLACgmxMu/2zwSN+MvnjaNQ1PnNhU
-ujQAn0XTAEw4k4Lpv+Vt0tllkteViyks
-=8qU9
+iEYEAREIAAYFAk4GJPcACgkQgAnW8HDreRYp8QCgn6kMlrfWQO9DhGBctnaq6tGS
+2M4AnRapnwg1c5wmif2aXFKMChSNMHQa
+=7eZO
 -----END PGP SIGNATURE-----