[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: 39738087f65f92ccf57e2eb741f60bd1cb4b9c86 Author: Marco Sirabella sirabella org> AuthorDate: Sat Mar 23 18:39:25 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:36:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39738087 dev-build/make: fix doc BDEPEND to use texi2dvi Closes: https://bugs.gentoo.org/927628 Signed-off-by: Marco Sirabella sirabella.org> Closes: https://github.com/gentoo/gentoo/pull/35886 Signed-off-by: Sam James gentoo.org> dev-build/make/make-4.4.1-r1.ebuild | 2 +- dev-build/make/make-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-build/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild index 4f363169f0ae..2e65b08c27e4 100644 --- a/dev-build/make/make-4.4.1-r1.ebuild +++ b/dev-build/make/make-4.4.1-r1.ebuild @@ -31,7 +31,7 @@ RDEPEND=" nls? ( virtual/libintl ) " BDEPEND=" - doc? ( sys-apps/texinfo ) + doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl ) diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild index 4df10fe00325..146e017cec5b 100644 --- a/dev-build/make/make-.ebuild +++ b/dev-build/make/make-.ebuild @@ -31,7 +31,7 @@ RDEPEND=" nls? ( virtual/libintl ) " BDEPEND=" - doc? ( sys-apps/texinfo ) + doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) test? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: 85423df7972767095b2ad59d10b9c44857d74dc8
Author: Sam James gentoo org>
AuthorDate: Mon Apr 22 03:58:34 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 22 03:58:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85423df7
dev-build/make: fix USE=verify-sig in src_unpack
Closes: https://bugs.gentoo.org/930392
Signed-off-by: Sam James gentoo.org>
dev-build/make/make-4.4.1-r1.ebuild | 2 +-
dev-build/make/make-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-build/make/make-4.4.1-r1.ebuild
b/dev-build/make/make-4.4.1-r1.ebuild
index 3a67d090b66c..4f363169f0ae 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -50,7 +50,7 @@ src_unpack() {
cd "${S}" || die
./bootstrap || die
else
- default
+ verify-sig_src_unpack
fi
}
diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild
index 568476904fc1..4df10fe00325 100644
--- a/dev-build/make/make-.ebuild
+++ b/dev-build/make/make-.ebuild
@@ -50,7 +50,7 @@ src_unpack() {
cd "${S}" || die
./bootstrap || die
else
- default
+ verify-sig_src_unpack
fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: f41c12dac57827e5af88404a24bb0706f306b4bb
Author: Marco Sirabella sirabella org>
AuthorDate: Tue Feb 27 07:52:00 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 23 08:35:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41c12da
dev-build/make: Build & install html+pdf docs
Signed-off-by: Marco Sirabella sirabella.org>
Closes: https://github.com/gentoo/gentoo/pull/35547
Signed-off-by: Sam James gentoo.org>
dev-build/make/make-4.4.1-r1.ebuild | 8 +++-
dev-build/make/make-.ebuild | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-build/make/make-4.4.1-r1.ebuild
b/dev-build/make/make-4.4.1-r1.ebuild
index c71a60cbfb18..3a67d090b66c 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-IUSE="guile nls static test"
+IUSE="doc guile nls static test"
RESTRICT="!test? ( test )"
DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
@@ -31,6 +31,7 @@ RDEPEND="
nls? ( virtual/libintl )
"
BDEPEND="
+ doc? ( sys-apps/texinfo )
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-make )
test? ( dev-lang/perl )
@@ -71,7 +72,12 @@ src_configure() {
econf "${myeconfargs[@]}"
}
+src_compile() {
+ emake all $(usev doc 'pdf html')
+}
+
src_install() {
+ use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
default
dosym gmake /usr/bin/make
diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild
index 6505deff9787..568476904fc1 100644
--- a/dev-build/make/make-.ebuild
+++ b/dev-build/make/make-.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-IUSE="guile nls static test"
+IUSE="doc guile nls static test"
RESTRICT="!test? ( test )"
DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
@@ -31,6 +31,7 @@ RDEPEND="
nls? ( virtual/libintl )
"
BDEPEND="
+ doc? ( sys-apps/texinfo )
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-make )
test? ( dev-lang/perl )
@@ -71,7 +72,12 @@ src_configure() {
econf "${myeconfargs[@]}"
}
+src_compile() {
+ emake all $(usev doc 'pdf html')
+}
+
src_install() {
+ use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
default
dosym gmake /usr/bin/make
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: 48352f4bd172977566b8d9c1579b921957c46b36
Author: Marco Sirabella sirabella org>
AuthorDate: Tue Feb 27 07:53:52 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 23 08:35:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48352f4b
dev-build/make: use src_install default
Signed-off-by: Marco Sirabella sirabella.org>
Signed-off-by: Sam James gentoo.org>
dev-build/make/make-4.4.1-r1.ebuild | 3 +--
dev-build/make/make-.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-build/make/make-4.4.1-r1.ebuild
b/dev-build/make/make-4.4.1-r1.ebuild
index 94a0d47b7ca0..c71a60cbfb18 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -72,8 +72,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
+ default
dosym gmake /usr/bin/make
dosym gmake.1 /usr/share/man/man1/make.1
diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild
index ee4f50eba0b0..6505deff9787 100644
--- a/dev-build/make/make-.ebuild
+++ b/dev-build/make/make-.ebuild
@@ -72,8 +72,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
+ default
dosym gmake /usr/bin/make
dosym gmake.1 /usr/share/man/man1/make.1
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: 121eba1aad27c0e228cfac6416151b547be44565
Author: Marco Sirabella sirabella org>
AuthorDate: Tue Feb 27 17:32:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 23 08:35:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121eba1a
dev-build/make: Use einstalldocs + DOCS var
Signed-off-by: Marco Sirabella sirabella.org>
Signed-off-by: Sam James gentoo.org>
dev-build/make/make-4.4.1-r1.ebuild | 4 +++-
dev-build/make/make-.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-build/make/make-4.4.1-r1.ebuild
b/dev-build/make/make-4.4.1-r1.ebuild
index c2fbdc0dcb2e..94a0d47b7ca0 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -36,6 +36,8 @@ BDEPEND="
test? ( dev-lang/perl )
"
+DOCS="AUTHORS NEWS README*"
+
PATCHES=(
"${FILESDIR}"/${PN}-4.4-default-cxx.patch
)
@@ -71,7 +73,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS README*
+ einstalldocs
dosym gmake /usr/bin/make
dosym gmake.1 /usr/share/man/man1/make.1
diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild
index b7bd016b9653..ee4f50eba0b0 100644
--- a/dev-build/make/make-.ebuild
+++ b/dev-build/make/make-.ebuild
@@ -36,6 +36,8 @@ BDEPEND="
test? ( dev-lang/perl )
"
+DOCS="AUTHORS NEWS README*"
+
PATCHES=(
"${FILESDIR}"/${PN}-4.4-default-cxx.patch
)
@@ -71,7 +73,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS README*
+ einstalldocs
dosym gmake /usr/bin/make
dosym gmake.1 /usr/share/man/man1/make.1
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/
commit: fe362bcfecccd6c45d7ae1e9a104f31d9d146f76 Author: Marco Sirabella sirabella org> AuthorDate: Tue Feb 20 09:12:01 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 21 02:46:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe362bcf dev-build/make: Add perl dependency for USE=test Signed-off-by: Marco Sirabella sirabella.org> Closes: https://github.com/gentoo/gentoo/pull/35437 Signed-off-by: Sam James gentoo.org> dev-build/make/make-4.4.1-r1.ebuild | 4 +++- dev-build/make/make-.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-build/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild index 61fbc91f243f..c2fbdc0dcb2e 100644 --- a/dev-build/make/make-4.4.1-r1.ebuild +++ b/dev-build/make/make-4.4.1-r1.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="guile nls static" +IUSE="guile nls static test" +RESTRICT="!test? ( test )" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" RDEPEND=" @@ -32,6 +33,7 @@ RDEPEND=" BDEPEND=" nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) + test? ( dev-lang/perl ) " PATCHES=( diff --git a/dev-build/make/make-.ebuild b/dev-build/make/make-.ebuild index 2be7d7adb832..b7bd016b9653 100644 --- a/dev-build/make/make-.ebuild +++ b/dev-build/make/make-.ebuild @@ -22,7 +22,8 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="guile nls static" +IUSE="guile nls static test" +RESTRICT="!test? ( test )" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" RDEPEND=" @@ -32,6 +33,7 @@ RDEPEND=" BDEPEND=" nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) + test? ( dev-lang/perl ) " PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: dev-build/make/, dev-build/make/files/
commit: 545c7958207add79b25b775c171b7ef9a05d5944
Author: Sam James gentoo org>
AuthorDate: Mon Mar 4 10:48:34 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 4 10:49:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545c7958
dev-build/make: drop 4.3-r1
Signed-off-by: Sam James gentoo.org>
dev-build/make/Manifest| 2 -
.../make-3.82-darwin-library_search-dylib.patch| 17 -
dev-build/make/files/make-4.2-default-cxx.patch| 11
dev-build/make/make-4.3-r1.ebuild | 73 --
4 files changed, 103 deletions(-)
diff --git a/dev-build/make/Manifest b/dev-build/make/Manifest
index ceee9e83b6c7..c639311d60ed 100644
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
@@ -1,4 +1,2 @@
-DIST make-4.3.tar.gz 2317073 BLAKE2B
5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff
SHA512
9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
-DIST make-4.3.tar.gz.sig 566 BLAKE2B
75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528
SHA512
bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
DIST make-4.4.1.tar.gz 2348200 BLAKE2B
09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995
SHA512
145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
DIST make-4.4.1.tar.gz.sig 833 BLAKE2B
d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1
SHA512
d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
diff --git a/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch
b/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch
deleted file mode 100644
index 743583b5a0a3..
--- a/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed default libpatttern on Darwin, imported from prefix overlay.
-Got merged upstream:
-https://savannah.gnu.org/bugs/?37197
a/src/default.c
-+++ b/src/default.c
-@@ -509,7 +509,11 @@
- #ifdef __MSDOS__
- ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
- #else
-+#ifdef __APPLE__
-+".LIBPATTERNS", "lib%.dylib lib%.a",
-+#else
- ".LIBPATTERNS", "lib%.so lib%.a",
-+#endif
- #endif
- #endif
-
diff --git a/dev-build/make/files/make-4.2-default-cxx.patch
b/dev-build/make/files/make-4.2-default-cxx.patch
deleted file mode 100644
index 39e3ee0dd9f9..
--- a/dev-build/make/files/make-4.2-default-cxx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/src/default.c
-+++ b/src/default.c
-@@ -530,7 +530,7 @@ static const char *default_variables[] =
- "OBJC", "gcc",
- #else
- "CC", "cc",
--"CXX", "g++",
-+"CXX", "c++",
- "OBJC", "cc",
- #endif
-
diff --git a/dev-build/make/make-4.3-r1.ebuild
b/dev-build/make/make-4.3-r1.ebuild
deleted file mode 100644
index 55a24ce4609e..
--- a/dev-build/make/make-4.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html;
-if [[ ${PV} == ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git;
- inherit autotools git-r3
-elif [[ $(ver_cut 3) -ge 90 ]] ; then
- SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz;
- SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig
)"
-else
- SRC_URI="mirror://gnu//make/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.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"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="guile nls static"
-
-DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-BDEPEND="nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-make )"
-RDEPEND="${DEPEND}
- nls? ( virtual/libintl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
- "${FILESDIR}"/${PN}-4.2-default-cxx.patch
-)
-
-src_unpack() {
- if [[ ${PV} == ]] ; then
- git-r3_src_unpack
-
- cd "${S}" || die
- ./bootstrap || die
- else
- default
-
