From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 591E9139694 for ; Thu, 3 Aug 2017 20:21:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7DF61FC040; Thu, 3 Aug 2017 20:20:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73A481FC040 for ; Thu, 3 Aug 2017 20:20:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD1173418CE for ; Thu, 3 Aug 2017 20:20:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73DD27491 for ; Thu, 3 Aug 2017 20:20:56 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1501791645.41abe76b06e50552be388dd2b27582bceaea965c.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/recode/files/, app-text/recode/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/recode/Manifest app-text/recode/files/recode-3.6-as-if.patch app-text/recode/files/recode-3.6-gettextfix.diff app-text/recode/recode-3.6_p20-r1.ebuild X-VCS-Directories: app-text/recode/files/ app-text/recode/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 41abe76b06e50552be388dd2b27582bceaea965c X-VCS-Branch: master Date: Thu, 3 Aug 2017 20:20:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: acd4cec7-16e5-43f8-964d-6f62d50c4275 X-Archives-Hash: 07093a367bf033dbded11e937a5b328b commit: 41abe76b06e50552be388dd2b27582bceaea965c Author: Patrice Clement gentoo org> AuthorDate: Thu Aug 3 20:20:45 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Thu Aug 3 20:20:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41abe76b app-text/recode: clean up old. Package-Manager: Portage-2.3.6, Repoman-2.3.1 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 deletions(-) diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest index cbb6d515936..2a33126e724 100644 --- a/app-text/recode/Manifest +++ b/app-text/recode/Manifest @@ -1,3 +1 @@ -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 deleted file mode 100644 index c7bcc27c875..00000000000 --- a/app-text/recode/files/recode-3.6-as-if.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 3b7eb8ba20e..00000000000 --- a/app-text/recode/files/recode-3.6-gettextfix.diff +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 7b6e7af72bc..00000000000 --- a/app-text/recode/recode-3.6_p20-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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 ' 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 -}