commit: c12f5e503c32f54f57e04eab0dd7547d2d2de6b1 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Thu Aug 3 21:09:56 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Thu Aug 3 21:10:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12f5e50
app-text/recode: revert 41abe76b06e50552be388dd2b27582bceaea965c. Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --force app-text/recode/Manifest | 2 + app-text/recode/files/recode-3.6-as-if.patch | 19 +++++++ app-text/recode/files/recode-3.6-gettextfix.diff | 23 +++++++++ app-text/recode/recode-3.6_p20-r1.ebuild | 65 ++++++++++++++++++++++++ 4 files changed, 109 insertions(+) diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest index 2a33126e724..cbb6d515936 100644 --- a/app-text/recode/Manifest +++ b/app-text/recode/Manifest @@ -1 +1,3 @@ +DIST recode-3.6.tar.gz 1751886 SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b WHIRLPOOL 08eef3eea75d1898800d9f18eec95f50706b4e75285ce22e71723069f7e2a07ee762693c8366e5139add65b319276ced71b6f046884c1e75eb89a3922b7f3dab DIST recode-3.7_pre20140303.zip 1902903 SHA256 baba145f8c8aa7ba223419dadc942f2182450925283c1067fa16f87b3a9b3857 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de WHIRLPOOL 19290f675cacc30ee51f198d765d27af9d03d7a6e0f048b1f14b812f7cf11533a542dbd1bc13c61037ae327a5b5693e07a5bd9b1aa3d244266f2f658ca378dfd +DIST recode_3.6-20.debian.tar.gz 341117 SHA256 ec0e25d91a8d5e4a61e8e2876c338ae6c1ba89018f02ff1ee4eb01cb7c44e7ee SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef WHIRLPOOL 72f00b3d6732b8794456795d847dbb2114c2577b8d5c9683c8fcb41d3bd92548322dc9d73d38af3a4811fb531d9482d1a5d37ee6600cf281bed4ceb6e794b058 diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch new file mode 100644 index 00000000000..c7bcc27c875 --- /dev/null +++ b/app-text/recode/files/recode-3.6-as-if.patch @@ -0,0 +1,19 @@ +http://bugs.gentoo.org/283029 + +--- a/m4/flex.m4 ++++ b/m4/flex.m4 +@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX + dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT + AC_DEFUN(ad_AC_PROG_FLEX, + [AC_CHECK_PROGS(LEX, flex, missing) +-if test "$LEX" = missing; then ++AS_IF([test "$LEX" = missing], [dnl + LEX="\$(top_srcdir)/$ac_aux_dir/missing flex" + LEX_OUTPUT_ROOT=lex.yy + AC_SUBST(LEX_OUTPUT_ROOT)dnl +-else ++], [: + AC_PROG_LEX + AC_DECL_YYTEXT +-fi]) ++])]) diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff new file mode 100644 index 00000000000..3b7eb8ba20e --- /dev/null +++ b/app-text/recode/files/recode-3.6-gettextfix.diff @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/239372 + +patch by Dmitry Karasik + +--- recode-3.6/m4/gettext.m4 ++++ recode-3.6/m4/gettext.m4 +@@ -109,12 +109,12 @@ + else + ac_items="$LINGUAS" + for ac_item in $ac_items; do +- case "$ALL_LINGUAS" in +- *$ac_item*) ++ for supported_item in $ALL_LINGUAS; do ++ if test "$ac_item" = "$supported_item"; then + ac_print="$ac_print $ac_item" + MOFILES="$MOFILES $ac_item.mo" +- ;; +- esac ++ fi ++ done + done + fi + AC_SUBST(MOFILES) diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild new file mode 100644 index 00000000000..7b6e7af72bc --- /dev/null +++ b/app-text/recode/recode-3.6_p20-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +WANT_AUTOMAKE="1.11" # bug 419455 + +inherit autotools eutils flag-o-matic libtool toolchain-funcs multilib-minimal + +MY_P=${P%_*} +MY_PV=${PV%_*} +DEB_PATCH=${PV#*p} + +DESCRIPTION="Convert files between various character sets" +HOMEPAGE="http://recode.progiciels-bpi.ca/"; +SRC_URI=" + mirror://gnu/${PN}/${MY_P}.tar.gz + mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls static-libs" + +DEPEND=" + sys-devel/flex + nls? ( sys-devel/gettext )" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + # fix #571106 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + + rm "${WORKDIR}"/debian/patches/series || die + epatch \ + "${FILESDIR}/${MY_P}-gettextfix.diff" \ + "${FILESDIR}"/${MY_P}-as-if.patch \ + "${WORKDIR}"/debian/patches/* + sed -i '1i#include <stdlib.h>' src/argmatch.c || die + + # Remove old libtool macros + rm "${S}"/acinclude.m4 || die + + eautoreconf + elibtoolize +} + +multilib_src_configure() { + # on solaris -lintl is needed to compile + [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl" + # --without-included-gettext means we always use system headers + # and library + ECONF_SOURCE="${S}" econf \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -exec rm -f {} + || die + rm -f "${ED}"/usr/lib/charset.alias || die +}
