commit: add34158d62d3170b3bbfc107908cd488d7aea3e Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Wed Feb 28 20:12:22 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Wed Feb 28 20:13:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add34158
dev-tcltk/iwidgets: use deployed itcl and itk Closes: https://bugs.gentoo.org/916006 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/iwidgets/Manifest | 2 -- dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild | 25 ++++++++++---------- ...ts-4.1.1-r2.ebuild => iwidgets-4.1.1-r3.ebuild} | 27 +++++++++++----------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest index c40fff60b3b0..fc1c4c0a9f90 100644 --- a/dev-tcltk/iwidgets/Manifest +++ b/dev-tcltk/iwidgets/Manifest @@ -1,3 +1 @@ -DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2 -DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305 diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild index bec5525391f4..f5a96d1b3c29 100644 --- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild +++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,25 +6,19 @@ EAPI=8 inherit virtualx autotools BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source" -ITCL_VER=4.1.1 -ITK_VER=4.1.0 DESCRIPTION="Widget collection for incrTcl/incrTk" HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"; -SRC_URI=" - mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz - ${BASE_URI_ITCLTK}/itcl%20${ITCL_VER}/itcl${ITCL_VER}.tar.gz - ${BASE_URI_ITCLTK}/itk%20${ITK_VER}/itk${ITK_VER}.tar.gz" +SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz" LICENSE="HPND Old-MIT tcltk" SLOT="0" KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="" RESTRICT="!test? ( test )" DEPEND=" - >=dev-tcltk/itcl-${ITCL_VER} - >=dev-tcltk/itk-${ITK_VER}" + dev-tcltk/itcl + dev-tcltk/itk" RDEPEND="${DEPEND}" QA_CONFIG_IMPL_DECL_SKIP=( @@ -48,12 +42,17 @@ src_prepare() { } src_configure() { - (cd ../itcl${ITCL_VER}; ./configure) + local itcl_package=$(best_version dev-tcltk/itcl) + local itcl_version=${itcl_package#*/*-} + local itcl="itcl${itcl_version%-*}" + local itk_package=$(best_version dev-tcltk/itk) + local itk_version=${itk_package#*/*-} + local itk="itk${itk_version%-*}" econf \ --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ --with-tk="${EPREFIX}"/usr/$(get_libdir) \ - --with-itcl="${WORKDIR}"/itcl${ITCL_VER} \ - --with-itk="${WORKDIR}"/itk${ITK_VER} + --with-itcl="${EPREFIX}"/usr/$(get_libdir)/${itcl} \ + --with-itk="${EPREFIX}"/usr/$(get_libdir)/${itk} } src_compile() { diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild similarity index 63% copy from dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild copy to dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild index bec5525391f4..314bd6b1b9a7 100644 --- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild +++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,25 +6,19 @@ EAPI=8 inherit virtualx autotools BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source" -ITCL_VER=4.1.1 -ITK_VER=4.1.0 DESCRIPTION="Widget collection for incrTcl/incrTk" HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"; -SRC_URI=" - mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz - ${BASE_URI_ITCLTK}/itcl%20${ITCL_VER}/itcl${ITCL_VER}.tar.gz - ${BASE_URI_ITCLTK}/itk%20${ITK_VER}/itk${ITK_VER}.tar.gz" +SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz" LICENSE="HPND Old-MIT tcltk" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" RESTRICT="!test? ( test )" DEPEND=" - >=dev-tcltk/itcl-${ITCL_VER} - >=dev-tcltk/itk-${ITK_VER}" + >=dev-tcltk/itcl-4.2.4-r1 + >=dev-tcltk/itk-4.1.0-r1" RDEPEND="${DEPEND}" QA_CONFIG_IMPL_DECL_SKIP=( @@ -48,12 +42,17 @@ src_prepare() { } src_configure() { - (cd ../itcl${ITCL_VER}; ./configure) + local itcl_package=$(best_version dev-tcltk/itcl) + local itcl_version=${itcl_package#*/*-} + local itcl="itcl${itcl_version%-*}" + local itk_package=$(best_version dev-tcltk/itk) + local itk_version=${itk_package#*/*-} + local itk="itk${itk_version%-*}" econf \ --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ --with-tk="${EPREFIX}"/usr/$(get_libdir) \ - --with-itcl="${WORKDIR}"/itcl${ITCL_VER} \ - --with-itk="${WORKDIR}"/itk${ITK_VER} + --with-itcl="${EPREFIX}"/usr/$(get_libdir)/${itcl} \ + --with-itk="${EPREFIX}"/usr/$(get_libdir)/${itk} } src_compile() {
