-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-devel/automake: Fix installing broken Info pages
This commit replaces the Info page slotting mechanism with simple INFOPATH setting. Closes: https://bugs.gentoo.org/902461 Closes: #30355 Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
- Loading branch information
1 parent
8a1b8b2
commit d685a4e
Showing
3 changed files
with
220 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
# Copyright 1999-2023 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
DESCRIPTION="Used to generate Makefile.in from Makefile.am" | ||
HOMEPAGE="https://www.gnu.org/software/automake/" | ||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" | ||
|
||
LICENSE="GPL-2" | ||
# Use Gentoo versioning for slotting. | ||
SLOT="${PV:0:4}" | ||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" | ||
IUSE="" | ||
RESTRICT="test" | ||
|
||
RDEPEND=">=dev-lang/perl-5.6 | ||
>=sys-devel/automake-wrapper-10 | ||
>=sys-devel/autoconf-2.69:* | ||
sys-devel/gnuconfig" | ||
DEPEND="${RDEPEND} | ||
sys-apps/help2man" | ||
BDEPEND="app-arch/gzip" | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 | ||
"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch | ||
"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch | ||
) | ||
|
||
src_prepare() { | ||
default | ||
export WANT_AUTOCONF=2.5 | ||
export HELP2MAN=true | ||
sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die | ||
export TZ="UTC" #589138 | ||
} | ||
|
||
src_compile() { | ||
# Also used in install. | ||
MY_INFODIR="${EPREFIX}/usr/share/automake-${PV}/info" | ||
econf --infodir="${MY_INFODIR}" | ||
|
||
local x | ||
for x in aclocal automake; do | ||
help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1 | ||
done | ||
} | ||
|
||
src_install() { | ||
default | ||
|
||
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}/${MY_INFODIR}" >/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 | ||
|
||
local major="$(ver_cut 1)" | ||
local minor="$(ver_cut 2)" | ||
local idx="$((99999-(major*1000+minor)))" | ||
newenvd - "06automake${idx}" <<-EOF | ||
INFOPATH="${MY_INFODIR}" | ||
EOF | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
# Copyright 1999-2023 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
PYTHON_COMPAT=( python3_{9..11} ) | ||
|
||
inherit python-any-r1 | ||
|
||
if [[ ${PV} == 9999 ]] ; then | ||
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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" | ||
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" | ||
fi | ||
|
||
S="${WORKDIR}/${MY_P}" | ||
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="${PV:0:4}" | ||
IUSE="test" | ||
RESTRICT="!test? ( test )" | ||
|
||
RDEPEND=">=dev-lang/perl-5.6 | ||
>=sys-devel/automake-wrapper-11 | ||
>=sys-devel/autoconf-2.69:* | ||
sys-devel/gnuconfig" | ||
DEPEND="${RDEPEND}" | ||
BDEPEND=" | ||
app-arch/gzip | ||
sys-apps/help2man | ||
test? ( ${PYTHON_DEPS} ) | ||
" | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/automake-1.16.2-py3-compile.patch | ||
"${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch | ||
"${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch | ||
) | ||
|
||
pkg_setup() { | ||
# Avoid 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() { | ||
use test && python_setup | ||
# Also used in install. | ||
MY_INFODIR="${EPREFIX}/usr/share/automake-${PV}/info" | ||
econf --infodir="${MY_INFODIR}" | ||
} | ||
|
||
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}/${MY_INFODIR}" >/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 | ||
|
||
local major="$(ver_cut 1)" | ||
local minor="$(ver_cut 2)" | ||
local idx="$((99999-(major*1000+minor)))" | ||
newenvd - "06automake${idx}" <<-EOF | ||
INFOPATH="${MY_INFODIR}" | ||
EOF | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters