commit: c94c04a54579b3509a3dcb9736c6a0082710f249 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Apr 5 11:51:10 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 9 20:48:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94c04a5
dev-lang/swi-prolog: Tidyup, drop multilib - local mycmakeargs - Drop superfluous and post-inherit BUILD_DIR, CMAKE_USE_DIR - Drop superfluous eapply_user, done by cmake_src_prepare Bug: https://bugs.gentoo.org/780366 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild | 16 +++++++--------- dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild | 22 +++++++++------------- dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild | 16 +++++++--------- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild index 9719353911f..53103284881 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild @@ -3,11 +3,11 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic multilib +inherit cmake desktop xdg-utils flag-o-matic PATCHSET_VER="0" -DESCRIPTION="versatile implementation of the Prolog programming language" +DESCRIPTION="Versatile implementation of the Prolog programming language" HOMEPAGE="https://www.swi-prolog.org/"; SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"; @@ -49,17 +49,15 @@ DEPEND="${RDEPEND} java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV} fi - eapply_user - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die + sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \ + -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ + -i CMakeLists.txt || die cmake_src_prepare } @@ -68,7 +66,7 @@ src_configure() { append-flags -fno-strict-aliasing use debug && append-flags -DO_DEBUG - mycmakeargs=( + local mycmakeargs=( -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl -DUSE_GMP=$(usex gmp) -DINSTALL_DOCUMENTATION=$(use doc && usex archive) @@ -83,7 +81,7 @@ src_configure() { -DSWIPL_PACKAGES_QT=$(usex qt5) -DSWIPL_PACKAGES_X=$(usex X) -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) + ) cmake_src_configure } diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild index 81dffeb547e..914c832b353 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild @@ -3,13 +3,11 @@ EAPI=7 -inherit cmake flag-o-matic multilib +inherit cmake flag-o-matic -PATCHSET_VER="0" - -DESCRIPTION="versatile implementation of the Prolog programming language" -HOMEPAGE="http://www.swi-prolog.org/"; -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"; +DESCRIPTION="Versatile implementation of the Prolog programming language" +HOMEPAGE="https://www.swi-prolog.org/"; +SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"; LICENSE="BSD-2" SLOT="0" @@ -49,17 +47,15 @@ DEPEND="${RDEPEND} java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV} fi - eapply_user - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die + sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \ + -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ + -i CMakeLists.txt || die cmake_src_prepare } @@ -68,7 +64,7 @@ src_configure() { append-flags -fno-strict-aliasing use debug && append-flags -DO_DEBUG - mycmakeargs=( + local mycmakeargs=( -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl -DUSE_GMP=$(usex gmp) -DINSTALL_DOCUMENTATION=$(use doc && usex archive) @@ -83,7 +79,7 @@ src_configure() { -DSWIPL_PACKAGES_QT=$(usex qt5) -DSWIPL_PACKAGES_X=$(usex X) -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) + ) cmake_src_configure } diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild index a6117bd15bc..2a8883edddf 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild @@ -3,11 +3,11 @@ EAPI=7 -inherit cmake desktop xdg-utils flag-o-matic multilib +inherit cmake desktop xdg-utils flag-o-matic PATCHSET_VER="0" -DESCRIPTION="versatile implementation of the Prolog programming language" +DESCRIPTION="Versatile implementation of the Prolog programming language" HOMEPAGE="https://www.swi-prolog.org/"; SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"; @@ -49,17 +49,15 @@ DEPEND="${RDEPEND} java? ( test? ( =dev-java/junit-3.8* ) )" S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV} fi - eapply_user - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die + sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \ + -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \ + -i CMakeLists.txt || die cmake_src_prepare } @@ -68,7 +66,7 @@ src_configure() { append-flags -fno-strict-aliasing use debug && append-flags -DO_DEBUG - mycmakeargs=( + local mycmakeargs=( -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl -DUSE_GMP=$(usex gmp) -DINSTALL_DOCUMENTATION=$(use doc && usex archive) @@ -83,7 +81,7 @@ src_configure() { -DSWIPL_PACKAGES_QT=$(usex qt5) -DSWIPL_PACKAGES_X=$(usex X) -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) + ) cmake_src_configure }
