commit: 0d2a598ccf73735880a42e5f67212dadec0fde0c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 5 19:55:52 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <rossi.f <AT> 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 }
