diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/Manifest index 4cfebedfef..dc9a220687 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/Manifest @@ -1 +1,2 @@ DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9 +DIST libunistring-1.0.tar.gz 4214306 BLAKE2B 177f21d9fb6d81ea6bb2fd05f9ca31cd6cecb5a16be273de8817a8fb6ffac997421ebf108acebcb3392b8df423b7e3e150f24a731e0909e2ba171b4bae2fb53d SHA512 6125e3911d15bea8fea5c0b97864f928eab8c8476f1a24c7349b0552e2d11d9b73c1fa0fcb354917e42407d4e5adea55d0c8012121fa0a53c60faa7b0911aef3 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/files/libunistring-test.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/files/libunistring-test.patch new file mode 100644 index 0000000000..c87befbd98 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/files/libunistring-test.patch @@ -0,0 +1,15 @@ +https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=cca32830b57e91f837c01d15b8732f23ff97fc36 + +Author: Bruno Haible + +--- a/tests/glthread/thread.h ++++ b/tests/glthread/thread.h +@@ -133,8 +133,6 @@ extern int glthread_in_use (void); + call to foo(...) in the same function. To avoid this, we test the + address of a function in libpthread that we don't use. */ + +-# pragma weak pthread_create +- + # ifndef pthread_sigmask /* Do not declare rpl_pthread_sigmask weak. */ + # pragma weak pthread_sigmask + # endif diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild index 2532ee5578..d1ebd58075 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib-minimal libtool +inherit multilib-minimal libtool DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard" HOMEPAGE="https://www.gnu.org/software/libunistring/" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -LICENSE="LGPL-3 GPL-3" +LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )" SLOT="0/2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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="doc static-libs" PATCHES=( "${FILESDIR}"/${PN}-nodocs.patch + "${FILESDIR}"/${PN}-test.patch ) src_prepare() { @@ -28,17 +29,14 @@ multilib_src_configure() { econf $(use_enable static-libs static) } -multilib_src_install() { - default - - prune_libtool_files -} - multilib_src_install_all() { default if use doc; then - dohtml doc/*.html + docinto html + dodoc doc/*.html doinfo doc/*.info fi + + find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.0.ebuild new file mode 100644 index 0000000000..2f294b42e0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal libtool + +DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard" +HOMEPAGE="https://www.gnu.org/software/libunistring/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )" +SLOT="0/2" +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="doc static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-nodocs.patch +) + +src_prepare() { + default + elibtoolize # for Solaris shared libraries +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + default + + if use doc ; then + docinto html + dodoc doc/*.html + doinfo doc/*.info + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/metadata.xml index da522d18c4..f757bba21c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/metadata.xml @@ -1,19 +1,20 @@ - + + - - scheme@gentoo.org - Gentoo Scheme Project - - - Text files are nowadays usually encoded in Unicode, and may consist of very - different scripts – from Latin letters to Chinese Hanzi –, with many kinds - of special characters – accents, right-to-left writing marks, hyphens, Roman - numbers, and much more. But the POSIX platform APIs for text do not contain - adequate functions for dealing with particular properties of many Unicode - characters. In fact, the POSIX APIs for text have several assumptions at - their base which don't hold for Unicode text. - This library provides functions for manipulating Unicode strings and for - manipulating C strings according to the Unicode standard. - + + scheme@gentoo.org + Gentoo Scheme Project + + + Text files are nowadays usually encoded in Unicode, and may consist of very + different scripts – from Latin letters to Chinese Hanzi –, with many kinds + of special characters – accents, right-to-left writing marks, hyphens, Roman + numbers, and much more. But the POSIX platform APIs for text do not contain + adequate functions for dealing with particular properties of many Unicode + characters. In fact, the POSIX APIs for text have several assumptions at + their base which don't hold for Unicode text. + This library provides functions for manipulating Unicode strings and for + manipulating C strings according to the Unicode standard. +