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 9AAA7138335 for ; Sat, 15 Sep 2018 02:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43384E0A53; Sat, 15 Sep 2018 02:31:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EDB19E0A49 for ; Sat, 15 Sep 2018 02:31:24 +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 2B75B335D1D for ; Sat, 15 Sep 2018 02:31:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 409813D2 for ; Sat, 15 Sep 2018 02:31:20 +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: <1536978626.7bf97178eba827b7b8257a6e47d4236d9a2f32e2.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/Manifest media-libs/assimp/assimp-3.0.1270.ebuild media-libs/assimp/assimp-3.1.1.ebuild media-libs/assimp/assimp-3.2-r2.ebuild media-libs/assimp/assimp-3.2-r3.ebuild media-libs/assimp/assimp-3.3.1.ebuild media-libs/assimp/files/findassimp.patch media-libs/assimp/files/test-cmakelists.patch media-libs/assimp/metadata.xml X-VCS-Directories: media-libs/assimp/ media-libs/assimp/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7bf97178eba827b7b8257a6e47d4236d9a2f32e2 X-VCS-Branch: master Date: Sat, 15 Sep 2018 02:31:20 +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: 4efbbbfa-58a8-46e3-b1a2-517c6c7d702f X-Archives-Hash: 7b1c0fa68811d5479b5119dfb5e7205b commit: 7bf97178eba827b7b8257a6e47d4236d9a2f32e2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 12 21:02:26 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 15 02:30:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf97178 media-libs/assimp: Drop old Closes: https://bugs.gentoo.org/571896 Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-libs/assimp/Manifest | 4 -- media-libs/assimp/assimp-3.0.1270.ebuild | 35 ----------------- media-libs/assimp/assimp-3.1.1.ebuild | 38 ------------------- media-libs/assimp/assimp-3.2-r2.ebuild | 44 ---------------------- media-libs/assimp/assimp-3.2-r3.ebuild | 54 --------------------------- media-libs/assimp/assimp-3.3.1.ebuild | 50 ------------------------- media-libs/assimp/files/findassimp.patch | 18 --------- media-libs/assimp/files/test-cmakelists.patch | 35 ----------------- media-libs/assimp/metadata.xml | 1 - 9 files changed, 279 deletions(-) diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 1b8f5764121..6e8afcaf3dc 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,5 +1 @@ -DIST assimp--3.0.1270-source-only.zip 4042147 BLAKE2B 1a96a958304d8cdb635f00bb20629aa959d6b158e6d86a465c913cb86e8bf9bbb29d7619c0de685b67483dd1ec12561f1bce63e3cbd6594d99617c3697287145 SHA512 0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820 -DIST assimp-3.1.1.zip 32869052 BLAKE2B 877b1a00a8e35eafb85c0f1b1c364c025a98c629da1797961f71df92ee0508b66606aca2b3f69d4da25ec6edef105776d8c4ef83335f3aa3cff1af5232be6745 SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 -DIST assimp-3.2.tar.gz 33756081 BLAKE2B 76de8f74b7b2eae04ebd3d71b69709d601d249a4ed7e6102fffce376f67dfb2d433536556e7683bc79d092465940cd5d7750f7fecb54edd33b9e8bfa974f8de0 SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a -DIST assimp-3.3.1.tar.gz 36428380 BLAKE2B 5239648ea99e23a1f5f568fb22e6f9607b3f2e642fcdb480737c8813456fee699a4a07937c248ded01c27edd503f1a30ae8bde30ff49d8bac61e6363f12d1cc5 SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild b/media-libs/assimp/assimp-3.0.1270.ebuild deleted file mode 100644 index 37368a1bb93..00000000000 --- a/media-libs/assimp/assimp-3.0.1270.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils versionator - -DESCRIPTION="Importer library to import assets from 3D files" -HOMEPAGE="http://assimp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}--${PV}-source-only.zip" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="+boost samples static tools" -SLOT="0" - -DEPEND=" - boost? ( dev-libs/boost ) - samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN}--${PV}-source-only - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ - $(cmake-utils_use_build tools ASSIMP_TOOLS) \ - $(cmake-utils_use_build static STATIC_LIB) \ - $(cmake-utils_use_enable !boost BOOST_WORKAROUND) - ) - - cmake-utils_src_configure -} diff --git a/media-libs/assimp/assimp-3.1.1.ebuild b/media-libs/assimp/assimp-3.1.1.ebuild deleted file mode 100644 index b3850b085c7..00000000000 --- a/media-libs/assimp/assimp-3.1.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils versionator - -DESCRIPTION="Importer library to import assets from 3D files" -HOMEPAGE="http://assimp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" - -LICENSE="BSD" -KEYWORDS="amd64 ~arm x86" -IUSE="+boost samples static tools" -SLOT="0" - -DEPEND=" - boost? ( dev-libs/boost ) - samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e 's/ASSIMP_LIB_INSTALL_DIR "lib"/ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ - $(cmake-utils_use_build tools ASSIMP_TOOLS) \ - $(cmake-utils_use_build static STATIC_LIB) \ - $(cmake-utils_use_enable !boost BOOST_WORKAROUND) - ) - - cmake-utils_src_configure -} diff --git a/media-libs/assimp/assimp-3.2-r2.ebuild b/media-libs/assimp/assimp-3.2-r2.ebuild deleted file mode 100644 index 0e5083ca247..00000000000 --- a/media-libs/assimp/assimp-3.2-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils versionator multilib - -DESCRIPTION="Importer library to import assets from 3D files" -HOMEPAGE="https://github.com/assimp/assimp" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+boost samples static test tools" -SLOT="0" - -RDEPEND=" - boost? ( dev-libs/boost ) - samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) - sys-libs/zlib -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( "${FILESDIR}/test-cmakelists.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ - $(cmake-utils_use_build tools ASSIMP_TOOLS) \ - $(cmake-utils_use_build static STATIC_LIB) \ - $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \ - $(cmake-utils_use_build test TESTS) - -DCMAKE_DEBUG_POSTFIX="" - -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" - ) - - cmake-utils_src_configure -} - -src_test() { - "${BUILD_DIR}/test/unit" || die -} diff --git a/media-libs/assimp/assimp-3.2-r3.ebuild b/media-libs/assimp/assimp-3.2-r3.ebuild deleted file mode 100644 index 4fd114b62ed..00000000000 --- a/media-libs/assimp/assimp-3.2-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils versionator multilib - -DESCRIPTION="Importer library to import assets from 3D files" -HOMEPAGE="https://github.com/assimp/assimp" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+boost samples static test tools" -SLOT="0" - -RDEPEND=" - boost? ( dev-libs/boost ) - samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) - sys-libs/zlib -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}/test-cmakelists.patch" - "${FILESDIR}/findassimp.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ - $(cmake-utils_use_build tools ASSIMP_TOOLS) \ - $(cmake-utils_use_build static STATIC_LIB) \ - $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \ - $(cmake-utils_use_build test TESTS) - -DCMAKE_DEBUG_POSTFIX="" - -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - insinto /usr/share/cmake/Modules - doins cmake-modules/Findassimp.cmake -} - -src_test() { - "${BUILD_DIR}/test/unit" || die -} diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild deleted file mode 100644 index e051dd165ea..00000000000 --- a/media-libs/assimp/assimp-3.3.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils versionator multilib - -DESCRIPTION="Importer library to import assets from 3D files" -HOMEPAGE="https://github.com/assimp/assimp" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="samples static test tools" -SLOT="0" - -RDEPEND=" - dev-libs/boost - samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) - sys-libs/zlib -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) - -src_configure() { - local mycmakeargs=( - -DASSIMP_BUILD_SAMPLES=$(usex samples) \ - -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \ - -DASSIMP_BUILD_STATIC_LIB=$(usex static) \ - -DASSIMP_BUILD_TESTS=$(usex test) - -DCMAKE_DEBUG_POSTFIX="" - -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - insinto /usr/share/cmake/Modules - doins cmake-modules/Findassimp.cmake -} - -src_test() { - "${BUILD_DIR}/test/unit" || die -} diff --git a/media-libs/assimp/files/findassimp.patch b/media-libs/assimp/files/findassimp.patch deleted file mode 100644 index 1b62e7301ff..00000000000 --- a/media-libs/assimp/files/findassimp.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- cmake-modules/Findassimp.cmake.old 2016-09-06 08:26:35.107697600 +0200 -+++ cmake-modules/Findassimp.cmake 2016-09-06 08:29:25.337696582 +0200 -@@ -1,13 +1,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) diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch deleted file mode 100644 index 9a3471bbc36..00000000000 --- a/media-libs/assimp/files/test-cmakelists.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- test/CMakeLists.txt.old 2016-01-21 06:46:12.053363212 +0100 -+++ test/CMakeLists.txt 2016-01-21 06:46:51.126697143 +0100 -@@ -1,7 +1,5 @@ - cmake_minimum_required( VERSION 2.6 ) - --INCLUDE( AddGTest ) -- - INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/include - ${Assimp_SOURCE_DIR}/code -@@ -47,7 +45,7 @@ - - SOURCE_GROUP( tests FILES ${TEST_SRCS} ) - --if(AddGTest_FOUND) -+if(BUILD_TESTS) - add_executable( unit - unit/CCompilerTest.c - unit/Main.cpp -@@ -56,13 +54,12 @@ - ) - - add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models") -+target_link_libraries( unit gtest ) - - SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} ) - - add_dependencies( unit gtest ) - target_link_libraries( unit assimp -- debug ${GTEST_DEBUG_LIBRARIES} -- optimized ${GTEST_RELEASE_LIBRARIES} - ) --endif(AddGTest_FOUND) -+endif(BUILD_TESTS) - add_subdirectory(headercheck) diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml index b23d8815c4e..1480b57c125 100644 --- a/media-libs/assimp/metadata.xml +++ b/media-libs/assimp/metadata.xml @@ -5,7 +5,6 @@ slis@gentoo.org - Build assimp with boost support Build viewer library Build assimp tool binary