EAPI=5

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 37 insertions, 41 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index b45c6bd2390a..6eddb38ca8c0 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.64 2012/12/08 12:32:25 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.65 2015/03/30 21:52:38 mr_bones_ Exp $
+
+  30 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> ode-0.11.1.ebuild,
+  ode-0.12.ebuild:
+  EAPI=5
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org> ode-0.12.ebuild:
   Stable for ppc64, wrt bug #425858
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index ecc6c377b381..e382c507c87f 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,6 +1,6 @@
 DIST ode-0.11.1.tar.bz2 1720088 SHA256 877884a86a3d53f3c5f2e35fbd8a3dc23c20249f0636c76f6ef41f6bf57a03a1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37 WHIRLPOOL a77c4a61b1dd551911e87a2233f279ac5e6cdea9abf1704574f2a42ab683a426b7fc2a8e9b422f80ca379532b7d755cf7d28f1a47948dd80444cff8c7796cd32
 DIST ode-0.12.tar.bz2 1816246 SHA256 65c5315a42c725d2da01ea2c1b045583d54e0d1a95e3f7c062e5ba3769f5c350 SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0 WHIRLPOOL def7dfd7bb9f78db9c593bb99eb635da9868dd05362817ca344e583ca157da87c3e6932b9912684bc3deed2aff9eeb409d57fd9eb388e2f195f9c83b5cccabc4
-EBUILD ode-0.11.1.ebuild 1949 SHA256 38b8f2fbafdd4bb7761da064451ea8189b925e9377a32d8c78505be1297e6e05 SHA512 88349624bf65f0b8544a89dd5db4ef369745e096dc2840b5f1cdbe04f1230ef2662882c0e5206821a05d7019374cd28cf88716604e02e5ce2736203d9e6a5249 WHIRLPOOL e2cbf4267fa471fa7397b7dc0aabb343e2585b20f32be90f158b0ab842abc45904fe31ae6e24eb9bd84ba5a7f913886cc87ff7da60992632a9907489b4888bbc
-EBUILD ode-0.12.ebuild 1965 SHA256 10943ea1187478d82bd0d1eae6ac77d82ca99513ad7b94c913f19e974cd744e5 SHA512 0d21633d371660257a690428b90f91aa07f2729a44be2f5cd3524a89e58adca01ada20d3ee81971b5a495f1df86218b6b08842055dd2f673a49fd538c4dd461b WHIRLPOOL 418cd0f5a6b14cf5edba6f6983d151c6a912499c2d56a4bae5477c35e83373e7865e0faf0ed81694cad4c64b3183f066c2fe34c11597ea1f47b725b5962737ac
-MISC ChangeLog 8484 SHA256 d7dc98a756ddfcd1fe2dccd76f705740a6310cc5d8be0eb37077c7cd6b4f4bce SHA512 ee74010325c2d6b7e381e150f4cdb1a3d426742a2335611ebe89059042d596c93f0c2cbdd03eea425af65dc9c71f4393d594ae5dfd1bde7314f5b1cf47614b41 WHIRLPOOL 7b76a64f6004007fbff4a15e239252489bd8669909ffc74e8d9b1653aa9e27e0e9f69b6631073eb55b5836bc5185eec01df2199ef332f6c9c738d1a2e6b2f8ac
+EBUILD ode-0.11.1.ebuild 1643 SHA256 1a52c9b26e71ca798058640096a164046b6e8184a4436623e2bf3651ff424f2e SHA512 f6324e1c35f729c898316e4fbd5f7ff58f0b9d2db8702c2bad186a1bc99735807b6d0cf3e86d7cfe2b838298bcdbf09e3d682b87e1dd2ab1c5d99a53a25bd7f9 WHIRLPOOL 2725dc14ea4fd0162cb05ca2281fa3295cef21d0fddd4c7889550b2cc3ec0dbc105034d056a9d4687437b8318d4249f55369bd3f7bc37481ef81ba8201fde3a4
+EBUILD ode-0.12.ebuild 1665 SHA256 90f3b898ef923f8d9856ae3f4817791f46f5fc7b7a3dbb5ac5251bbc92507a73 SHA512 9741a2c553749849c19b51e29ececdd5faebd46033ab7ff74a5204c9745107e138a09217d748ff2cffba575779f95b83c679a32c8b8807397722710d5dad45d1 WHIRLPOOL 2a35b55735e7079ee23c3f2afadd3d368d3e1bdf75d9aa3c211c4696c14e1ce6f3a78902c0197e0b93d84f7689907c6015835ec4b750800bb7c4b05913cddc00
+MISC ChangeLog 8593 SHA256 d53e099f5b5430102b574c312737a132419d6733d94cb86c81a5daaa03824781 SHA512 7f8248598071010c049e5a27c0da74bd6c3a6c7a8c9d0e4531bf9e9cf6bc1b432cfcd6d913a83d70cdbcf3e11a5f645e7d9c8bd1de0655c552339610f4ae8382 WHIRLPOOL 420fc667df748c04ff1bfe6d89259570d84451a85355abe2858d26d4b5c96edf15d75bae2e2639966f5724d000accfb7fc64d514e906aa87413a1c7d3faef321
 MISC metadata.xml 700 SHA256 44d20050da15d76be2e2eabb702458a32f3885ab668a92054c0f91be59d42726 SHA512 9d72d9f6ad6bd9935961b6cb55b3da967736343b0338e594e6a39c0199662f7affb5822f1d0156cd4269b6440a383fa13d05b0db2cc62d91505a535cbea2e415 WHIRLPOOL 3a12a67c191b0b37d6f122f95b7f25bf4a1d01017a20ab2ecb9d2073a58b6da434dbdd6e0b163f48aeb534c620bafdcd27de39830e5fec429defe3634449ce6c
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
index f0bacf039665..d33c9f45007c 100644
--- a/dev-games/ode/ode-0.11.1.ebuild
+++ b/dev-games/ode/ode-0.11.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.11.1.ebuild,v 1.7 2010/09/20 03:47:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.11.1.ebuild,v 1.8 2015/03/30 21:52:38 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils
 
-EAPI=2
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
 SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
@@ -22,15 +24,13 @@ src_prepare() {
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
 		drawstuff/src/Makefile.in \
-		ode/demo/Makefile.in \
-		|| die "sed Makefile.in failed"
+		ode/demo/Makefile.in || die
 }
 
 src_configure() {
 	# use bash (bug #335760)
 	CONFIG_SHELL=/bin/bash \
 	econf \
-		--disable-dependency-tracking \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable debug asserts) \
@@ -41,29 +41,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	if use doc ; then
 		cd ode/doc
-		doxygen Doxyfile || die "doxygen failed"
+		doxygen Doxyfile || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGELOG.txt README.txt
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
+	DOCS="CHANGELOG.txt README.txt" \
+		default
+	prune_libtool_files
 	if use doc ; then
-		dohtml docs/* || die "dohtml failed"
+		dohtml docs/*
 	fi
 	if use examples; then
 		cd ode/demo
 		exeinto /usr/share/doc/${PF}/examples
 		local f
 		for f in *.c* ; do
-			doexe .libs/${f%.*} || die "doexe ${f%.*} failed"
+			doexe .libs/${f%.*}
 		done
 		cd ../..
 		doexe drawstuff/dstest/dstest
@@ -71,7 +68,6 @@ src_install() {
 		doins ode/demo/*.{c,cpp,h} \
 			drawstuff/textures/*.ppm \
 			drawstuff/dstest/dstest.cpp \
-			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp} \
-			|| die "doins failed"
+			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
 	fi
 }
diff --git a/dev-games/ode/ode-0.12.ebuild b/dev-games/ode/ode-0.12.ebuild
index 3c919496603f..f79fcb4c791b 100644
--- a/dev-games/ode/ode-0.12.ebuild
+++ b/dev-games/ode/ode-0.12.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.12.ebuild,v 1.6 2012/12/08 12:32:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.12.ebuild,v 1.7 2015/03/30 21:52:38 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils
 
-EAPI=2
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
 SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
@@ -22,15 +24,13 @@ src_prepare() {
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
 		drawstuff/src/Makefile.in \
-		ode/demo/Makefile.in \
-		|| die "sed Makefile.in failed"
+		ode/demo/Makefile.in || die
 }
 
 src_configure() {
 	# use bash (bug #335760)
 	CONFIG_SHELL=/bin/bash \
 	econf \
-		--disable-dependency-tracking \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable debug asserts) \
@@ -41,29 +41,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	if use doc ; then
 		cd ode/doc
-		doxygen Doxyfile || die "doxygen failed"
+		doxygen Doxyfile || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGELOG.txt README.txt
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
+	DOCS="CHANGELOG.txt README.txt" \
+		default
+	prune_libtool_files
 	if use doc ; then
-		dohtml docs/* || die "dohtml failed"
+		dohtml docs/*
 	fi
 	if use examples; then
 		cd ode/demo
 		exeinto /usr/share/doc/${PF}/examples
 		local f
 		for f in *.c* ; do
-			doexe .libs/${f%.*} || die "doexe ${f%.*} failed"
+			doexe .libs/${f%.*}
 		done
 		cd ../..
 		doexe drawstuff/dstest/dstest
@@ -71,7 +68,6 @@ src_install() {
 		doins ode/demo/*.{c,cpp,h} \
 			drawstuff/textures/*.ppm \
 			drawstuff/dstest/dstest.cpp \
-			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp} \
-			|| die "doins failed"
+			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
 	fi
 }