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 57095138334 for ; Mon, 16 Jul 2018 22:26:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6844EE087B; Mon, 16 Jul 2018 22:26:19 +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 23AF7E087B for ; Mon, 16 Jul 2018 22:26:19 +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 4043D335C71 for ; Mon, 16 Jul 2018 22:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15A6037C for ; Mon, 16 Jul 2018 22:26:13 +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: <1531779956.f6ce89541c522298b585d8096b4d0cd8b744f15e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/qhull/Manifest media-libs/qhull/files/qhull-2012.1-format-security.patch media-libs/qhull/qhull-2012.1-r4.ebuild X-VCS-Directories: media-libs/qhull/files/ media-libs/qhull/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f6ce89541c522298b585d8096b4d0cd8b744f15e X-VCS-Branch: master Date: Mon, 16 Jul 2018 22:26:13 +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: 1aa5808e-b50d-44c5-90d6-7a772dc4bcea X-Archives-Hash: 1a52a539376fab48147c8e681f8308f5 commit: f6ce89541c522298b585d8096b4d0cd8b744f15e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 16 21:16:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 16 22:25:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ce8954 media-libs/qhull: Drop old, EAPI5-- Package-Manager: Portage-2.3.43, Repoman-2.3.10 media-libs/qhull/Manifest | 1 - .../qhull/files/qhull-2012.1-format-security.patch | 16 ------- media-libs/qhull/qhull-2012.1-r4.ebuild | 52 ---------------------- 3 files changed, 69 deletions(-) diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest index db5f8317167..92eb25e0562 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,2 +1 @@ -DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4 diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch deleted file mode 100644 index 14bce2baa75..00000000000 --- a/media-libs/qhull/files/qhull-2012.1-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/libqhull/io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libqhull/io.c b/src/libqhull/io.c -index 09a0079..2bd066e 100644 ---- a/src/libqhull/io.c -+++ b/src/libqhull/io.c -@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst) - qh_memfree(point, qh normal_size); - qh_settempfree(&points); - qh_settempfree(&vertices); -- qh_fprintf(fp, 9110, endfmt); -+ fprintf(fp, "%s", endfmt); - } /* printfacet3math */ - - diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild deleted file mode 100644 index 64bfebe065b..00000000000 --- a/media-libs/qhull/qhull-2012.1-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils flag-o-matic - -MY_P="${PN}${PV}" - -DESCRIPTION="Geometry library" -HOMEPAGE="http://www.qhull.org/" -SRC_URI="${HOMEPAGE}/download/${P}-src.tgz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc static-libs" - -DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-64bit.patch - "${FILESDIR}"/${P}-format-security.patch - ) - -src_configure() { - append-flags -fno-strict-aliasing - mycmakeargs+=( - -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) - -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html - ) - cmake-utils_src_configure -} - -pkg_preinst() { - # See https://bugs.gentoo.org/show_bug.cgi?id=435006 - # If qhull-2010 is installed we need to remove its include dir so - # that it can be replaced with a symlink in this version. - rm -rf "${EROOT}"usr/include/qhull || die -} - -src_install() { - cmake-utils_src_install - # compatibility with previous installs - dosym libqhull /usr/include/qhull - if ! use doc; then - rm -rf "${ED}"/usr/share/doc/${PF}/html || die - fi - if ! use static-libs; then - rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die - fi -}