| 1 |
commit: 5ce42624d550356443f67ec524b739a3f3f1acdb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 29 19:22:43 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 30 11:00:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce42624 |
| 7 |
|
| 8 |
sys-devel/m4: add 1.4.19, drop 1.4.19_beta2 |
| 9 |
|
| 10 |
* Add 1.4.19 |
| 11 |
** Add USE=nls for new gettext/libintl support |
| 12 |
** Add packaging information via configure |
| 13 |
|
| 14 |
* Drop 1.4.19_beta2 |
| 15 |
|
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/21044 |
| 18 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-devel/m4/Manifest | 2 +- |
| 21 |
.../{m4-1.4.19_beta2.ebuild => m4-1.4.19.ebuild} | 28 +++++++++++++++++----- |
| 22 |
2 files changed, 23 insertions(+), 7 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest |
| 25 |
index eba754a6ffd..c24847bf023 100644 |
| 26 |
--- a/sys-devel/m4/Manifest |
| 27 |
+++ b/sys-devel/m4/Manifest |
| 28 |
@@ -1,2 +1,2 @@ |
| 29 |
DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 |
| 30 |
-DIST m4-1.4.18d.tar.xz 1546856 BLAKE2B fb2deb18237e62d87cc9e4f28d4f95519e90309d515dbfb05b6f042d73f1fa14e02620fdf66febeb22dd7bc4286c0a11085632741b4468a237c273e702f4a4fe SHA512 54205a88b623a605d1905d4959062d622c08d2daf191b862bc857f7cce7b11347e979a3dccbe4ab1c7425202acc144586dfc8f202e298183454b34100d3da51e |
| 31 |
+DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b |
| 32 |
|
| 33 |
diff --git a/sys-devel/m4/m4-1.4.19_beta2.ebuild b/sys-devel/m4/m4-1.4.19.ebuild |
| 34 |
similarity index 73% |
| 35 |
rename from sys-devel/m4/m4-1.4.19_beta2.ebuild |
| 36 |
rename to sys-devel/m4/m4-1.4.19.ebuild |
| 37 |
index 370f1d50f9e..7e30a110bc3 100644 |
| 38 |
--- a/sys-devel/m4/m4-1.4.19_beta2.ebuild |
| 39 |
+++ b/sys-devel/m4/m4-1.4.19.ebuild |
| 40 |
@@ -3,29 +3,43 @@ |
| 41 |
|
| 42 |
EAPI=7 |
| 43 |
|
| 44 |
-MY_P="${PN}-1.4.18d" |
| 45 |
- |
| 46 |
DESCRIPTION="GNU macro processor" |
| 47 |
HOMEPAGE="https://www.gnu.org/software/m4/m4.html" |
| 48 |
if [[ "${PV}" == *_beta* ]] ; then |
| 49 |
+ MY_P="${PN}-1.4.18d" |
| 50 |
#SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" |
| 51 |
SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" |
| 52 |
S="${WORKDIR}/${MY_P}" |
| 53 |
else |
| 54 |
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz" |
| 55 |
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 56 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" |
| 57 |
fi |
| 58 |
+ |
| 59 |
LICENSE="GPL-3" |
| 60 |
SLOT="0" |
| 61 |
-IUSE="examples" |
| 62 |
+IUSE="examples nls" |
| 63 |
|
| 64 |
-# remember: cannot dep on autoconf since it needs us |
| 65 |
-BDEPEND="app-arch/xz-utils" |
| 66 |
+RDEPEND=" |
| 67 |
+ virtual/libiconv |
| 68 |
+ nls? ( |
| 69 |
+ sys-devel/gettext |
| 70 |
+ virtual/libintl |
| 71 |
+ )" |
| 72 |
+DEPEND="${RDEPEND}" |
| 73 |
+# Remember: cannot dep on autoconf since it needs us |
| 74 |
+BDEPEND="app-arch/xz-utils |
| 75 |
+ nls? ( sys-devel/gettext )" |
| 76 |
|
| 77 |
src_configure() { |
| 78 |
local -a myeconfargs=( |
| 79 |
--enable-changeword |
| 80 |
|
| 81 |
+ --with-packager="Gentoo Linux" |
| 82 |
+ --with-packager-version="${PVR}" |
| 83 |
+ --with-packager-bug-reports="https://bugs.gentoo.org/" |
| 84 |
+ |
| 85 |
+ $(usex nls '' '--disable-nls') |
| 86 |
+ |
| 87 |
# Disable automagic dependency over libsigsegv; see bug #278026 |
| 88 |
ac_cv_libsigsegv=no |
| 89 |
) |
| 90 |
@@ -42,9 +56,11 @@ src_test() { |
| 91 |
|
| 92 |
src_install() { |
| 93 |
default |
| 94 |
+ |
| 95 |
# autoconf-2.60 for instance, first checks gm4, then m4. If we don't have |
| 96 |
# gm4, it might find gm4 from outside the prefix on for instance Darwin |
| 97 |
use prefix && dosym m4 /usr/bin/gm4 |
| 98 |
+ |
| 99 |
if use examples ; then |
| 100 |
dodoc -r examples |
| 101 |
rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* |
Archives