* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-06-21 22:55 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-06-21 22:55 UTC (permalink / raw
To: gentoo-commits
commit: ca8656c4317eb59f3186c79f851ff8aac23eca48
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 22:53:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 22:53:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca8656c4
dev-build/automake: add 1.16.92 (unkeyworded)
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/Manifest | 2 +
dev-build/automake/automake-1.16.92.ebuild | 148 +++++++++++++++++++++++++++++
2 files changed, 150 insertions(+)
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index 91fc191e87be..1b8cfc0a6ff3 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -4,3 +4,5 @@ DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d15
DIST automake-1.16.5.tar.xz.sig 833 BLAKE2B a79fcdce97e13ac3bf39d73e183da92703681ff80011974d95a41be20169f95414551985f7a46602fba3558e33f24d6dcb76222d99f9de4fef0d3dc59b88807e SHA512 032a7c39abb4cabbefa4eb9c15263baec0902e48c0c81364307361a41fd55be282b9640707c789f5ae572e8e60240e34d1b575a671b5710f5d2a5716fafc2d51
DIST automake-1.16.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
+DIST automake-1.16.92.tar.xz 1649420 BLAKE2B aa7c50d9d8f2d9b9444530c24bf694c031909f96164cb3f335e793ae1244f34253903123e26ce9cd50724c60fa47cbcee5ae4c59b8a2d955d8f8363480050a71 SHA512 47609fcbe962195b6683d3ccc62bda7f86af0bb702148caa4aa7e21ce1b49ae4c238254817b51ea7afdaa671d183ec43fc4af41b676cd1afafec8e485142e2fc
+DIST automake-1.16.92.tar.xz.sig 833 BLAKE2B 0ad23cea8e865be0e928fb3feaee4f982de59e1c60322465f44acb7126dee5ab13d2010757f23f60960819345399ff5ba1f80dee7cbc4483c7adf3413b6025e4 SHA512 1df37c983b70250383084b2dcdba543e9c32a028a842ca6dd7cb8a3f17dba5edfb4372a87c03d2da1053ea5a72e45972e0ae1f0492b78463bae437e7b0dad6b4
diff --git a/dev-build/automake/automake-1.16.92.ebuild b/dev-build/automake/automake-1.16.92.ebuild
new file mode 100644
index 000000000000..ac793c1acd3d
--- /dev/null
+++ b/dev-build/automake/automake-1.16.92.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes:
+# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
+# on new automake (major) releases, as well as the dependency in RDEPEND below too.
+# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1 verify-sig
+
+MANGLED_SLOT=${PV:0:4}
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_MIN_CLONE_TYPE=single
+ EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
+ SRC_URI="
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
+ else
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ mirror://gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ fi
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${MANGLED_SLOT}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/perl-5.6
+ >=dev-build/automake-wrapper-20240607
+ >=dev-build/autoconf-2.69:*
+ sys-devel/gnuconfig
+"
+BDEPEND="
+ app-alternatives/gzip
+ sys-apps/help2man
+ dev-build/autoconf-wrapper
+ dev-build/autoconf
+ test? (
+ ${PYTHON_DEPS}
+ dev-util/dejagnu
+ sys-devel/bison
+ sys-devel/flex
+ )
+ verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
+"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ export WANT_AUTOCONF=2.5
+ # Don't try wrapping the autotools - this thing runs as it tends
+ # to be a bit esoteric, and the script does `set -e` itself.
+ ./bootstrap || die
+ sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+ # bug #628912
+ if ! has_version -b sys-apps/texinfo ; then
+ touch doc/{stamp-vti,version.texi,automake.info} || die
+ fi
+}
+
+src_configure() {
+ # Also used in install.
+ infopath="${EPREFIX}/usr/share/automake-${PV}/info"
+ econf --infodir="${infopath}"
+}
+
+src_test() {
+ # Fails with byacc/flex
+ emake YACC="bison -y" LEX="flex" check
+}
+
+src_install() {
+ default
+
+ rm "${ED}"/usr/share/aclocal/README || die
+ rmdir "${ED}"/usr/share/aclocal || die
+ rm \
+ "${ED}"/usr/bin/{aclocal,automake} \
+ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+ # remove all config.guess and config.sub files replacing them
+ # w/a symlink to a specific gnuconfig version
+ local x
+ for x in guess sub ; do
+ dosym ../gnuconfig/config.${x} \
+ /usr/share/${PN}-${SLOT}/config.${x}
+ done
+
+ # Avoid QA message about pre-compressed file in docs
+ local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+ if [[ -f "${tarfile}" ]] ; then
+ gunzip "${tarfile}" || die
+ fi
+
+ pushd "${D}/${infopath}" >/dev/null || die
+ for f in *.info*; do
+ # Install convenience aliases for versioned Automake pages.
+ ln -s "$f" "${f/./-${PV}.}" || die
+ done
+ popd >/dev/null || die
+
+ if [[ ${PV} == 9999 ]]; then
+ local major="89"
+ local minor="999"
+ else
+ local major="$(ver_cut 1)"
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ local minor=$(($(ver_cut 2) + 1))
+ else
+ local minor="$(ver_cut 2)"
+ fi
+ fi
+ local idx="$((99999-(major*1000+minor)))"
+ newenvd - "06automake${idx}" <<-EOF
+ INFOPATH="${infopath}"
+ EOF
+
+ docompress "${MY_INFODIR}"
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-07-12 7:06 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-07-12 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 84abb13dfe99bb005abc555afb891bf759192ad7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 07:05:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 07:06:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84abb13d
dev-build/automake: fix docompress call
Bug: https://bugs.gentoo.org/935880
Bug: https://bugs.gentoo.org/935879
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/{automake-1.17.ebuild => automake-1.17-r1.ebuild} | 2 +-
dev-build/automake/automake-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-build/automake/automake-1.17.ebuild b/dev-build/automake/automake-1.17-r1.ebuild
similarity index 99%
rename from dev-build/automake/automake-1.17.ebuild
rename to dev-build/automake/automake-1.17-r1.ebuild
index 36b8c26e2d1c..eeadb43cf475 100644
--- a/dev-build/automake/automake-1.17.ebuild
+++ b/dev-build/automake/automake-1.17-r1.ebuild
@@ -144,5 +144,5 @@ src_install() {
INFOPATH="${infopath}"
EOF
- docompress "${MY_INFODIR}"
+ docompress "${infopath}"
}
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index 36b8c26e2d1c..eeadb43cf475 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -144,5 +144,5 @@ src_install() {
INFOPATH="${infopath}"
EOF
- docompress "${MY_INFODIR}"
+ docompress "${infopath}"
}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-07-12 6:28 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-07-12 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 73db09378e0adb9e724f7141216d329cf2788479
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 06:27:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 06:27:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73db0937
dev-build/automake: forward ~loong
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/automake-1.17.ebuild | 2 +-
dev-build/automake/automake-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-build/automake/automake-1.17.ebuild b/dev-build/automake/automake-1.17.ebuild
index 66fe54668a46..36b8c26e2d1c 100644
--- a/dev-build/automake/automake-1.17.ebuild
+++ b/dev-build/automake/automake-1.17.ebuild
@@ -35,7 +35,7 @@ else
mirror://gnu/${PN}/${P}.tar.xz.sig
)
"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
fi
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index 66fe54668a46..36b8c26e2d1c 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -35,7 +35,7 @@ else
mirror://gnu/${PN}/${P}.tar.xz.sig
)
"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
fi
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-07-12 6:27 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-07-12 6:27 UTC (permalink / raw
To: gentoo-commits
commit: 4727c52fa2229c9437c1d7fcafbbc081e5ae8837
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 06:25:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 06:26:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4727c52f
dev-build/automake: add 1.17, drop 1.16.90, drop 1.16.92
Keywording immediately as I've been running the 1.16.* pre-releases for
a while. automake-wrapper is already done and new version depended-upon.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/Manifest | 6 +-
dev-build/automake/automake-1.16.90.ebuild | 148 ---------------------
...utomake-1.16.92.ebuild => automake-1.17.ebuild} | 0
3 files changed, 2 insertions(+), 152 deletions(-)
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index 1b8cfc0a6ff3..28d1f25e03b2 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -2,7 +2,5 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e40
DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
DIST automake-1.16.5.tar.xz.sig 833 BLAKE2B a79fcdce97e13ac3bf39d73e183da92703681ff80011974d95a41be20169f95414551985f7a46602fba3558e33f24d6dcb76222d99f9de4fef0d3dc59b88807e SHA512 032a7c39abb4cabbefa4eb9c15263baec0902e48c0c81364307361a41fd55be282b9640707c789f5ae572e8e60240e34d1b575a671b5710f5d2a5716fafc2d51
-DIST automake-1.16.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
-DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
-DIST automake-1.16.92.tar.xz 1649420 BLAKE2B aa7c50d9d8f2d9b9444530c24bf694c031909f96164cb3f335e793ae1244f34253903123e26ce9cd50724c60fa47cbcee5ae4c59b8a2d955d8f8363480050a71 SHA512 47609fcbe962195b6683d3ccc62bda7f86af0bb702148caa4aa7e21ce1b49ae4c238254817b51ea7afdaa671d183ec43fc4af41b676cd1afafec8e485142e2fc
-DIST automake-1.16.92.tar.xz.sig 833 BLAKE2B 0ad23cea8e865be0e928fb3feaee4f982de59e1c60322465f44acb7126dee5ab13d2010757f23f60960819345399ff5ba1f80dee7cbc4483c7adf3413b6025e4 SHA512 1df37c983b70250383084b2dcdba543e9c32a028a842ca6dd7cb8a3f17dba5edfb4372a87c03d2da1053ea5a72e45972e0ae1f0492b78463bae437e7b0dad6b4
+DIST automake-1.17.tar.xz 1652632 BLAKE2B 53c24c138faf3d2be4e30ababcccd4d157c03e815fc4b7f3e3063b6648cf254dfa63afe6e3285b21309dbf260335c3e67991db3825e7532b158b25ccaead83f5 SHA512 46aba1c9d64a6368b326020803a2999831c1deaf31eaa1c1dfdcfa5138a7f755643294e82a08b6daab3983b31eee725bdb7b9edc4e9a558374c7d1f1b8e854a7
+DIST automake-1.17.tar.xz.sig 833 BLAKE2B 4564c7189360c61bde7e16a7c3a52b86084fb16b7f4625969fc588a6aa0da687c7b27acf7247822ec0e09e59336acf0ef69784032f255190a070081f6d9da5cc SHA512 180dde452ec097a9267c334044a9ec16bb65cc6ccbc000b7eca0af81ed7ece6f4ce6f6c2be8a2cabca9d48fd46085c81f0ee5d020967104bc25f37f52927829a
diff --git a/dev-build/automake/automake-1.16.90.ebuild b/dev-build/automake/automake-1.16.90.ebuild
deleted file mode 100644
index ac793c1acd3d..000000000000
--- a/dev-build/automake/automake-1.16.90.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Bumping notes:
-# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
-# on new automake (major) releases, as well as the dependency in RDEPEND below too.
-# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-any-r1 verify-sig
-
-MANGLED_SLOT=${PV:0:4}
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_MIN_CLONE_TYPE=single
- EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
- if [[ $(ver_cut 3) -ge 90 ]] ; then
- MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
- SRC_URI="
- https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
- verify-sig? (
- https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
- )
- "
- else
- SRC_URI="
- mirror://gnu/${PN}/${P}.tar.xz
- verify-sig? (
- mirror://gnu/${PN}/${P}.tar.xz.sig
- )
- "
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- fi
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${MANGLED_SLOT}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-lang/perl-5.6
- >=dev-build/automake-wrapper-20240607
- >=dev-build/autoconf-2.69:*
- sys-devel/gnuconfig
-"
-BDEPEND="
- app-alternatives/gzip
- sys-apps/help2man
- dev-build/autoconf-wrapper
- dev-build/autoconf
- test? (
- ${PYTHON_DEPS}
- dev-util/dejagnu
- sys-devel/bison
- sys-devel/flex
- )
- verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
-"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- export WANT_AUTOCONF=2.5
- # Don't try wrapping the autotools - this thing runs as it tends
- # to be a bit esoteric, and the script does `set -e` itself.
- ./bootstrap || die
- sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
- # bug #628912
- if ! has_version -b sys-apps/texinfo ; then
- touch doc/{stamp-vti,version.texi,automake.info} || die
- fi
-}
-
-src_configure() {
- # Also used in install.
- infopath="${EPREFIX}/usr/share/automake-${PV}/info"
- econf --infodir="${infopath}"
-}
-
-src_test() {
- # Fails with byacc/flex
- emake YACC="bison -y" LEX="flex" check
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/share/aclocal/README || die
- rmdir "${ED}"/usr/share/aclocal || die
- rm \
- "${ED}"/usr/bin/{aclocal,automake} \
- "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
- # remove all config.guess and config.sub files replacing them
- # w/a symlink to a specific gnuconfig version
- local x
- for x in guess sub ; do
- dosym ../gnuconfig/config.${x} \
- /usr/share/${PN}-${SLOT}/config.${x}
- done
-
- # Avoid QA message about pre-compressed file in docs
- local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
- if [[ -f "${tarfile}" ]] ; then
- gunzip "${tarfile}" || die
- fi
-
- pushd "${D}/${infopath}" >/dev/null || die
- for f in *.info*; do
- # Install convenience aliases for versioned Automake pages.
- ln -s "$f" "${f/./-${PV}.}" || die
- done
- popd >/dev/null || die
-
- if [[ ${PV} == 9999 ]]; then
- local major="89"
- local minor="999"
- else
- local major="$(ver_cut 1)"
- if [[ $(ver_cut 3) -ge 90 ]] ; then
- local minor=$(($(ver_cut 2) + 1))
- else
- local minor="$(ver_cut 2)"
- fi
- fi
- local idx="$((99999-(major*1000+minor)))"
- newenvd - "06automake${idx}" <<-EOF
- INFOPATH="${infopath}"
- EOF
-
- docompress "${MY_INFODIR}"
-}
diff --git a/dev-build/automake/automake-1.16.92.ebuild b/dev-build/automake/automake-1.17.ebuild
similarity index 100%
rename from dev-build/automake/automake-1.16.92.ebuild
rename to dev-build/automake/automake-1.17.ebuild
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-07-06 14:14 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2024-07-06 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 4ea7b3f4730854ab995e515133935413ab5dca00
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 13:43:46 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 14:14:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea7b3f4
dev-build/automake: Enable py3.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-build/automake/automake-1.16.5-r2.ebuild | 2 +-
dev-build/automake/automake-1.16.92.ebuild | 2 +-
dev-build/automake/automake-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-build/automake/automake-1.16.5-r2.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild
index b1b2b9fb6761..7fac003550a5 100644
--- a/dev-build/automake/automake-1.16.5-r2.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -8,7 +8,7 @@ EAPI=7
# on new automake (major) releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
inherit python-any-r1 verify-sig
diff --git a/dev-build/automake/automake-1.16.92.ebuild b/dev-build/automake/automake-1.16.92.ebuild
index ac793c1acd3d..66fe54668a46 100644
--- a/dev-build/automake/automake-1.16.92.ebuild
+++ b/dev-build/automake/automake-1.16.92.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# on new automake (major) releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit python-any-r1 verify-sig
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index ac793c1acd3d..66fe54668a46 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# on new automake (major) releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit python-any-r1 verify-sig
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-06-07 14:21 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-06-07 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 46e18d6159fb1b8595ae0b73801891ca670e8189
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 13:40:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 14:19:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e18d61
dev-build/automake: backport verify-sig to 1.16.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/Manifest | 1 +
dev-build/automake/automake-1.16.5-r2.ebuild | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index a9cb10527626..91fc191e87be 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -1,5 +1,6 @@
DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
+DIST automake-1.16.5.tar.xz.sig 833 BLAKE2B a79fcdce97e13ac3bf39d73e183da92703681ff80011974d95a41be20169f95414551985f7a46602fba3558e33f24d6dcb76222d99f9de4fef0d3dc59b88807e SHA512 032a7c39abb4cabbefa4eb9c15263baec0902e48c0c81364307361a41fd55be282b9640707c789f5ae572e8e60240e34d1b575a671b5710f5d2a5716fafc2d51
DIST automake-1.16.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
diff --git a/dev-build/automake/automake-1.16.5-r2.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild
index d4553e58b66f..b1b2b9fb6761 100644
--- a/dev-build/automake/automake-1.16.5-r2.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -10,7 +10,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+inherit python-any-r1 verify-sig
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
@@ -22,6 +23,10 @@ else
mirror://gnu/${PN}/${P}.tar.xz
https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.xz
+ verify-sig? (
+ mirror://gnu/${PN}/${P}.tar.xz.sig
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz.sig
+ )
"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
else
@@ -61,6 +66,7 @@ BDEPEND="
sys-devel/bison
sys-devel/flex
)
+ verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
"
PATCHES=(
@@ -78,6 +84,11 @@ pkg_setup() {
:
}
+src_unpack() {
+ use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+ default
+}
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-06-07 14:21 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-06-07 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 695e465aa045a706e840ece230bee486a4b0ca15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 13:41:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 14:20:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=695e465a
dev-build/automake: fix test deps for 1.16.90+
Fixes: c4e79ef6658665c3aeafd2d6516aaa51b8718064
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/automake-1.16.90.ebuild | 2 ++
dev-build/automake/automake-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dev-build/automake/automake-1.16.90.ebuild b/dev-build/automake/automake-1.16.90.ebuild
index 99d1c3dc731d..ac793c1acd3d 100644
--- a/dev-build/automake/automake-1.16.90.ebuild
+++ b/dev-build/automake/automake-1.16.90.ebuild
@@ -62,6 +62,8 @@ BDEPEND="
test? (
${PYTHON_DEPS}
dev-util/dejagnu
+ sys-devel/bison
+ sys-devel/flex
)
verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
"
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index 99d1c3dc731d..ac793c1acd3d 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -62,6 +62,8 @@ BDEPEND="
test? (
${PYTHON_DEPS}
dev-util/dejagnu
+ sys-devel/bison
+ sys-devel/flex
)
verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-06-07 13:36 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-06-07 13:36 UTC (permalink / raw
To: gentoo-commits
commit: c4e79ef6658665c3aeafd2d6516aaa51b8718064
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 13:24:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 13:36:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e79ef6
dev-build/automake: add 1.16.90 (unkeyworded)
This forward ports ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8 and syncs
live too. We also add verify-sig.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/Manifest | 2 +
...utomake-9999.ebuild => automake-1.16.90.ebuild} | 54 ++++++++++++++--------
dev-build/automake/automake-9999.ebuild | 54 ++++++++++++++--------
3 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index 8ba58d3e3240..a9cb10527626 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -1,3 +1,5 @@
DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
+DIST automake-1.16.90.tar.xz 1644220 BLAKE2B 01a4ddfccbbdd96976b1801c767ef2ff6951a09eb7e0071a7b8e7c8c768fae1accc4a6a38290109995710b9296a2ac1e0dcf8d03a3f6ec42e4d69d25b3ff106e SHA512 139a2777be1417e02a7701a8e0166d4961fe50e3bddc79e2e852727fc1032b7f85ad0bee6ddc8bfd796a02c75a464500e984295290dac5614a7d6039dae9c52d
+DIST automake-1.16.90.tar.xz.sig 833 BLAKE2B c77fa1a99a7638b570f26f4858486d20b83801a661549e82ac4f7b7e9fd9c7dd2211e2403fc13b65a488d05d7a3c81ae7a372988c4a7e2e0588e4d7d609c77b5 SHA512 f4fc6ff3e1158bc37f95375f4eb2497e5bd9bb943a7d418e94379fcd292b9f35357b842b8a7383c942b23bf5510b61b17b997231267fb6f55dad7bab00b954e2
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-1.16.90.ebuild
similarity index 77%
copy from dev-build/automake/automake-9999.ebuild
copy to dev-build/automake/automake-1.16.90.ebuild
index a5d0371f5253..99d1c3dc731d 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-1.16.90.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# Bumping notes:
# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
@@ -10,27 +10,33 @@ EAPI=7
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1
+inherit python-any-r1 verify-sig
+
+MANGLED_SLOT=${PV:0:4}
if [[ ${PV} == 9999 ]] ; then
EGIT_MIN_CLONE_TYPE=single
EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
inherit git-r3
else
- if [[ ${PV/_beta} == ${PV} ]]; then
- MY_P="${P}"
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
+ SRC_URI="
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
else
- MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
- MY_P="${PN}-${MY_PV}"
-
- # Alpha/beta releases are not distributed on the usual mirrors.
- SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ mirror://gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
-
- S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="Used to generate Makefile.in from Makefile.am"
@@ -38,13 +44,13 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
+SLOT="${MANGLED_SLOT}"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/perl-5.6
- >=dev-build/automake-wrapper-11
+ >=dev-build/automake-wrapper-20240607
>=dev-build/autoconf-2.69:*
sys-devel/gnuconfig
"
@@ -57,11 +63,11 @@ BDEPEND="
${PYTHON_DEPS}
dev-util/dejagnu
)
+ verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
"
pkg_setup() {
- # Avoid python-any-r1_pkg_setup
- :
+ use test && python-any-r1_pkg_setup
}
src_prepare() {
@@ -80,12 +86,16 @@ src_prepare() {
}
src_configure() {
- use test && python_setup
# Also used in install.
infopath="${EPREFIX}/usr/share/automake-${PV}/info"
econf --infodir="${infopath}"
}
+src_test() {
+ # Fails with byacc/flex
+ emake YACC="bison -y" LEX="flex" check
+}
+
src_install() {
default
@@ -121,7 +131,11 @@ src_install() {
local minor="999"
else
local major="$(ver_cut 1)"
- local minor="$(ver_cut 2)"
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ local minor=$(($(ver_cut 2) + 1))
+ else
+ local minor="$(ver_cut 2)"
+ fi
fi
local idx="$((99999-(major*1000+minor)))"
newenvd - "06automake${idx}" <<-EOF
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index a5d0371f5253..99d1c3dc731d 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# Bumping notes:
# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper
@@ -10,27 +10,33 @@ EAPI=7
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1
+inherit python-any-r1 verify-sig
+
+MANGLED_SLOT=${PV:0:4}
if [[ ${PV} == 9999 ]] ; then
EGIT_MIN_CLONE_TYPE=single
EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
inherit git-r3
else
- if [[ ${PV/_beta} == ${PV} ]]; then
- MY_P="${P}"
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1))
+ SRC_URI="
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
else
- MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
- MY_P="${PN}-${MY_PV}"
-
- # Alpha/beta releases are not distributed on the usual mirrors.
- SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? (
+ mirror://gnu/${PN}/${P}.tar.xz.sig
+ )
+ "
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
-
- S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="Used to generate Makefile.in from Makefile.am"
@@ -38,13 +44,13 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
+SLOT="${MANGLED_SLOT}"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-lang/perl-5.6
- >=dev-build/automake-wrapper-11
+ >=dev-build/automake-wrapper-20240607
>=dev-build/autoconf-2.69:*
sys-devel/gnuconfig
"
@@ -57,11 +63,11 @@ BDEPEND="
${PYTHON_DEPS}
dev-util/dejagnu
)
+ verify-sig? ( sec-keys/openpgp-keys-jimmeyering )
"
pkg_setup() {
- # Avoid python-any-r1_pkg_setup
- :
+ use test && python-any-r1_pkg_setup
}
src_prepare() {
@@ -80,12 +86,16 @@ src_prepare() {
}
src_configure() {
- use test && python_setup
# Also used in install.
infopath="${EPREFIX}/usr/share/automake-${PV}/info"
econf --infodir="${infopath}"
}
+src_test() {
+ # Fails with byacc/flex
+ emake YACC="bison -y" LEX="flex" check
+}
+
src_install() {
default
@@ -121,7 +131,11 @@ src_install() {
local minor="999"
else
local major="$(ver_cut 1)"
- local minor="$(ver_cut 2)"
+ if [[ $(ver_cut 3) -ge 90 ]] ; then
+ local minor=$(($(ver_cut 2) + 1))
+ else
+ local minor="$(ver_cut 2)"
+ fi
fi
local idx="$((99999-(major*1000+minor)))"
newenvd - "06automake${idx}" <<-EOF
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-03-09 16:10 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2024-03-09 16:10 UTC (permalink / raw
To: gentoo-commits
commit: a34b56c7a4743332f7d3006f3c10d65a56b4daf7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 15:59:38 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 15:59:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34b56c7
dev-build/automake: Set EGIT_MIN_CLONE_TYPE
Set EGIT_MIN_CLONE_TYPE to single, as upstream server does not support
shallow clones.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-build/automake/automake-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index fbae9d59d81b..2c69b7942972 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -13,6 +13,7 @@ PYTHON_COMPAT=( python3_{10..11} )
inherit python-any-r1
if [[ ${PV} == 9999 ]] ; then
+ EGIT_MIN_CLONE_TYPE=single
EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
inherit git-r3
else
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-03-09 16:10 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2024-03-09 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 34875e30e73e33d3597d1101cdf97dc22729b268
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 16:09:01 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 16:09:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34875e30
dev-build/automake: Enable py3.12 on -9999
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-build/automake/automake-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index 2c69b7942972..a5d0371f5253 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -8,7 +8,7 @@ EAPI=7
# on new automake (major) releases, as well as the dependency in RDEPEND below too.
# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit python-any-r1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-01-31 16:59 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-31 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 0a775770d5e41e46d1b9026bf222191901584728
Author: Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Tue Aug 15 17:44:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 16:59:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a775770
dev-build/automake: Cleanup depends
The automake ./bootstrap script requires the `autom4te` tool.
```
: ${AUTOM4TE=autom4te}
export AUTOM4TE # ditto
```
If it's not installed the package fails with the following error:
```
sh: line 1: autom4te: command not found
aclocal.tmp: error: autom4te failed with exit status: 127
* ERROR: sys-devel/automake-1.16.5-r1::portage-stable failed (prepare phase):
* (no error message)
*
* Call stack:
* ebuild.sh, line 125: Called src_prepare
* environment, line 2813: Called die
* The specific snippet of code:
* ./bootstrap || die;
```
We also need to add autoconf so the wrapper doesn't fail:
```
ac-wrapper: Unable to locate any usuable version of autoconf.
```
We also don't need to declare any DEPEND.
Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/32327
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../automake/{automake-1.16.5-r1.ebuild => automake-1.16.5-r2.ebuild} | 3 ++-
dev-build/automake/automake-9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-build/automake/automake-1.16.5-r1.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild
similarity index 98%
rename from dev-build/automake/automake-1.16.5-r1.ebuild
rename to dev-build/automake/automake-1.16.5-r2.ebuild
index 25e29244ced0..ce41b4760596 100644
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -50,10 +50,11 @@ RDEPEND="
>=dev-build/autoconf-2.69:*
sys-devel/gnuconfig
"
-DEPEND="${RDEPEND}"
BDEPEND="
app-alternatives/gzip
sys-apps/help2man
+ dev-build/autoconf-wrapper
+ dev-build/autoconf
test? (
${PYTHON_DEPS}
dev-util/dejagnu
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index b65ba04aa145..fbae9d59d81b 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -47,10 +47,11 @@ RDEPEND="
>=dev-build/autoconf-2.69:*
sys-devel/gnuconfig
"
-DEPEND="${RDEPEND}"
BDEPEND="
app-alternatives/gzip
sys-apps/help2man
+ dev-build/autoconf-wrapper
+ dev-build/autoconf
test? (
${PYTHON_DEPS}
dev-util/dejagnu
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-01-24 10:25 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-24 10:25 UTC (permalink / raw
To: gentoo-commits
commit: ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:21:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:25:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9bfdfb
dev-build/automake: fix modern C issues in tests, fix tests w/ byacc/reflex too
Bug: https://bugs.gentoo.org/922676
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/Manifest | 1 +
dev-build/automake/automake-1.16.5-r1.ebuild | 15 +++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index ee180dcca549..8ba58d3e3240 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -1,2 +1,3 @@
DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
+DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
diff --git a/dev-build/automake/automake-1.16.5-r1.ebuild b/dev-build/automake/automake-1.16.5-r1.ebuild
index 0cde725c8964..25e29244ced0 100644
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r1.ebuild
@@ -18,8 +18,11 @@ if [[ ${PV} == 9999 ]] ; then
else
if [[ ${PV/_beta} == ${PV} ]]; then
MY_P="${P}"
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.xz
+ "
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
else
MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
@@ -54,6 +57,8 @@ BDEPEND="
test? (
${PYTHON_DEPS}
dev-util/dejagnu
+ sys-devel/bison
+ sys-devel/flex
)
"
@@ -63,6 +68,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
"${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
+ "${WORKDIR}"/${PN}-1.16.5-tests-c99.patch
)
pkg_setup() {
@@ -92,6 +98,11 @@ src_configure() {
econf --infodir="${MY_INFODIR}"
}
+src_test() {
+ # Fails with byacc/flex
+ emake YACC="bison -y" LEX="flex" check
+}
+
src_install() {
default
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/
@ 2024-01-23 6:00 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-23 6:00 UTC (permalink / raw
To: gentoo-commits
commit: fd7aa5622003aa9f300fb6b68afcb46ad5f02d00
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 05:54:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 05:58:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7aa562
dev-build/automake: compress slotted info pages
As noted in the bug, we install to a different location to accommodate slotting
and hence do not benefit from the automagic compression for /usr/share/doc.
Explicitly opt-in for the info pages we install.
Bug: https://bugs.gentoo.org/922729
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/automake/automake-1.11.6-r4.ebuild | 2 ++
dev-build/automake/automake-1.16.5-r1.ebuild | 2 ++
dev-build/automake/automake-9999.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/dev-build/automake/automake-1.11.6-r4.ebuild b/dev-build/automake/automake-1.11.6-r4.ebuild
index 63adb6b1358a..ce79acae9463 100644
--- a/dev-build/automake/automake-1.11.6-r4.ebuild
+++ b/dev-build/automake/automake-1.11.6-r4.ebuild
@@ -88,4 +88,6 @@ src_install() {
newenvd - "06automake${idx}" <<-EOF
INFOPATH="${MY_INFODIR}"
EOF
+
+ docompress "${MY_INFODIR}"
}
diff --git a/dev-build/automake/automake-1.16.5-r1.ebuild b/dev-build/automake/automake-1.16.5-r1.ebuild
index 07d5a58bdec0..0cde725c8964 100644
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r1.ebuild
@@ -128,4 +128,6 @@ src_install() {
newenvd - "06automake${idx}" <<-EOF
INFOPATH="${MY_INFODIR}"
EOF
+
+ docompress "${MY_INFODIR}"
}
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index a16d0ba489bc..b65ba04aa145 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -125,4 +125,6 @@ src_install() {
newenvd - "06automake${idx}" <<-EOF
INFOPATH="${infopath}"
EOF
+
+ docompress "${MY_INFODIR}"
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-07-12 7:06 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-21 22:55 [gentoo-commits] repo/gentoo:master commit in: dev-build/automake/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-12 7:06 Sam James
2024-07-12 6:28 Sam James
2024-07-12 6:27 Sam James
2024-07-06 14:14 Michał Górny
2024-06-07 14:21 Sam James
2024-06-07 14:21 Sam James
2024-06-07 13:36 Sam James
2024-03-09 16:10 Michał Górny
2024-03-09 16:10 Michał Górny
2024-01-31 16:59 Sam James
2024-01-24 10:25 Sam James
2024-01-23 6:00 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox