[gentoo-commits] proj/betagarden:master commit in: media-gfx/u3d/

["Justin Lecher" <jlec@gentoo.org>]

commit:     8a0525e05e3ea27a3e2d5a84f321a67645911199
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 18:17:26 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 18:17:26 2017 +0000
URL:        https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=8a0525e0

media-gfx/u3d: Bump EAPI

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 media-gfx/u3d/u3d-1.4.4.ebuild | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/media-gfx/u3d/u3d-1.4.4.ebuild b/media-gfx/u3d/u3d-1.4.4.ebuild
index a16cb3a..fa83a53 100644
--- a/media-gfx/u3d/u3d-1.4.4.ebuild
+++ b/media-gfx/u3d/u3d-1.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit base cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="Port of Intel's U3D library to gnu build tools"
 HOMEPAGE="http://u3d.sourceforge.net/"
@@ -15,22 +15,30 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-		sys-libs/zlib
-		virtual/jpeg
-		media-libs/libpng
-		"
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
 RDEPEND="${DEPEND}"
 
-MYCMAKEARGS="-DU3D_SHARED=ON -DBUILD_SHARED_LIBS=ON"
-
 src_prepare() {
 	sed \
+		-e "s:LIB_DESTINATION lib:LIB_DESTINATION $(get_libdir):g" \
 		-e "s:LIB_DESTINATION u3d:LIB_DESTINATION $(get_libdir):g" \
+		-e "s:PLUGIN_DESTINATION lib:PLUGIN_DESTINATION $(get_libdir):g" \
 		-e "s:PLUGIN_DESTINATION u3d:PLUGIN_DESTINATION $(get_libdir):g" \
 		-e "s:BIN_DESTINATION u3d:BIN_DESTINATION bin:g" \
 		-e "s:INCLUDE_DESTINATION u3d/include:INCLUDE_DESTINATION include:g" \
 		-e "s:SAMPLE_DESTINATION u3d/samples:SAMPLE_DESTINATION share/${PN}/samples:g" \
 		-e "s:DOC_DESTINATION u3d/docs:DOC_DESTINATION share/docs/${P}:g" \
 		-i CMakeLists.txt
-	base_src_prepare
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DU3D_SHARED=ON
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
 }