From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- sys-devel/gettext/Manifest | 5 +- .../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 +++ sys-devel/gettext/gettext-0.20.1.ebuild | 4 +- sys-devel/gettext/gettext-0.21_rc1.ebuild | 156 +++++++++++++++++++++ 4 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch create mode 100644 sys-devel/gettext/gettext-0.21_rc1.ebuild (limited to 'sys-devel/gettext') diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index c5fa7c33a3eb..ced938f82440 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -2,8 +2,11 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5 AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8 AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64a29d32ea37b60d87b6a62b90176f64c34fd2a6a2549a47c42d4409cfb26de1b42136d740794d7059f7fce1cf67067104980 SHA512 9f765f34e68b887242d1b727ac36dc8f91ee50a6a0920c2f0697fd3c0d2369cc470e728612441f6cf4b9274ad737d985e3e69aa006adcae21a61a664eea2af38 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942 +AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 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 EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79 -EBUILD gettext-0.20.1.ebuild 4057 BLAKE2B 8d8dc78dd911f0d7881d4903b488adf265796ec980c30c24e66479dc867119e2ab78f3eda2636621e7eef84adad2bb41a884937b7fc956663b8093dcfb12e42e SHA512 45ecf89cbbf98d72e4fa82859fbf36c588505acf1b5ab67f262486226d4001d74d46e5356e1f5ad0afea5a815803f45bef25af1060379c38e286887f17d21afb +EBUILD gettext-0.20.1.ebuild 4060 BLAKE2B 0c10e36f77f0c6746ed86d663a8211dcaa59aee0227d5a243248990ae269768ae97a45cc6d6dffc648c513d574e42392138d617fa6d71ea452e5a0909524fb3d SHA512 47cd205896fed3ae9abe47c160cf0b26e20140e2a0ea1505042c9764bbaa23976c871ad6d588f939deeabbe4e285c64915b9548f849659427d8168c7326da3fb +EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507 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.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild index fb8b5c7d444d..81ad0c6242a1 100644 --- a/sys-devel/gettext/gettext-0.20.1.ebuild +++ b/sys-devel/gettext/gettext-0.20.1.ebuild @@ -15,7 +15,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86" +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 @@ -132,7 +132,7 @@ multilib_src_install_all() { 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}/javadoc2 + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 fi fi 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 000000000000..286653708ac9 --- /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 +} -- cgit v1.2.3