[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/

[Andreas K. Hüttel]

commit:     0771146ab79d6c98adad0628c17fa0759528fe5b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 12:18:21 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 12:18:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0771146a

sys-apps/texinfo: remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-apps/texinfo/Manifest                          |  1 -
 .../files/texinfo-6.5-escape-braces-in-regex.patch | 28 -------------
 ...texinfo-6.5-perl-5.28-thread-safe-locales.patch | 37 -----------------
 sys-apps/texinfo/metadata.xml                      |  1 -
 sys-apps/texinfo/texinfo-6.5-r1.ebuild             | 47 ----------------------
 sys-apps/texinfo/texinfo-6.6-r2.ebuild             | 47 ----------------------
 6 files changed, 161 deletions(-)

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 02d330863d3..ea91c7c2989 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,2 @@
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
-DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0

diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
deleted file mode 100644
index 72f1288393a..00000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@×××××.com>
-Date: Fri, 13 Jul 2018 15:31:28 +0000
-Subject: [PATCH] escape braces in regex
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007 39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
-index ba1cd423d..b5eece680 100644
---- a/tp/Texinfo/Parser.pm
-+++ b/tp/Texinfo/Parser.pm
-@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command($$$$)
-     }
-   } elsif ($command eq 'clickstyle') {
-     # REMACRO
--    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
-+    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
-       $args = ['@'.$1];
-       $self->{'clickstyle'} = $1;
-       $remaining = $line;
--      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-+      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-       $has_comment = 1 if (defined($4));
-     } else {
-       $self->line_error (sprintf($self->__(
--- 
-2.20.1
-

diff --git a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
deleted file mode 100644
index 2d33abe78c7..00000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@×××××.com>
-Date: Fri, 13 Jul 2018 15:39:29 +0000
-Subject: [PATCH] perl 5.28 thread-safe locales
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008 39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c
-index 51eea4a30..f2d6d1ccd 100644
---- a/tp/Texinfo/Convert/XSParagraph/xspara.c
-+++ b/tp/Texinfo/Convert/XSParagraph/xspara.c
-@@ -248,6 +248,11 @@ xspara_init (void)
- 
-   dTHX;
- 
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+  /* needed due to thread-safe locale handling in newer perls */
-+  switch_to_global_locale();
-+#endif
-+
-   if (setlocale (LC_CTYPE, "en_US.UTF-8")
-       || setlocale (LC_CTYPE, "en_US.utf8"))
-     goto success;
-@@ -320,6 +325,10 @@ failure:
-     {
- success: ;
-       free (utf8_locale);
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+      /* needed due to thread-safe locale handling in newer perls */
-+      sync_locale();
-+#endif
-       /*
-       fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
-       fprintf (stderr, "character encoding is: %s\n",
--- 
-2.20.1
-

diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index c939b6a3e97..b4920fb24a2 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -10,7 +10,6 @@
 	<name>Gentoo Perl Project</name>
 </maintainer>
 <use>
-	<flag name="xs">Build Perl modules with embedded C code for speed; requires rebuilds on Perl update</flag>
 	<flag name="standalone">Build standalone version that survives all Portage bugs</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/texinfo/texinfo-6.5-r1.ebuild b/sys-apps/texinfo/texinfo-6.5-r1.ebuild
deleted file mode 100644
index fb321453e23..00000000000
--- a/sys-apps/texinfo/texinfo-6.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="nls static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Unicode-EastAsianWidth
-	dev-perl/Text-Unidecode
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-escape-braces-in-regex.patch
-	"${FILESDIR}/${P}"-perl-5.28-thread-safe-locales.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-external-libintl-perl
-		--with-external-Unicode-EastAsianWidth
-		--with-external-Text-Unidecode
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/texinfo/texinfo-6.6-r2.ebuild b/sys-apps/texinfo/texinfo-6.6-r2.ebuild
deleted file mode 100644
index d142edb1221..00000000000
--- a/sys-apps/texinfo/texinfo-6.6-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="nls static xs"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	xs?  ( dev-lang/perl:= )
-	!xs? ( dev-lang/perl )
-	dev-perl/libintl-perl
-	dev-perl/Unicode-EastAsianWidth
-	dev-perl/Text-Unidecode
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19.6 )"
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-external-libintl-perl
-		--with-external-Unicode-EastAsianWidth
-		--with-external-Text-Unidecode
-		$(use_enable nls)
-		$(use_enable xs perl-xs)
-	)
-	econf "${myeconfargs[@]}"
-}