Sync with portage [Wed Jul 25 13:33:41 MSK 2018].

2018-07-25 13:33:41 +03:00 · 2018-07-25 13:33:41 +03:00 · 131d812df3
commit 131d812df3
parent 17c338fb0d
301 changed files with 3322 additions and 3520 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/brotli/brotli-1.0.5.ebuild
+++ b/app-arch/brotli/brotli-1.0.5.ebuild
@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi

--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@ -21,7 +21,8 @@ RDEPEND="
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:0= )
 	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"

 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.1.2-r1.ebuild
@ -41,8 +41,12 @@ ruby_add_rdepend "
 	<dev-ruby/mime-types-3:*
 "

+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
 ruby_add_bdepend "
-	>=dev-ruby/rake-12.0.0
+	>=dev-ruby/rake-10.0.0
 "

 all_ruby_prepare() {
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@ -1 +1,2 @@
 DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
+DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="A program (and preload library) to fake system date"
+HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+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=""
+
+PATCHES=()
+
+pkg_setup() {
+	use userland_BSD && PATCHES+=( "${FILESDIR}"/${P}-bsd.patch )
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/dpkg-parsechangelog/d' \
+		Makefile || die
+	use prefix && sed -i -e '/-o root -g root/d' Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" VERSION="${PV}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" install
+	einstalldocs
+}
--- a/app-misc/datefudge/files/datefudge-1.22-bsd.patch
+++ b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
@ -0,0 +1,60 @@
+From 3731c2da347dfffef34209fd779e67738b34ec88 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 24 Jul 2018 22:58:34 +0300
+Subject: [PATCH] bsd support
+
+---
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8855b49..5526cbf 100644
+--- a/Makefile
+++ b/Makefile
+@@ -20,11 +20,11 @@ all compile: datefudge datefudge.so datefudge.1
+ 
+ install: datefudge datefudge.so datefudge.1
+ 	install -d $(DESTDIR)$(libdir)/$(libarch)/datefudge
+-	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
+	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
+ 	install -d $(DESTDIR)$(bindir)
+-	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)$(bindir)
+ 	install -d $(DESTDIR)$(mandir)/man1
+-	install -o root -g root -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
+	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
+ 
+ datefudge: datefudge.sh
+ datefudge.1: datefudge.man
+@@ -34,7 +34,7 @@ datefudge datefudge.1:
+ 	< $< > $@
+ 
+ datefudge.so: datefudge.o
+-	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
+	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
+ 
+ datefudge.o: datefudge.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+@@ -48,8 +48,8 @@ test: compile
+ 	export TZ=UTC								 ;\
+ 	ret1=1; ret2=1                                                           ;\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
+-	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
+	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
+ 	        exp="1970-01-02.12:15:00"                                       ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; }          ;\
+ 	        echo "failed: expected: $$exp, actual: $$dt"                    ;\
+@@ -58,7 +58,7 @@ test: compile
+ 	echo -n "Running a simple perl localtime() test... "                    ;\
+ 	pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
+ 	        dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"`         ;\
+ 	        exp="1970-01-02"                                                ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; }          ;\
+-- 
+2.16.4
+
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/gentoo-guide-xml-dtd/Manifest
+++ b/app-text/gentoo-guide-xml-dtd/Manifest
--- a/app-text/gentoo-guide-xml-dtd/files/catalog
+++ b/app-text/gentoo-guide-xml-dtd/files/catalog
@ -1,14 +0,0 @@
-
-  -- Catalog data for Gentoo Guide XML V2.1 --
-  -- File catalog  --
-
-  -- Gentoo Guide driver file .................................................. --
-
-PUBLIC "-//Gentoo//DTD Guide XML V2.1//EN" "xml-dtd-2.1/guide.dtd"
-
-  -- ISO entity sets ...................................................... --
-
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent
@ -1,67 +0,0 @@
-<!-- iso-lat1.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
-
-<!-- Derived from the corresponding ISO 8879 standard entity set
-     and the Unicode character mappings provided by Sebastian Rahtz -->
-
-<!ENTITY aacute	"&#x00E1;"> <!-- LATIN SMALL LETTER A WITH ACUTE -->
-<!ENTITY Aacute	"&#x00C1;"> <!-- LATIN CAPITAL LETTER A WITH ACUTE -->
-<!ENTITY acirc	"&#x00E2;"> <!-- LATIN SMALL LETTER A WITH CIRCUMFLEX -->
-<!ENTITY Acirc	"&#x00C2;"> <!-- LATIN CAPITAL LETTER A WITH CIRCUMFLEX -->
-<!ENTITY agrave	"&#x00E0;"> <!-- LATIN SMALL LETTER A WITH GRAVE -->
-<!ENTITY Agrave	"&#x00C0;"> <!-- LATIN CAPITAL LETTER A WITH GRAVE -->
-<!ENTITY aring	"&#x00E5;"> <!-- LATIN SMALL LETTER A WITH RING ABOVE -->
-<!ENTITY Aring	"&#x00C5;"> <!-- LATIN CAPITAL LETTER A WITH RING ABOVE -->
-<!ENTITY atilde	"&#x00E3;"> <!-- LATIN SMALL LETTER A WITH TILDE -->
-<!ENTITY Atilde	"&#x00C3;"> <!-- LATIN CAPITAL LETTER A WITH TILDE -->
-<!ENTITY auml	"&#x00E4;"> <!-- LATIN SMALL LETTER A WITH DIAERESIS -->
-<!ENTITY Auml	"&#x00C4;"> <!-- LATIN CAPITAL LETTER A WITH DIAERESIS -->
-<!ENTITY aelig	"&#x00E6;"> <!-- LATIN SMALL LETTER AE -->
-<!ENTITY AElig	"&#x00C6;"> <!-- LATIN CAPITAL LETTER AE -->
-<!ENTITY ccedil	"&#x00E7;"> <!-- LATIN SMALL LETTER C WITH CEDILLA -->
-<!ENTITY Ccedil	"&#x00C7;"> <!-- LATIN CAPITAL LETTER C WITH CEDILLA -->
-<!ENTITY eth	"&#x00F0;"> <!-- LATIN SMALL LETTER ETH -->
-<!ENTITY ETH	"&#x00D0;"> <!-- LATIN CAPITAL LETTER ETH -->
-<!ENTITY eacute	"&#x00E9;"> <!-- LATIN SMALL LETTER E WITH ACUTE -->
-<!ENTITY Eacute	"&#x00C9;"> <!-- LATIN CAPITAL LETTER E WITH ACUTE -->
-<!ENTITY ecirc	"&#x00EA;"> <!-- LATIN SMALL LETTER E WITH CIRCUMFLEX -->
-<!ENTITY Ecirc	"&#x00CA;"> <!-- LATIN CAPITAL LETTER E WITH CIRCUMFLEX -->
-<!ENTITY egrave	"&#x00E8;"> <!-- LATIN SMALL LETTER E WITH GRAVE -->
-<!ENTITY Egrave	"&#x00C8;"> <!-- LATIN CAPITAL LETTER E WITH GRAVE -->
-<!ENTITY euml	"&#x00EB;"> <!-- LATIN SMALL LETTER E WITH DIAERESIS -->
-<!ENTITY Euml	"&#x00CB;"> <!-- LATIN CAPITAL LETTER E WITH DIAERESIS -->
-<!ENTITY iacute	"&#x00ED;"> <!-- LATIN SMALL LETTER I WITH ACUTE -->
-<!ENTITY Iacute	"&#x00CD;"> <!-- LATIN CAPITAL LETTER I WITH ACUTE -->
-<!ENTITY icirc	"&#x00EE;"> <!-- LATIN SMALL LETTER I WITH CIRCUMFLEX -->
-<!ENTITY Icirc	"&#x00CE;"> <!-- LATIN CAPITAL LETTER I WITH CIRCUMFLEX -->
-<!ENTITY igrave	"&#x00EC;"> <!-- LATIN SMALL LETTER I WITH GRAVE -->
-<!ENTITY Igrave	"&#x00CC;"> <!-- LATIN CAPITAL LETTER I WITH GRAVE -->
-<!ENTITY iuml	"&#x00EF;"> <!-- LATIN SMALL LETTER I WITH DIAERESIS -->
-<!ENTITY Iuml	"&#x00CF;"> <!-- LATIN CAPITAL LETTER I WITH DIAERESIS -->
-<!ENTITY ntilde	"&#x00F1;"> <!-- LATIN SMALL LETTER N WITH TILDE -->
-<!ENTITY Ntilde	"&#x00D1;"> <!-- LATIN CAPITAL LETTER N WITH TILDE -->
-<!ENTITY oacute	"&#x00F3;"> <!-- LATIN SMALL LETTER O WITH ACUTE -->
-<!ENTITY Oacute	"&#x00D3;"> <!-- LATIN CAPITAL LETTER O WITH ACUTE -->
-<!ENTITY ocirc	"&#x00F4;"> <!-- LATIN SMALL LETTER O WITH CIRCUMFLEX -->
-<!ENTITY Ocirc	"&#x00D4;"> <!-- LATIN CAPITAL LETTER O WITH CIRCUMFLEX -->
-<!ENTITY ograve	"&#x00F2;"> <!-- LATIN SMALL LETTER O WITH GRAVE -->
-<!ENTITY Ograve	"&#x00D2;"> <!-- LATIN CAPITAL LETTER O WITH GRAVE -->
-<!ENTITY oslash	"&#x00F8;"> <!-- CIRCLED DIVISION SLASH -->
-<!ENTITY Oslash	"&#x00D8;"> <!-- LATIN CAPITAL LETTER O WITH STROKE -->
-<!ENTITY otilde	"&#x00F5;"> <!-- LATIN SMALL LETTER O WITH TILDE -->
-<!ENTITY Otilde	"&#x00D5;"> <!-- LATIN CAPITAL LETTER O WITH TILDE -->
-<!ENTITY ouml	"&#x00F6;"> <!-- LATIN SMALL LETTER O WITH DIAERESIS -->
-<!ENTITY Ouml	"&#x00D6;"> <!-- LATIN CAPITAL LETTER O WITH DIAERESIS -->
-<!ENTITY szlig	"&#x00DF;"> <!-- LATIN SMALL LETTER SHARP S -->
-<!ENTITY thorn	"&#x00FE;"> <!-- LATIN SMALL LETTER THORN -->
-<!ENTITY THORN	"&#x00DE;"> <!-- LATIN CAPITAL LETTER THORN -->
-<!ENTITY uacute	"&#x00FA;"> <!-- LATIN SMALL LETTER U WITH ACUTE -->
-<!ENTITY Uacute	"&#x00DA;"> <!-- LATIN CAPITAL LETTER U WITH ACUTE -->
-<!ENTITY ucirc	"&#x00FB;"> <!-- LATIN SMALL LETTER U WITH CIRCUMFLEX -->
-<!ENTITY Ucirc	"&#x00DB;"> <!-- LATIN CAPITAL LETTER U WITH CIRCUMFLEX -->
-<!ENTITY ugrave	"&#x00F9;"> <!-- LATIN SMALL LETTER U WITH GRAVE -->
-<!ENTITY Ugrave	"&#x00D9;"> <!-- LATIN CAPITAL LETTER U WITH GRAVE -->
-<!ENTITY uuml	"&#x00FC;"> <!-- LATIN SMALL LETTER U WITH DIAERESIS -->
-<!ENTITY Uuml	"&#x00DC;"> <!-- LATIN CAPITAL LETTER U WITH DIAERESIS -->
-<!ENTITY yacute	"&#x00FD;"> <!-- LATIN SMALL LETTER Y WITH ACUTE -->
-<!ENTITY Yacute	"&#x00DD;"> <!-- LATIN CAPITAL LETTER Y WITH ACUTE -->
-<!ENTITY yuml	"&#x00FF;"> <!-- LATIN SMALL LETTER Y WITH DIAERESIS -->
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent
@ -1,81 +0,0 @@
-<!-- iso-num.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
-
-<!-- Derived from the corresponding ISO 8879 standard entity set
-     and the Unicode character mappings provided by Sebastian Rahtz -->
-
-<!ENTITY half	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
-<!ENTITY frac12	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
-<!ENTITY frac14	"&#x00BC;"> <!-- VULGAR FRACTION ONE QUARTER -->
-<!ENTITY frac34	"&#x00BE;"> <!-- VULGAR FRACTION THREE QUARTERS -->
-<!ENTITY frac18	"&#x215B;"> <!--  -->
-<!ENTITY frac38	"&#x215C;"> <!--  -->
-<!ENTITY frac58	"&#x215D;"> <!--  -->
-<!ENTITY frac78	"&#x215E;"> <!--  -->
-<!ENTITY sup1	"&#x00B9;"> <!-- SUPERSCRIPT ONE -->
-<!ENTITY sup2	"&#x00B2;"> <!-- SUPERSCRIPT TWO -->
-<!ENTITY sup3	"&#x00B3;"> <!-- SUPERSCRIPT THREE -->
-<!ENTITY plus	"&#x002B;"> <!-- PLUS SIGN -->
-<!ENTITY plusmn	"&#x00B1;"> <!-- PLUS-MINUS SIGN -->
-<!ENTITY lt	"&#38;#60;"> <!-- LESS-THAN SIGN -->
-<!ENTITY equals	"&#x003D;"> <!-- EQUALS SIGN -->
-<!ENTITY gt	"&#x003E;"> <!-- GREATER-THAN SIGN -->
-<!ENTITY divide	"&#x00F7;"> <!-- DIVISION SIGN -->
-<!ENTITY times	"&#x00D7;"> <!-- MULTIPLICATION SIGN -->
-<!ENTITY curren	"&#x00A4;"> <!-- CURRENCY SIGN -->
-<!ENTITY pound	"&#x00A3;"> <!-- POUND SIGN -->
-<!ENTITY dollar	"&#x0024;"> <!-- DOLLAR SIGN -->
-<!ENTITY cent	"&#x00A2;"> <!-- CENT SIGN -->
-<!ENTITY yen	"&#x00A5;"> <!-- YEN SIGN -->
-<!ENTITY num	"&#x0023;"> <!-- NUMBER SIGN -->
-<!ENTITY percnt	"&#x0025;"> <!-- PERCENT SIGN -->
-<!ENTITY amp	"&#38;#38;"> <!-- AMPERSAND -->
-<!ENTITY ast	"&#x002A;"> <!-- ASTERISK OPERATOR -->
-<!ENTITY commat	"&#x0040;"> <!-- COMMERCIAL AT -->
-<!ENTITY lsqb	"&#x005B;"> <!-- LEFT SQUARE BRACKET -->
-<!ENTITY bsol	"&#x005C;"> <!-- REVERSE SOLIDUS -->
-<!ENTITY rsqb	"&#x005D;"> <!-- RIGHT SQUARE BRACKET -->
-<!ENTITY lcub	"&#x007B;"> <!-- LEFT CURLY BRACKET -->
-<!ENTITY horbar	"&#x2015;"> <!-- HORIZONTAL BAR -->
-<!ENTITY verbar	"&#x007C;"> <!-- VERTICAL LINE -->
-<!ENTITY rcub	"&#x007D;"> <!-- RIGHT CURLY BRACKET -->
-<!ENTITY micro	"&#x00B5;"> <!-- MICRO SIGN -->
-<!ENTITY ohm	"&#x2126;"> <!-- OHM SIGN -->
-<!ENTITY deg	"&#x00B0;"> <!-- DEGREE SIGN -->
-<!ENTITY ordm	"&#x00BA;"> <!-- MASCULINE ORDINAL INDICATOR -->
-<!ENTITY ordf	"&#x00AA;"> <!-- FEMININE ORDINAL INDICATOR -->
-<!ENTITY sect	"&#x00A7;"> <!-- SECTION SIGN -->
-<!ENTITY para	"&#x00B6;"> <!-- PILCROW SIGN -->
-<!ENTITY middot	"&#x00B7;"> <!-- MIDDLE DOT -->
-<!ENTITY larr	"&#x2190;"> <!-- LEFTWARDS DOUBLE ARROW -->
-<!ENTITY rarr	"&#x2192;"> <!-- RIGHTWARDS DOUBLE ARROW -->
-<!ENTITY uarr	"&#x2191;"> <!-- UPWARDS ARROW -->
-<!ENTITY darr	"&#x2193;"> <!-- DOWNWARDS ARROW -->
-<!ENTITY copy	"&#x00A9;"> <!-- COPYRIGHT SIGN -->
-<!ENTITY reg	"&#x00AE;"> <!-- REG TRADE MARK SIGN -->
-<!ENTITY trade	"&#x2122;"> <!-- TRADE MARK SIGN -->
-<!ENTITY brvbar	"&#x00A6;"> <!-- BROKEN BAR -->
-<!ENTITY not	"&#x00AC;"> <!-- NOT SIGN -->
-<!ENTITY sung	"&#x2669;"> <!--  -->
-<!ENTITY excl	"&#x0021;"> <!-- EXCLAMATION MARK -->
-<!ENTITY iexcl	"&#x00A1;"> <!-- INVERTED EXCLAMATION MARK -->
-<!ENTITY quot	"&#x0022;"> <!-- QUOTATION MARK -->
-<!ENTITY apos	"&#x0027;"> <!-- APOSTROPHE -->
-<!ENTITY lpar	"&#x0028;"> <!-- LEFT PARENTHESIS -->
-<!ENTITY rpar	"&#x0029;"> <!-- RIGHT PARENTHESIS -->
-<!ENTITY comma	"&#x002C;"> <!-- COMMA -->
-<!ENTITY lowbar	"&#x005F;"> <!-- LOW LINE -->
-<!ENTITY hyphen	"&#x002D;"> <!-- HYPHEN-MINUS -->
-<!ENTITY period	"&#x002E;"> <!-- FULL STOP -->
-<!ENTITY sol	"&#x002F;"> <!-- SOLIDUS -->
-<!ENTITY colon	"&#x003A;"> <!-- COLON -->
-<!ENTITY semi	"&#x003B;"> <!-- SEMICOLON -->
-<!ENTITY quest	"&#x003F;"> <!-- QUESTION MARK -->
-<!ENTITY iquest	"&#x00BF;"> <!-- INVERTED QUESTION MARK -->
-<!ENTITY laquo	"&#x00AB;"> <!-- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-<!ENTITY raquo	"&#x00BB;"> <!-- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-<!ENTITY lsquo	"&#x2018;"> <!--  -->
-<!ENTITY rsquo	"&#x2019;"> <!-- RIGHT SINGLE QUOTATION MARK -->
-<!ENTITY ldquo	"&#x201C;"> <!--  -->
-<!ENTITY rdquo	"&#x201D;"> <!-- RIGHT DOUBLE QUOTATION MARK -->
-<!ENTITY nbsp	"&#x00A0;"> <!-- NO-BREAK SPACE -->
-<!ENTITY shy	"&#x00AD;"> <!-- SOFT HYPHEN -->
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent
@ -1,90 +0,0 @@
-<!-- iso-pub.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
-
-<!-- Derived from the corresponding ISO 8879 standard entity set
-     and the Unicode character mappings provided by Sebastian Rahtz -->
-
-<!ENTITY emsp	"&#x2003;"> <!-- EM SPACE -->
-<!ENTITY ensp	"&#x2002;"> <!-- EN SPACE -->
-<!ENTITY emsp13	"&#x2004;"> <!-- THREE-PER-EM SPACE -->
-<!ENTITY emsp14	"&#x2005;"> <!-- FOUR-PER-EM SPACE -->
-<!ENTITY numsp	"&#x2007;"> <!-- FIGURE SPACE -->
-<!ENTITY puncsp	"&#x2008;"> <!-- PUNCTUATION SPACE -->
-<!ENTITY thinsp	"&#x2009;"> <!-- THIN SPACE -->
-<!ENTITY hairsp	"&#x200A;"> <!-- HAIR SPACE -->
-<!ENTITY mdash	"&#x2014;"> <!-- EM DASH -->
-<!ENTITY ndash	"&#x2013;"> <!-- EN DASH -->
-<!ENTITY dash	"&#x2010;"> <!-- HYPHEN -->
-<!ENTITY blank	"&#x2423;"> <!-- OPEN BOX -->
-<!ENTITY hellip	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
-<!ENTITY nldr	"&#x2025;"> <!-- TWO DOT LEADER -->
-<!ENTITY frac13	"&#x2153;"> <!-- VULGAR FRACTION ONE THIRD -->
-<!ENTITY frac23	"&#x2154;"> <!-- VULGAR FRACTION TWO THIRDS -->
-<!ENTITY frac15	"&#x2155;"> <!-- VULGAR FRACTION ONE FIFTH -->
-<!ENTITY frac25	"&#x2156;"> <!-- VULGAR FRACTION TWO FIFTHS -->
-<!ENTITY frac35	"&#x2157;"> <!-- VULGAR FRACTION THREE FIFTHS -->
-<!ENTITY frac45	"&#x2158;"> <!-- VULGAR FRACTION FOUR FIFTHS -->
-<!ENTITY frac16	"&#x2159;"> <!-- VULGAR FRACTION ONE SIXTH -->
-<!ENTITY frac56	"&#x215A;"> <!-- VULGAR FRACTION FIVE SIXTHS -->
-<!ENTITY incare	"&#x2105;"> <!-- CARE OF -->
-<!ENTITY block	"&#x2588;"> <!-- FULL BLOCK -->
-<!ENTITY uhblk	"&#x2580;"> <!-- UPPER HALF BLOCK -->
-<!ENTITY lhblk	"&#x2584;"> <!-- LOWER HALF BLOCK -->
-<!ENTITY blk14	"&#x2591;"> <!-- LIGHT SHADE -->
-<!ENTITY blk12	"&#x2592;"> <!-- MEDIUM SHADE -->
-<!ENTITY blk34	"&#x2593;"> <!-- DARK SHADE -->
-<!ENTITY marker	"&#x25AE;"> <!-- BLACK VERTICAL RECTANGLE -->
-<!ENTITY cir	"&#x25CB;"> <!-- WHITE CIRCLE -->
-<!ENTITY squ	"&#x25A1;"> <!-- WHITE SQUARE -->
-<!ENTITY rect	"&#x25AD;"> <!-- WHITE RECTANGLE -->
-<!ENTITY utri	"&#x25B5;"> <!-- WHITE UP-POINTING TRIANGLE -->
-<!ENTITY dtri	"&#x25BF;"> <!-- WHITE DOWN-POINTING TRIANGLE -->
-<!ENTITY star	"&#x22C6;"> <!-- STAR OPERATOR -->
-<!ENTITY bull	"&#x2022;"> <!-- BULLET -->
-<!ENTITY squf	"&#x25AA;"> <!--  -->
-<!ENTITY utrif	"&#x25B4;"> <!-- BLACK UP-POINTING TRIANGLE -->
-<!ENTITY dtrif	"&#x25BE;"> <!-- BLACK DOWN-POINTING TRIANGLE -->
-<!ENTITY ltrif	"&#x25C2;"> <!-- BLACK LEFT-POINTING TRIANGLE -->
-<!ENTITY rtrif	"&#x25B8;"> <!-- BLACK RIGHT-POINTING TRIANGLE -->
-<!ENTITY clubs	"&#x2663;"> <!-- BLACK CLUB SUIT -->
-<!ENTITY diams	"&#x2666;"> <!-- BLACK DIAMOND SUIT -->
-<!ENTITY hearts	"&#x2665;"> <!-- BLACK HEART SUIT -->
-<!ENTITY spades	"&#x2660;"> <!-- BLACK SPADE SUIT -->
-<!ENTITY malt	"&#x2720;"> <!-- MALTESE CROSS -->
-<!ENTITY dagger	"&#x2020;"> <!-- DAGGER -->
-<!ENTITY Dagger	"&#x2021;"> <!-- DOUBLE DAGGER -->
-<!ENTITY check	"&#x2713;"> <!-- CHECK MARK -->
-<!ENTITY cross	"&#x2717;"> <!-- BALLOT X -->
-<!ENTITY sharp	"&#x266F;"> <!-- MUSIC SHARP SIGN -->
-<!ENTITY flat	"&#x266D;"> <!-- MUSIC FLAT SIGN -->
-<!ENTITY male	"&#x2642;"> <!-- MALE SIGN -->
-<!ENTITY female	"&#x2640;"> <!--  -->
-<!ENTITY phone	"&#x260E;"> <!-- TELEPHONE SIGN -->
-<!ENTITY telrec	"&#x2315;"> <!-- TELEPHONE RECORDER -->
-<!ENTITY copysr	"&#x2117;"> <!-- SOUND RECORDING COPYRIGHT -->
-<!ENTITY caret	"&#x2041;"> <!-- CARET -->
-<!ENTITY lsquor	"&#x201A;"> <!-- SINGLE LOW-9 QUOTATION MARK -->
-<!ENTITY ldquor	"&#x201E;"> <!-- DOUBLE LOW-9 QUOTATION MARK -->
-<!ENTITY fflig	"&#xFB00;"> <!--  -->
-<!ENTITY filig	"&#xFB01;"> <!--  -->
-<!--     fjlig	Unknown unicode character -->
-<!ENTITY ffilig	"&#xFB03;"> <!--  -->
-<!ENTITY ffllig	"&#xFB04;"> <!--  -->
-<!ENTITY fllig	"&#xFB02;"> <!--  -->
-<!ENTITY mldr	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
-<!ENTITY rdquor	"&#x201C;"> <!--  -->
-<!ENTITY rsquor	"&#x2018;"> <!--  -->
-<!ENTITY vellip	"&#x22EE;"> <!--  -->
-<!ENTITY hybull	"&#x2043;"> <!-- HYPHEN BULLET -->
-<!ENTITY loz	"&#x25CA;"> <!-- LOZENGE -->
-<!ENTITY lozf	"&#x2726;"> <!--  -->
-<!ENTITY ltri	"&#x25C3;"> <!-- WHITE LEFT-POINTING TRIANGLE -->
-<!ENTITY rtri	"&#x25B9;"> <!-- WHITE RIGHT-POINTING TRIANGLE -->
-<!ENTITY starf	"&#x2605;"> <!-- BLACK STAR -->
-<!ENTITY natur	"&#x266E;"> <!-- MUSIC NATURAL SIGN -->
-<!ENTITY rx	"&#x211E;"> <!-- PRESCRIPTION TAKE -->
-<!ENTITY sext	"&#x2736;"> <!-- SIX POINTED BLACK STAR -->
-<!ENTITY target	"&#x2316;"> <!-- POSITION INDICATOR -->
-<!ENTITY dlcrop	"&#x230D;"> <!-- BOTTOM LEFT CROP -->
-<!ENTITY drcrop	"&#x230C;"> <!-- BOTTOM RIGHT CROP -->
-<!ENTITY ulcrop	"&#x230F;"> <!-- TOP LEFT CROP -->
-<!ENTITY urcrop	"&#x230E;"> <!-- TOP RIGHT CROP -->
--- a/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
@ -1,163 +0,0 @@
-<!-- This is a DTD, but will be read as -*- sgml -*-   -->
-<!-- ================================================= -->
-
-<!-- ==== Title Elements ====-->
-    <!ENTITY % guide.title "title">
-    <!ENTITY % chapter.title "title">
-    <!ENTITY % sect.title "title">
-
-<!-- ==== List Elements ==== -->
-
-    <!ENTITY % list.class "ul|ol">
-
-<!-- ==== Elements which are admonitions. ==== -->
-
-    <!ENTITY % admon.class "note|warn|impo">
-
-<!-- ==== Elements which are "line specific". Spaces and line breaks are significant in line specific elements. ==== -->
-
-    <!ENTITY % linespecific.class "pre">
-    <!ENTITY % linespecific.sub.class "i|codenote">
-
-<!-- ==== Paragraph Elements ==== -->
-
-    <!ENTITY % para.class "p">
-
-<!-- ==== Formal objects (objects with titles). ==== -->
-
-    <!ENTITY % formal.class "figure|table">
-
-<!-- ==== Elements which are descriptive in nature. ==== -->
-
-    <!ENTITY % descobj.class "abstract">
-
-<!-- ==== The class of general inline elements. ==== -->
-
-    <!ENTITY % gen.class "e">
-
-    <!ENTITY % link.class "mail|link">
-
-    <!ENTITY % tech.class "c|path">
-
-    <!ENTITY % guideinfo.class "author|version|date">
-
-
-<!-- ===== ATTRIBUTE ENTITIES =====-->
-
-    <!ENTITY % link.attributes
-            "link  CDATA   #IMPLIED">
-
-    <!ENTITY % figure.attributes
-            "link       CDATA   #REQUIRED
-             short      CDATA   #IMPLIED
-             caption    CDATA   #IMPLIED">
-
-    <!ENTITY % author.attributes
-            "title   CDATA   #IMPLIED">
-
-<!-- ==== Mix Objects ==== -->
-
-    <!ENTITY % admon.mix
-            "%list.class;
-            |%linespecific.class;
-            |%para.class;
-            |%formal.class;">
-
-    <!ENTITY % para.mix
-            "#PCDATA
-            |%list.class;
-            |%gen.class;
-            |%link.class;
-            |%tech.class;">
-
-    <!ENTITY % list.mix
-            "#PCDATA
-            |%gen.class;
-            |%link.class;
-            |%tech.class;">
-
-    <!ENTITY % pre.mix
-            "#PCDATA
-            |%linespecific.sub.class;
-            |%gen.class;
-            |%link.class;
-            |%tech.class;">
-
-    <!ENTITY % title.mix
-            "#PCDATA
-            |%gen.class;
-            |%link.class;	|%tech.class;">
-
-    <!ENTITY % cptr.mix
-            "#PCDATA
-            |%link.class;	|%tech.class;">
-
-    <!ENTITY % smallcptr.mix "#PCDATA">
-
-    <!ENTITY % docinfo.mix
-            "#PCDATA
-            |%link.class;
-            |e">
-
-    <!ENTITY % body.mix
-            "%admon.class;
-            |%linespecific.class;
-            |%para.class;
-            |%formal.class;">
-
-
-<!-- ==== Objects ==== -->
-
-    <!ELEMENT title (%title.mix;)*>
-
-    <!ELEMENT ul (li+)>
-    <!ELEMENT ol (li+)>
-    <!ELEMENT li (%list.mix;)*>
-
-    <!ELEMENT note (%para.mix;)*>
-    <!ELEMENT warn (%para.mix;)*>
-    <!ELEMENT impo (%para.mix;)*>
-
-    <!ELEMENT pre (%pre.mix;)*>
-    <!ELEMENT codenote (#PCDATA)>
-    <!ELEMENT i (#PCDATA)>
-
-    <!ELEMENT p (%para.mix;)*>
-
-    <!ELEMENT figure EMPTY>
-    <!ATTLIST figure %figure.attributes;>
-
-    <!ELEMENT table (tr*)>
-    <!ELEMENT tr ((ti|th)*)>
-    <!ELEMENT ti (%para.mix;)*>
-    <!ELEMENT th (%para.mix;)*>
-
-
-    <!ELEMENT e (%smallcptr.mix;)>
-
-    <!ELEMENT link (#PCDATA)>
-    <!ATTLIST link %link.attributes;>
-
-    <!ELEMENT mail (#PCDATA)>
-    <!ATTLIST mail %link.attributes;>
-
-    <!ELEMENT c (%smallcptr.mix;)>
-
-    <!ELEMENT abstract (%para.mix;)*>
-
-    <!ELEMENT author (%smallcptr.mix;)>
-    <!ATTLIST author %author.attributes;>
-    <!ELEMENT version (%smallcptr.mix;)>
-    <!ELEMENT date (%smallcptr.mix;)>
-
-    <!ELEMENT chapter (%chapter.title;,(section)+)>
-
-    <!ELEMENT section (%sect.title;,body)>
-
-    <!ELEMENT body (%body.mix;)+>
-
-<!-- ==== The ARTICLE element ==== -->
-
-    <!ELEMENT guide ((%guide.title;), (%guideinfo.class;)*, (chapter)+)>
-
-
--- a/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd
@ -1,274 +0,0 @@
-<!-- *********************************************************************
-     *** THIS IS THE FLATTENED DTD. DO NOT EDIT THIS DTD BY HAND, EDIT ***
-     *** THE CUSTOMIZATION LAYER AND REGNERATE THE FLATTENED DTD! ********
-     ********************************************************************* -->
-
-<!-- ====================================================================== -->
-
-<!-- Gentoo Guide XML V1.0 DTD
-     Copyright (C) 2001 Gentoo Foundation
-     http://www.gentoo.org/gentoo/guide
-
-     See COPYRIGHT for more information
-
-     Please direct all questions and comments about this DTD to
-     Achim Gottinger <achim@gentoo.org>.
-
-     Common declaration:
-
-     <?xml version="1.0"?>
-     <!DOCTYPE guide
-       PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN"
-       "http://www.gentoo.org/gentoo/guide/guide.dtd">
-                                                                            -->
-<!-- ====================================================================== -->
-<!ENTITY lt	"&#60;">
-<!ENTITY gt	 "&#62;">
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % URI "CDATA">
-<!ENTITY % Character "CDATA">
-<!ENTITY % Text "CDATA">
-
-<!--================== Imported Names ====================================-->
-
-<!-- Parameter Entities -->
-
-<!ENTITY % list "UL | OL">
-
-<!ENTITY % preformatted "PRE">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
- -->
-
- <!--=================== Generic Attributes ===============================-->
-
- <!ENTITY % coreattrs "id ID #IMPLIED">
- <!ENTITY % attrs "%coreattrs;">
-
- <!ENTITY % align "align (left|center|right|justify)  #IMPLIED">
-
- <!--=================== Text Markup ======================================-->
-
- <!ENTITY % fontstyle "I | B">
- <!ENTITY % phrase "CODE">
- <!ENTITY % special "A | IMG | BR | FONT">
- <!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special;">
-<!ELEMENT I  (%inline;)*>
-<!ATTLIST I %attrs;>
-<!ELEMENT B  (%inline;)*>
-<!ATTLIST B %attrs;>
-<!ELEMENT CODE  (%inline;)*>
-<!ATTLIST CODE %attrs;>
-
-<!ELEMENT FONT (%inline;)*>
-<!ATTLIST FONT
-  %coreattrs;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT BR EMPTY>
-
-<!--================== HTML content models ===============================-->
-
-<!ENTITY % block "P | %preformatted; | %list; | TABLE">
-<!ENTITY % flow "%inline; | %block;">
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT BODY (%flow;)* >
-<!ATTLIST BODY
-  %attrs;
->
-
-<!--================== The Anchor Element ================================-->
-
-<!ELEMENT A (%inline;)*>
-<!ATTLIST A
-    %attrs;
-    name  CDATA  #IMPLIED
-    href  %URI;  #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!ENTITY % Length "CDATA">
-
-<!ENTITY % Pixels "CDATA">
-
-<!ENTITY % IAlign "(top|middle|bottom|left|right)">
-
-<!ELEMENT IMG EMPTY>
-<!ATTLIST IMG
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #IMPLIED
-  name    CDATA          #IMPLIED
-  height   %Length;       #IMPLIED
-  width     %Length;       #IMPLIED
-  align      %IAlign;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT P (%inline;)*>
-<!ATTLIST P
-  %attrs;
-  %align;
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- excludes markup for images and changes in font size -->
-<!ENTITY % pre.exclusion "IMG">
-
-<!ELEMENT PRE (#PCDATA | A | BR | FONT | %fontstyle; | %phrase;)*>
-<!ATTLIST PRE
-  %attrs;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- definition lists - DT for term, DD for its definition -->
-
-<!ELEMENT DL  (DT|DD)+>
-<!ATTLIST DL
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT DT (%inline;)*>
-<!ATTLIST DT
-  %attrs;
-  >
-
-<!ELEMENT DD (%flow;)*>
-<!ATTLIST DD
-  %attrs;
-  >
-
-<!-- Ordered lists (OL) Numbering style
-
-    1   arablic numbers     1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
-
-    This can't be expressed directly in SGML due to case folding.
-->
-
-<!ENTITY % OLStyle "CDATA">
-
-<!ELEMENT OL  (LI)+>
-<!ATTLIST OL
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       NMTOKEN         #IMPLIED
-  >
-
-<!-- Unordered Lists (UL) bullet styles -->
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!ELEMENT UL (LI)+>
-<!ATTLIST UL
-  %attrs;
-  type        %ULStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  >
-
-<!ENTITY % LIStyle "CDATA">
-
-<!ELEMENT LI  (%flow;)*>
-<!ATTLIST LI
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       NMTOKEN     #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
- <!-- horizontal alignment attributes for cell contents -->
-<!ENTITY % cellhalign  "align      (left|center|right|justify|char) #IMPLIED">
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign "valign (top|middle|bottom|baseline) #IMPLIED">
-
-<!ELEMENT TABLE (TR+)>
-<!ATTLIST TABLE
-  %attrs;
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ELEMENT TR (TH|TD)+>
-<!ATTLIST TR
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
-
-<!ELEMENT TH  (%flow;)*>
-<!ATTLIST TH
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!ELEMENT TD  (%flow;)*>
-<!ATTLIST TD
-  %attrs;
-  rowspan    NMTOKEN #IMPLIED
-  colspan    NMTOKEN  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!--===================== Gentoo Specific =================================-->
-
-<!ELEMENT TITLE (#PCDATA)>
-<!ELEMENT AUTHOR (#PCDATA)>
-<!ATTLIST AUTHOR
-    title %Text; #IMPLIED
-    email %Text; #IMPLIED
->
-<!ELEMENT DATE (#PCDATA)>
-<!ELEMENT VERSION (#PCDATA)>
-<!ELEMENT ABSTRACT (#PCDATA)>
-<!ELEMENT CHAPTER (TITLE,SECTION+)>
-<!ATTLIST CHAPTER
-    link %Text; #IMPLIED
-    >
-
-<!ELEMENT SECTION (TITLE, BODY)>
-<!ELEMENT GUIDE (TITLE, (AUTHOR+ & DATE & VERSION? & ABSTRACT?),CHAPTER+)>
--- a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-S=${WORKDIR}
-DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
-HOMEPAGE="https://www.gentoo.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE=""
-
-DEPEND=">=app-text/sgml-common-0.6.1"
-
-src_unpack() {
-	# Nothing to unpack
-	return 0
-}
-
-src_install () {
-
-	cd ${FILESDIR}
-
-	insinto /usr/share/sgml/guide
-	doins catalog
-	insinto /usr/share/sgml/guide/ent
-	doins ent/*.ent
-	insinto /usr/share/sgml/guide/xml-dtd-2.1
-	newins guide/guide-2.1.dtd guide.dtd
-
-}
-
-sgml-catalog_cat_include "/etc/sgml/gentoo-guide.cat" \
-	"/usr/share/sgml/guide/catalog"
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -1,2 +1,3 @@
 DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
 DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
--- a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
+++ b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
@ -0,0 +1,39 @@
+diff --git a/Makerules b/Makerules
+index ef2b6b0..f9b25d6 100644
+--- a/Makerules
+++ b/Makerules
+@@ -104,12 +104,17 @@ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS :=
+ SYS_GLUT_LIBS := -lglut -lGL
+ 
+WANT_OPENSSL ?= yes
+ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
+endif
+ 
+WANT_CURL ?= yes
+ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -121,12 +126,16 @@ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
+endif
+ 
+WANT_X11 ?= yes
+ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.13-openssl-curl-x11.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	# specialized lcms2, keep it if wanted inside lubmupdfthird
+	if ! use lcms ; then
+		rm -rf thirdparty/lcms2
+	fi
+
+	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
+	for my_third in thirdparty/* ; do
+		ewarn "Bundled thirdparty lib: ${my_third}"
+	done
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	use lcms && emake XCFLAGS="-fpic" third
+	emake XCFLAGS="-fpic" \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@ -1,5 +1,3 @@
 DIST mysql++-2.3.2.tar.gz 1627115 BLAKE2B 058ed41485474e4283a7200aa57398e85162f697f017ccfde7974b85457bb827d17bfdd522ef46818d42a75751a0eeb6ade39ded73e0265ee6811eb2769df3ea SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7
-DIST mysql++-3.1.0.tar.gz 1944101 BLAKE2B dabfa6491c2535fa974c6ee679d5130853dff1fe8530fc6e0ce1cd2762447c2430f9ccbd45dbfd0c67dfee8019d0446cb04b440d1352813dc76962ca8fea5b80 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90
 DIST mysql++-3.2.1.tar.gz 2256735 BLAKE2B 8d5e713926a405fa9b93af690554595d8cc79cc25af216103df241f549fd93e7fa051ef5f1a27e7c67825408b8310886bedaeb69bd80b6ea6cf1c320a94cc9d2 SHA512 936021dcf8568d3ee0c935e5c552acc6fd2b57849d1cc60e68b45b690d798d7bfbc1dedc04e21417d1b4c27017b471e4f6cb70de7f1904949b9222090a777de9
-DIST mysql++-3.2.2.tar.gz 3257359 BLAKE2B 180ffaa4d5a198795386f46a6be3bc6f50ded373057b5c6fe618ae3d0976ced8288647bc1beac64fbd7c93aab5f2a79ced4ecc947101e3118b39aa0b40b1eb1a SHA512 eb4250394027f1baafa660711d8221c9eb3a70ff2a37331c58807a97a67b84f792290b24830e851b2421f6ccf2867e9f3597af3af41530256c44521a4c4a55b1
 DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
--- a/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
@ -1,26 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-
-inherit eutils
+EAPI=6

 DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
+HOMEPAGE="http://tangentsoft.net/mysqlpp/"
 SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""

-RDEPEND=">=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		>=sys-devel/gcc-3"
+RDEPEND="dev-db/mysql-connector-c:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/html/{refman,userman} )
+DOCS=( README{,.cygwin,.examples,.mingw,.unix,.vc} CREDITS ChangeLog
+	HACKERS Wishlist doc/pdf doc/README.devel doc/README.manuals
+	doc/refman doc/ssqls-pretty doc/userman )

 src_prepare() {
-
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	eapply "${FILESDIR}"/${P}-gcc-4.3.patch

 	for i in "${S}"/lib/*.h ; do
 		sed -i \
@ -28,6 +29,8 @@ src_prepare() {
 			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
 			"${i}" || die "Failed to sed ${i} for fixing MySQL includes"
 	done
+	sed -i 's/mysqlclient_r/mysqlclient/' "${S}/configure" || die
+	eapply_user
 }

 src_configure() {
@ -44,12 +47,3 @@ src_configure() {
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	econf ${myconf}
 }
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	dodoc README* CREDITS ChangeLog HACKERS Wishlist
-	dohtml -r doc/html/*
-	rm -r doc/html || die
-	dodoc -r doc/*
-}
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		|| ( >=sys-devel/gcc-3 >=sys-devel/gcc-apple-4 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-gcc-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-gold.patch
-
-	for i in "${S}"/lib/*.h ; do
-		sed -i \
-			-e '/#include </s,mysql.h,mysql/mysql.h,g' \
-			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
-			"${i}"
-	done
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use prefix || local EPREFIX=
-	myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# install the docs and HTML pages
-	dodoc README* CREDITS* ChangeLog HACKERS.txt Wishlist doc/ssqls-pretty
-	dodoc -r doc/pdf/ doc/refman/ doc/userman/
-	dohtml -r doc/html/
-}
--- a/dev-db/mysql++/mysql++-3.2.2.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="virtual/libmysqlclient:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gold.patch"
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	dodoc CREDITS* HACKERS.txt Wishlist doc/ssqls-pretty
-	dodoc -r doc/pdf/ doc/refman/ doc/userman/
-	dohtml -r doc/html/
-}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/ell/ell-0.6-r1.ebuild
+++ b/dev-libs/ell/ell-0.6-r1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@ -1 +1 @@
-DIST xxhash-0.6.4.tar.gz 28995 BLAKE2B 2556ac14e6a6b1341adeeba244ad5bac7b52ff43b5d85acfc51de903771f1a7b32defeab657db765d21a33ec49aee1a892617d6656a152ad5ce6e1636a743e18 SHA512 6c914bac5092dfd01349c8223c382d3c13ba1b22e08300ce86ea9663a9a934f930debdeb71c14365ec57d72b95088a4354da92dfb7fcf7d07ec01c0f4fb70ca7
+DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
--- a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
+++ b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Custom OP checking attached to subroutines"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
+++ b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Deconstructed Dynamic C Library Loading"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"

 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test +xs"

 # needs Scalar-Util
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
+++ b/dev-perl/Params-Classify/Params-Classify-0.15.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Argument type classification"

 SLOT="0"
-KEYWORDS="amd64 ~arm ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read/Write YAML files with as little code as possible"

 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"

 RDEPEND="
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"

 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
--- a/dev-python/denonavr/denonavr-0.7.4.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.4.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="xml(+)"

 inherit distutils-r1
@ -29,5 +29,5 @@ DEPEND="
 "

 python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
+	pytest -vv || die "tests failed with ${EPYTHON}"
 }
--- a/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
@ -28,8 +28,10 @@ RDEPEND="${COMMON_DEPEND}

 # test: django fails at current version of sci-libs/geos, making tests
 # explode immediately
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
 		dev-python/biplist[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@ -38,8 +40,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
 		!!sci-libs/geos[python] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/django-1.9[${PYTHON_USEDEP}]
-		<dev-python/django-1.10[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '>=dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )"

--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )

 inherit distutils-r1

@ -21,5 +21,5 @@ DEPEND="
 "

 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
--- a/dev-python/eliot/Manifest
+++ b/dev-python/eliot/Manifest
@ -1 +0,0 @@
-DIST eliot-0.4.0.tar.gz 67581 BLAKE2B 6d453bfd9bce12cda235390a852bec479e8616bd328043c93e502f95ff967397884cb234ba735b53aad6e580390532912164d7dc5868da854e49f2c6a255dbf3 SHA512 f63b487905996bf06c2efccc66c5b9214e13d672f9c3ddcfa5f2a65dc909953b489111469251501efa2e46b3911b213ffe404c6fddfea92646e086e439fb6503
--- a/dev-python/eliot/eliot-0.4.0.ebuild
+++ b/dev-python/eliot/eliot-0.4.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-inherit distutils-r1
-
-DESCRIPTION="Logging as Storytelling"
-HOMEPAGE="https://github.com/ScatterHQ/eliot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	"
-
-python_compile_all() {
-	emake -C "${S}/docs" man
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	doman "${S}/docs/build/man/"*
-	use doc && dohtml -r "${S}/docs/build/html/"*
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/eliot/metadata.xml
+++ b/dev-python/eliot/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">eliot</remote-id>
-    <remote-id type="github">hybridcluster/eliot</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"

 DEPEND="
--- a/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
+++ b/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )

 inherit distutils-r1

@ -15,7 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-misc/curl:*"

 # Requires access to google.com and http2.akamai.com
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )

 inherit distutils-r1

@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"

-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
--- a/dev-python/inflect/inflect-0.3.1.ebuild
+++ b/dev-python/inflect/inflect-0.3.1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( pypy{,3} python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )

 inherit distutils-r1

@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"

-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )

 inherit distutils-r1

@ -17,12 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"

-RDEPEND=""
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "

@ -34,5 +31,5 @@ python_compile_all() {
 }

 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
--- a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 # Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )

 inherit distutils-r1

@ -47,8 +47,8 @@ python_compile_all() {
 }

 python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	# Avoid ImportMismatchError, override pytest options to skip flake8
+	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }

--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@ -37,7 +37,6 @@ python_compile_all() {

 python_test() {
 	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
-	cd "${BUILD_DIR}/lib" || die
-	py.test --doctest-modules more_itertools \
+	pytest -vv --doctest-modules "${BUILD_DIR}"/lib/more_itertools \
 		|| die "tests fail with ${EPYTHON}"
 }
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@ -1,7 +1,5 @@
 DIST pbr-0.8.2.tar.gz 77790 BLAKE2B 4b2efa9a06f0e47eac8d2b591d2c10223418c5813a8de83696348d7ec7ddd20f077492e43028994f1a2d1e28856d3d6159e4105174a760211584b026a616da24 SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a
 DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24b6e299284f49a7f838dcfc846daabc4e40de388848ad415a12c19813e13aab1d3f3bf147e064269e4dd725 SHA512 f7f6ce2f70324e2d287f58c3d12e0be2e33ef9ed32311ad2c56410eb67cda20732adff2058ba2fc244249a17a4c95b0d589ba913db4777e63ff1023ae888c864
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
-DIST pbr-4.0.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
-DIST pbr-4.0.3.tar.gz 108684 BLAKE2B e3a9a695b04333a9523c8e749628773cd12f38e87cd6cc670b8ba40b800871004a5cd9d038913e5f483291d180afbeb524535c6c68833ee48adde6ff276783f4 SHA512 9e5c915bd661e3356ad1b92b3d01df3a592a6120c9dc58d3e4bfbc3040f2d69f896244ea8f6c9cffad3e774747d330cd03e928cfc160e5df980c134fe2dee801
-DIST pbr-4.0.4.tar.gz 109077 BLAKE2B efe901b074cd6747fe123b6a325cb45e010d774834a875e86647b6a9c3afbaff9e435087e757ae4276c0b18558faeea57c8dec6b2039ab7b0f70424f64d94f57 SHA512 fc849a27c3b5deb89545dd05eb102a14f2c42a0d617f474df46b3292c14ab7e0a4343cd6e1a38eef77815cca49374d58698cb0c2fdd2aa5f2f47e890939adbb3
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
+DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
--- a/dev-python/pbr/pbr-4.0.2.ebuild
+++ b/dev-python/pbr/pbr-4.0.2.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
--- a/dev-python/pbr/pbr-4.0.3.ebuild
+++ b/dev-python/pbr/pbr-4.0.3.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
--- a/dev-python/pbr/pbr-4.2.0-r1.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"

 inherit distutils-r1
@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

@ -34,6 +35,7 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
 		dev-python/wheel[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
@ -65,6 +67,6 @@ python_test() {

 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"

-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
 }
--- a/dev-python/python-netlink/Manifest
+++ b/dev-python/python-netlink/Manifest
@ -0,0 +1 @@
+DIST python-netlink-0.1.tar.gz 21664 BLAKE2B 09a920256adeebee6762fc8ee7dcdabb38fe7e603d196b8b0cb8210023ee297eec26ed94b5171db2b180b7496c4c8f98aaaf7e3ad55c965051aa73f8709fe0c6 SHA512 ae4a55f7a12b4eab48d4696e41a90a47b4f3a298bee953d5234b47b4889fee61190a6cf30f4ed529f378f05231584116fbd85ebc0aeaf1e14307316edf16043a
--- a/games-emulation/advancemenu/metadata.xml
+++ b/games-emulation/advancemenu/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">advancemame</remote-id>
+		<remote-id type="pypi">NetLink</remote-id>
+		<doc>https://xmine128.tk/Software/Python/netlink/docs/</doc>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/python-netlink/python-netlink-0.1.ebuild
+++ b/dev-python/python-netlink/python-netlink-0.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="NetLink"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Pure-Python client for the Linux NetLink interface"
+HOMEPAGE="https://pypi.org/project/NetLink/ https://xmine128.tk/Software/Python/netlink/docs/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# setuptools-markdown is not needed.
+	sed -e "s:'setuptools-markdown'::" -i setup.py || die
+}
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@ -1,2 +1,2 @@
-DIST pyxattr-0.5.5.tar.gz 26718 BLAKE2B b8d599ed0194fec4809ebdb8277fa4023e932ed49a8a6253a7c6a879250a73330334bd8a72b0c9d9bfd828cac1454659d23b55b5e608bfe0109392988709beb8 SHA512 77b732a7e524a7c31a0511df2c96c18b214f93c6ac47276ecdf12ed95133ee506fa882b2532a7159aa2f4e02a7128e33bb8883ea632a5394297d98fb28898327
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
+DIST pyxattr-0.6.1.tar.gz 32105 BLAKE2B 0334d056ea652492fcc7958e0caf0ec438253e287c3f2ee663c0eb059fad5f01bba02963fc90035f84c129e19ee08e11bbc5573cebef6fd7ffe5c65adddc02ab SHA512 2c2defee81e2bd7e7e7f67d33676858f27494f12ba5c3d34bd548912a058cae562e9e9ed0dc5697892d1d55c29f2a5e10455260092b63faa54e40b841c42681d
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python interface to xattr"
-HOMEPAGE="https://pyxattr.k1024.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyxattr.k1024.org/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e 's:, "-Werror"::' setup.py || die
-	# Bug 548486
-	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
-		-i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake doc
-}
-
-src_test() {
-	# Perform the tests in /var/tmp; that location is more likely
-	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
-
-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/pyxattr/pyxattr-0.6.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )

 inherit distutils-r1 eutils

@ -38,15 +38,25 @@ python_compile_all() {
 src_test() {
 	# Perform the tests in /var/tmp; that location is more likely
 	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
+	local -x TEST_DIR="${TEST_DIR:-/var/tmp}"
+	# Ignore selinux attributes by default, bug #503946.
+	local -x TEST_IGNORE_XATTRS="${TEST_IGNORE_XATTRS:-security.selinux}"

-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
+	einfo "Please note that the tests fail if xattrs are not supported"
+	einfo "by the filesystem used for ${TEST_DIR}."
+	einfo
+	einfo "The location for tests can be overriden using TEST_DIR variable:"
+	einfo "  $ export TEST_DIR=/my/test/place"
+	einfo
+	einfo "Additionally, TEST_IGNORE_XATTRS can be set to control which"
+	einfo "external attributes are ignored by the tests."
+	einfo "See https://bugs.gentoo.org/503946 for details."
+	einfo
 	distutils-r1_src_test
 }

 python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
+	nosetests -v || die "Tests fail with ${EPYTHON}"
 }

 python_install_all() {
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@ -1,2 +1,3 @@
 DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
+DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="pypi">requests-mock</remote-id>
 		<remote-id type="github">jamielennox/requests-mock</remote-id>
+		<bugs-to>https://github.com/jamielennox/requests-mock/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	# Disable intersphinx
+	sed -i -e "s/'reno.sphinxext',//" \
+		-e "s/'sphinx.ext.intersphinx'//" \
+		doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc/source docs/source/build/_html || die
+		HTML_DOCS=( docs/source/build/_html/. )
+	fi
+}
+
+python_test() {
+	rm -rf .testrepository \
+		|| die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@ -1 +1,2 @@
 DIST stestr-1.1.0.tar.gz 95353 BLAKE2B 70435cec22d56f38fb9d87484b261fd73d79f8ea719ffd67861e2504580d6e2932b762839e44dc4c9e348e448693a80e8173850d800374643bbce15374137c37 SHA512 7490f0982c77190adf97daae965a957fc40d0e418a64fc38ccb50817a7266b06224e61f17ae9c84edfe200417eaab726cf834646bfa2efbac67ea029dea54df1
+DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
--- a/dev-python/stestr/stestr-2.1.0.ebuild
+++ b/dev-python/stestr/stestr-2.1.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A parallel Python test runner built around subunit"
+HOMEPAGE="https://github.com/mtreinish/stestr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
--- a/dev-python/voluptuous/voluptuous-0.11.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@ -3,3 +3,4 @@ DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca1
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
+DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
--- a/dev-ruby/capybara/capybara-3.4.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.4.2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra:2 )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
--- a/dev-ruby/fivemat/Manifest
+++ b/dev-ruby/fivemat/Manifest
@ -1,2 +1,3 @@
 DIST fivemat-1.3.5.gem 9728 BLAKE2B bd95cbac081e32df6c03a89d2533d20f8e892a575e1cea3679c3599a233c6097ecd03d4e804ca78be9d32de49759f3b03407f643ac14eeb5cf31e12e2bcb97ae SHA512 c19f30708cc2fe3cba045333eab7409049013f04f273606fe27cfc90eadbe68feba4b1e2c6a0d7a2183e637805c2fb8921a7ffd6d895dc746efabebad6189a7b
 DIST fivemat-1.3.6.gem 9728 BLAKE2B 002470ba61b6eb51a9e1e2020b8d3e60d6f4824549032fe7da7b31c3b67f9995a61c4bd59a1c2fe777b72ffd9ddcff568efa91ca6d07651eedcf6935455205f7 SHA512 b3cdaed761c0d955621c1bb7de691a552e0f49588a132235515cf02e39e27344d868b57b53752c027a4231a5bbca7b5957f30d5e77359f606031526d92eee1fc
+DIST fivemat-1.3.7.gem 10240 BLAKE2B 624eabf458130792e6dd06667fe67f578005630e164a4ce30871204d792c5b562c1ad0fcf2470915bed877b60b3db341887735a3330cfeae181bee6775775295 SHA512 b380bef69756d0214325ee6f3f608062d63d8dd7603aac7b9af1abdf406687971cb4914634e9c807ca73819bafd8e99c5cec0a29f461a1ef3f861676bee86ddf
--- a/dev-ruby/fivemat/fivemat-1.3.7.ebuild
+++ b/dev-ruby/fivemat/fivemat-1.3.7.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Package does not contain tests
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
+HOMEPAGE="https://github.com/tpope/fivemat"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
--- a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
+++ b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RUBY_PATCHES=( ${P}-frozen-classes.patch )
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@ -1,2 +1,3 @@
 DIST sanitize-4.6.4.tar.gz 1349418 BLAKE2B 2d1a56340e562d057c85edc0d5157508267a4089b0aeb59156d0c249c8a39adcc15a10c8c67d84be77a2b388aa779e9330b9b4b52f28f11d7666eb97fb41bd24 SHA512 d870d8cc5ce6043e3825cfbb50f31c00d348c9ca05823c0eda245b9c175ae0bb9d0941845112bb3721ded9013bc554c09bfc55a1bfad70fcccd1660142e4ca82
 DIST sanitize-4.6.5.tar.gz 1349481 BLAKE2B bc0b3317952c1b5a903ca403300fdc788df129669761ab7f16d1cb76a75bed7306bd47065cb58449525c0ab0986015da93cc91d74f12fe407e273a84a79876f4 SHA512 3bd37faf5e99073fd87cf7e3f12628233117dcf38c298a806680da20c00050237d83d286936c898f03583d64b4bac5ae2be373fb89b259e4ca6dea283ca713b7
+DIST sanitize-4.6.6.tar.gz 1349809 BLAKE2B d34f3359f1241881f96d48cfce6aa554796e7c7a2282c729dc93b6db7f1c5d2ec1677ebd1cddb79cb14f84d7724ddb7dad551136cd130bd89750ab5851a8094f SHA512 6f2567601dea9fd08996fe537e5543c7618e407a68580a19b74333a6e840d1123891a087e6c57c88f887390cd04e4c25af71547d7d9622e61369dc4ffe92f220
--- a/dev-ruby/sanitize/sanitize-4.6.6.ebuild
+++ b/dev-ruby/sanitize/sanitize-4.6.6.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/nokogumbo-1.4:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
--- a/games-emulation/advancemenu/Manifest
+++ b/games-emulation/advancemenu/Manifest
@ -1,3 +0,0 @@
-DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb
-DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c
-DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386
--- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
+++ b/games-emulation/advancemenu/advancemenu-2.7.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-src_prepare() {
-	# pic patch - bug #142021
-	epatch \
-		"${FILESDIR}"/${P}-alsa-pkg-config.patch \
-		"${FILESDIR}"/${P}-pic.patch
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use !sdl && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	egamesconf \
-		--enable-expat \
-		--enable-zlib \
-		--disable-svgalib \
-		--disable-static \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable fbcon fb) \
-		$(use_enable ncurses) \
-		$(use_enable truetype freetype) \
-		$(use_enable oss) \
-		$(use_enable sdl) \
-		$(use_enable slang) \
-		$(use !sdl && use !fbcon && echo --enable-sdl) \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	dogamesbin advmenu
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	dohtml doc/*.html
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
--- a/games-emulation/advancemenu/advancemenu-2.9.ebuild
+++ b/games-emulation/advancemenu/advancemenu-2.9.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-# Too big to put into FILESDIR
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-PATCHES=(
-	# pic patch - bug #142021
-	"${FILESDIR}"/${PN}-2.7-pic.patch
-	"${FILESDIR}/${PN}-2.9-destdir.patch"
-	"${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	local myeconfargs=(
-		--enable-expat
-		--enable-zlib
-		--disable-svgalib
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable fbcon fb)
-		$(use_enable ncurses)
-		$(use_enable truetype freetype)
-		$(use_enable oss)
-		$(use_enable sdl)
-		$(use_enable slang)
-		$(use !sdl && use !fbcon && echo --enable-sdl)
-		$(use_enable x86 asm)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
--- a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
+++ b/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
@ -1,20 +0,0 @@
--- advancemenu-2.6.orig/configure.ac
-+++ advancemenu-2.6/configure.ac
-@@ -512,7 +512,7 @@
- 		[snd_pcm_open],
- 		[ac_lib_alsa=yes],
- 		[ac_lib_alsa=no],
-		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	if test $ac_lib_alsa = yes; then
- 		AC_MSG_CHECKING([for ALSA])
-@@ -531,7 +531,7 @@
- 		[snd_pcm_open],
- 		[],
- 		[AC_MSG_ERROR([the ALSA library is missing])],
-		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	AC_MSG_CHECKING([for ALSA version])
- 	AC_TRY_COMPILE([
--- a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
+++ b/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
@ -1,13 +0,0 @@
--- ./advance/blit/blit.c.orig
-+++ ./advance/blit/blit.c
-@@ -28,6 +28,10 @@
-  * do so, delete this exception statement from your version.
-  */
- 
-+#if defined(USE_ASM_INLINE) && defined(__PIC__)
-+# undef USE_ASM_INLINE
-+#endif
-+
- #include "portable.h"
- 
- #include "blit.h"
--- a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
+++ b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
@ -1,112 +0,0 @@
--- advancemenu-2.9/advance/advance.mak
-+++ advancemenu-2.9/advance/advance.mak
-@@ -284,45 +284,45 @@
- # Common install
- 
- pkgdir = $(datadir)/advance
-pkgdocdir = $(docdir)/advance
-+pkgdocdir = $(docdir)
- 
- install-dirs:
-	-$(INSTALL_PROGRAM_DIR) $(bindir)
-	-$(INSTALL_DATA_DIR) $(pkgdir)
-	-$(INSTALL_DATA_DIR) $(pkgdocdir)
-	-$(INSTALL_MAN_DIR) $(mandir)/man1
-+	-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
-+	-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
- ifneq ($(wildcard $(EMUSRC)),)
-	-$(INSTALL_DATA_DIR) $(pkgdir)/rom
-	-$(INSTALL_DATA_DIR) $(pkgdir)/sample
-	-$(INSTALL_DATA_DIR) $(pkgdir)/artwork
-	-$(INSTALL_DATA_DIR) $(pkgdir)/image
-	-$(INSTALL_DATA_DIR) $(pkgdir)/crc
-	-$(INSTALL_DATA_DIR) $(pkgdir)/snap
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap
- endif
- 
- install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES)
- ifdef INSTALL_DATAFILES
- 	@for i in $(INSTALL_DATAFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)"; \
-		$(INSTALL_DATA) $$i $(pkgdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \
- 	done
- endif
- ifdef INSTALL_ROMFILES
- 	@for i in $(INSTALL_ROMFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \
-		$(INSTALL_DATA) $$i $(pkgdir)/rom; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \
- 	done
- endif
- ifdef INSTALL_SAMPLEFILES
- 	@for i in $(INSTALL_SAMPLEFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \
-		$(INSTALL_DATA) $$i $(pkgdir)/sample; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \
- 	done
- endif
- ifdef INSTALL_SNAPFILES
- 	@for i in $(INSTALL_SNAPFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \
-		$(INSTALL_DATA) $$i $(pkgdir)/snap; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \
- 	done
- endif
- 
-@@ -351,7 +351,7 @@
- install-bin: $(INSTALL_BINFILES)
- 	@for i in $(INSTALL_BINFILES); do \
- 		echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \
-		$(INSTALL_PROGRAM) $$i $(bindir); \
-+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
- 	done
- 
- uninstall-bin:
-@@ -363,7 +363,7 @@
- ifdef INSTALL_DOCFILES
- 	@for i in $(INSTALL_DOCFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \
-		$(INSTALL_DATA) $$i $(pkgdocdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
- 	done
- endif
- 
-@@ -378,7 +378,7 @@
- ifdef INSTALL_MANFILES
- 	@for i in $(INSTALL_MANFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \
-		$(INSTALL_DATA) $$i $(mandir)/man1; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
- 	done
- endif
- 
-@@ -401,7 +401,7 @@
- 	-rmdir $(pkgdocdir)
- endif
- 
-install: install-dirs install-bin install-data install-doc install-man
-+install: install-dirs install-bin install-data
- 
- uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs
- 
--- advancemenu-2.9/configure.ac
-+++ advancemenu-2.9/configure.ac
-@@ -1158,8 +1158,8 @@
- 
- dnl Final
- AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
-AC_SUBST([mandir],['${prefix}/man'])
-AC_SUBST([docdir],['${prefix}/doc'])
-+AC_SUBST([mandir],['${prefix}/share/man'])
-+AC_SUBST([docdir],['${prefix}/share/doc/${PF}'])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
- 
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
--- a/games-fps/postal2mp-demo/Manifest
+++ b/games-fps/postal2mp-demo/Manifest
@ -1 +0,0 @@
-DIST Postal2STP-FreeMP-linux.tar.bz2 591082047 BLAKE2B b633ec1d5337438af3abfee30584b6977136abd6aaa52b1ba946f30ccc7a03c3de6539fa2d3519a5e106af4113d0ee9171fbe92fdeb3057db052f870e4ae3bec SHA512 92580c2ce0593f37890013a5b2e5c1d420b57ae4e90569725446dbb2c939d1dd29b6df566783f020419dd8c4b1301213d1e8d9d581c95efd3f5950e8e54b46d1
--- a/games-fps/postal2mp-demo/metadata.xml
+++ b/games-fps/postal2mp-demo/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
--- a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker multilib games
-
-DESCRIPTION="You play the Postal Dude: Postal 2 is only as violent as you are"
-HOMEPAGE="http://icculus.org/news/news.php?id=4419"
-SRC_URI="http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
-	http://0day.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
-	http://cyberstalker.dk/sponsored-by-dkchan.org/Postal2STP-FreeMP-linux.tar.bz2"
-
-LICENSE="postal2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-DEPEND=""
-
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/System/*"
-
-S=${WORKDIR}/Postal2STP-FreeMP-linux
-
-src_install() {
-	has_multilib_profile && ABI=x86
-
-	dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/postal2-bin
-
-	rm "${ED}/${dir}"/System/{openal.so,libSDL-1.2.so.0,libstdc++.so.5,libgcc_s.so.1} || die
-	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
-	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
-
-	games_make_wrapper ${PN} ./postal2-bin "${dir}"/System .
-	newicon postal2.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Postal 2: Share the Pain (Demo)"
-
-	prepgamesdirs
-}
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@ -1 +1 @@
-DIST brainworkshop-4.8.4.zip 9373980 BLAKE2B 85af1f17755f0007f01c1684f4d746de6bab6580ed29c717e9462f8dd57115ce8ed7d2d61a411523e2d92191abe5a49d29b2598e937b014e68b3e1cb9ac3e059 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936
+DIST brainworkshop-5_beta20180712.tar.gz 8001699 BLAKE2B 0bf6114d89ab39a79e7659f6fb76d1e1cb21624a014381fc73bf6ca56f2bd721c192bc89e42b147666dd6fb7d0f6df12c60230dc3bf17b75d68f3fba1ea58b99 SHA512 5733daefd79f77c0eadcf7cec03d1cd3658ca8f79b23705f763ba5b15cf44d2f67861852287a3998c101072a7dfae20304508bf68cd728f27e2051271a16464f
--- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils python-r1 games
-
-DESCRIPTION="Short-term-memory training N-Back game"
-HOMEPAGE="http://brainworkshop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pyopenal
-	|| ( >=dev-python/pyglet-1.1.4[openal]
-		 >=dev-python/pyglet-1.1.4[alsa] )"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-paths.patch
-	edos2unix ${PN}.pyw
-
-	sed -i \
-		-e 's#@GENTOO_DATADIR@#'${GAMES_DATADIR}'#' \
-		${PN}.pyw || die
-}
-
-src_install() {
-	newgamesbin ${PN}.pyw ${PN}
-	python_replicate_script "${D}${GAMES_BINDIR}"/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r res/*
-	dodoc Readme.txt data/Readme-stats.txt
-	newicon -s 48 res/misc/brain/brain.png ${PN}.png
-	make_desktop_entry ${PN} "Brain Workshop"
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit eutils gnome2-utils python-r1
+
+COMMIT="c5343cb3d828e8181ffff8249f683fce2fcca6db"
+DESCRIPTION="Short-term-memory training N-Back game"
+HOMEPAGE="https://github.com/samcv/brainworkshop"
+SRC_URI="https://github.com/samcv/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| ( >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},openal]
+		 >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},alsa] )"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-${PV%_*}-fix-paths.patch
+)
+
+src_prepare() {
+	edos2unix ${PN}.pyw
+	default
+
+	sed -i \
+		"s#@GENTOO_DATADIR@#${EPREFIX}/usr/share/${PN}#g" \
+		${PN}.pyw || die
+}
+
+src_install() {
+	newbin ${PN}.pyw ${PN}
+	python_replicate_script "${ED}"usr/bin/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r res/*
+
+	dodoc Readme.md Readme-{instructions,resources}.txt data/Readme-stats.txt
+
+	newicon -s 48 res/misc/brain/brain.png ${PN}.png
+	make_desktop_entry ${PN} "Brain Workshop"
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
--- a/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
+++ b/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
@ -1,15 +0,0 @@
--- a/brainworkshop.pyw	2010-10-15 19:06:16.529006906 +0200
-+++ b/brainworkshop.pyw	2010-10-15 19:08:17.095632136 +0200
-@@ -35,8 +35,10 @@
- NOVBO = True
- VSYNC = False
- DEBUG = False
-FOLDER_RES = 'res'
-FOLDER_DATA = 'data'
-+FOLDER_RES = '@GENTOO_DATADIR@/brainworkshop'
-+FOLDER_DATA = os.path.expanduser('~/.brainworkshop')
-+if not os.path.isdir(FOLDER_DATA):
-+	os.mkdir(FOLDER_DATA)
- CONFIGFILE = 'config.ini'
- STATS_BINARY = 'logfile.dat'
- USER = 'default'
--- a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
+++ b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
@ -0,0 +1,38 @@
+diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
+--- a/brainworkshop.pyw	2018-07-14 19:11:17.536581902 +0100
+++ b/brainworkshop.pyw	2018-07-14 19:12:07.582695292 +0100
+@@ -41,7 +41,7 @@
+             error_msg("Expected an argument following %s" % arg)
+             exit(1)
+ 
+-import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime
+import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime, errno
+ if sys.version_info >= (3,0):
+     import urllib.request, configparser as ConfigParser
+     from io import StringIO
+@@ -173,7 +173,7 @@
+     if rtrn:
+         return rtrn
+     else:
+-        return os.path.join(get_main_dir(), FOLDER_RES)
+        return '@GENTOO_DATADIR@'
+ def edit_config_ini():
+     if sys.platform == 'win32':
+         cmd = 'notepad'
+@@ -823,7 +823,15 @@
+         f = open(os.path.join(get_data_dir(), STATS_BINARY), 'w')
+         f.close()
+ 
+-check_and_move_user_data()
+try:
+    path = get_data_dir()
+    os.makedirs(path)
+except OSError as exc:
+    if exc.errno == errno.EEXIST and os.path.isdir(path):
+        pass
+    else:
+        raise
+
+ load_last_user('defaults.ini')
+ 
+ cfg = parse_config(CONFIGFILE)
--- a/games-puzzle/brainworkshop/metadata.xml
+++ b/games-puzzle/brainworkshop/metadata.xml
@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">samcv/brainworkshop</remote-id>
 		<remote-id type="sourceforge">brainworkshop</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@ -0,0 +1 @@
+DIST gnome-shell-extension-gsconnect-11.tar.gz 1015034 BLAKE2B 470f9247987bf1ec9c37e658276427fb06e5406bbd862e33498935f860b955fa69219dacdbc4ee40cffe7257d74a01ddf018e19a81b0849a8879d997720c11c9 SHA512 134d26b37668e2dcc9fb3e96196cde1b6e17531050d5c91b2b9853bb3ef76e660b230a5ab9c77ded742541a7c871ed50e4d2a2facea9cbb29cd3a546a0a476a4
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	>=gnome-base/gnome-shell-3.24
+	gnome-base/nautilus[introspection]
+	net-fs/sshfs
+	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
+	|| ( media-libs/libcanberra media-libs/gsound )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_install() {
+	meson_src_install
+	# Rule for install is not complete, only ready for install-zip
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`DIST eliot-0.4.0.tar.gz 67581 BLAKE2B 6d453bfd9bce12cda235390a852bec479e8616bd328043c93e502f95ff967397884cb234ba735b53aad6e580390532912164d7dc5868da854e49f2c6a255dbf3 SHA512 f63b487905996bf06c2efccc66c5b9214e13d672f9c3ddcfa5f2a65dc909953b489111469251501efa2e46b3911b213ffe404c6fddfea92646e086e439fb6503`
				`@ -0,0 +1 @@`
				`DIST python-netlink-0.1.tar.gz 21664 BLAKE2B 09a920256adeebee6762fc8ee7dcdabb38fe7e603d196b8b0cb8210023ee297eec26ed94b5171db2b180b7496c4c8f98aaaf7e3ad55c965051aa73f8709fe0c6 SHA512 ae4a55f7a12b4eab48d4696e41a90a47b4f3a298bee953d5234b47b4889fee61190a6cf30f4ed529f378f05231584116fbd85ebc0aeaf1e14307316edf16043a`
				`@ -1 +0,0 @@`
				`DIST Postal2STP-FreeMP-linux.tar.bz2 591082047 BLAKE2B b633ec1d5337438af3abfee30584b6977136abd6aaa52b1ba946f30ccc7a03c3de6539fa2d3519a5e106af4113d0ee9171fbe92fdeb3057db052f870e4ae3bec SHA512 92580c2ce0593f37890013a5b2e5c1d420b57ae4e90569725446dbb2c939d1dd29b6df566783f020419dd8c4b1301213d1e8d9d581c95efd3f5950e8e54b46d1`
				`@ -0,0 +1 @@`
				`DIST gnome-shell-extension-gsconnect-11.tar.gz 1015034 BLAKE2B 470f9247987bf1ec9c37e658276427fb06e5406bbd862e33498935f860b955fa69219dacdbc4ee40cffe7257d74a01ddf018e19a81b0849a8879d997720c11c9 SHA512 134d26b37668e2dcc9fb3e96196cde1b6e17531050d5c91b2b9853bb3ef76e660b230a5ab9c77ded742541a7c871ed50e4d2a2facea9cbb29cd3a546a0a476a4`