diff --git a/Manifest.files.gz b/Manifest.files.gz
index bd00a7a72060..3f8e212be156 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 819c48555232..e1f021f7d3a5 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/cantera-docs/metadata.xml b/app-doc/cantera-docs/metadata.xml
index 8515d6895ba1..fcc1fbde7c8c 100644
--- a/app-doc/cantera-docs/metadata.xml
+++ b/app-doc/cantera-docs/metadata.xml
@@ -2,7 +2,7 @@
- torokhov_s_a@mail.ru
+ torokhov-s-a@yandex.ru
Sergey Torokhov
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 53cd6afd3c06..8043b8a34aac 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
new file mode 100644
index 000000000000..2506526d39d2
--- /dev/null
+++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A very minimal imitation of the famous GNU Emacs editor"
+HOMEPAGE="https://web.archive.org/web/20171126221613/http://hunter.apana.org.au/~cjb/Code/"
+# taken from http://hunter.apana.org.au/~cjb/Code/ersatz.tar.gz
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}
+ !app-editors/ee"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ sed -i -e "s%/usr/local/share/%/usr/share/doc/${PF}/%" ee.1 \
+ || die "sed failed"
+ eapply_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -Wall" \
+ LFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+ # Note: /usr/bin/ee is "easy edit" on FreeBSD, so if this
+ # is ever keyworded *-fbsd the binary has to be renamed.
+ dobin ee
+ doman ee.1
+ dodoc ChangeLog ERSATZ.keys README
+}
diff --git a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch b/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
index 67c40e789241..3a31f2f116ca 100644
--- a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
+++ b/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
@@ -1,5 +1,5 @@
---- display.c
-+++ display.c
+--- a/display.c
++++ b/display.c
@@ -5,6 +5,7 @@
* hints that are left in the windows by the commands
*/
@@ -16,8 +16,8 @@
int i;
(*term.t_open) ();
---- line.c
-+++ line.c
+--- a/line.c
++++ b/line.c
@@ -47,7 +47,6 @@
{
LINE *lp;
@@ -35,8 +35,8 @@
char *nbufp;
if (kused == ksize)
---- tcap.c
-+++ tcap.c
+--- a/tcap.c
++++ b/tcap.c
@@ -2,6 +2,7 @@
#define termdef 1 /* don't define "term" external */
@@ -45,8 +45,8 @@
#include /* puts(3), snprintf(3) */
#include "estruct.h"
#include "edef.h"
---- termio.c
-+++ termio.c
+--- a/termio.c
++++ b/termio.c
@@ -5,6 +5,7 @@
*/
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
new file mode 100644
index 000000000000..ec91058ed134
--- /dev/null
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 -)"
+DESCRIPTION="Console S-Lang-based editor"
+HOMEPAGE="http://www.jedsoft.org/jed/"
+SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="X gpm xft"
+
+RDEPEND=">=sys-libs/slang-2
+ gpm? ( sys-libs/gpm )
+ X? (
+ x11-libs/libX11
+ xft? (
+ >=media-libs/freetype-2
+ x11-libs/libXft
+ )
+ )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-libs/libXt
+ x11-base/xorg-proto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # replace IDE mode with EMACS mode
+ sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
+ lib/jed.conf || die
+ eapply_user
+}
+
+src_configure() {
+ econf \
+ $(use_enable gpm) \
+ $(use_enable xft) \
+ JED_ROOT="${EPREFIX}"/usr/share/jed
+}
+
+src_compile() {
+ emake
+ use X && emake xjed
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc changes.txt INSTALL{,.unx} README
+ doinfo info/jed*
+
+ insinto /etc
+ doins lib/jed.conf
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d3ca3c60ba75..1c1076c698ae 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/analog/analog-1.9.99.ebuild b/app-emacs/analog/analog-1.9.99.ebuild
index b4aa33cca786..9e84b75732da 100644
--- a/app-emacs/analog/analog-1.9.99.ebuild
+++ b/app-emacs/analog/analog-1.9.99.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit elisp
DESCRIPTION="Monitor lists of files or command output"
-HOMEPAGE="http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
+HOMEPAGE="https://web.archive.org/web/20150919120435/http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
SRC_URI="mirror://gentoo/${P}.el.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE=""
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
index a3c41f739d3a..6be7e2ac368d 100644
--- a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
+++ b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Apache configuration files"
HOMEPAGE="https://github.com/emacs-php/apache-mode"
SRC_URI="https://github.com/emacs-php/apache-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
SITEFILE="50${PN}-gentoo.el"
DOCS="README.org"
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
similarity index 98%
rename from app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
rename to app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
index 3ad20e46390a..2e7a5cec2cc4 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit elisp
@@ -13,5 +13,5 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-SITEFILE="50${PN}-gentoo.el"
S="${WORKDIR}/autoconf-${PV}/lib/emacs"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
similarity index 85%
rename from app-emacs/bbdb/bbdb-3.1.2.ebuild
rename to app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
index 58c9da5277c0..b747df62d953 100644
--- a/app-emacs/bbdb/bbdb-3.1.2.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit elisp autotools
@@ -15,15 +15,16 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="tex vm"
RESTRICT="test" #631700
-DEPEND="tex? ( virtual/tex-base )
- vm? ( app-emacs/vm )"
-RDEPEND="${DEPEND}"
+BDEPEND="vm? ( app-emacs/vm )"
+RDEPEND="${BDEPEND}
+ tex? ( virtual/tex-base )"
SITEFILE="50${PN}-gentoo-${PV}.el"
TEXMF="/usr/share/texmf-site"
src_prepare() {
- epatch "${FILESDIR}"/${P}-no-init.patch
+ eapply "${FILESDIR}"/${P}-no-init.patch
+ eapply_user
eautoreconf
}
diff --git a/app-emacs/df-mode/df-mode-20050509.ebuild b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
similarity index 91%
rename from app-emacs/df-mode/df-mode-20050509.ebuild
rename to app-emacs/df-mode/df-mode-20050509-r1.ebuild
index c46eb76c2460..28fa3a259f40 100644
--- a/app-emacs/df-mode/df-mode-20050509.ebuild
+++ b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit elisp
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 71b064d851b0..5c495a5a7870 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -13,8 +13,8 @@
etc. These applications likely consist of two or more windows, so when you
switch among applications, you may want to save or restore how windows are
located (this is called as "window-configuration"). For this purpose, Emacs
- has two functions, window-configuratin-to-register and jump-to-register, but
- these are too primitive to use on a daily basis.
+ has two functions, window-configuration-to-register and jump-to-register,
+ but these are too primitive to use on a daily basis.
ElScreen provides the ease-to-use environment to save or restore several
window-configurations.
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
new file mode 100644
index 000000000000..b5714cc69480
--- /dev/null
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-el-${PV}"
+DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
+HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
+ http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
+SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="If your network gets really slow when you use mldonkey,
+ consider reducing the max number of connections. See bug #50510.
+ \n\nRemember to install net-p2p/mldonkey separately if you want to
+ work with a local instance."
+
+src_compile() {
+ elisp-compile ml*.el
+}
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
index 0b93b90bc77b..33438fd4bf4c 100644
--- a/app-emacs/muse/muse-3.20.ebuild
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -9,14 +9,13 @@ DESCRIPTION="An authoring and publishing environment for Emacs"
HOMEPAGE="http://mwolson.org/projects/EmacsMuse.html"
SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
-LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
+LICENSE="GPL-3+ FDL-1.2+ GPL-2 MIT"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="test"
+#IUSE="test"
RESTRICT="test" #426546
-DEPEND="test? ( app-emacs/htmlize )"
-RDEPEND=""
+#DEPEND="test? ( app-emacs/htmlize )"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
similarity index 84%
rename from app-emacs/nagios-mode/nagios-mode-0.3.ebuild
rename to app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
index d8df07e7fb29..4993e417bc3a 100644
--- a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
+++ b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit elisp
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Nagios configuration files"
HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.php"
SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
SITEFILE="50${PN}-gentoo.el"
DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 0cbd469ab8bd..ee692887a736 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,2 +1 @@
-DIST libvirt-0.9.7.tar.gz 17853636 BLAKE2B d149fe4f095c76d003bdca1a307e588a9bd1b011b34119e90b8875837ced533caa2f05f2b9e7709d13f5af0a078fdc4779b7fc8a247f7ca04ad490b18fe728c5 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d
DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
deleted file mode 100644
index 9a8a326fa0db..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#BACKPORTS=
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
- ${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
-RDEPEND=""
-
-SITEFILE="60${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
- if [[ -d "${WORKDIR}/patches" ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/patches" \
- epatch
- fi
-}
-
-src_compile() {
- emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
-}
-
-src_test() {
- # No we don't need tests here... trang will take care of checking
- # the well-formedness of the schema files for us
- :
-}
-
-src_install() {
- insinto ${SITEETC}/${PN}
- doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
deleted file mode 100644
index 8f45033a3fce..000000000000
--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
-(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
-(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
-(autoload 'camldebug "camldebug"
- "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
-(autoload 'inferior-caml-mode-font-hook "caml-font")
-
-(eval-after-load "caml" '(require 'caml-font))
-(add-hook 'inferior-caml-mode-hooks 'inferior-caml-mode-font-hook)
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
deleted file mode 100644
index 095b08c559eb..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-MY_P=${P/-mode/}
-
-DESCRIPTION="Emacs mode for OCaml"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README README.itz"
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index 7457aa219833..5745a1524426 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1 +1,2 @@
+DIST xslide-0.2.2.tar.gz 23469 BLAKE2B a7628267b45b1da9ba1cefef5b186ed0a01975546e0bd0f551dcac6810c59e7a75bd7d479c21e4199eb12725d8a0babb2e1ae1912ae53702ad72021b4775a7bf SHA512 e0cc7b42eddcaf9fe7860fad4eff14dd3c963578302884c9aa1caf09eaef08e73b7a3f60d15de7e31ce39d735751dbef33db2181531947ace9af25d0c5092697
DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
diff --git a/app-emacs/xslide/xslide-0.2.2-r1.ebuild b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..f940babe7d83
--- /dev/null
+++ b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing XSL stylesheets and running XSL processes"
+HOMEPAGE="https://sourceforge.net/projects/xslide/"
+SRC_URI="mirror://sourceforge/xslide/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.TXT TODO"
+
+src_compile() {
+ default
+}
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index e0ba521ba96f..274bfe46b5bc 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1 +1,2 @@
DIST zenburn-20110907.el.bz2 6979 BLAKE2B 3f38e857c9e09d73d5aafc7e5a98292c122b5ab903c902fe43be1d91ab20a9703a974707354b9f07eab190324ee4ac8a392efae06f2c05a07dd9914a78ebde4c SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062
+DIST zenburn-20110907.tar.gz 7952 BLAKE2B c1d63eacd5e77f1d453ddd9323a7f573e487625e1f210c0a93f8992fe741d097f7662fca23900cbca320c9b0aa1484ada885b0b9c077f9a9370863172683b255 SHA512 be19da75b1f776128a8c8701655a0c7cae0d1228ed9d92cf5b57047f99385cf996c27aec9514118612a1728c126feb8892f1375c156a1b345e1018154edf6e79
diff --git a/app-emacs/zenburn/zenburn-20110907-r1.ebuild b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
new file mode 100644
index 000000000000..a444bae490e2
--- /dev/null
+++ b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+COMMIT="2b0672b04ef3e95c25f849dceb10d669296a188b"
+DESCRIPTION="Zenburn color theme for Emacs"
+HOMEPAGE="https://web.archive.org/web/20140612104441/http://slinky.imukuppi.org/zenburnpage/
+ https://github.com/dbrock/zenburn-el"
+SRC_URI="https://github.com/dbrock/${PN}-el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/color-theme"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-el-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable zenburn by default, initialise it in your ~/.emacs:
+ \n\t(color-theme-zenburn)"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a4411e270aef..2613a51cfedd 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index af2125fdb82d..06d9c85c8eda 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,2 +1,3 @@
DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
DIST cadvisor-0.33.1.tar.gz 4646909 BLAKE2B 1ba30d559c018bf11297ded8adcc77a8761f77a1a39d75fb6e704ab84b3118d14587c91fd638da59bc9a46969b0545bdcf55e482390adeef6a4841fd6a57988c SHA512 659b8c48f74ef34044c7b3d9a41d42338c9c90fa443bdf7766001ae570aab8ed61efa948d1d01c324b6f03a0d1bf3d3fb1483d40bfc3b7e67f768253e3638de5
+DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
diff --git a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
new file mode 100644
index 000000000000..26280e2293af
--- /dev/null
+++ b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="24a6a52"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+ sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+ sed -i -e "s/git describe.*/echo ${PV} )/"\
+ -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+ src/${EGO_PN}/build/build.sh || die
+ default
+}
+
+src_compile() {
+ pushd "src/${EGO_PN}"
+ GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+ popd || die
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ dobin src/${EGO_PN}/${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index d4384fed6ac2..4646e7d336c1 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,4 +1,4 @@
DIST slirp4netns-0.3.1.tar.gz 180163 BLAKE2B 228331bea2aef527d4feb6f195a2a7db0aefa5a561b0425a7d48bab5fc0bed2231d535904223852284c6789a608f70d8c78923c06b89db6e583248744caf34fd SHA512 d482f6d22e9bb62ddca9d7f05d4aef7e2f365439a0d38d864f71c9dc4af3fbcda8ec259285ed54ebabc7e15fced26c844563944eaa1b2fe295273049e42d7686
DIST slirp4netns-0.3.2.tar.gz 162136 BLAKE2B bc33c66ecc47e0b566eaa960e1651a0ad0b09010bc9ae3d1eb0692c7b2b67197a078b25df645bc11c50f1e805937b8e0aeeecf2fee6114937ca98eda49f61765 SHA512 b5146a9b165471037542af64618da8fb5f6824a9a4193867f4357b1b7f38082dea00e15930561eb9729fed406dae1bc2ca371035577d0f22cfb9004c13464496
-DIST slirp4netns-0.4.0_beta2.tar.gz 173593 BLAKE2B fd827f92db03eddea86bccf401ff67535343cf759353e3c221fe1d3de494e8cc0c83169ef5cda900e512aeb16cfb7e5ba6181729483fa48d8f3257d70035a41a SHA512 38b6a1fbaceece1fe151477b3bc7db624e79e2b7913f5cca9e826a5f4289e53cfa584cfb90a5a3520e3e342eb803ff8ae090ca9892ea1051fd79ce802328e578
DIST slirp4netns-0.4.0_beta3.tar.gz 167294 BLAKE2B 349cab3199f2d228f0d9ed545d6bd8ddff25e80a57d69c16f5a4a5c8af88cae21c48d98891e844e03ab5c47feb829007c7d6ccfb37510fbe5aaa03d90b0ecea7 SHA512 83ce7eee14ebb9cea481fdde1951d89346a1b741e1232f1b032142b331226193b6869dd6febbca91f1fac1fec7afdcafedeef98f204059a1513c8ab972a411f9
+DIST slirp4netns-0.4.0_beta4.tar.gz 168436 BLAKE2B 708a92bcdd8f0d1ce925a013d999b3a172391ffaa1dce2f414a440feb8933cdb2f5986badfbdb98c98705ef414d86a353f642e1d8964d3ca700a39527cbf6274 SHA512 2dfe5be6c6b298823e2ae4f72ea11afa8d16a5c6ab9a88522775949508a6f6edfe5eadb3681b7d1300f21a93ebfa1791f04e27066cefdaa988fc12f385ee6340
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
similarity index 100%
rename from app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
rename to app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ec6680101ed2..012b2cb5a4f7 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index b91538b182f1..fdafb0e556f5 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1 +1 @@
-DIST lynis-2.7.3.tar.gz 282609 BLAKE2B 68dcb9d1fc9f81007c15a5f1074d9f42b6f558f7bc62dfba134adffb7b6d858604a10e188abea298eb51e82f8ec1ea5f270563d16a87a68de25dab8e13a1f1c1 SHA512 eb50d5d1769f0276a8383a5c6c664b390ced75248678edd80b00a7c344e8567d9c5fcc7a1f4a1a0e20a26c03bb3648d3b81f165266b3654e75bbec5061ab3837
+DIST lynis-2.7.5.tar.gz 288688 BLAKE2B e82dd67a49c234745e8af8faca9c4a9664568db9e6c9f9e33c1a3213582f2110a27109fa370642135bd3ec90fc9086314836cfe6d9712bedb110ef61e93aa115 SHA512 0ec814cb65252e3e8a44013ad0902e188a4825c521d47280586c0dd9924dfb7b79cce9797055ab7b7be59dacc111607d114175e0a793844227eadda76f68980b
diff --git a/app-forensics/lynis/lynis-2.7.3.ebuild b/app-forensics/lynis/lynis-2.7.5.ebuild
similarity index 100%
rename from app-forensics/lynis/lynis-2.7.3.ebuild
rename to app-forensics/lynis/lynis-2.7.5.ebuild
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e2ae6b41e2f4..d9099a38e47e 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
index 26f1be9445c7..1477cdb488e8 100644
--- a/app-misc/clockywock/clockywock-0.3.1a.ebuild
+++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs
@@ -14,7 +14,9 @@ SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
diff --git a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
index e6f5bd510dc3..cb1521947a7c 100644
--- a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
+++ b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
@@ -1,7 +1,8 @@
--- a/Makefile
+++ b/Makefile
-@@ -1,5 +1,6 @@
-+LIBS += -lncurses -lpthread
+@@ -1,5 +1,7 @@
++PKGCONFIG ?= pkg-config
++LIBS += $(shell $(PKGCONFIG) --libs ncurses) -lpthread
all:
- g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o clockywock clockywock.cpp $(LIBS)
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
similarity index 97%
rename from app-misc/editor-wrapper/editor-wrapper-4.ebuild
rename to app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 888c907c4373..361c762024fa 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -1,16 +1,14 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
S="${WORKDIR}"
@@ -23,6 +21,7 @@ src_prepare() {
-e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
editor pager || die
fi
+ eapply_user
}
src_install() {
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-4.sh b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
index b58f1a8b9eeb..9c8fe9599552 100644
--- a/app-misc/editor-wrapper/files/editor-wrapper-4.sh
+++ b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2009-2011 Gentoo Foundation
+# Copyright 2009-2011 Gentoo Authors
# Distributed under the terms of the MIT/X11 license
# Wrapper script, executes ${@VAR@} with arguments $@
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d996ab8117b9..d026763278d5 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
index bfa36dc64cdf..1c687efe9403 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-3+ MIT SGMLUG"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
IUSE="doc"
RDEPEND="
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..7313d345c7a4
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:0=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
new file mode 100644
index 000000000000..0af9a6f855d7
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
@@ -0,0 +1,40 @@
+From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?=
+Date: Tue, 23 Jul 2019 00:16:19 +0200
+Subject: [PATCH] Fix handling of bpaste urls.
+
+---
+ wgetpaste | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 585fcd9..99eb7f1 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb
+ xml+velocity xml xquery xslt xtend yaml"
+ EXPIRATIONS_pinnwand="1day 1week 1month never"
+ POST_pinnwand="submit=Paste! % % lexer expiry % code"
+-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'
++REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1"
++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|'
+
+ ### errors
+ die() {
+@@ -550,11 +551,15 @@ postdata() {
+
+ # get url from response from server
+ geturl() {
+- local regex
++ local regex location
+ regex=REGEX_URL_$ENGINE
++ location=REGEX_LOC_$ENGINE
+ if [[ -n ${!regex} ]]; then
+ [[ needstdout = $1 ]] && return 0
+ sed -n -e "${!regex}" <<< "$*"
++ elif [[ -n ${!location} ]]; then
++ [[ needstdout = $1 ]] && return 1
++ sed -n -e "s|^.*Location: ${!location}|p" <<< "$*"
+ else
+ [[ needstdout = $1 ]] && return 1
+ sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 23d91c3c4034..1aa3c4c3cd76 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -6,7 +6,11 @@
Maxim Koltsov
- zlogene@gentoo.org
- Mikle Kolyada
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+ zlin/wgetpaste
+ https://github.com/zlin/wgetpaste/issues
+
diff --git a/app-text/wgetpaste/wgetpaste-2.29.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
similarity index 93%
rename from app-text/wgetpaste/wgetpaste-2.29.ebuild
rename to app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index ff53674f0697..175617a320c6 100644
--- a/app-text/wgetpaste/wgetpaste-2.29.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -15,6 +15,8 @@ IUSE="+ssl"
DEPEND=""
RDEPEND="net-misc/wget[ssl?]"
+PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
+
src_prepare() {
sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
default
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 3e5b3ca1295b..5f55bbdca36a 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aunit/aunit-2019.ebuild b/dev-ada/aunit/aunit-2019.ebuild
index 069e8fc90324..58339ce37a43 100644
--- a/dev-ada/aunit/aunit-2019.ebuild
+++ b/dev-ada/aunit/aunit-2019.ebuild
@@ -22,7 +22,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
index a3ffe95306c1..8cdf9346bfde 100644
--- a/dev-ada/aws/aws-2018-r1.ebuild
+++ b/dev-ada/aws/aws-2018-r1.ebuild
@@ -22,7 +22,8 @@ RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
DEPEND="${RDEPEND}
dev-ada/asis[gnat_2016(-)?]
dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
index e4b95d410d3e..104ed2eaa332 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
gmp? ( dev-libs/gmp:* )"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
index 60a73d35f0d0..d4e00b70793b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
@@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
gmp? ( dev-libs/gmp:* )"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
index e3449f09b04f..80b10b247cb8 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
dev-ada/libgpr[shared?,static-libs?,static-pic?]
!dev-ada/gnatcoll"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
index e9678209c711..e1a9570911f3 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
dev-ada/libgpr[shared?,static-libs?,static-pic?]
!dev-ada/gnatcoll"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
index edb42ca118a3..f66fbf0b7c96 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -28,7 +28,8 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_20
)
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+ dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gprbuild[gnat_2019(-)?]"
REQUIRED_USE="gnatinspect? ( xref )
xref? ( sqlite )
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index 7ba8da900cc2..5e0622d36358 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -4,10 +4,6 @@
ada@gentoo.org
-
- tupone@gentoo.org
- Tupone Alfredo
-