gentoo resync : 14.07.2018

6 files changed, 163 insertions, 0 deletions

diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
new file mode 100644
index 000000000000..2b49cecfac06
--- /dev/null
+++ b/app-text/recode/Manifest
@@ -0,0 +1,8 @@
+AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
+AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
+DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
+DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
+DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
+EBUILD recode-3.6_p20-r1.ebuild 1667 BLAKE2B 7fde7a6da18f666a3711a13235b118c0f9e4962acfcbfd130dec412af8610eab9c6350378dbd6bac32c45c0d133761be4b08ae171b0d96a253cd0fa0b55d2583 SHA512 73b11ba7aa86643856d0b2cef8ddcae846108bbd38ab59e3eb779b7846b7afd5552370a653965f1d25ca32d97ba6461b37ece56b4d92b4c45e97fd6b5d6879b4
+EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
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 000000000000..c7bcc27c8750
--- /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 000000000000..3b7eb8ba20e6
--- /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 000000000000..3e927f8d7480
--- /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 000000000000..9444428a270b
--- /dev/null
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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="https://github.com/rrthomas/recode"
+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 -v {} + || die
+}
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
new file mode 100644
index 000000000000..a6c2e5b129fe
--- /dev/null
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
+SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
+
+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 )"
+
+S="${WORKDIR}/Recode-${REV}"
+
+# tests fail.
+RESTRICT="test"
+
+src_configure() {
+	tc-export CC LD
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -v {} + || die
+}