From 236c32b87db256fa891574113452c70d543acaae Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Sep 2021 12:57:39 +0200 Subject: [PATCH] sys-apps/texinfo: Update from gentoo This is to get rid of EAPI 5 in the package. --- .../coreos-overlay/sys-apps/texinfo/Manifest | 10 +- ...configure-Fixups-for-Container-Linux.patch | 44 ----- .../texinfo-6.8-undo-gnulib-nonnul.patch | 186 ++++++++++++++++++ .../sys-apps/texinfo/metadata.xml | 12 +- .../sys-apps/texinfo/texinfo-6.1.ebuild | 40 ---- .../sys-apps/texinfo/texinfo-6.3.ebuild | 45 ----- .../sys-apps/texinfo/texinfo-6.4.ebuild | 40 ---- .../sys-apps/texinfo/texinfo-6.5.ebuild | 42 ---- .../sys-apps/texinfo/texinfo-6.8.ebuild | 72 +++++++ 9 files changed, 270 insertions(+), 221 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/0001-configure-Fixups-for-Container-Linux.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.3.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.4.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.5.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest index 743a53f7b6..b6017de329 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/Manifest @@ -1,9 +1 @@ -DIST texinfo-6.1.tar.xz 4520376 BLAKE2B 3b96ed431288815df4261fcd0266f2be01d27f82904f20169ab5c9dbecc26dbe817a36a41817868b3f44f1bea45b53e3da5703399cd8ae2ad098f5b1cb0b49d9 SHA512 ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235 -DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4 -DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006 -DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc -EBUILD texinfo-6.1.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2 -EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2 -EBUILD texinfo-6.4.ebuild 1119 BLAKE2B 3758a080518277f705a6d0726015e5bb9f1dfbeb3b14bdbee668f3641acbf564d4d41f147a827011f358b0e739307e2fd5994af3fa93210275e717e588c82382 SHA512 3cb88782ece710208c38b506fdb028e03390c6f798fc13a9bf8e2891d0096a8bea5531d16e454b091a6227b905ffc73f4d2d786f3fdef7102637fa3023de7530 -EBUILD texinfo-6.5.ebuild 1153 BLAKE2B 114c01323863fee4903830e36f798eff5b525f3d67618100cfd713ec06a3edc79d960e66ee2973622f5d11d711f7a35880185c103d8da40fa79fc21f8a17f3ad SHA512 5968b0d3b4455e5c6b32c52540c17014566a1a2f7604dcb26ecf01736da6077a002dbf3b17a5170909c26c4ac46ca48b85f07c66fe415c85fcc07d52d4adf991 -MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 +DIST texinfo-6.8.tar.gz 10119420 BLAKE2B df9dc1698e7bb4f7c97ba4d44b08631502e3f997b91169ae64161b69701fbb0f85c82295ef6867e716a0addfd7c5677e14079645b167bd74933a0153fee92200 SHA512 f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/0001-configure-Fixups-for-Container-Linux.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/0001-configure-Fixups-for-Container-Linux.patch deleted file mode 100644 index 9a0f26667d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/0001-configure-Fixups-for-Container-Linux.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 94b3629f6c781344e01fe8fa2b0b8e1df96f65eb Mon Sep 17 00:00:00 2001 -From: Geoff Levand -Date: Wed, 24 Jan 2018 16:30:05 -0800 -Subject: [PATCH] configure: Fixups for Container Linux builds - -Need to set CCACHE_DIR for tool build. -Need to skip doc, man for main build. - -Signed-off-by: Geoff Levand ---- - Makefile.am | 3 +-- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index b3ea505..abc43e4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -66,8 +66,7 @@ if HOST_IS_WINDOWS - SUBDIRS += info - endif - endif -- SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util \ -- doc man -+ SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util - endif - - distclean-local: -diff --git a/configure.ac b/configure.ac -index 055b294..80ec33b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -210,7 +210,7 @@ else - # it gets the wrong CC etc. - # env -i gives this build host configure a clean environment; - # consequently, we have to re-initialize $PATH. -- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ -+ env -i CCACHE_DIR=$CCACHE_DIR CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ - PATH="$PATH" \ - tools_only=1 \ - ${confdir}/configure --build=${build} --host=${build} \ --- -2.11.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch new file mode 100644 index 0000000000..60f2e63b7c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch @@ -0,0 +1,186 @@ + +Patch by Vitezslav Crhonek +Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide + +diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h +--- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 +@@ -321,15 +321,15 @@ + + /* The nonnull function attribute marks pointer parameters that + must not be NULL. */ +-#ifndef __attribute_nonnull__ ++#ifndef __nonnull + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) +-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) ++# define __nonnull(params) __attribute__ ((__nonnull__ params)) + # else +-# define __attribute_nonnull__(params) ++# define __nonnull(params) + # endif +-#endif +-#ifndef __nonnull +-# define __nonnull(params) __attribute_nonnull__ (params) ++#elif !defined __GLIBC__ ++# undef __nonnull ++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) + #endif + + /* If fortification mode, we warn about unused results of certain +diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h +--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 +@@ -33,9 +33,9 @@ + #include + + /* On glibc this includes and and #defines +- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and +- DragonFlyBSD 5.9 it includes which defines __nonnull. +- Elsewhere it is harmless. */ ++ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it ++ includes which defines __nonnull. Elsewhere it ++ is harmless. */ + #include + + /* From glibc . */ +diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c +--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 +@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY + + /* Initialize a dynamic array object. This must be called before any + use of the object. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) + { +@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST + } + + /* Deallocate the dynamic array and its elements. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) + { +@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l + } + + /* Return true if the dynamic array is in an error state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline bool + DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) + { +@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct + + /* Mark the dynamic array as failed. All elements are deallocated as + a side effect. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) + { +@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA + + /* Return the number of elements which have been added to the dynamic + array. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline size_t + DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) + { +@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR + + /* Return a pointer to the array element at INDEX. Terminate the + process if INDEX is out of bounds. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) + { +@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU + /* Return a pointer to the first array element, if any. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) + { +@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S + /* Return a pointer one element past the last array element. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) + { +@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S + /* Add ITEM at the end of the array, enlarging it by one element. + Mark *LIST as failed if the dynamic array allocation size cannot be + increased. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline void + DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) + { +@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR + /* Allocate a place for a new element in *LIST and return a pointer to + it. The pointer can be NULL if the dynamic array cannot be + enlarged due to a memory allocation failure. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static + /* Avoid inlining with the larger initialization code. */ + #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) +@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY + existing size, new elements are added (which can be initialized). + Otherwise, the list is truncated, and elements are freed. Return + false on memory allocation failure (and mark *LIST as failed). */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static bool + DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) + { +@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ + } + + /* Remove the last element of LIST if it is present. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) + { +@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA + + /* Remove all elements from the list. The elements are freed, but the + list itself is not. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) + { +@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S + stored in *RESULT if LIST refers to an empty list. On success, the + pointer in *RESULT is heap-allocated and must be deallocated using + free. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1, 2)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) + static bool + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, + DYNARRAY_FINAL_TYPE *result) +@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA + have a sentinel at the end). If LENGTHP is not NULL, the array + length is written to *LENGTHP. *LIST is re-initialized and can be + reused. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static DYNARRAY_ELEMENT * + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) + { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml index 56c1244130..fd41c89eb3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/metadata.xml @@ -1,8 +1,18 @@ - + base-system@gentoo.org Gentoo Base System + + perl@gentoo.org + Gentoo Perl Project + + + Build standalone version that survives all Portage bugs + + + cpe:/a:gnu:texinfo + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.1.ebuild deleted file mode 100644 index eb694ae0d9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI="5" - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.3.ebuild deleted file mode 100644 index 63bda9ff2e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI="5" - -inherit autotools flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_prepare() { - epatch "${FILESDIR}"/0001-configure-Fixups-for-Container-Linux.patch - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.4.ebuild deleted file mode 100644 index f710186e79..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI="5" - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.5.ebuild deleted file mode 100644 index e7a4ae2669..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - local myeconfargs=( - --with-external-libintl-perl - --with-external-Unicode-EastAsianWidth - --with-external-Text-Unidecode - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild new file mode 100644 index 0000000000..e6d5db9200 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/texinfo/texinfo-6.8.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: if your package uses the texi2dvi utility, it must depend on the +# virtual/texi2dvi package to pull in all the right deps. The tool is not +# usable out-of-the-box because it requires the large tex packages. + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="https://www.gnu.org/software/texinfo/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +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" +IUSE="nls +standalone static" + +RDEPEND=" + !=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2:0= + standalone? ( dev-lang/perl ) + !standalone? ( + dev-lang/perl:= + dev-perl/libintl-perl + dev-perl/Unicode-EastAsianWidth + dev-perl/Text-Unidecode + ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )" + +PATCHES=( + "${FILESDIR}/${P}-undo-gnulib-nonnul.patch" +) + +src_prepare() { + default + + if use prefix ; then + sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die + touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 + fi +} + +src_configure() { + # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576 + local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" + + use static && append-ldflags -static + local myeconfargs=( $(use_enable nls) ) + + if use standalone ; then + myeconfargs+=( + --without-external-libintl-perl + --without-external-Unicode-EastAsianWidth + --without-external-Text-Unidecode + --disable-perl-xs + ) + else + myeconfargs+=( + --with-external-libintl-perl + --with-external-Unicode-EastAsianWidth + --with-external-Text-Unidecode + --enable-perl-xs + ) + fi + + econf "${myeconfargs[@]}" +}