From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 150DB139694 for ; Sun, 4 Jun 2017 18:18:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00F2621C24D; Sun, 4 Jun 2017 18:18:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D335021C24D for ; Sun, 4 Jun 2017 18:18:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE0A2341841 for ; Sun, 4 Jun 2017 18:18:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99A4E747E for ; Sun, 4 Jun 2017 18:17:58 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1496600246.8a0525e05e3ea27a3e2d5a84f321a67645911199.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: media-gfx/u3d/ X-VCS-Repository: proj/betagarden X-VCS-Files: media-gfx/u3d/u3d-1.4.4.ebuild X-VCS-Directories: media-gfx/u3d/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8a0525e05e3ea27a3e2d5a84f321a67645911199 X-VCS-Branch: master Date: Sun, 4 Jun 2017 18:17:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0088d952-0f06-41fc-b855-31ca3a433657 X-Archives-Hash: a9ab3a9ad37f35583fc7c72a06acd583 commit: 8a0525e05e3ea27a3e2d5a84f321a67645911199 Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 4 18:17:26 2017 +0000 Commit: Justin Lecher gentoo 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 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 }