commit: f11b310bc673e371cae597450ebd0c706563555b 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:07:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11b310b
sys-devel/gettext: Removed old Closes: https://bugs.gentoo.org/717478 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 -}
