gentoo resync : 23.12.2017

8 files changed, 38 insertions, 47 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9ce39a371d2c..dd374c48ab0b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index fe7b041913a4..bed32a8baa45 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -5,5 +5,5 @@ DIST atril-1.18.0.tar.xz 1688144 BLAKE2B 73457c22f8742db4a075a477190eeb57967c98a
 EBUILD atril-1.12.2-r4.ebuild 2331 BLAKE2B 7d360aa43a0a549ae7117c6c97f882fe4d80022f8884f8eb5cea6593683d982c410a58728a9367e4d57a3a3fcac247adac875458f688325b7c9e8f658ccbf044 SHA512 897bc693606b157ab17b9a1f56b3a26e3a3d69b0bca0f8d0ebec5af5a0777acfe8dd60457090ae2d1fe04280b9a455e8c92c669fe2afa74b0045ace60a8a6eb4
 EBUILD atril-1.14.2-r1.ebuild 2373 BLAKE2B 9cc6e82f3ab2b401676b61db4bf68db89ee7082b445c3a1c60ec026d8d6b3f6079f50cfcf444e2a2a86a360b8578ece4da872fcc503eac44ecbbd3afa0235c1e SHA512 f10dac5113a74cee27f28f47ae59e850a9331755864016cf35a24fe3ddcea84a7e6ce2d24bbc8237d2b4745afc1fd4616f5f8d0df9c6bd5aa1cc2c36fa5b4625
 EBUILD atril-1.16.1-r1.ebuild 2310 BLAKE2B 9afe9abf863f41048a9c22c750fd5328f00ff669c25c1365b968b63a059d4909b9a4beb15273586fe4aca1956165ae00853090e9f9d827be351e3f11c930a9fa SHA512 61d811ce7d246b8e962dfd60a710da7a5f08ad17bb532a0396f1206599918e0eb89ec7675032fc1a3bdb72724073feb80d35875e7215636fc8d22abff43fb188
-EBUILD atril-1.18.0.ebuild 2162 BLAKE2B bb28f49c88f5b307d2e039ee8af24bf08b44fd7c79a059ad5e70496d6e2e82059e24328a7e63b0bda820d8681220dc25a600084fdaf48c7ec03b84d9b42a0103 SHA512 813b95f5230e292164c658147e961b6cc2eb5ab80ad63643fa06fcc6bd9092750f4af45b8de4c85965b704740ec8e138cee25185296d8aa5156dca58f96212a8
+EBUILD atril-1.18.0.ebuild 2169 BLAKE2B 3caa9aaca3f81ab3d1bf63459d73b8da16eafd9378c99665e916afb6e098dd34c1aa25d9f32887b7c5e03d2e4a534c2b3817aef3a515b15395a4b4f7cf7ba2a0 SHA512 c80982fd6d539c26272556b7a08e46ec628ecc42772caf1f080da844a26fc66f20fa569b214e656791f1cd2b0bdd34dc80b86352a510c22087d5eb1e6cc3b655
 MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
diff --git a/app-text/atril/atril-1.18.0.ebuild b/app-text/atril/atril-1.18.0.ebuild
index e253873cfbba..4769e545a0a9 100644
--- a/app-text/atril/atril-1.18.0.ebuild
+++ b/app-text/atril/atril-1.18.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
new file mode 100644
index 000000000000..7bc77732f2ad
--- /dev/null
+++ b/app-text/fictionup/Manifest
@@ -0,0 +1,3 @@
+DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e
+EBUILD fictionup-0.1.ebuild 514 BLAKE2B 80f508bdee2c8308d840fca9ec476e0252c32c25d2a64bb6e19b8430e1ff580ae632c26ee1fbbd1a9a2f69195aea0e0a11caf5edc5ee6da8edf9af692f18751e SHA512 ca95b1d8b0553d899c3c86d77c7f5175888d74d5b734ad6b66f90d3cf6eb916c851897cdad07706adb3ed83c2398a468257197ffc9344a641ee5ae8346f724dc
+MISC metadata.xml 466 BLAKE2B 49d2b46c6b3bdc4d25b6373c363d22eba40437fc09f4302fb6f627fdd856802d1d9a5143f9129326516ed7ff4d1bc3fa8f2d2583bb070d71c6a8ba817a5e3a6f SHA512 bf13006956e97c9e3fbf1f0fe52acbc42e321b2fe39ac988cfc70f7e9b5ae4de83da1bc131dce9b69882c05c6205fc8630d6776a47e665231544c34a1bcba8dd
diff --git a/app-text/fictionup/fictionup-0.1.ebuild b/app-text/fictionup/fictionup-0.1.ebuild
new file mode 100644
index 000000000000..08b5f5315776
--- /dev/null
+++ b/app-text/fictionup/fictionup-0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="A command-line markdown to fb2 convertor"
+HOMEPAGE="http://cdslow.org.ru/fictionup/"
+SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF} || die "doc mv failed"
+}
diff --git a/app-text/fictionup/metadata.xml b/app-text/fictionup/metadata.xml
new file mode 100644
index 000000000000..af04cd4a1e5f
--- /dev/null
+++ b/app-text/fictionup/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    fictionup is a command-line markdown to fb2 convertor. Metadata can be
+    included in the input file as a yaml block or given by a command-line
+    argument.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 5a7eb84afcd6..627bcc964fa5 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,5 +1,4 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
-AUX po4a-0.45-port-our-regex-to-perl-5.22.patch 1779 BLAKE2B 25f66218bc9410aaf0ecb7399a6163b0a14e8b598a94dabacea5f452ac65608c780c552df84ba0248119a36584bb4dc2258a8d46222a86572d1d6f0c596af7c3 SHA512 493e80b8ffff96ef4434fe268e96a305246ca5f492f4d24fa01752131aa6f2c88c6b484f7e8c536d268d3de4c0fb7b0b7a920bc2709108f66822b5e64b030576
 DIST po4a_0.45.orig.tar.gz 2208959 BLAKE2B f5fd533036eac41aa15413559bab7fb176556b47d63fe7bae4a98797a128f8314f6a22076fd1792d1ae19d8aad27599508064ec8323b6fe8ffd433989541151e SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.45-r3.ebuild 1980 BLAKE2B 3840a33a5c574b1f853a6ac582a93cd0f51f90c36fce29dd74be8a8432d5a4a923046b173a59a5b9cb3040e91fc44624ddfdea9e125399d1349c35c835079b62 SHA512 28547b542eb7ddc4125f9d6c1d1cd9efa3f0db8498beffde5ffe0f8ff9bd2223ff2e43d7b8f0d71571f6a91487c3259941cc1b5c217bcb8b01a443093cdde26e
diff --git a/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch b/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
deleted file mode 100644
index a204d5e97217..000000000000
--- a/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix sgml and tex regex against perl-5.22. See Gentoo-bug: 604428.
-Based on a patch from upstream git. Original commit info:
-From 44e5c2f02b3166536257bc9d6384d41dda386648 Mon Sep 17 00:00:00 2001
-From: Martin Quinson <martin.quinson@loria.fr>
-Date: Fri, 28 Aug 2015 19:01:17 +0200
-Subject: [PATCH] Port our regex to Perl 5.22 (patch by Roderich Schupp)
-
----
- lib/Locale/Po4a/Sgml.pm | 4 ++--
- lib/Locale/Po4a/TeX.pm  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
-index 742e003..3ad5e8d 100644
---- a/lib/Locale/Po4a/Sgml.pm
-+++ b/lib/Locale/Po4a/Sgml.pm
-@@ -672,9 +672,9 @@ sub parse_file {
-             }
-         }
-     }
--    $prolog =~ s/<!--{PO4A-ent-beg-(.*?)}(.*?){PO4A-ent-end}-->/<!ENTITY % $1 SYSTEM "$2">/g;
-+    $prolog =~ s/<!--\{PO4A-ent-beg-(.*?)\}(.*?)\{PO4A-ent-end\}-->/<!ENTITY % $1 SYSTEM "$2">/g;
-     # Unprotect undefined inclusions, and die of them
--    $prolog =~ s/{PO4A-percent}/%/sg;
-+    $prolog =~ s/\{PO4A-percent\}/%/sg;
-     if ($prolog =~ /%([^;\s]*);/) {
-         die wrap_mod("po4a::sgml",
-                      dgettext("po4a",
-diff --git a/lib/Locale/Po4a/TeX.pm b/lib/Locale/Po4a/TeX.pm
-index a78f94b..0faa465 100644
---- a/lib/Locale/Po4a/TeX.pm
-+++ b/lib/Locale/Po4a/TeX.pm
-@@ -1168,7 +1168,7 @@ sub parse {
- #       environment contains an un-closed bracket)
-         if (   ($closed and ($line =~ /^\s*$/ or
-                              $line =~ /^\s*$RE_VERBATIM\s*$/))
--            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend{$env[-1]}\s*$/)
-+            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend\{$env[-1]\}\s*$/)
-            ) {
-             # An empty line. This indicates the end of the current
-             # paragraph.
--- 
-2.10.2
-