bump(sys-devel/gettext): sync with upstream

This commit is contained in:
David Michael 2017-12-19 21:11:45 -05:00
parent 717ab9227b
commit b60b53faa9
12 changed files with 156 additions and 1549 deletions

View File

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170422 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=GNU locale utilities
EAPI=4
HOMEPAGE=https://www.gnu.org/software/gettext/
IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3+ LGPL-2.1+
PDEPEND=emacs? ( app-emacs/po-mode )
RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=6e7d216d38f3664ab5cd86880ac8c005

View File

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170422 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=GNU locale utilities
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gettext/
IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
PDEPEND=emacs? ( app-emacs/po-mode )
RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=mirror://gnu/gettext/gettext-0.19.6.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=5711970f10485ada024f9a1758578dfc

View File

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170422 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=GNU locale utilities
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gettext/
IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
PDEPEND=emacs? ( app-emacs/po-mode )
RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=mirror://gnu/gettext/gettext-0.19.7.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=5711970f10485ada024f9a1758578dfc

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=GNU locale utilities
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gettext/
IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
PDEPEND=emacs? ( app-emacs/po-mode )
RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx e99babeaa7d98c1caaa6a61a79902210 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=b4663c5b206f56ba2d517935832b4f06

View File

@ -1,186 +0,0 @@
# ChangeLog for sys-devel/gettext
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*gettext-0.19.5.1 (09 Aug 2015)
*gettext-0.19.5 (09 Aug 2015)
*gettext-0.19.4 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +gettext-0.19.4.ebuild,
+gettext-0.19.5.ebuild, +gettext-0.19.5.1.ebuild, +metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Justin Lecher <jlec@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1.ebuild:
Use https for most gnu.org URLs
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
*gettext-0.19.5.1-r1 (27 Aug 2015)
27 Aug 2015; Mike Frysinger <vapier@gentoo.org>
+files/gettext-0.19.5.1-version-hack.patch, -gettext-0.19.5.1.ebuild,
+gettext-0.19.5.1-r1.ebuild:
hack gettextize configure output #556024
Until upstream sorts out a fix for us, hack the output in a terrible
way so packages stop failing. This seems to be less terrible than
just masking the new version.
*gettext-0.19.6 (11 Sep 2015)
11 Sep 2015; Lars Wendler <polynomial-c@gentoo.org> +gettext-0.19.6.ebuild:
Bump to version 0.19.6
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
fix LICENSE setting to reflect source
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
drop old acl workaround for cross-compilers #333887
The new release has happened and all these versions include corrected
code with acl compile tests (they assume yes when cross-compiling).
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
drop unused flag-o-matic/multilib inherits
These were added a while ago for OS X/prefix, but when the code using
them was deleted (also years ago), the inherits weren't dropped.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
fix mono/java eclass interaction w/pkg_setup
Both of these eclasses export pkg_setup, but gettext doesn't, so only
one of them ends up being run. Make sure we explicitly execute both.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
drop old emul-linux-x86-baselibs logic
These packages were dropped from the tree a while ago, and they're masked
now entirely in the profile, so drop them to simplify things a bit.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.4.ebuild,
gettext-0.19.5.ebuild, gettext-0.19.5.1-r1.ebuild, gettext-0.19.6.ebuild:
sort IUSE properly
*gettext-0.19.6-r1 (13 Oct 2015)
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> +gettext-0.19.6-r1.ebuild:
bump EAPI to use subslots on libs #562584
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.6-r1.ebuild:
switch C++ disabling to new configure flag
Rather than clobber CXX ourselves, use the new --disable-c++ flag.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.6-r1.ebuild:
simplify configure flag setup slightly
We don't really need to omit these flags when building the shared libs,
so move them all into one common block to simplify the code a bit.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.6-r1.ebuild:
respect USE=nls all the time
Building of the libiconv library is orthogonal to general nls support,
so respect that configure flag for all builds and not just the system
libiconv cases.
13 Oct 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.6-r1.ebuild:
dev-libs/libiconv: split out from gettext
The gettext ebuild is big and fat and full of tools/deps that are
independent of libintl. Since slimming that down with USE flags
gets ugly fast (it provides multiple libs in addition to tools),
just create a dedicated libintl package.
24 Nov 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml:
standardize various metadata.xml style
*gettext-0.19.7 (28 Dec 2015)
28 Dec 2015; Lars Wendler <polynomial-c@gentoo.org> +gettext-0.19.7.ebuild:
Bump to version 0.19.7
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
28 Dec 2015; Lars Wendler <polynomial-c@gentoo.org>
-files/gettext-0.19.5.1-version-hack.patch, -gettext-0.19.5.ebuild,
-gettext-0.19.5.1-r1.ebuild, -gettext-0.19.6.ebuild:
Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Unify quoting in metadata.xml files for machine processing
Force unified quoting in all metadata.xml files since lxml does not
preserve original use of single and double quotes. Ensuring unified
quoting before the process allows distinguishing the GLEP 67-related
metadata.xml changes from unrelated quoting changes.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)

View File

@ -1,9 +1 @@
DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
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
EBUILD gettext-0.19.4.ebuild 3347 SHA256 1c8c2822a874d0e2d55d89fd7de34c3c4f57d519159dead64b270dfa2eb16b74 SHA512 43dd0da0a21da08c378a4f8c5cee037012043ebb897de785020e144f22cfbdc0bb5bbc2735b50bdd5c9056fd029b452c2add7f4aabc6e765e1a504446af61e81 WHIRLPOOL 5c7e1225893630af064c6ed774725c1e0e1cbda4bbcc84ad36321145a8348f69c232b26e0e7255b86d5049b81458b81084cdc79cb1203f7ec5ea109b35d2ff66
EBUILD gettext-0.19.6-r1.ebuild 3515 SHA256 00f49c583c23ac50f5152b7712bd786e8f127018a9e96fc843aa0ab3826a330c SHA512 b11b40d70c3a2f6eb825976a54bc61e8df31e5eef1d389ed0215a9266a59864f6ec4fdc5de9b41fd3101c9bc90fad5a8f6729cc594ba8adf1881611c18b72b90 WHIRLPOOL 46431e7b2f2c29d65b1440327113dbe20596819a91f0bc47817232ffff783180bd4db92dbf6ad0770d85109def1d81dd28df251e0380ad84abfbac9e7b096149
EBUILD gettext-0.19.7.ebuild 3515 SHA256 00f49c583c23ac50f5152b7712bd786e8f127018a9e96fc843aa0ab3826a330c SHA512 b11b40d70c3a2f6eb825976a54bc61e8df31e5eef1d389ed0215a9266a59864f6ec4fdc5de9b41fd3101c9bc90fad5a8f6729cc594ba8adf1881611c18b72b90 WHIRLPOOL 46431e7b2f2c29d65b1440327113dbe20596819a91f0bc47817232ffff783180bd4db92dbf6ad0770d85109def1d81dd28df251e0380ad84abfbac9e7b096149
MISC ChangeLog 7364 SHA256 e80e2e5b13ba7e08f5be5970f42621c6eef18eb91ed35595310f23be91c37686 SHA512 dcb863fdfa4af608196894f389601e1f360724d9d08dd65f96508864f6504c77df70e488d870cb78072b8b5bf04a8107fdbd304654f9d4e48cfc788cd0ab5e9b WHIRLPOOL affc7c730b8a99629142388420afadb508a0d2ff385d83f0e184caeef9595ee266490de061d24005559a6e03837b90396a2862fe4b053c30cb695edc0d65bd2b
MISC ChangeLog-2015 36817 SHA256 037bc77bf0a97f45bde0a74b220a43048fa9c99d78c709e504b1822833a9abc2 SHA512 80e6e8120717bbe49b2a267887b425f4c3d00d97d4b0c509511181d5d2069727155bc1003423d0657b639c09438d8b4118beb2f9262fd4ad02761e947fe3f222 WHIRLPOOL 4f3fdbfe933b7f8d3669a94c2a676c675fae6596870f1cbc712871a5de90777a1f325101751d110298d8b3c879ed17bc4cecb66bd77c55a39d0674cb89c267af
MISC metadata.xml 630 SHA256 5e5aecc7a7c777f2bb2a3137d66e48218fa979965d59250af1cdb3b0cf8e161d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507 WHIRLPOOL 095b6f0c61a74e9bcbc07b541e69d001e1d96a922bf8b5bc6afc00048dcee51442d7c36c782fd8efa0c48cf1519bccea640372dab06aa259ab7c50cd1f8f547b
DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1

View File

@ -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=

View File

@ -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

View File

@ -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
}

View File

@ -1,133 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Note: Keep version bumps in sync with dev-libs/libintl.
EAPI="5"
inherit eutils 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
# only runtime goes multilib
# 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:=
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
)
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}"
# 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
$(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 "${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
}

View File

@ -1,12 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Note: Keep version bumps in sync with dev-libs/libintl.
EAPI="5"
inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
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/"
@ -16,20 +15,23 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
# 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
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"
# 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:=
>=dev-libs/libxml2-2.9.3:=
dev-libs/expat
acl? ( virtual/acl )
ncurses? ( sys-libs/ncurses:0= )
java? ( >=virtual/jdk-1.4 )"
java? ( >=virtual/jdk-1.4:= )"
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
@ -49,6 +51,9 @@ 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
}
@ -57,7 +62,7 @@ multilib_src_configure() {
local myconf=(
# switches common to runtime and top-level
--cache-file="${BUILD_DIR}"/config.cache
--docdir="/usr/share/doc/${PF}"
--docdir="\$(datarootdir)/doc/${PF}"
# Emacs support is now in a separate package
--without-emacs
@ -71,6 +76,8 @@ multilib_src_configure() {
--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++)
@ -103,27 +110,27 @@ multilib_src_install() {
}
multilib_src_install_all() {
use nls || rm -r "${D}"/usr/share/locale
use nls || rm -r "${ED}"/usr/share/locale
use static-libs || prune_libtool_files --all
rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/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
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 "${D}"/usr/share/doc/${PF}/javadoc2
rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
fi
fi
if use doc ; then
dohtml "${D}"/usr/share/doc/${PF}/*.html
dohtml "${ED}"/usr/share/doc/${PF}/*.html
else
rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
fi
rm -f "${D}"/usr/share/doc/${PF}/*.html
rm -f "${ED}"/usr/share/doc/${PF}/*.html
dodoc AUTHORS ChangeLog NEWS README THANKS
}