Cleaned ebuild, EAPI=4 bump

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

6 files changed, 56 insertions, 58 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 67971726f7f8..9db46649166d 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.25 2011/06/21 15:57:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.26 2011/07/01 06:30:47 jlec Exp $
+
+  01 Jul 2011; Justin Lecher <jlec@gentoo.org> rasmol-2.7.2.1.1-r1.ebuild,
+  rasmol-2.7.5-r1.ebuild, rasmol-2.7.5.1.ebuild, metadata.xml:
+  Cleaned ebuild, EAPI=4 bump
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> rasmol-2.7.2.1.1-r1.ebuild,
   rasmol-2.7.5-r1.ebuild, rasmol-2.7.5.1.ebuild:
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 9fdd66e09e9a..b84f0ab9c7fd 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 2.7.5-bundled-lib.patch 2513 RMD160 ea8976ac0da2f77767cf78c10fc148033452a731 SHA1 0601835bbcaa22a1fed9f18f8c668daee84cd55b SHA256 86fc627ae39fbc6d85063436b1e05e19745fd4690e6df70fd6111f99c1b90505
 AUX ldflags.patch 423 RMD160 bb60fdfff87e4c511a3c8a4df983fff33c7dc1f5 SHA1 4ebfdb40b52606a52930a374d51d01ec3950dc3c SHA256 1530faa9739dc97d769f8c772de4510bc201b7cdb1e40ddea4e366c7a17b90ea
@@ -7,15 +7,15 @@ AUX rasmol.sh.debian 966 RMD160 e3e750f854978c24e7b2357cf08d47f9d679b5e4 SHA1 2d
 DIST RasMol_2.7.2.1.1.tar.gz 4892830 RMD160 0030d3574dadfd9df97435d3456757dfe32d45b9 SHA1 6cb729f3866960af27fdc1675ace7bb286538b67 SHA256 aa1b5df8f47c073914d4e3f6db8d4b3b06cbb6ff8304f56c155cc4f95e29d527
 DIST RasMol_2.7.5.tar.gz 9766996 RMD160 100e40382986b002e21976b54f1af5240e43a919 SHA1 0e307d7a789d4cd201862c317b21d5d7e67730cf SHA256 aa7e7fd4b3c074e67697bd6adf7e86b9a4c60b605f5a319d6ecdd144b39f7fe9
 DIST rasmol-2.7.5-9Aug09.tar.gz 9763631 RMD160 a126c8f790d4be078fd584e0a50ab6cd0d91b528 SHA1 640ada7601d5ad00bc560ce5ab9494ca05c6358a SHA256 2c601433ea48fea03c3a71aad160ae81ac435290fba4f3e257c20fe839ae3f3a
-EBUILD rasmol-2.7.2.1.1-r1.ebuild 1604 RMD160 b065d0a2960b899f747669d3e47cdd94e6b0e00d SHA1 ceeb55cae436cba19163d049d56bf09803416854 SHA256 691cf502d9f6d74e3e43ef0520ebbd4957dae1a243fce05fbd48170066acc299
-EBUILD rasmol-2.7.5-r1.ebuild 1728 RMD160 93948b979e1a44c0cfe89ed28803cde515996703 SHA1 658eda7fdd779fdb8da4370def4cae5c02b3f2de SHA256 0e8335b0df0a701f9906880a8800298956f88d9fdbe29dc0206382ae4b2ee9f4
-EBUILD rasmol-2.7.5.1.ebuild 1824 RMD160 90197c989a4f1728dbeafb0240483ceab7fdab24 SHA1 b89aa88a4b9029bf319c49c38ae35427a33bdd57 SHA256 0a710491e1039887643530e307582d8b8a298afe0f1429dee7b2f8985db62e96
-MISC ChangeLog 5256 RMD160 0b4fba044027ae5e5ad355c7463529f819c3977e SHA1 ce5f014dea35dbd84a618eb2576b1af15f233e4f SHA256 24c700c32ae1ad70ca27edf1a6b81423381f1ad2849bb24d418f6fd0af508319
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD rasmol-2.7.2.1.1-r1.ebuild 1602 RMD160 18abeaf8ab4b0804ed52f503836a0010f92e9958 SHA1 639810eafbdcf854f6803e45d4b2417ed195e690 SHA256 8499ffebb75d95de002379f0829cc370959bb9e15274bb4f3c9f5ad769b26ac5
+EBUILD rasmol-2.7.5-r1.ebuild 1669 RMD160 9f2e74dec93369afd0b7164187920161d2ba9064 SHA1 6ecf212da23acc339832ddb0550e857e94191ed2 SHA256 d53df3655469243a86d846d111388abeab06df6274771d471e3c52d10ea5768e
+EBUILD rasmol-2.7.5.1.ebuild 1765 RMD160 eb83abef81c1aa0c7c228eb2ee320831ae7c158b SHA1 f3a5f0a38b3fa52e15bcfeba65b68ab06fee5ecd SHA256 a18b171ea129e0f6866ce41e918fd76b4bc3f10ecc12e5a7398ff43fca496c93
+MISC ChangeLog 5425 RMD160 725bbd6681e6af794e830219aea4d5142d2143c1 SHA1 82a0386f1540b4208672b89c504e9751d6e311d7 SHA256 530297e6e0de6382ec4a3727079fc046e1aec23c52c9b671bbc49a71d05cdd9e
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Av3oACgkQgAnW8HDreRbZwwCfYsC5a7wGtitMSpgrTBJPfiCw
-iHEAoJREJTKLoA3Xp5//9vYizpnf0o0R
-=pez/
+iEYEAREKAAYFAk4NaaIACgkQgAnW8HDreRYyEACgy0Ks1WRJgrRb8CbfH5hy2rjU
+d8YAn2ZZwCHfwCfNdj68esFWPNls3LRg
+=uTz2
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rasmol/metadata.xml b/sci-chemistry/rasmol/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/rasmol/metadata.xml
+++ b/sci-chemistry/rasmol/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/rasmol/rasmol-2.7.2.1.1-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
index 1b89d7c78134..0f878339f850 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.11 2011/06/21 15:57:41 jlec Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.12 2011/07/01 06:30:47 jlec Exp $
 inherit fortran-2 toolchain-funcs
 
 MY_P="RasMol_${PV}"
@@ -17,7 +16,6 @@ IUSE=""
 
 RDEPEND="
 	virtual/fortran
-
 	x11-libs/libXext
 	x11-libs/libXi
 	|| ( x11-apps/xdpyinfo x11-apps/xwininfo )"
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild
index 4175dd32d2cc..6c38a4366b10 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild,v 1.7 2011/06/21 15:57:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild,v 1.8 2011/07/01 06:30:47 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs prefix
+inherit eutils fortran-2 prefix toolchain-funcs
 
 MY_P="RasMol_${PV}"
 VERS="23Jul09"
@@ -19,22 +19,21 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
+	dev-libs/cvector
+	sci-libs/cbflib
+	sci-libs/cqrlib
+	sci-libs/neartree
 	virtual/fortran
-
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libXext
 	x11-libs/libXi
-	x11-libs/vte:0
-	dev-libs/cvector
-	sci-libs/cbflib
-	sci-libs/cqrlib
-	sci-libs/neartree"
+	x11-libs/vte:0"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
 	app-text/rman
-	x11-misc/imake"
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto"
 
 S="${WORKDIR}/${P}-${VERS}"
 
@@ -55,25 +54,24 @@ src_prepare() {
 }
 
 src_compile() {
-	cd src
-	make clean
+	emake -C src clean
 	emake \
+		-C src \
 		DEPTHDEF=-DTHIRTYTWOBIT \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "make failed"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install () {
 	libdir=$(get_libdir)
 	insinto /usr/${libdir}/${PN}
-	doins doc/rasmol.hlp || die
-	dobin src/rasmol || die
-	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz || die
-	doman doc/rasmol.1 || die
+	doins doc/rasmol.hlp
+	dobin src/rasmol
+	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
 	insinto /usr/${libdir}/${PN}/databases
-	doins data/* || die
+	doins data/*
 
-	dohtml -r *html doc/*.html html_graphics || die
+	dohtml -r *html doc/*.html html_graphics
 }
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
index 87fa9dc06616..57ae8b074c0a 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild,v 1.3 2011/06/21 15:57:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.1.ebuild,v 1.4 2011/07/01 06:30:48 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs prefix
+inherit eutils fortran-2 prefix toolchain-funcs
 
 MY_P="RasMol_${PV}"
 VERS="9Aug09"
@@ -20,22 +20,21 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
+	dev-libs/cvector
+	sci-libs/cbflib
+	sci-libs/cqrlib
+	sci-libs/neartree
 	virtual/fortran
-
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libXext
 	x11-libs/libXi
-	x11-libs/vte:0
-	dev-libs/cvector
-	sci-libs/cbflib
-	sci-libs/cqrlib
-	sci-libs/neartree"
+	x11-libs/vte:0"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
 	app-text/rman
-	x11-misc/imake"
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto"
 
 S="${WORKDIR}/${PN}-2.7.5-${VERS}"
 
@@ -56,25 +55,24 @@ src_prepare() {
 }
 
 src_compile() {
-	cd src
-	make clean
+	emake -C src clean
 	emake \
+		-C src \
 		DEPTHDEF=-DTHIRTYTWOBIT \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "make failed"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install () {
 	libdir=$(get_libdir)
 	insinto /usr/${libdir}/${PN}
-	doins doc/rasmol.hlp || die
-	dobin src/rasmol || die
-	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz || die
-	doman doc/rasmol.1 || die
+	doins doc/rasmol.hlp
+	dobin src/rasmol
+	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
 	insinto /usr/${libdir}/${PN}/databases
-	doins data/* || die
+	doins data/*
 
-	dohtml -r *html doc/*.html html_graphics || die
+	dohtml -r *html doc/*.html html_graphics
 }