diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8b84c48d2642..f5a45a893a9a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index fb36beaec710..84d37b457b70 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/oidentd/Manifest b/acct-group/oidentd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/oidentd/metadata.xml b/acct-group/oidentd/metadata.xml
new file mode 100644
index 000000000000..cb9c34b1836a
--- /dev/null
+++ b/acct-group/oidentd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Dessa@gmake.de
+ Robert Förster
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/oidentd/oidentd-0.ebuild b/acct-group/oidentd/oidentd-0.ebuild
new file mode 100644
index 000000000000..1d14d7dca5e6
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/plex/Manifest b/acct-group/plex/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/plex/metadata.xml b/acct-group/plex/metadata.xml
new file mode 100644
index 000000000000..8815e575c0e3
--- /dev/null
+++ b/acct-group/plex/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ ss23@ss23.geek.nz
+ Stephen Shkardoon
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/plex/plex-0.ebuild b/acct-group/plex/plex-0.ebuild
new file mode 100644
index 000000000000..87e5a692cc10
--- /dev/null
+++ b/acct-group/plex/plex-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Plex Media Server group"
+ACCT_GROUP_ID=103
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 18c4c561cb16..195db834b521 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/oidentd/Manifest b/acct-user/oidentd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/oidentd/metadata.xml b/acct-user/oidentd/metadata.xml
new file mode 100644
index 000000000000..cb9c34b1836a
--- /dev/null
+++ b/acct-user/oidentd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Dessa@gmake.de
+ Robert Förster
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/oidentd/oidentd-0.ebuild b/acct-user/oidentd/oidentd-0.ebuild
new file mode 100644
index 000000000000..7397d031ba84
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=493
+ACCT_USER_GROUPS=( oidentd )
+
+acct-user_add_deps
diff --git a/acct-user/plex/Manifest b/acct-user/plex/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/plex/metadata.xml b/acct-user/plex/metadata.xml
new file mode 100644
index 000000000000..8815e575c0e3
--- /dev/null
+++ b/acct-user/plex/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ ss23@ss23.geek.nz
+ Stephen Shkardoon
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/plex/plex-0.ebuild b/acct-user/plex/plex-0.ebuild
new file mode 100644
index 000000000000..e5e528bb3bf9
--- /dev/null
+++ b/acct-user/plex/plex-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Plex Media Server user"
+ACCT_USER_ID=103
+ACCT_USER_HOME=/var/lib/plexmediaserver
+ACCT_USER_GROUPS=( plex video )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9b7c3bcefdd9..3b0a0bf0bf9d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index d4977789cb11..1fbe5854b306 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -5,10 +5,6 @@
williamh@gentoo.org
William Hubbs
-
- zlogene@gentoo.org
- Mikle Kolyada
-
ruby@gentoo.org
Gentoo Ruby Project
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 18302fbbe7ee..a0aab3e23f37 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -10,3 +10,4 @@ DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d
DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
+DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
new file mode 100644
index 000000000000..9a251dd782d8
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ sys-apps/moreutils
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/spectre-meltdown-checker/metadata.xml b/app-admin/spectre-meltdown-checker/metadata.xml
index 5e8946a7b96c..73a0024551da 100644
--- a/app-admin/spectre-meltdown-checker/metadata.xml
+++ b/app-admin/spectre-meltdown-checker/metadata.xml
@@ -2,12 +2,8 @@
- lucianposton@pm.me
- Lucian Poston
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ candrews@gentoo.org
+ Craig Andrews
speed47/spectre-meltdown-checker
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 60a22e6e3940..9d0946260edb 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index e8ea352106d7..426ec5ec784a 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,4 +1,3 @@
-DIST clamtk-6.01.tar.xz 227872 BLAKE2B 25cc54b8aa3d6cd16317b0266dfc2aa035ad168f009678e82a648ea05da7850cee52772d0ea540b5cf84783c4ce52fda115de4695fb416e25f4242c0640c4a23 SHA512 43db326e322dce9632b03ce44475c36dacfee86e5059ebdea827ddc58b73fb66e36982a86427267b7ae37839688f16673e9e5dc4c9286eb545b75aac3711da6b
DIST clamtk-6.02.tar.xz 227780 BLAKE2B cd5f05c5d5fe2fe7e6d52ab4619fe01f810195ca505ae85101e0cf743d9d20e42de74dfadfaecdc23cb97359121ea8ddc49772a96ec237921a7d6628ae453cc4 SHA512 df619da28ebadb218bb2f9ab2c9be1804f2df5e7e444762f2b1eb3ce0e830b07ebfd05b8cb9c7d79a9e3523c9837b00b52d0e06265c62d782487546f15b0349f
DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703299799c90548b02a5fee92c80f82c1d4f63e1cd726438e428e1ae3ee1550b4c8acbc22e97093131f993099c47c36 SHA512 c35a3ee34cbe5609f2ad22d0974a503bf6f24710c26d71d865c3ad3751a72fe909a9773c27cc53295c581f77d33e58d49fdd6f38f71177aa7ef1570e00ea55f2
DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
diff --git a/app-antivirus/clamtk/clamtk-6.01-r1.ebuild b/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
deleted file mode 100644
index ea9ef8556d47..000000000000
--- a/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.03"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://dave-theunsub.github.io/clamtk/"
-SRC_URI="
- https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
- kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
- nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
- nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
- thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-antivirus/clamav
- dev-perl/File-chdir
- dev-perl/Gtk3
- dev-perl/JSON
- dev-perl/LWP-Protocol-https
- dev-perl/LWP-UserAgent-Cached
- dev-perl/Locale-gettext
- dev-perl/Text-CSV
- dev-perl/glib-perl
- dev-perl/libwww-perl
- virtual/perl-Digest-MD5
- virtual/perl-Digest-SHA
- virtual/perl-Encode
- virtual/perl-MIME-Base64
- virtual/perl-Time-Piece
- x11-themes/faenza-icon-theme
- nautilus? (
- ${PYTHON_DEPS}
- dev-python/nautilus-python[${PYTHON_USEDEP}]
- )
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
-
-pkg_setup() {
- if use nautilus; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- unpack "${S}"/clamtk.1.gz
-
- if use kde; then
- unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
- fi
-
- if use nautilus; then
- unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
- fi
-
- if use nemo; then
- unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
- fi
-
- if use thunar; then
- unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
- fi
-}
-
-src_install() {
- dobin clamtk
-
- perl_set_version
- insinto "${VENDOR_LIB}"/ClamTk
- doins lib/*.pm
-
- if use nls; then
- domo po/*.mo
- fi
-
- doicon images/clamtk.png images/clamtk.xpm
-
- domenu clamtk.desktop
-
- doman ../clamtk.1
-
- if use kde; then
- insinto /usr/share/kservices5/ServiceMenus
- doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
- doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
- doman ../clamtk-kde.1
-
- docinto dolphin
- dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
- fi
-
- if use nautilus; then
- insinto /usr/share/nautilus-python/extensions
- doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
- doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
- doman ../clamtk-gnome.1
-
- docinto nautilus
- dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
- fi
-
- if use nemo; then
- insinto /usr/share/nemo/actions/
- doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
- doman ../nemo-sendto-clamtk.1
-
- docinto nemo
- dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
- fi
-
- if use thunar; then
- insinto /usr/share/Thunar/sendto
- doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
- doman ../thunar-sendto-clamtk.1
-
- docinto thunar
- dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-antivirus/clamtk/clamtk-6.02.ebuild b/app-antivirus/clamtk/clamtk-6.02.ebuild
index 1754b41e51b3..df2e37a36698 100644
--- a/app-antivirus/clamtk/clamtk-6.02.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.02.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="kde nautilus nemo +nls thunar"
REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2873c8961211..56f12fef9c11 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index 517bfa843fb1..a7710862b88e 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,9 +1,7 @@
-
- hanno@gentoo.org
-
+
MacPaw/XADMaster
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 69e65c969c4c..b6951fffc809 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
new file mode 100644
index 000000000000..6142fd7c265c
--- /dev/null
+++ b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+MY_P=Backup-Manager-${PV}
+DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux"
+HOMEPAGE="https://github.com/sukria/Backup-Manager"
+SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="s3"
+
+DEPEND="dev-lang/perl:=
+ sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+ s3? ( dev-perl/Net-Amazon-S3
+ dev-perl/File-Slurp )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix_purge.patch )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e "/^PERL5DIR/s/sitelib/vendorlib/" \
+ -e "/sed/s:=\$(DESTDIR)/:=:" \
+ -i Makefile || die
+
+ default
+}
+
+src_compile() {
+ default
+ emake -C po
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+
+ insinto /etc
+ newins backup-manager.conf.tpl backup-manager.conf
+ fperms 0600 /etc/backup-manager.conf
+}
diff --git a/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch b/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch
new file mode 100644
index 000000000000..c3e2cbf0ce7b
--- /dev/null
+++ b/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch
@@ -0,0 +1,23 @@
+From 90b5f71f3803747a788c693d4bcb7e3b60bb4911 Mon Sep 17 00:00:00 2001
+From: Thomas Parmelan <36071478+tompar28@users.noreply.github.com>
+Date: Sat, 3 Aug 2019 20:02:34 +0200
+Subject: [PATCH] Fix issue #91 (See
+ https://github.com/sukria/Backup-Manager/issues/91#issuecomment-381925277)
+ (#120)
+
+---
+ backup-manager | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/backup-manager b/backup-manager
+index 331cfa9..53e622a 100755
+--- a/backup-manager
++++ b/backup-manager
+@@ -34,7 +34,6 @@ vardir="/var/lib/backup-manager"
+ bindir="/usr/bin"
+ bmu="$bindir/backup-manager-upload"
+ bmp="$bindir/backup-manager-purge"
+-export BM_BMP_PATH=$bmp
+
+ # Find which lockfile to use
+ # If we are called by an unprivileged user, use a lockfile inside the user's home;
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 5ad29d61d839..fae6436c70f1 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 592135dc5085..5629dd3ca1c2 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.10.12.tar.xz 408952 BLAKE2B f0894073c651f0defe35af0e916db4d60c211ea0b485cb574bf79ceaaa2794eada28dcf8e8cbee3747a6991d61ec829b0a3e5049e5cad540fc95e63ba33a38cc SHA512 d8b169adcea823113165ba3beabddd72cbd9e6780d39a52e459508ca088c50a5102eeca344e16f4e40d72d77f8135e3c5b973b07d55246ccb2a252806217e529
+DIST stress-ng-0.10.13.tar.xz 409940 BLAKE2B fffeaedd999a0887955674f3883f65124eb13814cf284ab1bd7c7dec34380cd381026d9217c9f949a7c0c2227c8b9558409153d0feff01473a6c9f49730f89b4 SHA512 97e8a7ce5dc5e428c26b0d4eeb1350c43c1043aa7dbf591112768c33e208bafe9df7fe737c9a912f0b4296d64e4b27b81131b459c356aca95bc8856e8b939639
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
similarity index 83%
rename from app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
rename to app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
index cf08858d361b..b6a8554cdde2 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
@@ -1,7 +1,7 @@
---- a/Makefile 2019-02-15 13:06:01.000000000 +0100
-+++ b/Makefile 2019-02-19 21:44:10.000000000 +0100
+--- stress-ng-0.10.13.orig/Makefile 2019-12-09 13:42:13.000000000 +0100
++++ stress-ng-0.10.13/Makefile 2019-12-14 00:51:33.390034647 +0100
@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
+ # Codename "systematic system smasher"
#
-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
@@ -9,7 +9,7 @@
#
# Pedantic flags
-@@ -347,12 +347,10 @@
+@@ -359,12 +359,10 @@
.o: stress-ng.h Makefile
.c.o: stress-ng.h Makefile $(SRC)
@@ -24,7 +24,7 @@
@sync
makeconfig:
-@@ -373,7 +371,7 @@
+@@ -385,7 +383,7 @@
sed '$$ s/.$$//' >> apparmor-data.c
@echo "};" >> apparmor-data.c
@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -33,7 +33,7 @@
@$(CC) -c apparmor-data.c -o apparmor-data.o
@rm -rf apparmor-data.c apparmor-data.bin
-@@ -389,12 +387,12 @@
+@@ -401,12 +399,12 @@
core-perf.o: core-perf.c core-perf-event.c
@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
@@ -50,7 +50,7 @@
@touch stress-ng.c
$(OBJS): stress-ng.h Makefile
-@@ -442,6 +440,6 @@
+@@ -455,7 +453,7 @@
mkdir -p ${DESTDIR}${BINDIR}
cp stress-ng ${DESTDIR}${BINDIR}
mkdir -p ${DESTDIR}${MANDIR}
@@ -58,3 +58,4 @@
+ cp stress-ng.1 ${DESTDIR}${MANDIR}
mkdir -p ${DESTDIR}${JOBDIR}
cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
+ mkdir -p ${DESTDIR}${BASHDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
similarity index 90%
rename from app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
index 041c048472d9..342e1b2caa46 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Stress test for a computer system with various selectable ways"
HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-LICENSE="GPL-2+"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${PN}-0.09.53-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
src_compile() {
tc-export CC
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cdee1fc462fb..fec87c9fdcc5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 6bdc2fccf420..cb5dadf2d215 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1 +1,2 @@
DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
+DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
diff --git a/app-crypt/gnupg/gnupg-2.2.19.ebuild b/app-crypt/gnupg/gnupg-2.2.19.ebuild
new file mode 100644
index 000000000000..8a253de4ad99
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.19.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+ >=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.7.3
+ >=dev-libs/libgpg-error-1.28
+ >=dev-libs/libksba-1.3.4
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+ sys-libs/zlib
+ tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+ local myconf=()
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ #bug 663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == *clang ]] && \
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+
+ econf \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable nls) \
+ $(use_enable smartcard scdaemon) \
+ $(use_enable ssl gnutls) \
+ $(use_enable tofu) \
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
+ $(use_enable wks-server wks-tools) \
+ $(use_with ldap) \
+ $(use_with readline) \
+ --with-mailprog=/usr/libexec/sendmail \
+ --disable-ntbtls \
+ --enable-all-tests \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-large-secmem \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+ GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+ KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+ LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+ LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+ NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ #Bug: 638574
+ use tofu && export TESTFLAGS=--parallel
+ default
+}
+
+src_install() {
+ default
+
+ use tools &&
+ dobin \
+ tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/* doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
+
+pkg_postinst() {
+ elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+ elog
+ elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
index 9a91f82b01fc..ae03d2238a94 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
@@ -19,7 +19,7 @@ IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux
RESTRICT="!test? ( test )"
# Test suite requires network access
-#RESTRICT="test"
+RESTRICT="test"
DEPEND="
!!app-crypt/heimdal
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index a0be5c1edb32..9e460ad46982 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index 1dd1b52fa4d3..c5a7e898bac2 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
SRC_URI=""
- KEYWORDS="ia64 x86"
+ KEYWORDS="amd64 ia64 x86"
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9a28ffc63817..86a15648c55d 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
new file mode 100644
index 000000000000..4ac39947e0d6
--- /dev/null
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator toolchain-funcs
+
+MY_PV=$(replace_version_separator 2 '_')
+
+DESCRIPTION="A vi/ex clone"
+HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="X doc"
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ app-eselect/eselect-vi
+ X? (
+ >=x11-libs/libX11-1.0.0
+ >=x11-libs/libXt-1.0.0
+ >=x11-libs/libXpm-3.5.4.2
+ >=x11-libs/libXft-2.1.8.2
+ )"
+
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/ft2.3-symbol-collision-fix.patch
+ "${FILESDIR}"/${P}-glibc-2.10.patch
+ "${FILESDIR}"/${P}-interix.patch
+)
+
+src_configure() {
+ ./configure \
+ --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ --prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --datadir="${EPREFIX}"/usr/share/elvis \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ $(use_with X x) \
+ || die
+
+ # Some Makefile fixups (must happen after configure)
+ # Use our CFLAGS
+ sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
+
+ # We'll install the man-pages ourselves
+ sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed"
+
+ # Don't try to write to /etc
+ sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
+
+ # Use LDFLAGS
+ sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
+ die "sed 4 failed"
+}
+
+src_install() {
+ dodir /usr/bin
+ dodir /usr/share/man/man1
+ dodir /usr/share/elvis
+ dodir /usr/share/doc/${PF}
+ dodir /etc
+
+ local docdir="${ED}/usr/share/doc/${PF}"
+ if ! use doc; then
+ docdir="${T}/doc-discard"
+ fi
+
+ emake install \
+ PREFIX="${ED}"/usr \
+ BINDIR="${ED}"/usr/bin \
+ DATADIR="${ED}"/usr/share/elvis \
+ DOCDIR="${docdir}"
+
+ # Install the man-pages
+ mv doc/elvis.man doc/elvis.1 || die
+ mv doc/elvtags.man doc/elvtags.1 || die
+ mv doc/ref.man doc/ref.1 || die
+ doman doc/*.1
+
+ # Fixup some READMEs
+ sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
+ || die 'sed /etc/elvis/README failed'
+ sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
+ || die 'sed /usr/share/elvis/README failed'
+}
+
+pkg_postinst() {
+ einfo "Setting /usr/bin/vi symlink"
+ eselect vi set "${PN}"
+}
+
+pkg_postrm() {
+ einfo "Updating /usr/bin/vi symlink"
+ eselect vi update
+}
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 35a20e7fa863..70d5a55ce802 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -1,3 +1,2 @@
DIST shed-1.12.tar.gz 57934 BLAKE2B 33c6096b60142e3a893827b68dc81cca03b53e0d558041d7042cd0e32450b1c5898218c9141683dbd50e49d6e03c8f0cc4090146de4762fedc22157c1d4d3914 SHA512 f668245478b88e74911a5f6bc13629b1be9412056bfb42860554979904451b20cb468ae7a9b2daa8bea83d7f78d3d0c016170767dd80f0a93ba140a51ad02097
-DIST shed-1.13.tar.gz 78699 BLAKE2B ee7651a3ec22184579ca692756c3deb52aef8aed3222d810e234b0ec5e70b599c36e25da8b2330d6a201aab88598df399b506e93bac672ae4ba5b1cb3cad1888 SHA512 abea90115820c50bba140a486d74e28cd20704905bb868aa75b94a346faf8d1a0e0739f9558131cff9c5250ac9ef2505cc375f2bdf24c75b6ff464ba767c1832
DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
diff --git a/app-editors/shed/shed-1.13.ebuild b/app-editors/shed/shed-1.13.ebuild
deleted file mode 100644
index fb93dffe4ab2..000000000000
--- a/app-editors/shed/shed-1.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Simple Hex EDitor"
-HOMEPAGE="http://shed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
-
-src_compile() {
- emake AM_CFLAGS="${CFLAGS}"
-}
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index 6d1bfdeb8c3d..f1dca98d7411 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools eutils
+EAPI="7"
+
+inherit autotools
DESCRIPTION="Simple Hex EDitor"
HOMEPAGE="http://shed.sourceforge.net/"
@@ -10,18 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="sys-libs/ncurses:0="
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cflags.patch
+ "${FILESDIR}"/${P}-interix.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-cflags.patch \
- "${FILESDIR}"/${P}-interix.patch \
- "${FILESDIR}"/${P}-tinfo.patch
+ default
+
+ mv configure.{in,ac} || die
eautoreconf
}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 99346040ade0..025daa610b46 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 029a0227420b..d2ffa3f6f33d 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,2 +1,3 @@
DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
+DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
diff --git a/app-emacs/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
new file mode 100644
index 000000000000..3fded696f7b8
--- /dev/null
+++ b/app-emacs/auctex/auctex-12.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+RDEPEND="virtual/latex-base
+ preview-latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ )"
+BDEPEND="${RDEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+ econf --with-emacs \
+ --with-auto-dir="${EPREFIX}/var/lib/auctex" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+ --with-texmf-dir="${EPREFIX}${TEXMF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-build-dir-test \
+ $(use_enable preview-latex preview)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ if use preview-latex; then
+ elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+ fi
+ dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
+
+pkg_postrm(){
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
diff --git a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
index 36ef6c5e2324..e2fd732e5f14 100644
--- a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/magit-2.90.1.ebuild b/app-emacs/magit/magit-2.90.1.ebuild
index fff49dbd2444..ded24c2c6690 100644
--- a/app-emacs/magit/magit-2.90.1.ebuild
+++ b/app-emacs/magit/magit-2.90.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P}/lisp"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index 81601b351288..c918cdef9591 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -5,9 +5,5 @@
gnu-emacs@gentoo.org
Gentoo GNU Emacs project
-
- ml@gentoo.org
- Gentoo ML Project
-
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index de72ddb18e30..8fc75d8f94f1 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -5,10 +5,6 @@
gnu-emacs@gentoo.org
Gentoo GNU Emacs project
-
- ml@gentoo.org
- Gentoo ML Project
-
Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/with-editor/with-editor-2.8.3.ebuild b/app-emacs/with-editor/with-editor-2.8.3.ebuild
index 2a7e31b64419..1316d5c5248d 100644
--- a/app-emacs/with-editor/with-editor-2.8.3.ebuild
+++ b/app-emacs/with-editor/with-editor-2.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index aac4379da208..d5c8c38e3e91 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index f2f644ce3048..1b288a357078 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,2 +1,4 @@
DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
+DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
+DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
diff --git a/app-emulation/buildah/buildah-1.11.6.ebuild b/app-emulation/buildah/buildah-1.11.6.ebuild
new file mode 100644
index 000000000000..0b2d48115c43
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="9513cb8"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
+RDEPEND="app-crypt/gpgme:=
+ app-emulation/skopeo
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-fs/lvm2:=
+ sys-libs/libseccomp:=
+ selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
+ sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+ [[ -f selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ selinux_tag.sh || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ emake all
+}
+
+src_install() {
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+ doman docs/*.1
+ dodoc -r docs/tutorials
+ dobin ${PN} imgtype
+ dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+ emake test-unit
+}
diff --git a/app-emulation/buildah/buildah-1.12.0.ebuild b/app-emulation/buildah/buildah-1.12.0.ebuild
new file mode 100644
index 000000000000..3608a7769b98
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="6cc4656"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+ app-emulation/skopeo
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-fs/lvm2:=
+ sys-libs/libseccomp:=
+ selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+ [[ -f selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ selinux_tag.sh || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ emake all
+}
+
+src_install() {
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+ doman docs/*.1
+ dodoc -r docs/tutorials
+ dobin ${PN} imgtype
+ dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+ emake test-unit
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 90118e25ae46..015922624fc6 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,2 +1,3 @@
DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf
DIST diskimage-builder-2.30.0.tar.gz 428448 BLAKE2B 4cb4c47c07885713f160a958aa2d80d57b9ae496961bce976beddab59f0760abadaaccc1db8c4f29458dd8f247d7d5c21164a34ef91a4d4b48212f1fa612dadd SHA512 4ed6e745b1184c0462ce0500fa5e5dc8754a7185b76a6b5963c5ca9e20ca0bce7f2a5166b4472ca69498cc5f00e8a6e7ae17fd3794e830679e4f3a22e74956c7
+DIST diskimage-builder-2.32.0.tar.gz 435328 BLAKE2B 78f306430819d94045e3b8c424cdf7a0fee9a306a317e44cd363d53bbbcd1af1f06731b83b63e490bb8ad3903630daf84a544878b87d6c7f377786778229f276 SHA512 357b56aba979cabd7a857d6646412893361c05a83e4260d1ef468de1d6fb0fbc2582ab8bf37428c56a52fafcf708b86be470f2c885008b10368bc92a2b679a09
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+ =dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+ =dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ app-emulation/qemu
+ sys-block/parted
+ sys-fs/multipath-tools
+ sys-fs/dosfstools
+ sys-apps/gptfdisk
+ !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/firecracker/Manifest b/app-emulation/firecracker/Manifest
index 5a90d6ee9aa7..9be91bdf6237 100644
--- a/app-emulation/firecracker/Manifest
+++ b/app-emulation/firecracker/Manifest
@@ -17,7 +17,9 @@ DIST cpuid-0.1.0.crate 5473 BLAKE2B ff6536dd8fa1aeaf52b3ae28e5d0c3e0033383d7265e
DIST device_tree-1.1.0.crate 7049 BLAKE2B 11236d709c7d35d6482eed7ccf8ac82dfbb4412bcf2fec98fd2a806bcf8740c1d0b2745c39b5971f5292ad00887f423afc28a4c674cdf37511cd8615ff654cbd SHA512 b671b582d9f5dc19d8ff28d18fd2ed77842191084c6acbb41362491ea3c994699044fe0b0505f927ad9569d933806f8129a4eb49bf25443c0806ddcb6ffefad7
DIST epoll-4.0.1.crate 8195 BLAKE2B 1ac732ade3c441a27832ef5f7cd75a4f80dcfbf42d195433a7bca91dcebd4f6a8ad0198daa3e3e12ef5ce50615dd85ef0d4cfe6670907ad0a65d55055b25da86 SHA512 b672091bc0b051c22a6217c37bf3986b2e173a1bf5d773590a1e181c9c0981baac656278f90aaa98f7a092e636e3bf68e5ea7a9edb6120cb90636f8db7e953d9
DIST firecracker-0.18.0.tar.gz 4064752 BLAKE2B 6d58ca099f5f891966e7ccf25e5f22836e4066847891cbacab328fcbbb44c5c9010dc47223a626cedfd1c9443a754fbcf1b333378f6947299d7abb745944f471 SHA512 af599401a9323219b9d07d7a146c382c1a7521e6dabd10d6a4282dcbb8ea7742268b7999ab6aedcdadfb5d7f07efbd03feb20ab225f5711abcd45121f4c89f09
+DIST firecracker-0.18.1.tar.gz 4065972 BLAKE2B 161e85a1e90b69db6bc153e4f04462e767057824cdb1bb6431ca69281cdd61890851e80eb45c0f5d9b5f38bb2b06385e6bf693c26995ca589dcf2a845c68fe92 SHA512 2af1e42ab2f9c218646d78907ca0d7a5ae2c24e8652d0d29124a4db0d862c5e805f50fdbee6499173d5a7f48178910e9a58dbb2c107dbcaea71c193c2e1570b3
DIST firecracker-0.19.0.tar.gz 4093985 BLAKE2B e974581d3c213c26b058d6536eac05e109147b3f949d83a6a8d19cd63c07e44ca7b309bf634edc5a42ebbd492485a06f21eedebb5257dbe81dd912516b37ca20 SHA512 f718cc5ec7b658c4a336f829a2db912684e1c2e2209091afddca6bb347001714c41091a32ad46822f3efe1e019f862fa1890d5f12c5b7e3bb2952492b7cf347e
+DIST firecracker-0.19.1.tar.gz 4095338 BLAKE2B e27e2ae6ad968cc09145525b83ff72896ceab6d03c6f3f588d88bdb6101a3c823e21688c1c1a9f5be2dfde41c7b47337f4e1cf54ac5c3c527bc3596393fab73c SHA512 0bfd1aeaa0faaf36125067391a4e7bf7a89e52d373cbcde2e4b45247b9de5bb17285556c7b3138595c80946035953968baf0ee9a2b1b6e8767155005b44ed1cf
DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
DIST futures-0.1.18.crate 153738 BLAKE2B df33639193cdfdf7c5ae7323e5798cc6decfdbfb3f1d819caf794e68411241f25cc05c5eae09a09a1df6f3fa8ac5de7fce5af4536108e5b530dd639c18860679 SHA512 5782b37be2bcd4c9d0ddfafba7718a48144c0f8533acbfd0217e1bf25c3c04ba95320b35765f57224cdfe0ee3a7748d1109d6e680e64bdb1a16addeac422b12e
diff --git a/app-emulation/firecracker/firecracker-0.18.1.ebuild b/app-emulation/firecracker/firecracker-0.18.1.ebuild
new file mode 100644
index 000000000000..1535788a9f3d
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.18.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.1.0
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.41
+cfg-if-0.1.9
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.11
+getrandom_package-0.1.20
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.2
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.13
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.2
+quote-1.0.2
+rand-0.7.0
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.11
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.0
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.99
+serde_derive-1.0.99
+serde_json-1.0.40
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.4.0
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.5.0
+ws2_32-sys-0.2.1
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+rust-libcore-0.0.3
+"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+ case "$(tc-arch)" in
+ amd64) target_arch=x86_64 ;;
+ x86) target_arch=i686 ;;
+ esac
+}
+
+pkg_setup() {
+
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK+=" ~KVM_AMD" || \
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ ERROR_KVM="${P} requires KVM in-kernel support."
+ fi
+}
+
+src_compile() {
+ local target_arch
+ set_target_arch
+ cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/firecracker/firecracker-0.19.1.ebuild b/app-emulation/firecracker/firecracker-0.19.1.ebuild
new file mode 100644
index 000000000000..05c89111ba62
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.19.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.2.1
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.12
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.4
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.14
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.5
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.12
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.1
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.41
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.5.1
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+ case "$(tc-arch)" in
+ amd64) target_arch=x86_64 ;;
+ x86) target_arch=i686 ;;
+ esac
+}
+
+pkg_setup() {
+
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK+=" ~KVM_AMD" || \
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ ERROR_KVM="${P} requires KVM in-kernel support."
+ fi
+}
+
+src_compile() {
+ local target_arch
+ set_target_arch
+ cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 8ea0c53b5868..894472752c31 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,2 +1,3 @@
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd
+DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
diff --git a/app-emulation/libpod/libpod-1.6.4.ebuild b/app-emulation/libpod/libpod-1.6.4.ebuild
new file mode 100644
index 000000000000..45bd559b5243
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.6.4.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!ostree"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ >=app-emulation/conmon-2.0.0
+ || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-fs/lvm2
+ sys-libs/libseccomp:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ rootless? ( app-emulation/slirp4netns )
+ selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
+
+ # Disable installation of python modules here, since those are
+ # installed by separate ebuilds.
+ sed -e '/^GIT_.*/d' \
+ -e 's/$(GO) build/$(GO) build -v -work -x/' \
+ -e 's/^\(install:.*\) install\.python$/\1/' \
+ -i Makefile || die
+
+ sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+ -i hack/get_release_info.sh || die
+}
+
+src_compile() {
+ # Filter unsupported linker flags
+ filter-flags '-Wl,*'
+
+ [[ -f hack/apparmor_tag.sh ]] || die
+ if use apparmor; then
+ echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+ fi
+
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ if use btrfs; then
+ echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+ else
+ echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die
+ fi
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ if use selinux; then
+ echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+ fi
+
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
+ GOBIN="${S}/bin" \
+ emake all \
+ GIT_BRANCH=master \
+ GIT_BRANCH_CLEAN=master \
+ COMMIT_NO="${EGIT_COMMIT}" \
+ GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ insinto /etc/containers
+ newins test/registries.conf registries.conf.example
+ newins test/policy.json policy.json.example
+
+ insinto /usr/share/containers
+ doins seccomp.json
+
+ newinitd "${FILESDIR}"/podman.initd podman
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/podman.logrotated" podman
+
+ dobashcomp completions/bash/*
+
+ keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+ LIBPOD_ROOTLESS_UPGRADE=false
+ if use rootless; then
+ has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+ fi
+}
+
+pkg_postinst() {
+ local want_newline=false
+ if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+ elog "You need to create the following config files:"
+ elog "/etc/containers/registries.conf"
+ elog "/etc/containers/policy.json"
+ elog "To copy over default examples, use:"
+ elog "cp /etc/containers/registries.conf{.example,}"
+ elog "cp /etc/containers/policy.json{.example,}"
+ want_newline=true
+ fi
+ if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+ ${want_newline} && elog ""
+ elog "For rootless operation, you need to configure subuid/subgid"
+ elog "for user running podman. In case subuid/subgid has only been"
+ elog "configured for root, run:"
+ elog "usermod --add-subuids 1065536-1131071 "
+ elog "usermod --add-subgids 1065536-1131071 "
+ want_newline=true
+ fi
+}
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index a730e2201567..df3d6785fdc1 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,3 +1,2 @@
-DIST sen-0.5.1.tar.gz 70930 BLAKE2B 93758076d014a36996ece021f1de2f3ece749453d32554fe79ffec0ab1101bf4cc5c11d80934817fa5b10d73b811e738c87ce8e745a642507ec8406ad2eb59fa SHA512 0faf2c12e6361d3b4e9d093e0830867976a1fbd03cadc7a527c88460244532a8b636d8d4b732bb0c7f4041a0bb0819d20caabe62327b5edbf731b4eb8a4898a6
DIST sen-0.6.0.tar.gz 55113 BLAKE2B 5f6affbea94005c0adc9ac544d40d94cd9a9eca930b979c19174d21d73fdd887d21802a5241c02ba212a45c4a7873f22c7372aeb69955e1f97e444ef74d91929 SHA512 5573a0d6da5ae395e947bf34c54313e4e3a0251dc1868c52bbfe9ad11463397da83a0c9ac3f1912da2e6f49341c84d40dcab900d41b4a32ebac44d1dde3ac82b
DIST sen-0.6.1.tar.gz 55357 BLAKE2B 0d58f0ea11eeff29161925018425c918b3260c754d1b658e2ebd3c88e0c371feb0f1815af61979206bee529c369a90ace895d25e645ef0d76c563abd8b74c943 SHA512 2f1cadf745ca7e12d3e92534e76984072b9678055b9911f76b1a6d3cbd43266ad1eeb4d5e7bb8742db91c4da4aef684fa644c33de6fa2494c37688e9747e0efa
diff --git a/app-emulation/sen/sen-0.5.1.ebuild b/app-emulation/sen/sen-0.5.1.ebuild
deleted file mode 100644
index 4ba87ce42c27..000000000000
--- a/app-emulation/sen/sen-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/urwidtrees[${PYTHON_USEDEP}]
- dev-python/docker-py[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
- distutils-r1_python_install_all
- dodoc docs/*
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
index 3845fd83fd92..59459515f5a9 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
@@ -244,6 +244,9 @@ src_configure() {
--disable-opengl
)
fi
+ if use amd64 && ! has_multilib_profile ; then
+ myconf+=( --disable-vmmraw )
+ fi
# not an autoconf script
doecho ./configure ${myconf[@]}
}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
index f23bc809640a..dbb3a2eb1294 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
@@ -33,7 +33,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="https://www.xenproject.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
index e730734169de..50a5ef2ff487 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
UPSTREAM_VER=0
SECURITY_VER=
# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 1e3cea990b92..12f882e6c570 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,8 +1,8 @@
DIST xen-4.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e
DIST xen-4.11.2-upstream-patches-3.tar.xz 98796 BLAKE2B 5bfb86a54b5bb1452849ac78eabf49c4622010f089f20d334fd5d6bf8537c6ccf179dc6f9ff5c1208c8e6b3276ef8b37f42360cbba4f83cfbbdae6f3475d88d2 SHA512 5e8cf109b9a00acea6e843f5793f01a14edb0f29573a12b632b93b328393b0cbf5f048088d9a82b2eb0aa51b4d355509921e63696225c355fe667b5b1da6b5d9
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
+DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287 SHA512 e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
-DIST xen-4.12.1-upstream-patches-3.tar.xz 84912 BLAKE2B 4e8ee83d9f48f9ceadf401c069627c4ca91f70b726c4de9806070aaa090df912dfb15251be0d79829e249600451cf42621e722b739eb0961189b6bafcf1c5c57 SHA512 ae8f902cc39f3b0b99520d932e3be9ae51d00a997f3a008562bf39c63ba0ee9fc0a5f00d03027d4a9bf7de777bd8f1a41ffb10d52bee5b92a05364e9fb5434eb
+DIST xen-4.12.1-upstream-patches-4.tar.xz 128244 BLAKE2B 881a4efe2552cdcff705325eeb1eee19338dc69e110efa8bf3e7fb57d5a6ca306c4848d61149a74c6827e938934963bc54f7ff8b939fc43198e8a892ac8f0708 SHA512 cec14e2000d6686c46c286e70bb4af29a13e06fc7aaca9bd1008564d346c99ea8909a1175eaf9a771524c6cfe4b313a3e35c9fd8bbf4f1a6778dc0cbe3134bc5
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
DIST xen-4.13.0-rc4.tar.gz 39003881 BLAKE2B 21352f0984f1c46f8f3a4e8420ec9eabeff65d47c61bbb16dadca6087a53a975285fd58f3c9d810a874b95059eb2538d989921e2acd0b23f46baa3668c4737e9 SHA512 cbea9cc6cbc2b80ba9bec840b9c08d90884e908ec9675000df75a483ee1f2c70ce09c97d69d923a6530726b92fe6bee7b22aeee71ce5e9530c2eba984c7f57f4
diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch
new file mode 100644
index 000000000000..c7173d91b244
--- /dev/null
+++ b/app-emulation/xen/files/xen-4.11-efi.patch
@@ -0,0 +1,36 @@
+diff --git a/xen/Makefile b/xen/Makefile
+index af27147777..a5299b3868 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
+@@ -57,9 +57,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
+ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
+ [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++ else \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++ fi;
+ [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
+ $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
+ $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+index ec02972f2b..628c245564 100644
+--- a/xen/arch/x86/Makefile
++++ b/xen/arch/x86/Makefile
+@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms
+ --rename-section=.data=.note.gnu.build-id -S $@.bin $@
+ rm -f $@.bin
+
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-emulation/xen/xen-4.11.3.ebuild b/app-emulation/xen/xen-4.11.3-r1.ebuild
similarity index 97%
rename from app-emulation/xen/xen-4.11.3.ebuild
rename to app-emulation/xen/xen-4.11.3-r1.ebuild
index 6d135ed74c97..3fb983d40166 100644
--- a/app-emulation/xen/xen-4.11.3.ebuild
+++ b/app-emulation/xen/xen-4.11.3-r1.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=0
+ UPSTREAM_VER=1
SECURITY_VER=
GENTOO_VER=
@@ -98,7 +98,7 @@ src_prepare() {
# Gentoo's patchset
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -120,6 +120,8 @@ src_configure() {
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
}
src_compile() {
diff --git a/app-emulation/xen/xen-4.12.1-r3.ebuild b/app-emulation/xen/xen-4.12.1-r4.ebuild
similarity index 97%
rename from app-emulation/xen/xen-4.12.1-r3.ebuild
rename to app-emulation/xen/xen-4.12.1-r4.ebuild
index 2f5212664be7..3ee8dd94a9ce 100644
--- a/app-emulation/xen/xen-4.12.1-r3.ebuild
+++ b/app-emulation/xen/xen-4.12.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=3
+ UPSTREAM_VER=4
SECURITY_VER=
GENTOO_VER=
@@ -98,7 +98,7 @@ src_prepare() {
# Gentoo's patchset
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -120,6 +120,8 @@ src_configure() {
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
}
src_compile() {
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 16c81705ced5..c854ee39ae21 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-unison/metadata.xml b/app-eselect/eselect-unison/metadata.xml
index ffac4d7ebc01..6f49eba8f496 100644
--- a/app-eselect/eselect-unison/metadata.xml
+++ b/app-eselect/eselect-unison/metadata.xml
@@ -1,8 +1,5 @@
-
- ml@gentoo.org
- Gentoo ML Project
-
+
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 99b351422e10..da597a485463 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 9cece8ff1f6c..4e9af7381e74 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,2 +1,3 @@
DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
+DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
new file mode 100644
index 000000000000..988c19a0a04e
--- /dev/null
+++ b/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN^^}
+
+DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 freedist public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="cdb"
+
+DEPEND="virtual/awk
+ cdb? (
+ || (
+ dev-db/tinycdb
+ dev-db/cdb
+ )
+ )"
+RDEPEND=""
+
+DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt )
+
+src_prepare() {
+ rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+
+ default
+}
+
+cdb_make() {
+ cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+ cdb -c "${1}"
+}
+
+src_compile() {
+ if use cdb; then
+ local cdbmake=cdb_make f
+ if has_version dev-db/tinycdb; then
+ cdbmake=tinycdb_make
+ fi
+ for f in {,zipcode/}${MY_PN}.*; do
+ LC_ALL=C awk '
+ /^[^;]/ {
+ s = substr($0, index($0, " ") + 1)
+ print "+" length($1) "," length(s) ":" $1 "->" s
+ }
+ END {
+ print ""
+ }
+ ' ${f} | ${cdbmake} ${f}.cdb || die
+ done
+ fi
+}
+
+src_install() {
+ insinto /usr/share/skk
+ doins {,zipcode/}${MY_PN}.*
+
+ einstalldocs
+ docinto zipcode
+ dodoc zipcode/README.md
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8cffa215ace4..248c937ccb38 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
index ecbb81e13662..0cc52ce565ac 100644
--- a/app-misc/ledit/ledit-2.03.ebuild
+++ b/app-misc/ledit/ledit-2.03.ebuild
@@ -4,22 +4,20 @@
EAPI=5
inherit eutils
-RESTRICT="installsources"
-IUSE="+ocamlopt"
-
DESCRIPTION="A line editor to be used with interactive commands"
SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
HOMEPAGE="http://pauillac.inria.fr/~ddr/ledit/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt"
+RESTRICT="installsources !ocamlopt? ( strip )"
+
DEPEND=">=dev-lang/ocaml-3.09:=[ocamlopt?]
dev-ml/camlp5:="
RDEPEND="${DEPEND}"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="!ocamlopt? ( strip )"
-
src_compile() {
emake -j1 all
if use ocamlopt; then
diff --git a/app-misc/ledit/metadata.xml b/app-misc/ledit/metadata.xml
index ffa6c6b4395b..1b2becffa26c 100644
--- a/app-misc/ledit/metadata.xml
+++ b/app-misc/ledit/metadata.xml
@@ -1,8 +1,5 @@
-
- ml@gentoo.org
- Gentoo ML Project
-
+
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 48a2c0ed00c0..4681673c879e 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -7,3 +7,4 @@ DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d
DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
+DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
diff --git a/app-misc/nnn/nnn-2.8.1.ebuild b/app-misc/nnn/nnn-2.8.1.ebuild
new file mode 100644
index 000000000000..6ca9e1095ee0
--- /dev/null
+++ b/app-misc/nnn/nnn-2.8.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+ sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ tc-export CC
+ sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+
+ newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins misc/auto-completion/fish/nnn.fish
+
+ insinto /usr/share/zsh/site-functions
+ doins misc/auto-completion/zsh/_nnn
+
+ einstalldocs
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1ff1ce02cf37..b38a4feb2786 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 3c2c8c935d5d..d23c49362eef 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,5 +1,3 @@
-DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
DIST cpuid2cpuflags-6.tar.bz2 79329 BLAKE2B 3fb1e104a065b020926602e3badcb96c8c3bbcf5ddc708eebdf7754e37bc302b88297471f51a07403eb49b0d688a1c2725b878bcb2a47edb0f491e3608d72b49 SHA512 b7c844667988663ad50430a506055c11263c33bd8821ae8025eea3f719c33101425dcaef3f89afed7f15952d678e4467afe99672eb3135bedc34fe5979f999e0
-DIST cpuid2cpuflags-7.tar.bz2 80582 BLAKE2B f78c94e2c3706a3bffe58631455c91d1742d8e551449b8ec0b3aa7cef4b542dbc7215f6cc6d5d8514aa7f8d90af56ea95ab6d1263f8d7442e0478581728d9511 SHA512 6ddfab6fc44910f8ad1c03ef1f6d6e2a9348a4ae419eeca6f97cf7bea76a88a2ff413421f6fc75df22b6b04d42346dc0f3c958dbd87d672abe007bfacf355d7f
DIST cpuid2cpuflags-8.tar.bz2 82432 BLAKE2B c4284106a4b1433e266e364b40dd50cf801f6b4afcb6928b13c1ac58ea1c3854b4a952f6ac914ef995aaa8bc9cfd8a4428c84386eb2949f83228a5b9d9781ada SHA512 167ee1620d6d726ef849d265785b568bb72a1aae15f5f0c527a903424c8ce9519033c49e8a143ae093b56e25fd71b4746793fb825233173fe60ac29eeecca20c
DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
deleted file mode 100644
index 81e0c4eaea60..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if [[ ${v%-r*} -lt 2 ]]; then
- elog 'Please note that the output has changed in v2. The new format is suitable'
- elog 'both for Portage and Paludis. To use it, e.g.:'
- elog
- elog ' $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
- elog
- elog '(you may need to convert package.use into a directory if you want to use'
- elog ' separate file as presented here)'
- fi
- done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
deleted file mode 100644
index 9d786e5efb95..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if [[ ${v%-r*} -lt 2 ]]; then
- elog 'Please note that the output has changed in v2. The new format is suitable'
- elog 'both for Portage and Paludis. To use it, e.g.:'
- elog
- elog ' $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
- elog
- elog '(you may need to convert package.use into a directory if you want to use'
- elog ' separate file as presented here)'
- fi
- done
-}
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 0eafd9624b5a..0d94d9b10246 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1 +1,2 @@
DIST eix-0.33.8.tar.xz 627116 BLAKE2B b301b4218d60c13a8d6c4be484b65e9bc257e6c4d1989054cc844861cd6ec96194e60094e72833f82cfaf1b1d14a249045590dbfc91a39e5c92d5dae13b2c643 SHA512 014ce5b660430e117e8037d8043bdfe5e6e98b7cb889e88d93aeb87e650296a8db64871f3eb736842dbebde7eb1f23936f6df9f5f547f89565734b7874e6e907
+DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
diff --git a/app-portage/eix/eix-0.33.9.ebuild b/app-portage/eix/eix-0.33.9.ebuild
new file mode 100644
index 000000000000..2c0ec5f0a0bc
--- /dev/null
+++ b/app-portage/eix/eix-0.33.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+ sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+ >=app-shells/push-2.0-r1
+ >=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+ app-arch/xz-utils
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ # remove stale cache file to prevent collisions
+ local old_cache=${EROOT}/var/cache/${PN}
+ if [[ -f ${old_cache} ]]; then
+ rm "${old_cache}" || die
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+ sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}/usr/share/push/push.sh\":" \
+ -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}/usr/share/quoter/quoter_pipe.sh\":" \
+ -i src/eix-functions.sh.in || die
+ sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}/usr/share/eix/eix-functions\\\\\":" \
+ -i src/Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable debug paranoic-asserts)
+ $(use_enable nls)
+ $(use_with doc extra-doc)
+ $(use_with sqlite)
+
+ # default configuration
+ $(use_with prefix always-accept-keywords)
+ --with-dep-default
+ --with-required-use-default
+
+ # paths
+ --with-portage-rootpath="${ROOTPATH}"
+ --with-eprefix-default="${EPREFIX}"
+
+ # build a single executable with symlinks
+ --disable-separate-binaries
+ --disable-separate-tools
+
+ # used purely to control/disrespect *FLAGS
+ --disable-debugging
+ --disable-new_dialect
+ --disable-optimization
+ --disable-strong-optimization
+ --disable-security
+ --disable-nopie-security
+ --disable-strong-security
+ )
+
+ # https://github.com/vaeth/eix/issues/35
+ append-cxxflags -std=c++14
+
+ # work around https://github.com/vaeth/eix/issues/64, bug#687988
+ local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dobashcomp bash/eix
+ dotmpfiles tmpfiles.d/eix.conf
+
+ rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+}
+
+pkg_postinst() {
+ tmpfiles_process eix.conf
+
+ local obs=${EROOT}/var/cache/eix.previous
+ if [[ -f ${obs} ]]; then
+ ewarn "Found obsolete ${obs}, please remove it"
+ fi
+}
+
+pkg_postrm() {
+ if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+ rm -rf "${EROOT}/var/cache/${PN}" || die
+ fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 390623535fde..9421bfb9223d 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c74997e556bc..7795ac801873 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,3 +2,4 @@ DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304
DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
DIST calibre-4.4.0.tar.xz 36389440 BLAKE2B d6f6bfb98dd95012a7d145d7700a2818974b2d2e9f8faf1d98b931283305c92ec7e136c9569ef2074d748cc39819e53186ab250b8331d60253d23fddaa1f8a41 SHA512 0204f47db53bc3d649f43276460152423f994cf321661db315904916997121592e0edfb0b9212fbb593d50d3faef0762a2dddd4a7568d1f72c7eecb6b952d278
DIST calibre-4.5.0.tar.xz 36472092 BLAKE2B b742f897b45e3832e5d8ebec93d8223973b6f5b6d6b3074a07e529eb4b823fa63cbf55c2d6b46ee7e0b5868dc45a858d0a841ce6b9a071ebc27a8977c44b00c6 SHA512 0d024ca7bda1ba9f2bb20fd02af1c4225d63c1a1e1bd71bf7760c214cec9ccf821fe31859cf389c6e45ba7fca21c706e5619f2066b600571f17660c52d84bd09
+DIST calibre-4.6.0.tar.xz 37397188 BLAKE2B 145f329bb4dfeaffcc1a1dec741cf7f0d2bb943bc343f83828ad3755452c6313e59cc2e1518d8b05120746928080bc2c0de52827202c6a45733495bddf9995ed SHA512 4a057ffa6a77dfcec99a7ac89caf98045e2884af5a2833aed232620bd668ce92f542c903ea3817cfc05bbdbf10d89be029a459924d889fc83c8151100779a70d
diff --git a/app-text/calibre/calibre-4.6.0.ebuild b/app-text/calibre/calibre-4.6.0.ebuild
new file mode 100644
index 000000000000..bd7b7fd33648
--- /dev/null
+++ b/app-text/calibre/calibre-4.6.0.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.9.6_pre20171027:=
+ >=app-text/poppler-0.26.5[qt5]
+ >=dev-libs/chmlib-0.40:=
+ dev-libs/glib:2=
+ >=dev-libs/icu-57.1:=
+ dev-libs/libinput:=
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+ >=dev-libs/dbus-glib-0.106
+ >=sys-apps/dbus-1.10.8
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=
+ >=dev-qt/qtwebengine-5.12
+ dev-qt/qtwidgets:5=
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-libs/libwmf-0.2.8
+ >=media-gfx/optipng-0.7.6
+ >=sys-libs/zlib-1.2.11:=
+ virtual/libusb:1=
+ x11-libs/libxkbcommon:=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ >=virtual/podofo-build-0.9.6_pre20171027
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+ eerror "Calibre cannot be built with this version of gcc."
+ eerror "You need at least gcc-6.0"
+ die "Your C compiler is too old for this package."
+ fi
+}
+
+src_prepare() {
+ # no_updates: do not annoy user with "new version is availible all the time
+ # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+ eapply \
+ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+ "${FILESDIR}/${PN}-disable_plugins.patch"
+
+ eapply_user
+
+ # Fix outdated version constant.
+ #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+ # -i src/calibre/constants.py || \
+ # die "sed failed to patch constants.py"
+
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+ # calls xdg-* (bug #258938).
+ sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+ -e "s|, PreserveMIMEDefaults():|:|" \
+ -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|cmd\[2\]|cmd[4]|" \
+ -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+ -i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+ -i setup/build.py || die "sed failed to patch build.py"
+
+ # use system beautifulsoup, instead of bundled
+ rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+ || die "could not remove bundled beautifulsoup"
+ find "${S}" -type f -name \*.py -exec \
+ sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+ || die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+ # Bypass kbuildsycoca and update-mime-database in order to
+ # avoid sandbox violations if xdg-mime tries to call them.
+ cat - > "${T}/kbuildsycoca" <<-EOF
+ #!${BASH}
+ echo $0 : $@
+ exit 0
+ EOF
+
+ cp "${T}"/{kbuildsycoca,update-mime-database} || die
+ chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+ export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+ # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+ # violation with kbuildsycoca as in bug #287067, comment #13.
+ export -n DISPLAY
+
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C #684484
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export XDG_CONFIG_HOME="${HOME}/.config"
+ export XDG_DATA_HOME="${HOME}/.local/share"
+ export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+ mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ tc-export CC CXX
+ # Bug #334243 - respect LDFLAGS when building extensions
+ export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+ local libdir=$(get_libdir)
+ [[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+ addpredict /dev/dri #665310
+
+ PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ "${PYTHON}" setup.py install \
+ --root="${D}" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/${libdir}" \
+ --staging-root="${ED}/usr" \
+ --staging-libdir="${ED}/usr/${libdir}" || die
+
+ rm "${ED}/usr/share/applications/defaults.list" || die
+ find "${ED}"/usr/share -type d -empty -delete
+
+ cd "${ED}"/usr/share/calibre/fonts/liberation || die
+ local x
+ for x in * ; do
+ [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+ ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+ done
+
+ einfo "Converting python shebangs"
+ python_fix_shebang --force "${ED}"
+
+ einfo "Compiling python modules"
+ python_optimize "${ED}"/usr/lib/calibre
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+ bashcomp_alias calibre \
+ lrfviewer \
+ calibre-debug \
+ ebook-meta \
+ calibre-server \
+ ebook-viewer \
+ ebook-polish \
+ fetch-ebook-metadata \
+ lrf2lrs \
+ ebook-convert \
+ ebook-edit \
+ calibre-smtp \
+ ebook-device
+
+}
+
+pkg_preinst() {
+ # Indentify stray directories from upstream's "Binary install"
+ # method (see bug 622728).
+ CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+ CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+ printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+ [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+ local x
+ for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+ if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+ elog "Purging '${x}'"
+ rm -rf "${x}"
+ fi
+ done
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
index 75c9ea74812d..7a38bb900964 100644
--- a/app-text/htmlc/metadata.xml
+++ b/app-text/htmlc/metadata.xml
@@ -1,8 +1,5 @@
-
- ml@gentoo.org
- Gentoo ML Project
-
+
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index d4b6be426aba..fb8cdb3b6f8c 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 37f9589ee1ca..db03af64ddfc 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,2 +1 @@
-DIST splice-1.0.1.tar.bz2 12369 BLAKE2B ce43b38a74dd8c51c4fb2d23951119c259595dcc3f5bbeb5524d747a373ba7e71dc2bf4df957b48dca5aba5f2c04bb18bbe83d9551f63d2b055cdeddbc523713 SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede
DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.1.0-r1.ebuild
similarity index 59%
rename from app-vim/splice/splice-1.0.1.ebuild
rename to app-vim/splice/splice-1.1.0-r1.ebuild
index 4edbc76ad7f3..3753a52afbed 100644
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r1.ebuild
@@ -1,29 +1,32 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
-inherit vim-plugin python-single-r1
+inherit vim-plugin python-single-r1 vcs-snapshot
DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
HOMEPAGE="https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
+SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
|| (
- app-editors/vim[python]
- app-editors/gvim[python]
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
)"
VIM_PLUGIN_HELPFILES="${PN}.txt"
src_prepare() {
- rm LICENSE.markdown || die
+ default
+ rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+ rm -r site || die
}
src_install() {
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index a943ac802bd6..85f64aacf847 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,2 +1 @@
-DIST vimtex-20160324.tar.bz2 95040 BLAKE2B a6ea2c0ace2aea108545347e0dd624dd838005d752d3e823d230f6fff04ba37f82c98ff472b06b6b5b58a8481824ba1ffad3c756d50a96ea9c79e8e506783131 SHA512 0c0d2a95f3b62239f47113f5b8876728d6d9fddf7e526477e92ef1f09317cb607ddd3b2aa07f6e8bebd357308adf21e4c353795952dc30372b493963bd0554ff
DIST vimtex-20180324.tar.gz 684092 BLAKE2B 4472c9e62c5795b621a9230fbd7ea1f018c6df440f58065e7b439f64ae67f4064b158094c8d0b8a6eba6202bc9e6729b792fced02ea9deeaf400f0240537795d SHA512 59038aff6ec761a9f73db7d638a70e9ea5ba4d3ef4bd9283f3a62beb5e412f1a3c752dd0d739dc4c9c5e33e4a00a84a91da56e8fea2b8113b7ef73d219997409
diff --git a/app-vim/vimtex/vimtex-20160324.ebuild b/app-vim/vimtex/vimtex-20160324.ebuild
deleted file mode 100644
index 3b8069b4db5a..000000000000
--- a/app-vim/vimtex/vimtex-20160324.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
-HOMEPAGE="https://github.com/lervag/vimtex"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RDEPEND="!app-vim/vim-latex
- virtual/latex-base
- dev-tex/latexmk"
-
-src_prepare() {
- rm -rf *.md test || die
-}
diff --git a/app-vim/vimtex/vimtex-20180324.ebuild b/app-vim/vimtex/vimtex-20180324-r1.ebuild
similarity index 86%
rename from app-vim/vimtex/vimtex-20180324.ebuild
rename to app-vim/vimtex/vimtex-20180324-r1.ebuild
index d4031034c014..fc0060ecefde 100644
--- a/app-vim/vimtex/vimtex-20180324.ebuild
+++ b/app-vim/vimtex/vimtex-20180324-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,10 +23,7 @@ VIM_PLUGIN_HELPFILES="${PN}"
RDEPEND="
!app-vim/vim-latex
- !app-vim/automatictexplugin
- virtual/latex-base
- dev-tex/latexmk
-"
+ !app-vim/automatictexplugin"
src_prepare() {
default
diff --git a/app-vim/vimtex/vimtex-99999999.ebuild b/app-vim/vimtex/vimtex-99999999.ebuild
index d4031034c014..fc0060ecefde 100644
--- a/app-vim/vimtex/vimtex-99999999.ebuild
+++ b/app-vim/vimtex/vimtex-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,10 +23,7 @@ VIM_PLUGIN_HELPFILES="${PN}"
RDEPEND="
!app-vim/vim-latex
- !app-vim/automatictexplugin
- virtual/latex-base
- dev-tex/latexmk
-"
+ !app-vim/automatictexplugin"
src_prepare() {
default
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8d4cfba17857..9f9a3184a8f5 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 2e35d371fc67..c38c30f56131 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1 +1,2 @@
DIST pgcli-2.0.2.tar.gz 432325 BLAKE2B 5cbe2be05910d9bfa64e7ac908d636a39ed11f994e0e81cd06afce97510e02be335837b2587653df716beee0d30076f07489ac8e4fb05fbc579bceee8636a470 SHA512 5681effcb36101ce408f7c4dcc881984686d63a6e593bd4f5c2bb3b2d870362c787094895ece027a3ba27d3a4524498b27082da0f25b1b77f23e54b2df6c0501
+DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
new file mode 100644
index 000000000000..d651e872230d
--- /dev/null
+++ b/dev-db/pgcli/pgcli-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
+HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
+ =dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+ =dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/click-4.1[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
+ >=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ test? (
+ dev-db/postgresql
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+# there is a flaky test, so no tests for now
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3fe33ce8dbe2..4ded74b57a43 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 4d7d550ba90b..8ee02d5e7136 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,3 +1,4 @@
DIST u-boot-2018.05.tar.bz2 12469276 BLAKE2B b09189d9bf8554c21630d42024d64894270c02e3efa8046bc2bef0efd68b9e0a02c3290228ffb71a4bab524d46111e32adb492c3ce9a3ef1be32287a3bbdb36a SHA512 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2
DIST u-boot-2018.11.tar.bz2 13045125 BLAKE2B d2522e1eb2fb899f1217261b6c311be35ae2fb01d187714311184e6f913d1d5b3ad953b5fa02c5c7b0e1e5981be101ce82ea4cf09a457d32d778ffa5cadc0786 SHA512 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
DIST u-boot-2019.01.tar.bz2 13366005 BLAKE2B 161d927d5f2cb38c6a930f0b5edfedeb3a93586ea98e03066a1fa9c516bfc1f6ab8d5ba60b36714d10c08232971e7a0987f4d0a05635fa14a6359bb120aa0ed2 SHA512 d9699cd22afe9bc747d64208068c2cf8a2c3143d161ede24536f6fd6adfd6b81e28920589722639e2e48fcf34e8dbde3ead7f691f14cbcc38cd75694d14d719b
+DIST u-boot-2019.10.tar.bz2 14214608 BLAKE2B 0dc89ebe207f836d2430d5111def9b4efa22839311d28cbfe4f0387a1b211850b0bf3cd67440b3cc32fb23aa8ece270c2438c44f5432f72474b4802ff117e803 SHA512 d8e98fca4b6af8d49d20ec09beab16b77863fcee88cda3605cc14435de21030bf3ca5e7cf7d06e42d4c0f75279c7295ecd628d2b77666eff7b7fd50374e051fd
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
new file mode 100644
index 000000000000..bcda5a2499b5
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ # Unset a few KBUILD variables. Bug #540476
+ unset KBUILD_OUTPUT KBUILD_SRC
+
+ emake \
+ V=1 \
+ HOSTCC="$(tc-getCC)" \
+ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+ HOSTLDFLAGS="${LDFLAGS}" \
+ tools-only_defconfig
+
+ emake \
+ V=1 \
+ NO_SDL=1 \
+ HOSTSTRIP=: \
+ STRIP=: \
+ HOSTCC="$(tc-getCC)" \
+ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+ HOSTLDFLAGS="${LDFLAGS}" \
+ CONFIG_ENV_OVERWRITE=y \
+ tools-all
+}
+
+src_test() { :; }
+
+src_install() {
+ cd tools || die
+ dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+ dobin env/fw_printenv
+ dosym fw_printenv /usr/bin/fw_setenv
+ insinto /etc
+ doins env/fw_env.config
+ doman "${S}"/doc/mkimage.1
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 9eada7d444f7..6f554214c913 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index 405a0e082cfa..3fb902fa3e34 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1,3 +1,2 @@
-DIST ansi-terminal-0.5.5.tar.gz 13136 BLAKE2B 0a0d35d5bc69a0a5a19a083cdecc4a3e41cecbad53dba9abd304dad48a8429b48baa37865c5ba40d6d636c5cfb84c23d6ab5b72857470e7f4aca8ac5c673a8f7 SHA512 9fee8511f2edcadf146d1759634592ef725d6e18ccd278ba13cfbd117c918814ae65195237f83b36a96e0b8a89a7731edff2d692138baff9e3473e46d4982ce5
DIST ansi-terminal-0.6.2.1.tar.gz 14652 BLAKE2B ae068a4e0a1c4f17c01d4e5aa7c1daa350ea5b5b18e8dfadebb2f4be5891076f2c78e82a829bc8638bfd69cce2e847c0910a56a18661b764e2fc9f785d375386 SHA512 6a38f6ec13ca2c2669c707eeab1749fa7ca1805fa162cc024867cf0cabb5746c8844bc2188680de3f9dd748cfcb72917b88ac9122ff6b86459c80aa061f2adbf
DIST ansi-terminal-0.6.2.3.tar.gz 21964 BLAKE2B 3c3fdb0cd5808978e474602df9f722a4a349162975618e0144aa9b863039b0b8dc73d106c441481b8755f338fe252a9c0effc269a468b55f51fb9c025c648b75 SHA512 3d2999d0dcd45950240731ae9bbf5b65fbd5b00660b4f6387afa2e3db89f2f1a6690ea72311348cddd8e27fa31c447f282795c2ae1b76a5306aade785eb3448d
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
deleted file mode 100644
index b996d2379a4b..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://batterseapower.github.com/ansi-terminal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild
deleted file mode 100644
index 991ec5180b6d..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal[profile?]
- dev-haskell/mtl[profile?]
- >=dev-haskell/text-0.11[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index a78a0f6b1dad..2667500bb5b6 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1,2 +1 @@
-DIST base64-bytestring-0.1.1.3.tar.gz 6976 BLAKE2B 7d454b27a1bed7513954c191064776c5a9fed03d91657688a5ca5eccb58bc180f73cc731f4f053d7a0c6ab57f54472ce89b0492f359b9dc0a15470e81f3c5ea8 SHA512 49ca6320ddb3a6b149fd61e6a046404fc692c7030d4ad48e6d390b645e1c5343854d9814f7e58369c8cba0089d0da1803c57d808c4217bfefe27303d93a20587
DIST base64-bytestring-1.0.0.1.tar.gz 9080 BLAKE2B 272bd4cd4a87c76d5d85bf0bda4b9659168e9623deaebfdc2cedc7083b833fda9512775d17096e8f01b6ca1a1f73c9d1bfa5059b7564f1f3dc2cd467322cfbc8 SHA512 6936b34955b89a275f5bd71c74bbad2be6ff9e2023ac652bdbc9c5b10dd624e3862fc348849858fdb5c7b8aacc36ab4cda8bc6ea797c129b6b28d7e2e2e610e7
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild
deleted file mode 100644
index d17395f1f928..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base64 encoding and deconding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base64-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? (
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.4.0.1
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- )
- "
-
-src_configure() {
- cabal_src_configure $(use test && use_enable test tests) #395351
-}
diff --git a/dev-haskell/diff/Manifest b/dev-haskell/diff/Manifest
index a67a07c1a28d..42aa05e31a08 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1,4 +1,3 @@
-DIST Diff-0.1.3.tar.gz 2851 BLAKE2B e7a542443eeadad52f206dc8f3038197bd88947cd9c0ad32a2ffb73ab0a66702d7df375df3aadfdbdb353eb5c226e4f80b1776555e5ced3e56a5d39b8fbeb05d SHA512 6959d9fcd6f7a59b4a32779e8c96723b7219dd0a3b70a61a996d375825c84a8626de79cef9135d4ee8d24599ebdb4ba525a1a11234ade8b70278282f1544370e
DIST Diff-0.3.0.tar.gz 4128 BLAKE2B 94855d33247d1cf44642ad3bc395dd6944442e48405d2987dce1550acb34e3a8408c139b160f0d26aa1e4c76dfe3680750d96662b197e4633cc891563b65a19a SHA512 6920802ba715a97f7650e8edbcc8469c1479d8be2c7fb61703fccaf77f4adc23ced7d26794e6210318afd98f350bc5cb08fd70c1b2797fde9f95546e55a85198
DIST Diff-0.3.2.tar.gz 5024 BLAKE2B fbbccebe6627853649367e016487b0d01e671a1a6a495996413ed2f4f4d7bc63245ea915f9de2465aa8ebe92db1893c34812306afe18aaf466eafcdfd21911ae SHA512 b41c8482b1bcd4e332f85015f7ea99dc3c76d106327bf6b3a8676bb31ffbbdc80f09386f8044aae234a1be6a6304ec4860bb9c0ced95f8910db19d3e2cefe297
DIST Diff-0.3.4.tar.gz 7979 BLAKE2B 937b90294b9e48a741577c7d240a1b02feaadd2aca8afc439e19b36a98c0e3bc319ee67307b77a2410bf2139a580166cbedbc964d5c9b9fc15dc7422ec2350db SHA512 7b8af9a668429d8de141b840e4b22abafb7ccafa9cdbe4c5ee21efe58802ac5889f1575fd6b3c83755b1128ecec68f3aa0213e99b65161f1e7b5681dc6978ad7
diff --git a/dev-haskell/diff/diff-0.1.3.ebuild b/dev-haskell/diff/diff-0.1.3.ebuild
deleted file mode 100644
index f2101d15082c..000000000000
--- a/dev-haskell/diff/diff-0.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/fgl/fgl-5.4.2.4.ebuild b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
deleted file mode 100644
index b79846bf01b1..000000000000
--- a/dev-haskell/fgl/fgl-5.4.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
index 0b96f82117ab..3f232b61fd7b 100644
--- a/dev-haskell/gluraw/Manifest
+++ b/dev-haskell/gluraw/Manifest
@@ -1,4 +1,3 @@
-DIST GLURaw-1.2.0.0.tar.gz 7736 BLAKE2B e0e2acf008e733e805101216761c0bfd126ad9a412288247305aedf02d0c08a5584542e8c5908c65c023a791aae82cc1edda47f9f9681e9ad1cafee10da53be1 SHA512 a25cff8c6d5356b858dafadbe1cb024c1662358fa259bdaf5ddeacacae1684b4adb1e0c5bc3bf30d5d3333bb9672838b37394810e07c3201d32b24b86355786a
DIST GLURaw-1.3.0.0.tar.gz 7779 BLAKE2B 7de3ec011ffaeb9cb098d0253452433c1b2c0214b6345116842a21723e9c59b1edf4d4dad1a62a075b105c2df2dcfba1bf19180a8b5c09d18e9d08b80e3be316 SHA512 a51f62ab3465913216c43686c2ceac16ab78e24fabe740afec4264afd5afbfc1fc45d535b08374d719ca38dad9bb12a7227a01b1cfaee044f549fd4f4f8900b6
DIST GLURaw-1.4.0.1.tar.gz 8445 BLAKE2B fbfe156d291fa830c91672b2c8aaff4c60c04ff990af66991da1fd8845645dc876751648f15c81c2004176d839b75a9b595be9513eb3970aad1d4fd17b5400b4 SHA512 48eb52f7923148c014f89d07029cb7293b325f9bc0d3786c685f1de73a58553602d77edd8261da3d3bdc7090249d11234ef97e76ba436bcd9acc2a8cdec78bed
DIST GLURaw-1.5.0.1.tar.gz 10121 BLAKE2B e21d22e49349becd367686684e87f915cf42a5afb50fd03a2b811ff1047f5bc60eb709b09fcd935497a7a0512bb219a646705011dc0046e132034f49344f9eeb SHA512 085e28e63a28a72e766ec1404d4cf4f3189251e5a159fc00f5d06916a6e38ef80cf9f319e06e3a751db2354042aca4e74e5a736bba966457edc0f24197c950ad
diff --git a/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild b/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild
deleted file mode 100644
index 89f8871ebbfd..000000000000
--- a/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/openglraw-1.2*[profile?]
- >=dev-lang/ghc-6.8.2
- virtual/glu"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index b9fb82bec9fe..29a46a9d4482 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,4 +1,3 @@
-DIST hscolour-1.19.tar.gz 25466 BLAKE2B 852fa5e8d08cabc16c930f32951043f92c8f564773da07de0eeda931caef0197b09d307fffcb9c0c1e86ef139238d46261d355f3b54889bf61d49692b6d8a2e4 SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1
DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
deleted file mode 100644
index 82c5a14bf84c..000000000000
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit base haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-1.19-ghc-7.5.patch")
-
-src_install() {
- cabal_src_install
- if use doc; then
- dohtml hscolour.css
- fi
-}
diff --git a/dev-haskell/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
index 66bbb6a8e88a..9153835a8351 100644
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ b/dev-haskell/hxt-regex-xmlschema/Manifest
@@ -1,4 +1,3 @@
-DIST hxt-regex-xmlschema-9.0.4.tar.gz 27212 BLAKE2B 02eebe5a2aa5c045735520d0038d07dee2434fdba09272da800fb327b2a0014be94d83a728302cd2751d1e28c3d966ae7e803e9cd655e5bd12b0d4ddfe5038a8 SHA512 6523fdab964c007b616e69a9d2d8be535b2a00aa8daa063c62303e932d3a841bcf8447ca85c828d9de01cc748a28db4554acee456f9804c8c257cd332debbe4d
DIST hxt-regex-xmlschema-9.1.0.tar.gz 26675 BLAKE2B 515cadb11536101a2332e0fca909feb7cab2339c05ba0e1dd0854d192e52f3b42f215371ff050509ddc42b9a45518f84ff9c9b4557cbc65fe393f770d7f2db8c SHA512 c41fa5a685c441d07f39eb6806ab201aaf4328466b34e98e0f0c2cfa89bdbad4d510d5e68a2f73bf94d3079db87b1cf9716d68e52bab7638b6084e8aae70a94d
DIST hxt-regex-xmlschema-9.2.0.2.tar.gz 35896 BLAKE2B 6333073f0ba758aca7bee4d4695b26f7337eb9a9eb2d50fd5ed5acf6fb0b0cff69bdd23d83fbacc9a825592f8ec7a4bfcc3cdc412005f3c81461f3d37a85f70c SHA512 4a8f1c9fe0f14e4ab7a64f24e3cc6f1d7c29cf67c5751352629f1f847e7cc062c86d4f90c7a10c35b9afdb44d4459f0fd74968ff2101f62848aa6b5e22b52cc9
DIST hxt-regex-xmlschema-9.2.0.3.tar.gz 35781 BLAKE2B 0ab5c2042acf032e2709e6781457ec28f2bda3b9778947b08dafd7075c9422e0375574104fd06089f19192bebce3f3f3da5e1b515c8eb62bb7ce5c06c3e8680c SHA512 707ad7a4b5c32785fd89131279dd89a871f134a26ce1f98fd4ac8fec196c8960c2d39d18674967379b40508748fca3a34b9289500173075c54c1d6726191bbd8
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild
deleted file mode 100644
index 8d05083a09de..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*[profile?]
- >=dev-haskell/parsec-2.1[profile?]
- =dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
index a8a3c3754a75..1e944bd4ab84 100644
--- a/dev-haskell/openglraw/Manifest
+++ b/dev-haskell/openglraw/Manifest
@@ -1,4 +1,3 @@
-DIST OpenGLRaw-1.2.0.0.tar.gz 72680 BLAKE2B 0bc467e3ce46fa09fd0c410d9fbfb2967f286d7d36b4a8e322ed2258c4097bd3008a734017af6b86b3866253ce3760b237095df01560bfbe1f3402da0bb74fbd SHA512 8cf6301943a72036c9396d7d4d99223feb62bc419cdf8395622b0a1a7c55e7e44f66a6f30e324bc54d9660758eee5b5701f412a375289c82646dbf9b53fb7bf9
DIST OpenGLRaw-1.3.0.0.tar.gz 75328 BLAKE2B 0bccfed258369fa0e84737bc752b6db5db768cec2bcb5030c11c265f8565ec0f8269da29ede8d91ae899b97e11a06a552f9cc81a0949256f8a9c55cf820f1e6d SHA512 444cf2238ebb24710cfca95f11c2ba4888bc70793880f69bc93c932ebb5e44485303699fb0c1e2ea9450f5a911162fe3142aa2bf91d3948f7abd2d07ad1b255e
DIST OpenGLRaw-1.5.0.0.tar.gz 102276 BLAKE2B 33cf8f755a48952bf65fc748e11febd0ddbd3ba6810c2d9ed71d24926c3ba257c73a65aa58505757221b75b9f7912c4dc7aa080425e7b6b19035fc2d1acaa4a2 SHA512 455d1149d70a73e12493ce931bce72c62a11568a43d4b139b8c4a5e5c940533e23feb46c71b2a76eb80d3d9512825bb8ed176d4701e17be890b47ba63fccac76
DIST OpenGLRaw-2.5.1.0.tar.gz 733570 BLAKE2B 6d8ae440d4ab782a578dd3d3bc3bd734f06909a5ecdd9474561596249eb7bfe7dce4047634ad2d271c612f006a18f4ab2706083a572acacf9f78cbc1889b024c SHA512 98f6224d57e8fd5d152a9e028c4c8dafa69de4d52ef30e5a44555cb4c32d0fc92db1b3651beb388f357f59d2a0dd40e0946b26967287f56f268f0ed08008873a
diff --git a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild
deleted file mode 100644
index b9b66bc64d79..000000000000
--- a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2
- virtual/opengl"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
index 5133bbf03e19..73ae0f7dafd1 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -1,4 +1,3 @@
-DIST primitive-0.4.1.tar.gz 9058 BLAKE2B 015266e73c8332d438d0161e05005a0f25be2e6893067b8c1e812a9ff00584a2d8235842f623bf06c7a4171d770ad51f220022c1b59df0be456035a754c04a99 SHA512 72f76569bdf4518c3e27897047fa038e0b056ccc93c273bca91bf40d0d76015727ec81455f6459df3c6f04f07b1b669d7899f5b9d43aba088cc4a9cab03ce03f
DIST primitive-0.5.0.1.tar.gz 10372 BLAKE2B c8b3feb5228db084b0fd41d06ecbabc31fa4d4d09449e6c0798fdab49ca6d1f9030dca3e77ff5993bdf299361d38bbc57d39228d987aa5ee8c203276ce65fe53 SHA512 f52ea7c3b3c8e01949dfb55e158b770375c718151bdd65b0123278334d21fe219711c0d207318d248958b4f39a93a62c66ca77737c7775e3fe3b053dc20b34a8
DIST primitive-0.5.1.0.tar.gz 10482 BLAKE2B 2507da63606de91bb4f20db6db156fdb5ec16a065658f71b10a2f4a2e9ffa47b3ff1eaf65603064a904f6b52e6724a604459296011a445e4ca6ca0bf6727f2b2 SHA512 23d0d0afc80e2b1a674d93feb059d8b240a81793ffd53f496562b87d7b4abc605f66549ac7f23774d8c36fdf8a6768f02cf15b962c75b5052358a1c8cd1664de
DIST primitive-0.5.4.0.tar.gz 11966 BLAKE2B e6127adaf508955903569c86fdb8e0a300645d61faee4f7fe31a51847e7d706fce368e4a94007a207c61bcc59c41d6d8a7480e02f06d04a1f3706a95de0083b6 SHA512 8d0203834f09be52aea6a8f46d556340583ec79f8490e240f660326d670ddd67510caef1c30ee7d7374d88b812a9f5761c1528152212e46b56cd7c744f7aa656
diff --git a/dev-haskell/primitive/primitive-0.4.1.ebuild b/dev-haskell/primitive/primitive-0.4.1.ebuild
deleted file mode 100644
index 81891c6d9e5e..000000000000
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Wrappers for primitive operations"
-HOMEPAGE="http://code.haskell.org/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index 5b166b724858..4db54add153d 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1,4 +1,3 @@
-DIST split-0.1.4.3.tar.gz 12882 BLAKE2B 75943c52bd37a49ab497caf7a1ddb14b44e28c329b6f3e8f3aa765565da195b6bc60c0ef08b33612ec057ff0eea96313849d3e17c43e1de0e2fba7c285f33494 SHA512 d5add24f0757fdbcc0671b1eea48be678021e12619bd6971b624cf62b23affa6e1a15d064e9784eeaaf87ad20087bc0fdb34dce2997ce3fe273e8cdada014121
DIST split-0.2.2.tar.gz 14666 BLAKE2B 77ec6491edaff1e0de17567694e9b34bedf837462bd47e696b8f1e4f3c6610a4ea13e08fd7f11101d7a5941807cf82c260ea6ebff692a7811e696c02079fba68 SHA512 d3e1a0d875632d15b12c0e454188382b705f2b9d93cb99d64f0a2a150ee7b7458628eff95da7da5f51fe9ed4ef3bd8ef3640f925f66e8f6f61253f679326614e
DIST split-0.2.3.1.tar.gz 15623 BLAKE2B aed85fbcb6e1c7aee14f3d4517fce632f3fa95bf63f13f46d454e3dc64f4c88d970e6253a891b184e79e981bd3a9c7eee08cacb9268b7dfb1624fbb4639113ac SHA512 7b56be09279c1279120631a75bb5305bfdd6c351d582174a326985a7a630933aab747f32dd9d4ef13c81528255fe95337488f6a9117c259fe967189651828fce
DIST split-0.2.3.tar.gz 15545 BLAKE2B d0494d299a9d6d109bfcca3f5e2f86d80357abd68038595cb94873a1b0eb0fd11ccad5439b67dde611d11c45118168a56376ec074ee2a5080ba4257694f06ea2 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece
diff --git a/dev-haskell/split/split-0.1.4.3.ebuild b/dev-haskell/split/split-0.1.4.3.ebuild
deleted file mode 100644
index 9148753dc120..000000000000
--- a/dev-haskell/split/split-0.1.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://code.haskell.org/~byorgey/code/split"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-src_prepare() {
- sed -e 's@base <4.6@base <5.0@' \
- -i "${S}/${PN}.cabal" || die "Could not loosen depdencies"
-}
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index 3cbd830d1119..3dd5097c9f85 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -1,4 +1,3 @@
-DIST syb-0.3.7.tar.gz 39091 BLAKE2B 46ef45c632a89b80f403b632583478d1f9468dbb311380c9f6a02e55b9692938ec2f7c8c4e59609cbd08b0112f3d2a6165a392b1d65193b785f4f697390d87b5 SHA512 ede12bc5db250430932c65f764388d356d687059158aa94b2da7b9618b4cc610e5f945a691b86fd9dce6e9761eb1ef4207abdf9b2aa3a4c3ac01d57fb18818ff
DIST syb-0.4.3.tar.gz 38860 BLAKE2B a4587047b9fbf9a33b9f9e1c94afd4abe87e4f284d91255c9e02863cd1efed9bf4e59fe8441e433adf0aaf81556cfdba2988746f37b6b672d604749f57669035 SHA512 d351eb020dba7c257904b81504cacc233b33864bcc54aad48267db313755243206a2dc4a89d473062d5ca4eff09dd57f0610e99f944717a8e3bbd724775fd6b3
DIST syb-0.4.4.tar.gz 39215 BLAKE2B 5ef855075b5516ec1c3504ce54a997877873dcb32d6b3050eb7768ded0e10e6b4ef1f652bcb332d3823afb04ffd05724baa9d0e32cdbc271528467e0666d2b93 SHA512 fc916ec2ad4c76c7aa979f2b5040df5088b0a75b1e33e3b2325e2212b59d22db5773fe0803beb1b8b2e0a0a292f5620bcb23201dce8b790b8f4fa2252bd64a33
DIST syb-0.5.1.tar.gz 39469 BLAKE2B d69ba87a733bc81eb8e4cb24c5a2b6ac3f90a67f6da576f7fdb3a9191b7301805af8029847a578b3750fd672ae238697f7c5e91d34ca4ac1f7046684dc5f4184 SHA512 087bf9a51abe0a09edc0b920f9b91733016701d6ed24184d8f82da87d3b1912b96af4845a3b0ddb41868efede48f90b52d1940633cf0d366559e176cc7771257
diff --git a/dev-haskell/syb/syb-0.3.7.ebuild b/dev-haskell/syb/syb-0.3.7.ebuild
deleted file mode 100644
index 7053cb7658c9..000000000000
--- a/dev-haskell/syb/syb-0.3.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# PDEPEND of ghc, so restrict depgraph
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index 545606b4cd4d..48b99007a55d 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -1,3 +1,2 @@
-DIST test-framework-hunit-0.2.7.tar.gz 2633 BLAKE2B 5abebc66e7eddb6631142597d3f0f95e80fb5d58baee50392815e4b00e6b37d5fb216ed582b7e1961bb92a9b954d20003053507689b66898cd67f08ebd72603d SHA512 db3edad323edd8441a0c8ca980a2113901c66dca3076cd971891a692d6772b5df0a863b004094a71b707d9014add2f865f8c1072cb35e2d5fa85351f7f2b49c3
DIST test-framework-hunit-0.3.0.2.tar.gz 2770 BLAKE2B 48d5d90f215a27402c77967e4656e99cf74740775a98b3fbbd6d3ecd90ec1dc8d31cf462df6f7ba2939b40dd524d5f13a4cde01ce0d03aeb2829726393ef39de SHA512 068ca4326935746769aa4023076e9bd85d1753073c6e67d88daa6ccf2a69f3bafb87c3b03fd5ada612f6ddbdf2447b06ef8f853675cf0efe9eafd80606c40e32
DIST test-framework-hunit-0.3.0.tar.gz 2679 BLAKE2B 8e224ed1c05d8812b8fad8427350a725926ce150c9381c1f76e10deff0d5f818f3ab672b1e4dc5cbc4e6cdd61496a9d7c95d73ddfc110e263f0e17bbf37dd835 SHA512 39a537a56d3fa7f6a996b58a40971265acf4103608f10386af2c7d8d941cc416afa504af2f2f70b91e43616dac1231d384e2fc14835f5a13e41fd27d42f708ed
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
deleted file mode 100644
index 862edd2e81f5..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-HASKELLDEPS=">=dev-haskell/hunit-1.2[profile?]
- >=dev-haskell/test-framework-0.2.0[profile?]"
-RDEPEND=">=dev-lang/ghc-6.10
- ${HASKELLDEPS}"
-DEPEND=">=dev-haskell/cabal-1.2.3
- ${RDEPEND}"
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index 8f6e1ab6e1d4..db63f0026a7a 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,3 +1,2 @@
-DIST vector-algorithms-0.5.4.2.tar.gz 22938 BLAKE2B f2af4c6ef45d6af25e750ef497c15b4d80767aadc37c3ef05a6d893515b340297777064f9c8ef406ff7881b0c72c39c01727e2ee50b39ecbfab5daebd3ebb7a5 SHA512 10f376697e39561eeb4f9148db5ba71fcc3eecb8d9bdc796d8edb4b39a0567592b7740c40ea3ba402d594b3e0b46c365d26776f8ea0cc675fd79ab3c6ecb17fe
DIST vector-algorithms-0.6.0.4.tar.gz 20455 BLAKE2B 0d0c4ef7ed8996d1ebe65971a451d4cb49118faedbf9cb4a987afb281adf563808778a689df608d2fb3c8fe9398af995d1c5e31cc89fd4f2075c2ebdd7ca4277 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf
DIST vector-algorithms-0.7.0.1.tar.gz 25435 BLAKE2B f9cb3bf592316c92bff4313d264370cc35d62c64e7dec6f14ee9954c0fc12f573e799172793501e1b4f9c556fa1ea8e3db1ac3381ff71bb143e33520c69c18b8 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild
deleted file mode 100644
index aa6c02e2629b..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/primitive-0.3[profile?]
- =dev-haskell/vector-0.6[profile?]
- =dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2.3"
-
-PATCHES=("${FILESDIR}/${PN}-0.5.4.1-ghc-7.4.patch")
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2caa52b572a4..52d216bb4e30 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml
index e00a5b040ec4..bcf28489a614 100644
--- a/dev-lang/mlton/metadata.xml
+++ b/dev-lang/mlton/metadata.xml
@@ -1,10 +1,7 @@
-
- ml@gentoo.org
- Gentoo ML Project
-
+