diff options
author | 2016-09-02 20:38:36 +0200 | |
---|---|---|
committer | 2016-09-02 20:38:36 +0200 | |
commit | 8b927525a2eed81c7dc2e8a2cbe03dc7f008e19d (patch) | |
tree | fd1e11ef55b5e453b3fcd00273f2e3f4dbbab573 /app-text/recode | |
parent | dev-libs/libgcrypt: copy from gentoo repository to fix WANT_AUTOMAKE (diff) | |
download | mv-8b927525a2eed81c7dc2e8a2cbe03dc7f008e19d.tar.gz mv-8b927525a2eed81c7dc2e8a2cbe03dc7f008e19d.tar.bz2 mv-8b927525a2eed81c7dc2e8a2cbe03dc7f008e19d.zip |
app-text/recode: Copy from gentoo repository to fix WANT_AUTOMAKE
Diffstat (limited to 'app-text/recode')
-rw-r--r-- | app-text/recode/Manifest | 2 | ||||
-rw-r--r-- | app-text/recode/files/recode-3.6-as-if.patch | 19 | ||||
-rw-r--r-- | app-text/recode/files/recode-3.6-gettextfix.diff | 23 | ||||
-rw-r--r-- | app-text/recode/metadata.xml | 8 | ||||
-rw-r--r-- | app-text/recode/recode-3.6_p20-r1.ebuild | 71 |
5 files changed, 123 insertions, 0 deletions
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest new file mode 100644 index 00000000..8c08628e --- /dev/null +++ b/app-text/recode/Manifest @@ -0,0 +1,2 @@ +DIST recode-3.6.tar.gz 1751886 SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf +DIST recode_3.6-20.debian.tar.gz 341117 SHA256 ec0e25d91a8d5e4a61e8e2876c338ae6c1ba89018f02ff1ee4eb01cb7c44e7ee 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 00000000..c7bcc27c --- /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 00000000..3b7eb8ba --- /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/metadata.xml b/app-text/recode/metadata.xml new file mode 100644 index 00000000..3e927f8d --- /dev/null +++ b/app-text/recode/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>shell-tools@gentoo.org</email> + <name>Gentoo Shell Tools Project</name> + </maintainer> +</pkgmetadata> 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 00000000..96d17a24 --- /dev/null +++ b/app-text/recode/recode-3.6_p20-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# WANT_AUTOMAKE="1.11" # bug 419455 + +inherit autotools 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 ~x86-interix ~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 + eapply "${FILESDIR}/${MY_P}-gettextfix.diff" + eapply "${FILESDIR}"/${MY_P}-as-if.patch + eapply "${WORKDIR}"/debian/patches/* + sed -i '1i#include <stdlib.h>' src/argmatch.c || die + + # Avoid WANT_AUTOMAKE="1.11" (bug 419455): + sed -i -e '/^AM_C_PROTOTYPES/d' configure.in || die + sed -i -e 's/ansi2knr//' src/Makefile.am || die + + # Remove old libtool macros + rm "${S}"/acinclude.m4 || die + + mv configure.in configure.ac || die + + eapply_user + 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 +} |