[gentoo-commits] dev/dilfridge:master commit in: sci-libs/opencascade/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     5e60a74d1d9d9618d50b55b099d04125de14963e
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 15:16:28 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 15:16:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5e60a74d

Minor cleanups, EAPI bump

(Portage version: 2.1.10.34/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 sci-libs/opencascade/ChangeLog              |    4 +++
 sci-libs/opencascade/Manifest               |   32 +++++++++++++-------------
 sci-libs/opencascade/opencascade-6.5.ebuild |   18 +++++++-------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 5d81e36..dd0f592 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencascade-6.5.ebuild:
+  Minor cleanups, EAPI bump
+
   07 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   opencascade-6.5.ebuild:
   Minor cleanups

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 6c8923d..eaf7ecc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX env.ksh.template 1412 RMD160 aaf7c74e1aef841d669cf44c279e747cb336fd2b SHA1 e6f3a1157fdededd671c832ebeb8b25a900ec7ab SHA256 ac13e6d2b0dddbbac1350b24ab4fb44d38963fe43dc7732362500f8870dcccb7
 AUX env.sh.template 1485 RMD160 cc835658881384315348fb4f70a65425e934061e SHA1 fe19eb213403376b79e0da02a106c2c480b83a76 SHA256 fcf3d45a73a8499e6fb1282ddd3adcacff34a0cdf027af33e959b4d03e207798
@@ -10,23 +10,23 @@ AUX opencascade-6.5-ftgl.patch 3253 RMD160 90701e8ec2be5433e2303af9c90282e6dc5a5
 DIST OpenCASCADE650.tar.gz 214819922 RMD160 6532933a71cf54039a734ebc7e8c16be1d358e2e SHA1 7e4b5bda3cf84bf4ec9ecd1e31899c8741fcf6f9 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6
 DIST opencascade-6.3.tgz 105877329 RMD160 b71f1b9a57d9624d2f079d4f7a8090f700c6126f SHA1 21a177fae5fa73263517aedbe60a4ee4926156f2 SHA256 1f1fc8d8be1d4ff6fe8df1059f856eec156385887880f3f69d147824957c2411
 EBUILD opencascade-6.3-r3.ebuild 5101 RMD160 cd67bb416ace79d817c5f5ee00d9f40d92ab85b0 SHA1 21995c20e598459033f6832c04c470cdbe15fcbf SHA256 c386092ee862639610321c49f280f19673f9ed0aaa9c3b45856a8f7a60e7a013
-EBUILD opencascade-6.5.ebuild 5103 RMD160 21cbff091f05748b21cdfa9e50eff4367c0e74c6 SHA1 2746ea089dd007c0f0601e31deb9fd0482885499 SHA256 e6c0ef5d62acdaa8cc4af543d1fe4e0cdf93ae78f85d068d5e4d28625cd910f8
-MISC ChangeLog 4255 RMD160 e8d609c6bb567788e71c863cd053df5632db6a75 SHA1 1b341ac8d5b894485f25762ed103085287846f13 SHA256 af5fbe1f823f8a3f255071d551fae0dc84790bc48e2203632c27606cf3262c97
+EBUILD opencascade-6.5.ebuild 5075 RMD160 0b0ab3adae5ede0e594f77c9b8df487f2be32282 SHA1 2df2efdc8831c87673df3a28493941dfe87d04d5 SHA256 203b202df36569be67c2499078510be7cb16bd588460678bb60ca14ba4699357
+MISC ChangeLog 4367 RMD160 1de523f91a3b696ba205823383f85939dd70ebbf SHA1 03e1f9024da5adfddd8f95df4741f25d2c4949a2 SHA256 dd99987c8241ff3d1eac22b464fdaa0f26fcd678cf0165c296ca351cde3ca381
 MISC metadata.xml 313 RMD160 a6df54d4d380efbc16cb952b4db870a03aa0e128 SHA1 326fb1311d4a87b5fe6d13a72d9a4ca767a886f5 SHA256 89e8a176ab13ec13e311255c707d761c9ff89ff8de2ad3db9a2d248f423361bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNdW5KAAoJENwGBM22xffesUsP/1zHag6cCLDXrQFbT+sRcAJb
-8z9eRGL7wO7q3Gt2/u2dRAw1dtPgbqYfalETWVdaAQTEcZiHK2Gna3Xe2uvC4+Jr
-c1oo+oRGjTmw+LObJx7Q0JCeQ1JEG0fh5oW2EJwsWJs/fciX1+F7a4+99kfq7ou3
-5Mcaj2tXcyN3bC+LU830HACuZx4f7n5N+TD5zn7Gt3lCmBhsw9f1j5vdHP9/To/5
-7uO+upy8/5oPY2bvv8v9HeOq982UsfstWWAYpgGyyF/N9EftalccvEkALOVUPXiQ
-LQ5Ph6mRtEHppGF6nueDPSYQlXGaC6qXivxeZStQ336ZEYzDMMA9OD6XwPuDTxCS
-0j3/8y94+J7EFIXV0kyTKQiaQuXMRgv/QsboP+tRuG2g19XNR0s4EBnIxoGw6hFo
-MaqpkOPp78ZOiwkUyXeu6beGT65nmcxaEsbALmNJUvcKJ1LGn3YkZWL3lRquqzJD
-tn/X7OCSRrXNF9MUjvDjcoTWn10IvY27iRpgGhE9jud4s+aT/zyX43O86NVAvG9y
-s2xLFBK7c28cdNENqKzvrW/QafPOPll4bNZjXmqdnkeKJh1vHpTpvM01eKsVQ2NA
-C8sQwGmAubsdsnPVkNh6BBC9X/3g8TJnld3fIMDLVtygZs2Wyn09opc0esAzOUcv
-7lsRPmSxeZMPjb2S78jr
-=2ZpJ
+iQIcBAEBCgAGBQJOv99MAAoJEEb+UGWnxTyH/8EP/jf0fmF1x61Hd3ivKAJCKrCx
+ejNxke53tiv1+zqNxCFJ3ArRBp70Dv4gwUZb5W4SuB6bsxDvhbLk7Cw/SQZr/LWo
+K0xZZoeXQ3eSAvk+teNZTjIp6YTZa6kJNQFhl2Ey2ZcyReQDrEk7TWLogXB3iQd1
+Kx4ckxfAfypE4LsYRp+mKTNKgU3O0w4YmIjZfRNm8xpOXa/oTvlP/2EnPo454yyK
+MjkCtTLLVHTzIkzwSbo720rGD1R9uLSyiaDmw9BHGjvfMarXAejk7GyUI5P9KuXY
++dpBO/vNwVmEOQTIvjw+ORnoiFr61li/pM06B4BK2y7L0KCn5SlBtntNpFxWzg9N
+rEPvlSXIukV0IybUKUwnoH2Q/aeJg6VWS3SYdTOh61r4pnjr8f9CtKRKcl8NWFQf
+3ppB+mBLBw7E49KQ/qbr1bjYQg/opMlc21eAvZ2d869ajI2FRqNm1EQaFy2I+6K/
+gFzM/Tw+RzXWdhcOr4b0G2or7jyWZ7EHflFhQSreQN0jEIYLNoWSM/4DmaJIhJwG
+81TR9gtkR6rY7gQYuWFEztH6IH6pvL11H1JYzW6dbEfAgEw/S07fFxmi+4YMiHLC
+vBVbWgKhw2Hh8bvDbk17r5MVfxOwlA8qJTWOipmzx8aoKkWN28ECYfOFc/UFgP2V
+C9fdOTpI8G6Leb3o3NxJ
+=aoll
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/opencascade/opencascade-6.5.ebuild b/sci-libs/opencascade/opencascade-6.5.ebuild
index 9dc2d8c..794c054 100644
--- a/sci-libs/opencascade/opencascade-6.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.3-r3.ebuild,v 1.1 2011/03/03 01:08:20 dilfridge Exp $
 
-EAPI=3
+EAPI=4
 
 inherit autotools eutils check-reqs multilib java-pkg-opt-2
 
@@ -106,7 +106,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# .la files kill cute little kittens
 	find "${D}" -name '*.la' -exec rm {} +
@@ -119,10 +119,10 @@ src_install() {
 
 	# Tweak the environment variables script again with new destination
 	cp "${FILESDIR}"/env.sh.template env.sh
-	sed -i "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" env.sh
+	sed -i "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" env.sh || die
 
 	# Build the env.d environment variables
-	cp "${FILESDIR}"/env.sh.template 50${PN}
+	cp "${FILESDIR}"/env.sh.template 50${PN} || die
 	sed -i \
 		-e 's:export ::g' \
 		-e "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" \
@@ -146,24 +146,24 @@ src_install() {
 			|| die "Tweaking of the Tcl/Tk libraries location in env.sh and 50opencascade failed!"
 
 	# Install the env.d variables file
-	doenvd 50${PN} || die
+	doenvd 50${PN}
 
 	cd "${S}"/../ || die
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r data || die
+		doins -r data
 
 		insinto /usr/share/doc/${PF}/examples
-		doins -r samples || die
+		doins -r samples
 	fi
 
 	cd "${S}"/../doc || die
-	dodoc *.pdf || die
+	dodoc *.pdf
 
 	# Install the documentation
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins -r {overview,ReferenceDocumentation} || die
+		doins -r {overview,ReferenceDocumentation}
 	fi
 }