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 3FA951382C5 for ; Wed, 16 May 2018 12:09:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40713E08EE; Wed, 16 May 2018 12:09:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17E83E08EE for ; Wed, 16 May 2018 12:09:41 +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 BCFC5335C07 for ; Wed, 16 May 2018 12:09:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED812296 for ; Wed, 16 May 2018 12:09:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1526472562.02d2520b61e0c7d054020e6cbe63264bc8d2f5f9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/assimp/assimp-4.0.0.ebuild media-libs/assimp/files/findassimp-4.0.0.patch X-VCS-Directories: media-libs/assimp/files/ media-libs/assimp/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 02d2520b61e0c7d054020e6cbe63264bc8d2f5f9 X-VCS-Branch: master Date: Wed, 16 May 2018 12:09:38 +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: e635019d-a0f8-4297-9f0e-b87b2509d16e X-Archives-Hash: a66e147e4a9e34d0b0d0cc7bcc7069ca commit: 02d2520b61e0c7d054020e6cbe63264bc8d2f5f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 16 11:11:21 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 16 12:09:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d2520b media-libs/assimp: QA: Drop duplicate patch media-libs/assimp/assimp-4.0.0.ebuild | 2 +- media-libs/assimp/files/findassimp-4.0.0.patch | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild index e051dd165ea..2518909a9b2 100644 --- a/media-libs/assimp/assimp-4.0.0.ebuild +++ b/media-libs/assimp/assimp-4.0.0.ebuild @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) +PATCHES=( "${FILESDIR}/findassimp-3.3.1.patch" ) src_configure() { local mycmakeargs=( diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch deleted file mode 100644 index 2fbaa73a850..00000000000 --- a/media-libs/assimp/files/findassimp-4.0.0.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/cmake-modules/Findassimp.cmake 2017-07-24 08:21:12.436647541 +0200 -+++ b/cmake-modules/Findassimp.cmake 2017-07-24 08:21:30.139980768 +0200 -@@ -55,13 +55,13 @@ - find_path( - assimp_INCLUDE_DIRS - NAMES postprocess.h scene.h version.h config.h cimport.h -- PATHS /usr/local/include/ -+ PATHS /usr/include/ - ) - - find_library( - assimp_LIBRARIES - NAMES assimp -- PATHS /usr/local/lib/ -+ PATHS /usr/lib/ - ) - - if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -@@ -78,4 +78,4 @@ - endif (assimp_FIND_REQUIRED) - endif (assimp_FOUND) - --endif(WIN32) -\ Brak znaku nowej linii na końcu pliku -+endif(WIN32)