From 1c382dc5dbc52576ac2300fee0498af8af44e7b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Jun 2023 15:21:15 +0100 Subject: Revert "gentoo auto-resync : 14:06:2023 - 15:13:45" This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b. --- dev-tcltk/blt/Manifest | 2 +- dev-tcltk/blt/blt-2.5.3-r2.ebuild | 140 +++++++++++++++++++++++++++++++++++ dev-tcltk/blt/blt-2.5.3-r3.ebuild | 152 -------------------------------------- 3 files changed, 141 insertions(+), 153 deletions(-) create mode 100644 dev-tcltk/blt/blt-2.5.3-r2.ebuild delete mode 100644 dev-tcltk/blt/blt-2.5.3-r3.ebuild (limited to 'dev-tcltk/blt') diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index 0ecfa668bfc6..393a6dd066e7 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -5,5 +5,5 @@ AUX blt-2.5.3-lto.patch 877 BLAKE2B a61977113475d98fb2315ac0ab5aeae3ceb270552b19 AUX blt-2.5.3-parallelMake.patch 645 BLAKE2B 4100101f8a30ba1acb845f14e368c534e8cc4366e2eb3cd6911abb90f879e832c47b1d0ac5e93fd68dd41e52b0cd6a2bc9a8ad26878f1498b0b08b34e15354d7 SHA512 905a3e6f7dbf25449039e2c4fc3aa5682fdd302118267ce1c01834dc5bbb9b5ceb6e917c5b9c80195104b4a0183b60c736280d010e21d61d3ab40e93e2bf4b74 DIST blt-2.5.3-debian-patches.tar.gz 52252 BLAKE2B 700a2df32117ea84f9e211e18bda0d64163d24b633b0c5735808da6f3c5f32b73a69e9f1af548cca7eea4538c2aae57a87d82b2f61673e49709ac30dc036e38a SHA512 3da7831c3c8a7847e004cfb81e911883eb29f565e63f3b7ed47719ccba0a0cb593c0dbb77ff22262d5f8c4a3cb94cc074fd9c02f37729fe7763533be6677a852 DIST blt-src-2.5.3.zip 2724036 BLAKE2B c669bc033e691d1717b6b6dccf42901fed26f58bb4d2e9fffdd4e7f83eae788e1cbdb8fd1bcdc860845a569232ec26d06773146a420984d8abf5d25ee7f73dd9 SHA512 f589564cc5f790ab11ac1356b2e27659ef0e6132ffde42d4325f0aa8d8aa4269fdb9e81dd1c196017518704e4c1c78c0d4116f32afd1e6a1c60878961b8cdb26 -EBUILD blt-2.5.3-r3.ebuild 4534 BLAKE2B 851c2484a1249918fef7396adbd5e7dcf2bc4018e6700dd74b63a929d17a78fe92f50e0ce5cf2878717b97ba5a79122e0ae07e565280e5068a919d91f62fdfc1 SHA512 c055ebe34cb7e2377df91debc5483f8ec5aeba1be85c070a389f543d9c889aa74aa35e010906eb2ec94d34fbd2bcf7abcc0d9f0e15269f7324d7d7e6a3312c82 +EBUILD blt-2.5.3-r2.ebuild 3942 BLAKE2B 9e92c2ff2f9f782268cce69d592fbf3c866b935dd591c8246be5dc8bcacd6ab7a08d266dcd6d6a0a6eaae2b33277c4199574ce2d9e2305221900e81f51dac25c SHA512 cd94b8574e6940ef59aa02b098cdacd78670d7dc1aae8c8cd9356cd51517b408027df2cae05c3e3bf0de531cb5b204ce7a7697d846950d5c1f70461712c6cd72 MISC metadata.xml 337 BLAKE2B 516358308d0546bf002efb976c99fd297cdae8d4f9b7cc59b5eff5bb9ec530150ad0e0cf0b3cbb9a3285547683505f62d3ded7d55daba20c0935c55818155386 SHA512 1ea3c5a04ee8192793fbfb59d7532e4b8aca70c782378ad6f475445aa828680a09bb0e4f2ed0ec09df225582f545dcb32577dec58562fa307c775e9a7e10239c diff --git a/dev-tcltk/blt/blt-2.5.3-r2.ebuild b/dev-tcltk/blt/blt-2.5.3-r2.ebuild new file mode 100644 index 000000000000..0d8f822d5b07 --- /dev/null +++ b/dev-tcltk/blt/blt-2.5.3-r2.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MYP=${PN}$(ver_cut 1-2) +SHVER=$(ver_rs 1 '' $(ver_cut 1-2)) + +inherit autotools flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" +HOMEPAGE="https://sourceforge.net/projects/wize/" +SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip + https://dev.gentoo.org/~tupone/distfiles/${P}-debian-patches.tar.gz" + +IUSE="jpeg static-libs" +SLOT="0/${SHVER}" +LICENSE="BSD" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND=" + dev-lang/tk:0= + jpeg? ( media-libs/libjpeg-turbo:0= ) + x11-libs/libX11" +RDEPEND="${DEPEND}" +BDEPEND="app-arch/unzip" + +S="${WORKDIR}"/${MYP} + +MAKEOPTS+=" -j1" + +PATCHES=( + "${WORKDIR}"/patches/02-debian-all.patch + "${WORKDIR}"/patches/03-fedora-patch-2.patch + "${WORKDIR}"/patches/04-fedora-tk8.5.6.patch + "${WORKDIR}"/patches/05-tk8.5-zoomstack.patch + "${WORKDIR}"/patches/doc-typos.patch + "${WORKDIR}"/patches/tcl8.6.patch + "${WORKDIR}"/patches/tk8.6.patch + "${WORKDIR}"/patches/install.patch + "${WORKDIR}"/patches/usetclint.patch + "${WORKDIR}"/patches/usetkint.patch + "${WORKDIR}"/patches/table.patch + "${WORKDIR}"/patches/ldflags.patch + "${WORKDIR}"/patches/pkgindex.patch + "${WORKDIR}"/patches/decls.patch + "${WORKDIR}"/patches/bltnsutil.patch + "${WORKDIR}"/patches/blthash.patch + "${WORKDIR}"/patches/const.patch + "${WORKDIR}"/patches/uninitialized.patch + "${WORKDIR}"/patches/unused.patch + "${WORKDIR}"/patches/pointertoint.patch + "${WORKDIR}"/patches/autoreconf.patch + "${WORKDIR}"/patches/switch.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-darwin.patch + "${FILESDIR}"/${P}-gbsd.patch + "${FILESDIR}"/${P}-lto.patch + "${FILESDIR}"/${P}-parallelMake.patch +) + +src_prepare() { + default + rm acconfig.h || die + # Set the correct libdir and drop RPATH + sed \ + -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ + -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ + -i configure.in || die "sed configure* failed" + sed \ + -e "/^scriptdir =/s:lib:$(get_libdir):" \ + -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed" + + sed \ + -e "/AR/s:ar:$(tc-getAR):g" \ + -e 's:0444:0644:g' \ + -i generic/Makefile.in || die + + append-cflags -fPIC + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + LC_ALL=C \ + econf \ + --x-includes="${EPREFIX}/usr/include" \ + --x-libraries="${EPREFIX}/usr/$(get_libdir)" \ + --with-blt="${EPREFIX}/usr/$(get_libdir)" \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ + --with-tk="${EPREFIX}/usr/$(get_libdir)" \ + --with-tclincls="${EPREFIX}/usr/include" \ + --with-tkincls="${EPREFIX}/usr/include" \ + --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \ + --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ + --with-cflags="${CFLAGS}" \ + --with-gnu-ld \ + $(use_enable jpeg) \ + --with-x \ + CC="$(tc-getCC)" +} + +src_compile() { + emake LDFLAGS="${LDFLAGS}" +} + +src_install() { + sed \ + -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ + -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \ + -i demos/{,scripts/}*.tcl || die + + dodir \ + /usr/bin \ + /usr/$(get_libdir)/${MYP}/demos/bitmaps \ + /usr/share/man/mann \ + /usr/include + + emake INSTALL_ROOT="${D}" install + + dodoc NEWS PROBLEMS README + docinto html + dodoc html/*.html + pushd "${ED}"/usr/share/man/mann + for f in * ; do + mv ${f} ${f/.n/.nblt} || die + done + popd + + # fix for linking against shared lib with -lBLT or -lBLTlite + dosym libBLT${SHVER}$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) + dosym libBLTlite${SHVER}$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) + + use static-libs || \ + find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \ + xargs -r -0 rm -fv +} diff --git a/dev-tcltk/blt/blt-2.5.3-r3.ebuild b/dev-tcltk/blt/blt-2.5.3-r3.ebuild deleted file mode 100644 index d414b9687bbb..000000000000 --- a/dev-tcltk/blt/blt-2.5.3-r3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MYP=${PN}$(ver_cut 1-2) -SHVER=$(ver_rs 1 '' $(ver_cut 1-2)) - -inherit autotools flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" -HOMEPAGE="https://sourceforge.net/projects/wize/" -SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip - https://dev.gentoo.org/~tupone/distfiles/${P}-debian-patches.tar.gz" - -IUSE="jpeg static-libs" -SLOT="0/${SHVER}" -LICENSE="BSD" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - dev-lang/tk:0= - jpeg? ( media-libs/libjpeg-turbo:0= ) - x11-libs/libX11" -RDEPEND="${DEPEND}" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}"/${MYP} - -MAKEOPTS+=" -j1" - -PATCHES=( - "${WORKDIR}"/patches/02-debian-all.patch - "${WORKDIR}"/patches/03-fedora-patch-2.patch - "${WORKDIR}"/patches/04-fedora-tk8.5.6.patch - "${WORKDIR}"/patches/05-tk8.5-zoomstack.patch - "${WORKDIR}"/patches/doc-typos.patch - "${WORKDIR}"/patches/tcl8.6.patch - "${WORKDIR}"/patches/tk8.6.patch - "${WORKDIR}"/patches/install.patch - "${WORKDIR}"/patches/usetclint.patch - "${WORKDIR}"/patches/usetkint.patch - "${WORKDIR}"/patches/table.patch - "${WORKDIR}"/patches/ldflags.patch - "${WORKDIR}"/patches/pkgindex.patch - "${WORKDIR}"/patches/decls.patch - "${WORKDIR}"/patches/bltnsutil.patch - "${WORKDIR}"/patches/blthash.patch - "${WORKDIR}"/patches/const.patch - "${WORKDIR}"/patches/uninitialized.patch - "${WORKDIR}"/patches/unused.patch - "${WORKDIR}"/patches/pointertoint.patch - "${WORKDIR}"/patches/autoreconf.patch - "${WORKDIR}"/patches/switch.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-darwin.patch - "${FILESDIR}"/${P}-gbsd.patch - "${FILESDIR}"/${P}-lto.patch - "${FILESDIR}"/${P}-parallelMake.patch -) - -src_prepare() { - default - rm acconfig.h || die - # Set the correct libdir and drop RPATH - sed \ - -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ - -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ - -i configure.in || die "sed configure* failed" - sed \ - -e "/^scriptdir =/s:lib:$(get_libdir):" \ - -i Makefile.in demos/Makefile.in || die "sed Makefile.in failed" - - sed \ - -e "/AR/s:ar:$(tc-getAR):g" \ - -e 's:0444:0644:g' \ - -i generic/Makefile.in || die - - append-cflags -fPIC - - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - LC_ALL=C \ - econf \ - --x-includes="${EPREFIX}/usr/include" \ - --x-libraries="${EPREFIX}/usr/$(get_libdir)" \ - --with-blt="${EPREFIX}/usr/$(get_libdir)" \ - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ - --with-tk="${EPREFIX}/usr/$(get_libdir)" \ - --with-tclincls="${EPREFIX}/usr/include" \ - --with-tkincls="${EPREFIX}/usr/include" \ - --with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \ - --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ - --with-cflags="${CFLAGS}" \ - --with-gnu-ld \ - $(use_enable jpeg) \ - --with-x \ - CC="$(tc-getCC)" -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" -} - -src_install() { - sed \ - -e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ - -e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \ - -e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ - -e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \ - -i demos/{,scripts/}*.tcl || die - - dodir \ - /usr/bin \ - /usr/$(get_libdir)/${MYP}/demos/bitmaps \ - /usr/share/man/mann \ - /usr/include - - emake INSTALL_ROOT="${D}" install - - dodoc NEWS PROBLEMS README - docinto html - dodoc html/*.html - pushd "${ED}"/usr/share/man/mann - for f in * ; do - mv ${f} ${f/.n/.nblt} || die - done - popd - - # fix for linking against shared lib with -lBLT or -lBLTlite - dosym libBLT${SHVER}$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) - dosym libBLTlite${SHVER}$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) - - use static-libs || \ - find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \ - xargs -r -0 rm -fv -} - -pkg_preinst() { - # Fix 'symlink is blocked by a directory' Bug #907270 - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/bitmaps/hand - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/bitmaps/hand.backup.* - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/bitmaps/fish - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/bitmaps/fish.backup.* - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/images - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/images.backup.* - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/scripts - rm -rf "${EROOT}"/usr/$(get_libdir)/${MYP}/demos/scripts.backup.* -} -- cgit v1.2.3