From f32d6a9ca2663e906433d1cd5c23c0f60a4c24d0 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 16 May 2020 10:39:13 -0400 Subject: app-i18n/enca: add slot-operator to app-text/recode dep Signed-off-by: Mike Gilbert --- app-i18n/enca/enca-1.19-r1.ebuild | 82 --------------------------------------- app-i18n/enca/enca-1.19-r2.ebuild | 82 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 app-i18n/enca/enca-1.19-r1.ebuild create mode 100644 app-i18n/enca/enca-1.19-r2.ebuild (limited to 'app-i18n/enca') diff --git a/app-i18n/enca/enca-1.19-r1.ebuild b/app-i18n/enca/enca-1.19-r1.ebuild deleted file mode 100644 index 4344574406c0..000000000000 --- a/app-i18n/enca/enca-1.19-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic ltprune multilib-minimal toolchain-funcs - -DESCRIPTION="Detect and convert encoding of text files" -HOMEPAGE="https://cihar.com/software/enca/" -SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc +iconv recode static-libs" - -RDEPEND=" - iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - recode? ( app-text/recode[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( dev-util/gtk-doc ) -" - -pkg_pretend() { - if tc-is-cross-compiler && use iconv; then - die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220." - fi -} - -src_prepare() { - default_src_prepare - - # Disable unconditional documentation build. - sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - # Workaround GCC-4.8 brokenness. See Gentoo bug 501386. - if tc-is-gcc && [[ $(gcc-version) == "4.8" ]]; then - replace-flags -O[3-9] -O2 - fi - - local myeconfargs=( - --enable-external - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - $(use_with iconv libiconv-prefix "${EPREFIX}/usr") - $(use_with recode librecode "${EPREFIX}/usr") - ) - - # Workaround automagic virtual/libiconv dependency. - use iconv || export am_cv_func_iconv=no - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - # Workaround cross compilation issues. See Gentoo bug 424473. - tc-is-cross-compiler && tc-env_build emake -e -C tools - - if ! multilib_is_native_abi; then - emake -C lib - else - emake - use doc && emake -C devel-docs docs - fi -} - -multilib_src_install() { - if ! multilib_is_native_abi; then - emake -C lib DESTDIR="${D}" install - emake DESTDIR="${D}" install-pkgconfigDATA - else - emake DESTDIR="${D}" install - use doc && emake -C devel-docs DESTDIR="${D}" install - fi - prune_libtool_files -} diff --git a/app-i18n/enca/enca-1.19-r2.ebuild b/app-i18n/enca/enca-1.19-r2.ebuild new file mode 100644 index 000000000000..b810849245fc --- /dev/null +++ b/app-i18n/enca/enca-1.19-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic ltprune multilib-minimal toolchain-funcs + +DESCRIPTION="Detect and convert encoding of text files" +HOMEPAGE="https://cihar.com/software/enca/" +SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="doc +iconv recode static-libs" + +RDEPEND=" + iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) + recode? ( app-text/recode:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + sys-devel/gettext + doc? ( dev-util/gtk-doc ) +" + +pkg_pretend() { + if tc-is-cross-compiler && use iconv; then + die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220." + fi +} + +src_prepare() { + default_src_prepare + + # Disable unconditional documentation build. + sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + # Workaround GCC-4.8 brokenness. See Gentoo bug 501386. + if tc-is-gcc && [[ $(gcc-version) == "4.8" ]]; then + replace-flags -O[3-9] -O2 + fi + + local myeconfargs=( + --enable-external + $(use_enable doc gtk-doc) + $(use_enable static-libs static) + $(use_with iconv libiconv-prefix "${EPREFIX}/usr") + $(use_with recode librecode "${EPREFIX}/usr") + ) + + # Workaround automagic virtual/libiconv dependency. + use iconv || export am_cv_func_iconv=no + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + # Workaround cross compilation issues. See Gentoo bug 424473. + tc-is-cross-compiler && tc-env_build emake -e -C tools + + if ! multilib_is_native_abi; then + emake -C lib + else + emake + use doc && emake -C devel-docs docs + fi +} + +multilib_src_install() { + if ! multilib_is_native_abi; then + emake -C lib DESTDIR="${D}" install + emake DESTDIR="${D}" install-pkgconfigDATA + else + emake DESTDIR="${D}" install + use doc && emake -C devel-docs DESTDIR="${D}" install + fi + prune_libtool_files +} -- cgit v1.2.3-65-gdbad