[gentoo-commits] repo/gentoo:master commit in: app-text/xindy/files/, app-text/xindy/

[gentoo-commits] repo/gentoo:master commit in: app-text/xindy/files/, app-text/xindy/

[Ulrich Müller]

commit:     024796580d4fb4e2e41cde0c1ffe503999632f70
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 19:43:13 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 19:44:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02479658

app-text/xindy: Fix build of latin.xdy file.

Non-maintainer commit with permission from dilfridge.

Bug: 573794

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/xindy/files/xindy-2.4-nogrep.patch | 13 +++++++++
 app-text/xindy/xindy-2.4-r1.ebuild          | 42 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/app-text/xindy/files/xindy-2.4-nogrep.patch b/app-text/xindy/files/xindy-2.4-nogrep.patch
new file mode 100644
index 00000000..41f1b3a
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-nogrep.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/573794
+
+--- xindy-2.4-orig/make-rules/inputenc/Makefile.am
++++ xindy-2.4/make-rules/inputenc/Makefile.am
+@@ -43,7 +43,7 @@
+ latin.xdy : latin1.xdy latin2.xdy latin3.xdy
+ 	echo ';; Generated from latin?.xdy' >latin.xdy
+ 	echo >>latin.xdy
+-	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
++	sort -u latin?.xdy | sed '/^;/d' >>latin.xdy
+ 
+ %.xdy %.idx :
+ 	$(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex

diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
new file mode 100644
index 00000000..2a44636
--- /dev/null
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="A Flexible Indexing System"
+HOMEPAGE="http://www.xindy.org/"
+SRC_URI="http://www.xindy.org/xindy-2.4.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/latex-base
+	dev-texlive/texlive-fontsrecommended
+	>=dev-lisp/clisp-2.44.1-r1
+	dev-texlive/texlive-langcyrillic"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/flex"
+
+PATCHES=("${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-locale.patch
+	"${FILESDIR}"/${P}-nogrep.patch)
+DOCS=(AUTHORS ChangeLog.Gour NEWS README)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc docs)
+}
+
+src_compile() {
+	VARTEXFONTS="${T}/fonts" emake
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/xindy/files/, app-text/xindy/

[Alexis Ballier]

commit:     e57cd89dc7ec98ef47421f4d22bf0f6a0e560923
Author:     Martin Väth <martin <AT> mvath <DOT> de>
AuthorDate: Sun Jun 25 18:10:17 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 09:21:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57cd89d

app-text/xindy: Fix building with perl-5.26, #622702

 app-text/xindy/files/xindy-2.4-perl5.26.patch | 11 +++++++++++
 app-text/xindy/xindy-2.4-r1.ebuild            |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-text/xindy/files/xindy-2.4-perl5.26.patch b/app-text/xindy/files/xindy-2.4-perl5.26.patch
new file mode 100644
index 00000000000..657b5e94c36
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-perl5.26.patch
@@ -0,0 +1,11 @@
+--- xindy-2.4/make-rules/inputenc/make-inp-rules.pl
++++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl
+@@ -8,7 +8,7 @@
+ 
+ 
+ while (<STDIN>) {
+-  if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
++  if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
+     if (!($1 =~ /inputenc Error/)) {
+       $i = hex($2);
+       $macro = $1;

diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index d85f229fad3..4575091c563 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=("${FILESDIR}"/${P}-configure.patch
 	"${FILESDIR}"/${P}-locale.patch
-	"${FILESDIR}"/${P}-nogrep.patch)
+	"${FILESDIR}"/${P}-nogrep.patch
+	"${FILESDIR}"/${P}-perl5.26.patch)
 DOCS=(AUTHORS ChangeLog.Gour NEWS README)
 
 src_prepare() {