commit: f8e9f83b7e809f321ae92f6e95c52f2fa99b6f4d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 17 07:06:54 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 17 07:07:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e9f83b
Revert "dev-build/slibtool: add 0.7.0" This reverts commit d636653477d11c51b830c2865cb6ca9f1c7f063c. orbea has a PR which I'd missed. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-build/slibtool/Manifest | 2 -- dev-build/slibtool/slibtool-0.7.0.ebuild | 42 -------------------------------- dev-build/slibtool/slibtool-9999.ebuild | 17 ++++++------- 3 files changed, 8 insertions(+), 53 deletions(-) diff --git a/dev-build/slibtool/Manifest b/dev-build/slibtool/Manifest index 489cfe43e9cb..16efd041d78e 100644 --- a/dev-build/slibtool/Manifest +++ b/dev-build/slibtool/Manifest @@ -1,4 +1,2 @@ DIST slibtool-0.6.1.tar.xz 129584 BLAKE2B 99c90f580a45d450c9c213519c761dbdca1dcac916cc85782e71f7214584c1232f8d183f8ebb8afe91e39b5244a9bf7386eb93082044297c07320dbca3ec5f11 SHA512 71c36243c3a8c3dc63304b07a64ba8c948b8ec463783a63426c74ea6a51702ddd9a52c2397948300db4ddaa0851ef8c7cca3cef6b4d185d2cbc47a45212bcfe8 DIST slibtool-0.6.1.tar.xz.sig 833 BLAKE2B 135a34d295b2b8ceef3e41edfa0901b99026a503c025859d1364108bb8e12fe378d24bc77ae5c85f831c69c69cf005f1ea880e27d53538fc7cd5dd13641ba526 SHA512 82318cdfd15c8f103255b086921902ff3fcf01e4273fffeddf0515292644f0b677d4580be9810ffce85447b7a069a4c936e4bc42b346bd56f2bd755b38355ea6 -DIST slibtool-0.7.0.tar.xz 129996 BLAKE2B b3f0c6cd188b4824b63cf8a0636f7ae514f09a342601d46571527a81f0681d9d657aac702a0d773ed532011227de513d9cd26e312551784203dad913b46d1f04 SHA512 5c5ca11ab5a60df5adb33037c0b2835c965ebc0c3589ac5f4c2e61aebd8aa51d7609125263d3e665c14a916dedad4340816e4c3d70d55090dbb9941d1c2d8522 -DIST slibtool-0.7.0.tar.xz.sig 833 BLAKE2B 2985b8acb6871fb90d62759ba91fe0e5f7211af0203bb3580a23f015381779242ba3a490e0fb8004500bfcdb0f7669cf2be4df83451ed1b01d168a68f42a3f1e SHA512 91431527b7378d9792f9e4173fad3f8fbfcec25d0f81fac631f80bc8ff51524ce27d2599ca48a8a0f807fb9beedc9462511a36599ab0fbbb649431ebe4e42192 diff --git a/dev-build/slibtool/slibtool-0.7.0.ebuild b/dev-build/slibtool/slibtool-0.7.0.ebuild deleted file mode 100644 index c5f6f7a7434e..000000000000 --- a/dev-build/slibtool/slibtool-0.7.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -# git.foss21.org is the official repository per upstream -DESCRIPTION="A strong libtool implementation, written in C" -HOMEPAGE="https://git.foss21.org/slibtool"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.foss21.org/slibtool"; -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc - inherit verify-sig - - SRC_URI="https://dl.foss21.org/slibtool/${P}.tar.xz"; - SRC_URI+=" verify-sig? ( https://dl.foss21.org/slibtool/${P}.tar.xz.sig )" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" -fi - -BDEPEND="sys-devel/m4" - -if [[ ${PV} != *9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-midipix-20250517 )" -fi - -LICENSE="MIT" -SLOT="0" - -src_configure() { - # Custom configure script (not generated by autoconf) - edo ./configure \ - --compiler="$(tc-getCC)" \ - --host=${CHOST} \ - --prefix="${EPREFIX}"/usr \ - --docdir="${ERPEFIX}"/usr/share/doc/${PF} \ - --mandir="${EPREFIX}"/usr/share/man \ - --libdir="${EPREFIX}/usr/$(get_libdir)" -} diff --git a/dev-build/slibtool/slibtool-9999.ebuild b/dev-build/slibtool/slibtool-9999.ebuild index c5f6f7a7434e..e27de56818dd 100644 --- a/dev-build/slibtool/slibtool-9999.ebuild +++ b/dev-build/slibtool/slibtool-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit edo toolchain-funcs +inherit toolchain-funcs # git.foss21.org is the official repository per upstream DESCRIPTION="A strong libtool implementation, written in C" @@ -15,8 +15,8 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc inherit verify-sig - SRC_URI="https://dl.foss21.org/slibtool/${P}.tar.xz"; - SRC_URI+=" verify-sig? ( https://dl.foss21.org/slibtool/${P}.tar.xz.sig )" + SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"; + SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" fi @@ -24,7 +24,7 @@ fi BDEPEND="sys-devel/m4" if [[ ${PV} != *9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-midipix-20250517 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-midipix-20240315 )" fi LICENSE="MIT" @@ -32,11 +32,10 @@ SLOT="0" src_configure() { # Custom configure script (not generated by autoconf) - edo ./configure \ + ./configure \ --compiler="$(tc-getCC)" \ --host=${CHOST} \ --prefix="${EPREFIX}"/usr \ - --docdir="${ERPEFIX}"/usr/share/doc/${PF} \ - --mandir="${EPREFIX}"/usr/share/man \ - --libdir="${EPREFIX}/usr/$(get_libdir)" + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + || die }
