Diff gettext-0.21.1 with a gettext-0.22-r1

/usr/portage/sys-devel/gettext/gettext-0.22-r1.ebuild 2023-10-09 14:52:35.484368501 +0300
10 10

  
11 11
DESCRIPTION="GNU locale utilities"
12 12
HOMEPAGE="https://www.gnu.org/software/gettext/"
13

  
13 14
if [[ ${PV} == *_rc* ]] ; then
14 15
	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz"
15 16
	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )"
......
17 18
else
18 19
	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
19 20
	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
20
	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"
21
	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"
21 22
fi
23

  
22 24
# Only libasprintf is under the LGPL (and libintl is in a sep package),
23 25
# so put that license behind USE=cxx.
24 26
LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
25 27
SLOT="0"
26
IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs"
28
IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr"
27 29

  
28 30
# only runtime goes multilib
29 31
# Note: The version of libxml2 corresponds to the version bundled via gnulib.
......
32 34
# Note: expat lacks a subslot because it is dynamically loaded at runtime.  We
33 35
# would depend on older subslots if they were available (based on the ABIs that
34 36
# are explicitly handled), but expat doesn't currently use subslots.
35
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
37
DEPEND="
38
	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
36 39
	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
37 40
	>=dev-libs/libxml2-2.9.3:=
38 41
	dev-libs/expat
39 42
	acl? ( virtual/acl )
40
	ncurses? ( sys-libs/ncurses:0= )
41
	java? ( virtual/jdk:1.8 )"
42
RDEPEND="${DEPEND}
43
	ncurses? ( sys-libs/ncurses:= )
44
	java? ( virtual/jdk:1.8 )
45
	xattr? ( sys-apps/attr )
46
"
47
RDEPEND="
48
	${DEPEND}
43 49
	git? ( dev-vcs/git )
44
	java? ( virtual/jre:1.8 )"
50
	java? ( virtual/jre:1.8 )
51
"
45 52
BDEPEND="
46 53
	git? ( dev-vcs/git )
47
	verify-sig? ( sec-keys/openpgp-keys-gettext )"
54
	verify-sig? ( sec-keys/openpgp-keys-gettext )
55
"
48 56
PDEPEND="emacs? ( app-emacs/po-mode )"
49 57

  
50 58
MULTILIB_WRAPPED_HEADERS=(
......
59 67
)
60 68

  
61 69
PATCHES=(
62
	"${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
63
	"${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
64
	"${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
65 70
	"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
66
	"${FILESDIR}"/${P}-java-autoconf.patch
67 71
)
68 72

  
69 73
QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
......
85 89
	# gettext-0.21.1-java-autoconf.patch changes
86 90
	# gettext-{runtime,tools}/configure.ac and the corresponding
87 91
	# configure scripts. Avoid regenerating other autotools output.
88
	touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
89

  
92
	#touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
90 93
	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
91
	touch -c configure || die
94
	#touch -c configure || die
92 95

  
93 96
	elibtoolize
94 97

  
......
130 133
		$(use_enable nls)
131 134
		$(use_enable openmp)
132 135
		$(use_enable static-libs static)
136
		$(use_enable xattr attr)
133 137
	)
134 138

  
135 139
	local ECONF_SOURCE="${S}"
......
145 149
	emake DESTDIR="${D}" install
146 150

  
147 151
	if multilib_is_native_abi ; then
148
		dosym msgfmt /usr/bin/gmsgfmt #43435
152
		dosym msgfmt /usr/bin/gmsgfmt # bug #43435
149 153
		dobin gettext-tools/misc/gettextize
150 154
	fi
155

  
156
	# 909041 never install libintl which upstream insists on building
157
	rm -f "${ED}"/usr/$(get_libdir)/libintl.* "${ED}"/usr/include/libintl.h
151 158
}
152 159

  
153 160
multilib_src_install_all() {
Thank you!