* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2015-12-28 22:20 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2015-12-28 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 28d5b59c8154923137d999d6ee057fe8902530bc
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 22:16:22 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 22:16:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d5b59c
sys-devel/gettext: Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/gettext/Manifest | 2 -
.../files/gettext-0.19.5.1-version-hack.patch | 18 ---
sys-devel/gettext/gettext-0.19.5.1-r1.ebuild | 146 ---------------------
sys-devel/gettext/gettext-0.19.5.ebuild | 140 --------------------
sys-devel/gettext/gettext-0.19.6.ebuild | 141 --------------------
5 files changed, 447 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index c670405..72f21e0 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,5 +1,3 @@
DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
-DIST gettext-0.19.5.1.tar.gz 18353792 SHA256 a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731 SHA512 c2c1dc51d9c24c92b86619ec613b87266eae08a21280855e5b0d44c09e7efc8390341ded85dd85270c5a933ee21a6179373cc5cf275b6bc80cb510c7830d0ef4 WHIRLPOOL 2a2143edc4f3fdb37109aeb762072aa49f88045d55913ae282d203d5a7b3e848df5318c9e4f5e44f63a9f9a7c61c6018900df55b3bdfe06fa975a709322656d6
-DIST gettext-0.19.5.tar.gz 18352722 SHA256 1258814ba174e4783194be2dc93648bd630d4dda166eae034e4ad54489dcf73a SHA512 10b435bba4fcdcf15be3182b3c9756eef5b6ef6ec1416c1b12af35345fc1668c26dce81081e2616b7e2b0d174051fddd6fe6266e4709652a751a91fcf241e610 WHIRLPOOL 94db59cc7a1f3bf833e23a9c9aa25524c571b9585928d083438e7357d034236493584c0137f0c2bb58120f2e55f35055bc36731736162d9ad3e01aa6a1cf270e
DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
DIST gettext-0.19.7.tar.gz 19235781 SHA256 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d WHIRLPOOL eb51c4be7c0a92c5c33c16329003e21947e0b9d1583c4a785ae6836f81273ea7ec2823a0a28ae81c3b977f2148c0f3bd524949484383ff87510e1d2bc642a786
diff --git a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch b/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
deleted file mode 100644
index 1a9eaea..0000000
--- a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-the gettext tooling does not quite understand 4 version components.
-hack it so the output in the configure script sticks to 3 parts.
-this is a horrible hack that really needs an upstream fix.
-
-https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00027.html
-https://bugs.gentoo.org/556024
-
---- a/gettext-tools/misc/gettextize.in
-+++ b/gettext-tools/misc/gettextize.in
-@@ -1235,7 +1235,7 @@
- func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
- sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
--sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-+sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"${version%.?}"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
- $do_changelog && func_ChangeLog_finish
-
diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
deleted file mode 100644
index b6fb8a8..0000000
--- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- # This patch should not be included in version bumps (at least to 0.19.2).
- # Perhaps 0.19.5.2 will be broken in the same way. #556024
- [[ ${PV} != 0.19.5.1 ]] && die
- epatch "${FILESDIR}"/${P}-version-hack.patch #556024
-
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${D}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${D}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${D}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild
deleted file mode 100644
index 0b284dd..0000000
--- a/sys-devel/gettext/gettext-0.19.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${D}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${D}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${D}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild
deleted file mode 100644
index 0f921c0..0000000
--- a/sys-devel/gettext/gettext-0.19.6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${D}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${D}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${D}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2016-06-15 20:16 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-06-15 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 7006ca35680e9aa14f4e5f4bbf3b30f03d5b38d6
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 20:14:58 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 20:15:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7006ca35
sys-devel/gettext: make sure libintl building is disabled #564168
.../files/gettext-0.19.7-disable-libintl.patch | 30 ++++++++++++++++++++++
sys-devel/gettext/gettext-0.19.7.ebuild | 2 ++
sys-devel/gettext/gettext-0.19.8.1.ebuild | 2 ++
3 files changed, 34 insertions(+)
diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
new file mode 100644
index 0000000..f51de34
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/564168
+Never build libintl since it's in dev-libs/libintl now.
+
+We can drop this if/when upstream fixes the configure flag handling:
+https://savannah.gnu.org/bugs/?48233
+
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 962433a..7922b1d 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -49,6 +49,8 @@ pkg_setup() {
src_prepare() {
java-pkg-opt-2_src_prepare
+ epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+
epunt_cxx
elibtoolize
}
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index 165bf05..d49716f 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -49,6 +49,8 @@ pkg_setup() {
src_prepare() {
java-pkg-opt-2_src_prepare
+ epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+
epunt_cxx
elibtoolize
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2017-12-03 1:38 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2017-12-03 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 1f2bebec8775c96d1e2e76cbad71a84e789d1048
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 00:23:41 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 01:37:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2bebec
sys-devel/gettext: Fix compilation with format-security
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sys-devel/gettext/Manifest | 2 +-
.../files/gettext-0.19.8.1-format-security.patch | 87 ++++++++++++++++++++++
sys-devel/gettext/gettext-0.19.8.1.ebuild | 1 +
3 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 45ba8b69fd7..83c6b66de3f 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1 +1 @@
-DIST gettext-0.19.8.1.tar.gz 19704011 SHA256 ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 WHIRLPOOL ef9aa9eef3067595dc725169075401dfad8ba15d6224d2b563e3421afa7c4dce9336a287147404273b772def811230b3758c005902ec90192e6ee4ac373d9a9a
+DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
diff --git a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
new file mode 100644
index 00000000000..6af16041987
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
@@ -0,0 +1,87 @@
+From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sun, 19 Feb 2017 23:32:46 -0800
+Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
+
+Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
+| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
+| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
+| fprintf (a_fp, str) ;
+
+And:
+gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
+ gettext-tools/gnulib-lib/libxml/timsort.h | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+index 617520f..100104b 100644
+--- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
++++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
+ g_return_if_fail (a_fp && a_this);
+ str = cr_statement_ruleset_to_string (a_this, a_indent);
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str);
+ str = NULL;
+ }
+@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
+ str = cr_statement_charset_to_string (a_this,
+ a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
+
+ str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
+
+ str = cr_statement_media_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
+
+ str = cr_statement_import_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
+index 795f272..443918a 100644
+--- a/gettext-tools/gnulib-lib/libxml/timsort.h
++++ b/gettext-tools/gnulib-lib/libxml/timsort.h
+@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
+ SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
+ if (tempstore == NULL)
+ {
+- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
++ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
+ exit(1);
+ }
+ store->storage = tempstore;
+--
+2.10.2
+
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index 98f51b7a799..e947a0e8790 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
java-pkg-opt-2_src_prepare
epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+ epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
epunt_cxx
elibtoolize
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2019-05-10 18:40 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2019-05-10 18:40 UTC (permalink / raw
To: gentoo-commits
commit: f570cd6e3ccfa1b9afae0c875a367a55b75f8f1d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 18:40:17 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 10 18:40:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f570cd6e
sys-devel/gettext: Fixed parallel install issue
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Closes: https://bugs.gentoo.org/685530
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/gettext-0.20-avoid_eautomake.patch | 22 +++++++++++++
.../files/gettext-0.20-parallel_install.patch | 37 ++++++++++++++++++++++
sys-devel/gettext/gettext-0.20.ebuild | 2 ++
3 files changed, 61 insertions(+)
diff --git a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
new file mode 100644
index 00000000000..16592c8018e
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
@@ -0,0 +1,22 @@
+--- gettext-0.20/gettext-tools/src/Makefile.in
++++ gettext-0.20/gettext-tools/src/Makefile.in
+@@ -3952,9 +3952,16 @@
+
+ # How to get the include files of libtextstyle.
+ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+- here=`pwd`; \
+- cd ../../libtextstyle/lib && \
+- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
++ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
++ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
++ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
++ else \
++ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
++ fi; \
++ target_dir="$(abs_builddir)/$@"; \
++ target_dir="$${target_dir%/*}"; \
++ $(MKDIR_P) "$${target_dir}"; \
++ $(INSTALL_HEADER) "$$file" $@
+
+ # No need to install libgettextsrc.a, except on AIX.
+ install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
new file mode 100644
index 00000000000..e47beaf9443
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
@@ -0,0 +1,37 @@
+From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Fri, 10 May 2019 20:08:25 +0200
+Subject: [PATCH] Fix parallel install issue
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ gettext-tools/src/Makefile.am | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
+index 09a3c153d..1ee49cdca 100644
+--- a/gettext-tools/src/Makefile.am
++++ b/gettext-tools/src/Makefile.am
+@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
+
+ # How to get the include files of libtextstyle.
+ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+- here=`pwd`; \
+- cd ../../libtextstyle/lib && \
+- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
++ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
++ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
++ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
++ else \
++ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
++ fi; \
++ target_dir="$(abs_builddir)/$@"; \
++ target_dir="$${target_dir%/*}"; \
++ $(MKDIR_P) "$${target_dir}"; \
++ $(INSTALL_HEADER) "$$file" $@
+ BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+
+--
+2.21.0
+
diff --git a/sys-devel/gettext/gettext-0.20.ebuild b/sys-devel/gettext/gettext-0.20.ebuild
index e4877a91a2a..8f4c83d5321 100644
--- a/sys-devel/gettext/gettext-0.20.ebuild
+++ b/sys-devel/gettext/gettext-0.20.ebuild
@@ -51,6 +51,8 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+ "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
+ "${FILESDIR}"/${PN}-0.20-avoid_eautomake.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2020-01-17 17:19 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2020-01-17 17:19 UTC (permalink / raw
To: gentoo-commits
commit: e32d51442138fda5f45cd9657beae548ed04eccf
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 17:19:21 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 17:19:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32d5144
sys-devel/gettext: Bump to version 0.21_rc1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/gettext/Manifest | 1 +
.../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 +++
sys-devel/gettext/gettext-0.21_rc1.ebuild | 156 +++++++++++++++++++++
3 files changed, 179 insertions(+)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 649c288c7aa..b8e2683e1a5 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,2 +1,3 @@
DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
+DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
new file mode 100644
index 00000000000..8adae5d5484
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
@@ -0,0 +1,22 @@
+--- gettext-0.21-rc1/gettext-tools/src/Makefile.in
++++ gettext-0.21-rc1/gettext-tools/src/Makefile.in
+@@ -4106,9 +4106,16 @@
+
+ # How to get the include files of libtextstyle.
+ @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@
+
+ # No need to install libgettextsrc.a, except on AIX.
+ install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/gettext-0.21_rc1.ebuild b/sys-devel/gettext/gettext-0.21_rc1.ebuild
new file mode 100644
index 00000000000..286653708ac
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.21_rc1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI=7
+
+inherit mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+if [[ "${PV}" == *_rc* ]] ; then
+ SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.bz2"
+ S="${WORKDIR}/${P/_/-}"
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: The version of libxml2 corresponds to the version bundled via gnulib.
+# If the build detects too old of a system version, it will end up falling back
+# to the bundled copy. #596918
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.3:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( >=virtual/jdk-1.4:= )"
+RDEPEND="${DEPEND}
+ !git? ( cvs? ( dev-vcs/cvs ) )
+ git? ( dev-vcs/git )
+ java? ( >=virtual/jre-1.4 )"
+BDEPEND="
+ git? ( dev-vcs/git )
+"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+
+ /usr/include/autosprintf.h
+ /usr/include/textstyle.h
+ /usr/include/textstyle/stdbool.h
+ /usr/include/textstyle/version.h
+ /usr/include/textstyle/woe32dll.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+ "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
+ "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
+)
+
+QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ default
+
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ #--docdir="\$(datarootdir)/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+ # Never build bundled copy of libxml2.
+ --without-included-libxml
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
+ $(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE="${S}"
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use java ; then
+ java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
+ rm "${ED}"/usr/share/${PN}/*.jar || die
+ rm "${ED}"/usr/share/${PN}/*.class || die
+ if use doc ; then
+ java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
+ fi
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+
+ if use doc ; then
+ docinto html
+ dodoc "${ED}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm "${ED}"/usr/share/doc/${PF}/*.html || die
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2020-02-10 10:40 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2020-02-10 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 7aa63a2d8af90a1b6baaedf9beeeaa15f4b47499
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 10:22:48 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 10:40:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa63a2d
sys-devel/gettext: Removed old
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/gettext/Manifest | 1 -
.../files/gettext-0.19.8.1-format-security.patch | 87 -------------
sys-devel/gettext/gettext-0.19.8.1.ebuild | 142 ---------------------
3 files changed, 230 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index b8e2683e1a5..dea17feca81 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,2 @@
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
diff --git a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
deleted file mode 100644
index 6af16041987..00000000000
--- a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Sun, 19 Feb 2017 23:32:46 -0800
-Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
-| fprintf (a_fp, str) ;
-
-And:
-gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
- g_return_if_fail (a_fp && a_this);
- str = cr_statement_ruleset_to_string (a_this, a_indent);
- if (str) {
-- fprintf (a_fp, str);
-+ fprintf (a_fp, "%s", str);
- g_free (str);
- str = NULL;
- }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
- str = cr_statement_charset_to_string (a_this,
- a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
-
- str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str);
-+ fprintf (a_fp, "%s", str);
- g_free (str) ;
- str = NULL ;
- }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
-
- str = cr_statement_media_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
-
- str = cr_statement_import_rule_to_string (a_this, a_indent) ;
- if (str) {
-- fprintf (a_fp, str) ;
-+ fprintf (a_fp, "%s", str) ;
- g_free (str) ;
- str = NULL ;
- }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
- SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
- if (tempstore == NULL)
- {
-- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
- exit(1);
- }
- store->storage = tempstore;
---
-2.10.2
-
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
deleted file mode 100644
index eb057564fb3..00000000000
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI="5"
-
-inherit epatch epunt-cxx ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
-
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${ED}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2020-10-29 14:03 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2020-10-29 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 2820aee152f31d8627ab8c1dc42d38240ad108b5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 14:02:53 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 14:03:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2820aee1
sys-devel/gettext: Removed old
Closes: https://bugs.gentoo.org/751631
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/gettext/Manifest | 2 -
.../files/gettext-0.20-avoid_eautomake.patch | 22 ---
sys-devel/gettext/gettext-0.20.1.ebuild | 152 ---------------------
sys-devel/gettext/gettext-0.20.2.ebuild | 152 ---------------------
4 files changed, 328 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index aa086cfc85b..61bb66f324f 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1 @@
-DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
diff --git a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
deleted file mode 100644
index 16592c8018e..00000000000
--- a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gettext-0.20/gettext-tools/src/Makefile.in
-+++ gettext-0.20/gettext-tools/src/Makefile.in
-@@ -3952,9 +3952,16 @@
-
- # How to get the include files of libtextstyle.
- textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+ else \
-+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+ fi; \
-+ target_dir="$(abs_builddir)/$@"; \
-+ target_dir="$${target_dir%/*}"; \
-+ $(MKDIR_P) "$${target_dir}"; \
-+ $(INSTALL_HEADER) "$$file" $@
-
- # No need to install libgettextsrc.a, except on AIX.
- install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
deleted file mode 100644
index a36da278b93..00000000000
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI=7
-
-inherit mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-BDEPEND="
- git? ( dev-vcs/git )
-"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-
- /usr/include/autosprintf.h
- /usr/include/textstyle.h
- /usr/include/textstyle/stdbool.h
- /usr/include/textstyle/version.h
- /usr/include/textstyle/woe32dll.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
- "${FILESDIR}"/${PN}-0.20-avoid_eautomake.patch
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- default
-
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- #--docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE="${S}"
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm "${ED}"/usr/share/${PN}/*.jar || die
- rm "${ED}"/usr/share/${PN}/*.class || die
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
- fi
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- if use doc ; then
- docinto html
- dodoc "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm "${ED}"/usr/share/doc/${PF}/*.html || die
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.20.2.ebuild b/sys-devel/gettext/gettext-0.20.2.ebuild
deleted file mode 100644
index f84993f9796..00000000000
--- a/sys-devel/gettext/gettext-0.20.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI=7
-
-inherit mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-BDEPEND="
- git? ( dev-vcs/git )
-"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-
- /usr/include/autosprintf.h
- /usr/include/textstyle.h
- /usr/include/textstyle/stdbool.h
- /usr/include/textstyle/version.h
- /usr/include/textstyle/woe32dll.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
- "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- default
-
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- #--docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- $(use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE="${S}"
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm "${ED}"/usr/share/${PN}/*.jar || die
- rm "${ED}"/usr/share/${PN}/*.class || die
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
- fi
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- if use doc ; then
- docinto html
- dodoc "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm "${ED}"/usr/share/doc/${PF}/*.html || die
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2021-05-31 21:16 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2021-05-31 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 2ee902bc3a015cc4515363c78f584391aa491884
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 21:16:25 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 31 21:16:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee902bc
sys-devel/gettext: fix CVE-2020-12825
Bug: https://bugs.gentoo.org/769998
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/gettext-0.21-CVE-2020-12825.patch | 335 +++++++++++++++++++++
sys-devel/gettext/gettext-0.21-r1.ebuild | 157 ++++++++++
2 files changed, 492 insertions(+)
diff --git a/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch b/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch
new file mode 100644
index 00000000000..6b4c463b411
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.21-CVE-2020-12825.patch
@@ -0,0 +1,335 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/44cbd1e718d6a08e59b9300280c340218a84e089
+
+--- a/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
++++ b/libtextstyle/gnulib-local/lib/libcroco/cr-parser.c
+@@ -146,6 +146,8 @@ struct _CRParserPriv {
+
+ #define CHARS_TAB_SIZE 12
+
++#define RECURSIVE_CALLERS_LIMIT 100
++
+ /**
+ * IS_NUM:
+ *@a_char: the char to test.
+@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
+
+ static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
+
+-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
++ guint n_calls);
+
+-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
++ guint n_calls);
+
+ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
+
+@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+ cr_parser_try_to_skip_spaces_and_comments (a_this);
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ } while (status == CR_OK);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
+@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, 0);
+ CHECK_PARSING_STATUS (status,
+ FALSE);
+ goto done;
+@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
+
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ CHECK_PARSING_STATUS (status, FALSE);
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+
+ } while (status == CR_OK);
+
+@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
+ *in chapter 4.1 of the css2 spec.
+ *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
+ *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+ *FIXME: code this function.
+ */
+ static enum CRStatus
+-cr_parser_parse_block_core (CRParser * a_this)
++cr_parser_parse_block_core (CRParser * a_this,
++ guint n_calls)
+ {
+ CRToken *token = NULL;
+ CRInputPos init_pos;
+@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
+
+ g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
+
++ if (n_calls > RECURSIVE_CALLERS_LIMIT)
++ return CR_ERROR;
++
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
+@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
+ } else if (token->type == CBO_TK) {
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, n_calls + 1);
+ CHECK_PARSING_STATUS (status, FALSE);
+ goto parse_block_content;
+ } else {
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+ token = NULL;
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ CHECK_PARSING_STATUS (status, FALSE);
+ goto parse_block_content;
+ }
+@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+ status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, 0);
+ CHECK_PARSING_STATUS (status, FALSE);
+ ref++;
+ goto continue_parsing;
+@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+ status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ if (status == CR_OK) {
+ ref++;
+ goto continue_parsing;
+@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
+ * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
+ *
+ *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+ *@return CR_OK upon successfull completion, an error code otherwise.
+ */
+ static enum CRStatus
+-cr_parser_parse_any_core (CRParser * a_this)
++cr_parser_parse_any_core (CRParser * a_this,
++ guint n_calls)
+ {
+ CRToken *token1 = NULL,
+ *token2 = NULL;
+@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
+
+ g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+
++ if (n_calls > RECURSIVE_CALLERS_LIMIT)
++ return CR_ERROR;
++
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
+@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ *We consider parameter as being an "any*" production.
+ */
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ }
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ }
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+--- a/libtextstyle/lib/libcroco/cr-parser.c
++++ b/libtextstyle/lib/libcroco/cr-parser.c
+@@ -146,6 +146,8 @@ struct _CRParserPriv {
+
+ #define CHARS_TAB_SIZE 12
+
++#define RECURSIVE_CALLERS_LIMIT 100
++
+ /**
+ * IS_NUM:
+ *@a_char: the char to test.
+@@ -354,9 +356,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this);
+
+ static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this);
+
+-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this,
++ guint n_calls);
+
+-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this);
++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this,
++ guint n_calls);
+
+ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this);
+
+@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+ cr_parser_try_to_skip_spaces_and_comments (a_this);
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ } while (status == CR_OK);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr,
+@@ -805,7 +809,7 @@ cr_parser_parse_atrule_core (CRParser * a_this)
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, 0);
+ CHECK_PARSING_STATUS (status,
+ FALSE);
+ goto done;
+@@ -940,11 +944,11 @@ cr_parser_parse_selector_core (CRParser * a_this)
+
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ CHECK_PARSING_STATUS (status, FALSE);
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+
+ } while (status == CR_OK);
+
+@@ -966,10 +970,12 @@ cr_parser_parse_selector_core (CRParser * a_this)
+ *in chapter 4.1 of the css2 spec.
+ *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*;
+ *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+ *FIXME: code this function.
+ */
+ static enum CRStatus
+-cr_parser_parse_block_core (CRParser * a_this)
++cr_parser_parse_block_core (CRParser * a_this,
++ guint n_calls)
+ {
+ CRToken *token = NULL;
+ CRInputPos init_pos;
+@@ -977,6 +983,9 @@ cr_parser_parse_block_core (CRParser * a_this)
+
+ g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR);
+
++ if (n_calls > RECURSIVE_CALLERS_LIMIT)
++ return CR_ERROR;
++
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token);
+@@ -1006,13 +1015,13 @@ cr_parser_parse_block_core (CRParser * a_this)
+ } else if (token->type == CBO_TK) {
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, n_calls + 1);
+ CHECK_PARSING_STATUS (status, FALSE);
+ goto parse_block_content;
+ } else {
+ cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token);
+ token = NULL;
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ CHECK_PARSING_STATUS (status, FALSE);
+ goto parse_block_content;
+ }
+@@ -1119,7 +1128,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+ status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_block_core (a_this);
++ status = cr_parser_parse_block_core (a_this, 0);
+ CHECK_PARSING_STATUS (status, FALSE);
+ ref++;
+ goto continue_parsing;
+@@ -1133,7 +1142,7 @@ cr_parser_parse_value_core (CRParser * a_this)
+ status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr,
+ token);
+ token = NULL;
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, 0);
+ if (status == CR_OK) {
+ ref++;
+ goto continue_parsing;
+@@ -1172,10 +1181,12 @@ cr_parser_parse_value_core (CRParser * a_this)
+ * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
+ *
+ *@param a_this the current instance of #CRParser.
++ *@param n_calls used to limit recursion depth
+ *@return CR_OK upon successfull completion, an error code otherwise.
+ */
+ static enum CRStatus
+-cr_parser_parse_any_core (CRParser * a_this)
++cr_parser_parse_any_core (CRParser * a_this,
++ guint n_calls)
+ {
+ CRToken *token1 = NULL,
+ *token2 = NULL;
+@@ -1184,6 +1195,9 @@ cr_parser_parse_any_core (CRParser * a_this)
+
+ g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+
++ if (n_calls > RECURSIVE_CALLERS_LIMIT)
++ return CR_ERROR;
++
+ RECORD_INITIAL_POS (a_this, &init_pos);
+
+ status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1);
+@@ -1222,7 +1236,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ *We consider parameter as being an "any*" production.
+ */
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1247,7 +1261,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ }
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+@@ -1275,7 +1289,7 @@ cr_parser_parse_any_core (CRParser * a_this)
+ }
+
+ do {
+- status = cr_parser_parse_any_core (a_this);
++ status = cr_parser_parse_any_core (a_this, n_calls + 1);
+ } while (status == CR_OK);
+
+ ENSURE_PARSING_COND (status == CR_PARSING_ERROR);
+
diff --git a/sys-devel/gettext/gettext-0.21-r1.ebuild b/sys-devel/gettext/gettext-0.21-r1.ebuild
new file mode 100644
index 00000000000..f6ce7c38d3e
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.21-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI=7
+
+inherit mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+if [[ "${PV}" == *_rc* ]] ; then
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.bz2"
+ S="${WORKDIR}/${P/_/-}"
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ 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 ~x86-winnt"
+fi
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: The version of libxml2 corresponds to the version bundled via gnulib.
+# If the build detects too old of a system version, it will end up falling back
+# to the bundled copy. #596918
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.3:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( >=virtual/jdk-1.4:= )"
+RDEPEND="${DEPEND}
+ !git? ( cvs? ( dev-vcs/cvs ) )
+ git? ( dev-vcs/git )
+ java? ( >=virtual/jre-1.4 )"
+BDEPEND="
+ git? ( dev-vcs/git )
+"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+
+ /usr/include/autosprintf.h
+ /usr/include/textstyle.h
+ /usr/include/textstyle/stdbool.h
+ /usr/include/textstyle/version.h
+ /usr/include/textstyle/woe32dll.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+ "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
+ "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
+ "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
+)
+
+QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ default
+
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ #--docdir="\$(datarootdir)/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+ # Never build bundled copy of libxml2.
+ --without-included-libxml
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
+ $(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE="${S}"
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use java ; then
+ java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
+ rm "${ED}"/usr/share/${PN}/*.jar || die
+ rm "${ED}"/usr/share/${PN}/*.class || die
+ if use doc ; then
+ java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
+ fi
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+
+ if use doc ; then
+ docinto html
+ dodoc "${ED}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm "${ED}"/usr/share/doc/${PF}/*.html || die
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2023-06-25 9:37 Fabian Groffen
0 siblings, 0 replies; 11+ messages in thread
From: Fabian Groffen @ 2023-06-25 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 0b876c3fda58c3a1d901ac0ad2dd2f515eb363ea
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 09:34:12 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 09:37:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b876c3f
sys-devel/gettext-0.22-r1: take more future-proof route against libintl
Patching configure only is brittle (what if one autoreconfs) and the
whole of it is wired to insist on building libintl (upstreams says in
order to test) so, instead of trying to avoid building libintl (yes,
it's a shame we have to waste cycles on it) just remove the library
after install. This should be cleaner given we have no patch to
maintain (that can get outdated) and just makes the implementation a
one-liner.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../files/gettext-0.22-disable-libintl.patch | 34 ----------------------
sys-devel/gettext/gettext-0.22-r1.ebuild | 4 ++-
2 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch
deleted file mode 100644
index b242ead4b435..000000000000
--- a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/564168
-https://bugs.gentoo.org/909041
-
-Never build libintl since it's in dev-libs/libintl now.
-
-We can drop this if/when upstream fixes the configure flag handling:
-https://savannah.gnu.org/bugs/?48233
-
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -22765,9 +22765,7 @@
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools \
-- && test "$PACKAGE" != libintl; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -26129,9 +26129,7 @@
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools \
-- && test "$PACKAGE" != libintl; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
diff --git a/sys-devel/gettext/gettext-0.22-r1.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild
index 15b71238987e..a1e27860f3f0 100644
--- a/sys-devel/gettext/gettext-0.22-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.22-r1.ebuild
@@ -67,7 +67,6 @@ MULTILIB_WRAPPED_HEADERS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-0.22-disable-libintl.patch
"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
)
@@ -153,6 +152,9 @@ multilib_src_install() {
dosym msgfmt /usr/bin/gmsgfmt # bug #43435
dobin gettext-tools/misc/gettextize
fi
+
+ # 909041 never install libintl which upstream insists on building
+ rm -f "${ED}"/usr/$(get_libdir)/libintl.*
}
multilib_src_install_all() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2024-02-20 5:14 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-02-20 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 5c86dc85ae6cb3f657a992067b652c287910fe53
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 05:13:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 05:13:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c86dc85
sys-devel/gettext: drop 0.21.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gettext/Manifest | 2 -
.../files/gettext-0.19.7-disable-libintl.patch | 30 ----
.../files/gettext-0.20-parallel_install.patch | 37 -----
.../files/gettext-0.21.1-java-autoconf.patch | 100 ------------
.../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 ---
sys-devel/gettext/gettext-0.21.1.ebuild | 178 ---------------------
6 files changed, 369 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 3a4aa1ce180b..66b36f6c7aff 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,4 +1,2 @@
-DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
-DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
DIST gettext-0.22.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc SHA512 0f3620b1621b85b3df9e372885c2f040c8a91ec0b2d4e16978459a8a2a152318a0e6f5fefb8d971bad80c437e7ee8ac8c24edc4de0ab86e729528b8a2ac62c51
DIST gettext-0.22.4.tar.xz.sig 833 BLAKE2B fbb00b53c807934a11263c120861971fffebbd39689eda1fae0fb956476e69c3fb6799440cbf3acfcf43ecea2c134ea4dadb95becbac98badb43e546f3c8e9fb SHA512 a774c98de643b1ea3df645e451878652c2baa5cd786642aa457e6d5f5c44787cb1231eb15ad4390acdf314822633acaffffaa853eb69cbbc72c3b79b547a8854
diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
deleted file mode 100644
index f51de3484331..000000000000
--- a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/564168
-Never build libintl since it's in dev-libs/libintl now.
-
-We can drop this if/when upstream fixes the configure flag handling:
-https://savannah.gnu.org/bugs/?48233
-
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
deleted file mode 100644
index e47beaf94433..000000000000
--- a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Fri, 10 May 2019 20:08:25 +0200
-Subject: [PATCH] Fix parallel install issue
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- gettext-tools/src/Makefile.am | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
-index 09a3c153d..1ee49cdca 100644
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-
- # How to get the include files of libtextstyle.
- textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+ else \
-+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+ fi; \
-+ target_dir="$(abs_builddir)/$@"; \
-+ target_dir="$${target_dir%/*}"; \
-+ $(MKDIR_P) "$${target_dir}"; \
-+ $(INSTALL_HEADER) "$$file" $@
- BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
- MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
-
---
-2.21.0
-
diff --git a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
deleted file mode 100644
index a7471ac724c9..000000000000
--- a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Tue, 11 Oct 2022 01:54:44 +0200
-Subject: [PATCH] Avoid warnings during configure execution with
- --disable-java.
-
-Reported by Sam James <sam@cmpct.info>
-in <https://savannah.gnu.org/bugs/?63193>.
-
-* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline.
-* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and
-gt_JAVACOMP_DISABLED inline.
---- a/gettext-runtime/configure.ac
-+++ b/gettext-runtime/configure.ac
-@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [
- BUILDJAVA=no
- fi
- ], [
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
-+ AC_SUBST([CONF_JAVAC])
-+ AC_SUBST([HAVE_JAVAC_ENVVAR])
-+ AC_SUBST([HAVE_GCJ_C])
-+ AC_SUBST([HAVE_JAVAC])
-+ AC_SUBST([HAVE_JIKES])
- JAR=
- BUILDJAVA=no
- ])
---- a/gettext-tools/configure.ac
-+++ b/gettext-tools/configure.ac
-@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [
- BUILDJAVA=no
- fi
- ], [
-- gt_JAVAEXEC_DISABLED
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVA=
-+ HAVE_JAVA_ENVVAR=
-+ HAVE_GIJ=
-+ HAVE_JAVA=
-+ HAVE_JRE=
-+ HAVE_JVIEW=
-+ AC_SUBST([CONF_JAVA])
-+ AC_SUBST([HAVE_JAVA_ENVVAR])
-+ AC_SUBST([HAVE_GIJ])
-+ AC_SUBST([HAVE_JAVA])
-+ AC_SUBST([HAVE_JRE])
-+ AC_SUBST([HAVE_JVIEW])
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
-+ AC_SUBST([CONF_JAVAC])
-+ AC_SUBST([HAVE_JAVAC_ENVVAR])
-+ AC_SUBST([HAVE_GCJ_C])
-+ AC_SUBST([HAVE_JAVAC])
-+ AC_SUBST([HAVE_JIKES])
- JAR=
- BUILDJAVA=no
- ])
-diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index 5e2d593..cf579ff 100755
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -7070,7 +7070,11 @@ fi
-
- else $as_nop
-
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
- JAR=
- BUILDJAVA=no
-
-diff --git a/gettext-tools/configure b/gettext-tools/configure
-index f897bc3..3af54cd 100755
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -8718,8 +8718,11 @@ fi
-
- else $as_nop
-
-- gt_JAVAEXEC_DISABLED
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
- JAR=
- BUILDJAVA=no
-
diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
deleted file mode 100644
index 8adae5d5484a..000000000000
--- a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gettext-0.21-rc1/gettext-tools/src/Makefile.in
-+++ gettext-0.21-rc1/gettext-tools/src/Makefile.in
-@@ -4106,9 +4106,16 @@
-
- # How to get the include files of libtextstyle.
- @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@
-
- # No need to install libgettextsrc.a, except on AIX.
- install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
deleted file mode 100644
index 4988b01ddbeb..000000000000
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc
-inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-if [[ ${PV} == *_rc* ]] ; then
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz"
- SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )"
- S="${WORKDIR}/${P/_/-}"
-else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.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
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy. #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.3:=
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses:0= )
- java? ( virtual/jdk:1.8 )"
-RDEPEND="${DEPEND}
- git? ( dev-vcs/git )
- java? ( virtual/jre:1.8 )"
-BDEPEND="
- git? ( dev-vcs/git )
- verify-sig? ( sec-keys/openpgp-keys-gettext )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-
- /usr/include/autosprintf.h
- /usr/include/textstyle.h
- /usr/include/textstyle/stdbool.h
- /usr/include/textstyle/version.h
- /usr/include/textstyle/woe32dll.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
- "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
- "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
- "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
- "${FILESDIR}"/${P}-java-autoconf.patch
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- default
-
- # gettext-0.21.1-java-autoconf.patch changes
- # gettext-{runtime,tools}/configure.ac and the corresponding
- # configure scripts. Avoid regenerating other autotools output.
- touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
-
- # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
- touch -c configure || die
-
- elibtoolize
-
- if use elibc_musl || use elibc_Darwin; then
- eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch
- fi
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- #--docdir="\$(datarootdir)/doc/${PF}"
-
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
- # Never build bundled copy of libxml2.
- --without-included-libxml
-
- --disable-csharp
- --without-cvs
-
- $(use_enable acl)
- $(use_enable cxx c++)
- $(use_enable cxx libasprintf)
- $(use_with git)
- $(multilib_native_use_enable java)
- $(use_enable ncurses curses)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- local ECONF_SOURCE="${S}"
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm "${ED}"/usr/share/${PN}/*.jar || die
- rm "${ED}"/usr/share/${PN}/*.class || die
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
- fi
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- if use doc ; then
- docinto html
- dodoc "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm "${ED}"/usr/share/doc/${PF}/*.html || die
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
@ 2024-11-02 23:34 Andreas K. Hüttel
0 siblings, 0 replies; 11+ messages in thread
From: Andreas K. Hüttel @ 2024-11-02 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 854441995e8e52e31672479510b9046d7231fbf5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 23:33:40 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 23:33:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85444199
Revert "sys-devel/gettext: drop 0.21.1"
Still needed by dev-python/polib ...
This reverts commit 98608c8e15d4a70012b2b2fe51edf4679f5bc08c.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-devel/gettext/Manifest | 2 +
.../files/gettext-0.19.7-disable-libintl.patch | 30 ++++
.../files/gettext-0.20-parallel_install.patch | 37 +++++
.../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 +++
sys-devel/gettext/gettext-0.21.1.ebuild | 178 +++++++++++++++++++++
5 files changed, 269 insertions(+)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 19ce0f229f8d..fe3a242e1a81 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,5 @@
+DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
+DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
DIST gettext-0.22.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc SHA512 0f3620b1621b85b3df9e372885c2f040c8a91ec0b2d4e16978459a8a2a152318a0e6f5fefb8d971bad80c437e7ee8ac8c24edc4de0ab86e729528b8a2ac62c51
DIST gettext-0.22.4.tar.xz.sig 833 BLAKE2B fbb00b53c807934a11263c120861971fffebbd39689eda1fae0fb956476e69c3fb6799440cbf3acfcf43ecea2c134ea4dadb95becbac98badb43e546f3c8e9fb SHA512 a774c98de643b1ea3df645e451878652c2baa5cd786642aa457e6d5f5c44787cb1231eb15ad4390acdf314822633acaffffaa853eb69cbbc72c3b79b547a8854
DIST gettext-0.22.5.tar.xz 10270724 BLAKE2B 18c383518f5a78b5c04cf76de976524da2a87a892a30d6386778bb4c7dd526ffc3f14f484906c5d3a513b7caf76ea560e53962b325e552182d6940055d798f24 SHA512 a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd
diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
new file mode 100644
index 000000000000..f51de3484331
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/564168
+Never build libintl since it's in dev-libs/libintl now.
+
+We can drop this if/when upstream fixes the configure flag handling:
+https://savannah.gnu.org/bugs/?48233
+
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
++ }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
new file mode 100644
index 000000000000..e47beaf94433
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
@@ -0,0 +1,37 @@
+From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Fri, 10 May 2019 20:08:25 +0200
+Subject: [PATCH] Fix parallel install issue
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ gettext-tools/src/Makefile.am | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
+index 09a3c153d..1ee49cdca 100644
+--- a/gettext-tools/src/Makefile.am
++++ b/gettext-tools/src/Makefile.am
+@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
+
+ # How to get the include files of libtextstyle.
+ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+- here=`pwd`; \
+- cd ../../libtextstyle/lib && \
+- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
++ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
++ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
++ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
++ else \
++ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
++ fi; \
++ target_dir="$(abs_builddir)/$@"; \
++ target_dir="$${target_dir%/*}"; \
++ $(MKDIR_P) "$${target_dir}"; \
++ $(INSTALL_HEADER) "$$file" $@
+ BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+
+--
+2.21.0
+
diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
new file mode 100644
index 000000000000..8adae5d5484a
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
@@ -0,0 +1,22 @@
+--- gettext-0.21-rc1/gettext-tools/src/Makefile.in
++++ gettext-0.21-rc1/gettext-tools/src/Makefile.in
+@@ -4106,9 +4106,16 @@
+
+ # How to get the include files of libtextstyle.
+ @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \
+-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@
+
+ # No need to install libgettextsrc.a, except on AIX.
+ install-exec-hook: install-exec-clean
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
new file mode 100644
index 000000000000..f9bf8e52289c
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc
+inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+if [[ ${PV} == *_rc* ]] ; then
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )"
+ S="${WORKDIR}/${P/_/-}"
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: The version of libxml2 corresponds to the version bundled via gnulib.
+# If the build detects too old of a system version, it will end up falling back
+# to the bundled copy. #596918
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.3:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( virtual/jdk:1.8 )"
+RDEPEND="${DEPEND}
+ git? ( dev-vcs/git )
+ java? ( virtual/jre:1.8 )"
+BDEPEND="
+ git? ( dev-vcs/git )
+ verify-sig? ( sec-keys/openpgp-keys-gettext )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+
+ /usr/include/autosprintf.h
+ /usr/include/textstyle.h
+ /usr/include/textstyle/stdbool.h
+ /usr/include/textstyle/version.h
+ /usr/include/textstyle/woe32dll.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
+ "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
+ "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
+ "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
+ "${FILESDIR}"/${P}-java-autoconf.patch
+)
+
+QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ default
+
+ # gettext-0.21.1-java-autoconf.patch changes
+ # gettext-{runtime,tools}/configure.ac and the corresponding
+ # configure scripts. Avoid regenerating other autotools output.
+ touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+
+ # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+ touch -c configure || die
+
+ elibtoolize
+
+ if use elibc_musl || use elibc_Darwin; then
+ eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch
+ fi
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ #--docdir="\$(datarootdir)/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+ # Never build bundled copy of libxml2.
+ --without-included-libxml
+
+ --disable-csharp
+ --without-cvs
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(multilib_native_use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE="${S}"
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use java ; then
+ java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
+ rm "${ED}"/usr/share/${PN}/*.jar || die
+ rm "${ED}"/usr/share/${PN}/*.class || die
+ if use doc ; then
+ java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
+ fi
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+
+ if use doc ; then
+ docinto html
+ dodoc "${ED}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm "${ED}"/usr/share/doc/${PF}/*.html || die
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-11-02 23:34 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-17 17:19 [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-11-02 23:34 Andreas K. Hüttel
2024-02-20 5:14 Sam James
2023-06-25 9:37 Fabian Groffen
2021-05-31 21:16 Thomas Deutschmann
2020-10-29 14:03 Lars Wendler
2020-02-10 10:40 Lars Wendler
2019-05-10 18:40 Lars Wendler
2017-12-03 1:38 Thomas Deutschmann
2016-06-15 20:16 Mike Frysinger
2015-12-28 22:20 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox