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 2A76D1396D9 for ; Mon, 6 Nov 2017 01:58:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4924E0F73; Mon, 6 Nov 2017 01:58:12 +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 B1AD9E0F73 for ; Mon, 6 Nov 2017 01:58:12 +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 754D23416FA for ; Mon, 6 Nov 2017 01:58:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 266A9966E for ; Mon, 6 Nov 2017 01:58:08 +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: <1509933436.0d2a598ccf73735880a42e5f67212dadec0fde0c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-6.9.1-r2.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0d2a598ccf73735880a42e5f67212dadec0fde0c X-VCS-Branch: master Date: Mon, 6 Nov 2017 01:58:08 +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: 1cf47ea6-e718-4dec-bd8c-f4605e640990 X-Archives-Hash: 59fe48780f678ebc8020335d1a557c06 commit: 0d2a598ccf73735880a42e5f67212dadec0fde0c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 5 19:55:52 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 6 01:57:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2a598c sci-libs/opencascade: Drop USE=qt4 Thanks-to: Fabio Rossi inwind.it> Closes: https://bugs.gentoo.org/624194 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild index 3f0de66418d..5b581add74b 100644 --- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild +++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild @@ -12,9 +12,10 @@ SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_r LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" SLOT="${PV}" KEYWORDS="~amd64 ~x86" -IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk" +IUSE="debug doc examples freeimage gl2ps java +tbb +vtk" -DEPEND="app-eselect/eselect-opencascade +DEPEND=" + app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl @@ -28,14 +29,16 @@ DEPEND="app-eselect/eselect-opencascade gl2ps? ( x11-libs/gl2ps ) java? ( >=virtual/jdk-0:= ) tbb? ( dev-cpp/tbb ) - vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[qt4] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )" + vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )" RDEPEND="${DEPEND}" CHECKREQS_MEMORY="256M" CHECKREQS_DISK_BUILD="3584M" -PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch - "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch + "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch +) pkg_setup() { check-reqs_pkg_setup @@ -111,9 +114,9 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.* sed -e "/^AM_C_PROTOTYPES$/d" \ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \ - -e "s:\$qt/include:\$qt/include/qt4:g"\ - -e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\ + -e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \ -i configure.ac || die + eautoreconf } @@ -123,9 +126,9 @@ src_configure() { --with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \ --with-freetype="${EROOT}usr" \ --with-ftgl="${EROOT}usr" \ + --without-qt \ $(usex freeimage "--with-freeimage=${EROOT}usr" "") \ $(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \ - $(usex qt4 "--with-qt=${EROOT}usr" "") \ $(usex tbb "--with-tbb-include=${EROOT}usr" "") \ $(usex tbb "--with-tbb-library=${EROOT}usr" "") \ $(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \ @@ -162,9 +165,7 @@ src_install() { pkg_postinst() { eselect ${PN} set ${PV} - einfo elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it." elog "You get a list by running \"equery depends sci-libs/opencascade\"" elog "revdep-rebuild does NOT suffice." - einfo }