diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9765a16ee380..19cc47f5d9c9 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 9f6897a8d408..945ce74e2e6a 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/virtual/wireguard/Manifest b/acct-group/unbound/Manifest
similarity index 100%
rename from virtual/wireguard/Manifest
rename to acct-group/unbound/Manifest
diff --git a/acct-group/unbound/metadata.xml b/acct-group/unbound/metadata.xml
new file mode 100644
index 000000000000..c9701593d29d
--- /dev/null
+++ b/acct-group/unbound/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-group/unbound/unbound-0.ebuild b/acct-group/unbound/unbound-0.ebuild
new file mode 100644
index 000000000000..4a2eab027793
--- /dev/null
+++ b/acct-group/unbound/unbound-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="unbound program group"
+
+ACCT_GROUP_ID=391
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ff3ff0c58a7c..ea40b25d16b2 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/unbound/Manifest b/acct-user/unbound/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/unbound/metadata.xml b/acct-user/unbound/metadata.xml
new file mode 100644
index 000000000000..c9701593d29d
--- /dev/null
+++ b/acct-user/unbound/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-user/unbound/unbound-0.ebuild b/acct-user/unbound/unbound-0.ebuild
new file mode 100644
index 000000000000..13a6f407ad87
--- /dev/null
+++ b/acct-user/unbound/unbound-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="unbound program user"
+
+ACCT_USER_ID=391
+ACCT_USER_HOME="/etc/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5d78c08bdd08..bd3cc6154c55 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
new file mode 100644
index 000000000000..d84975354f05
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+ weather-metar webserver wifi X xmms2"
+
+COMMON_DEPEND="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
+ lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
+ lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( dev-db/mysql-connector-c )
+ ncurses? ( sys-libs/ncurses:= )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ || ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkgconfig.patch
+ "${FILESDIR}"/${P}-libical-3.patch
+ "${FILESDIR}"/${P}-portmon.patch
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-virtual-sinks.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_EVE=$(usex eve)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
new file mode 100644
index 000000000000..c0198ccc4ecf
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
@@ -0,0 +1,49 @@
+From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
+From: Jan Seeger
+Date: Wed, 5 Aug 2020 15:39:20 +0200
+Subject: Fixed crash on virtual sinks.
+
+Taken from upstream commits
+https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
+https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
+
+Signed-off-by: Jan Seeger
+---
+ src/pulseaudio.cc | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
+index 93226c1b..af814bd6 100644
+--- a/src/pulseaudio.cc
++++ b/src/pulseaudio.cc
+@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
+ pdr->sink_mute = i->mute;
+ pdr->sink_card = i->card;
+ pdr->sink_index = i->index;
+- pdr->sink_active_port_name.assign(i->active_port->name);
+- pdr->sink_active_port_description.assign(i->active_port->description);
++ if (i->active_port != nullptr) {
++ pdr->sink_active_port_name.assign(i->active_port->name);
++ pdr->sink_active_port_description.assign(i->active_port->description);
++ } else {
++ pdr->sink_active_port_name.erase();
++ pdr->sink_active_port_name.erase();
++ }
+ pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
+ pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
+ }
+@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
+ return;
+ }
+
+- if(pulseaudio->result.sink_card!=(uint32_t)-1)
++ if(pulseaudio->result.sink_card!=(uint32_t)-1) {
+ PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
+ pa_card_info_callback, &pulseaudio->result));
++ }
+
+ // get notification when something changes in PA
+ pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
+--
+2.26.2
+
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index f0a52eb94a9d..2bf48f496f5b 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,2 +1 @@
-DIST graylog-3.3.1.tgz 129279195 BLAKE2B b3894a453d369f200951d260c0229cec7dbbeb01fcd5df1d8be354c0669c32c1ae3f435a7bad2fc92823f2408fd6e06eded19a56442d6eaa636bd8401f8573a9 SHA512 9e99784e4c349965aafae8c153bd843007dadf664febe7088cfa7561568841d6acb73592d5f57feaece683ea667a535124cdd49e6ed3a05bab13d07239c8b3dd
-DIST graylog-3.3.2.tgz 129297286 BLAKE2B a09e8211f39cf5ea57bd05c49ccd2efba4d166e20bbd2bfa9f52d2de0768d54821a002453497545bc8022ee161c8a69080cf8f99d6988eb1a6e56f7ee13fdb9f SHA512 6422f15d75067f5639d1d3c181c29429bf10f2f499179df304441ff1b01a7cc0b29a27361837c7b2ef8b6d33fbd3448fc759e123f59843391838daf3ee353824
+DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
diff --git a/app-admin/graylog/graylog-3.3.2.ebuild b/app-admin/graylog/graylog-3.3.2.ebuild
deleted file mode 100644
index cda5c7e5b52d..000000000000
--- a/app-admin/graylog/graylog-3.3.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="!app-admin/graylog2
- acct-group/graylog
- acct-user/graylog
- >=virtual/jdk-1.8:*"
-
-DOCS=(
- COPYING README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
- default
-
- # Stick to architecture of build host
- if ! use amd64; then
- rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
- fi
- if ! use ppc64; then
- rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
- fi
- if ! use x86; then
- rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
- fi
- # Currently unsupported platforms
- # QA warning galore but testing/patches welcome
- rm lib/sigar/libsigar-*freebsd*so \
- lib/sigar/libsigar-*solaris*so \
- lib/sigar/libsigar-*hpux*.sl \
- lib/sigar/libsigar-*macosx*.dylib \
- lib/sigar/libsigar-ia64-*.so \
- lib/sigar/libsigar-ppc-*.so \
- lib/sigar/libsigar-s390x*.so \
- lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
- # gentoo specific paths
- sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
- s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
- graylog.conf.example || die
-}
-
-src_install() {
- default
-
- insinto /etc/graylog
- doins graylog.conf.example
-
- insinto "${GRAYLOG_INSTALL_DIR}"
- doins graylog.jar
- doins -r lib plugin
-
- keepdir "${GRAYLOG_DATA_DIR}"
-
- newconfd "${FILESDIR}/graylog.confd" graylog
- newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
- ewarn "Graylog does not depend on need.net any more (#439092)."
- ewarn
- ewarn "Please configure rc_need according to your binding address in:"
- ewarn "/etc/conf.d/graylog"
- ewarn
- ewarn "Graylog requires Java >= 8"
- ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
- ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
-}
diff --git a/app-admin/graylog/graylog-3.3.1.ebuild b/app-admin/graylog/graylog-3.3.3.ebuild
similarity index 100%
rename from app-admin/graylog/graylog-3.3.1.ebuild
rename to app-admin/graylog/graylog-3.3.3.ebuild
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 77637bd9a1bb..71cae00ecdc5 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -843,6 +843,7 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3
DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
DIST helm-2.16.7.tar.gz 1287743 BLAKE2B fc04e25699489a18703ea1fcf8d63ec4b657098a06f36cc13e5f02696706654203a6a2b075799e3354c7bd7ccb507d538ece14a6a2b7be304a3eed0aa64984ad SHA512 6fc04395e966be8282e576675860f3dddbba812cd23ef30a5bd0997db226887e209a8ffc27c94e4728bfd07a6a0fe4a2a5a24bcd81bd2981c45ddc1adb192087
+DIST helm-2.16.9.tar.gz 1289259 BLAKE2B e633445c51e762762916e10df15f9b5d28f5e9e1dd84bd30c041a37aa4e06b5427657ffc9c62fef27e194694d98335c601cf855f980b1a89b4a44048ae13b0c2 SHA512 a30a153419ffc3bb7f7bc3f17d7a29ecc9789a392e2117c03050345a73439c2c0f1dc53b40f67ef762497e08912da0b21b95f24d548efd5615ff1aaeca08a101
DIST helm-3.2.4.tar.gz 622121 BLAKE2B f676dc80accc3be8e1332c86ae2263bce00b68723953e9783e62b493489bc844e87ae7b2eb6b0a3319babb6e0b128e0aea2a276a9d983566da202c243312c158 SHA512 57634ce225943b369bc25d372ec1355d7d54a37a790913586d8fc01e2955bc7da92f767e125410276b1e8e7579059f6730ccc24dd04488f62f3dbd5cae75f9fe
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
diff --git a/app-admin/helm/helm-2.16.9.ebuild b/app-admin/helm/helm-2.16.9.ebuild
new file mode 100644
index 000000000000..e0b6de643bee
--- /dev/null
+++ b/app-admin/helm/helm-2.16.9.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
+"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
+"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
+"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
+"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
+"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
+"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
+"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
+"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
+"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
+"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
+"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
+"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
+"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
+"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
+"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
+"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
+"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
+"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
+"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
+"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
+"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
+"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
+"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
+"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
+"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
+"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
+"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
+"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
+"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
+"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
+"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
+"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
+"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
+"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
+"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
+"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
+"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
+"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
+"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
+"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
+"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
+"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT=8ad7037828e5a0fca1009dabe290130da6368e39
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+ -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+ -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+ -e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+ rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+ GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+ go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+ popd || die
+ bin/${PN} completion bash > ${PN}.bash || die
+ bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+ newbashcomp ${PN}.bash ${PN}
+ insinto /usr/share/zsh/site-functions
+ newins ${PN}.zsh _${PN}
+
+ dobin bin/${PN} bin/tiller
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 97e8ebe8b427..ead0b0f9c546 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/engrampa/engrampa-1.24.0.ebuild b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
similarity index 97%
rename from app-arch/engrampa/engrampa-1.24.0.ebuild
rename to app-arch/engrampa/engrampa-1.24.0-r1.ebuild
index 27c5563509e5..ba457c153973 100644
--- a/app-arch/engrampa/engrampa-1.24.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate readme.gentoo-r1
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Engrampa archive manager for MATE"
@@ -23,6 +23,7 @@ COMMON_DEPEND="
virtual/libintl
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.22:3[X]
+ x11-libs/libSM
x11-libs/pango
caja? ( >=mate-base/caja-1.17.1 )
magic? ( sys-apps/file )
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 00adfb47a804..c93c0eca0214 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a844a97724bd..17a60ca90764 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,3 +9,4 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
DIST emacs-27.1-rc1.tar.xz 43758028 BLAKE2B e1cc285a954aa1de00c4925909f9d027c5edb71aab740cf856e47001a0b0343cbab547819b367e8391814df4f833e39f1624d914ee52381b612e41b9b02c7fb2 SHA512 fba75ee01e3f82e8fedb09f94d2a6edf76fa2e4cf1e135294a86ffa8d8444292c75cccfeb30037c25f76cd5f0c6376145c09550614e7e42ddc934a8656424134
+DIST emacs-27.1-rc2.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
diff --git a/app-editors/emacs/emacs-27.1_rc2.ebuild b/app-editors/emacs/emacs-27.1_rc2.ebuild
new file mode 100644
index 000000000000..ec0279847418
--- /dev/null
+++ b/app-editors/emacs/emacs-27.1_rc2.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+ EGIT_BRANCH="emacs-27"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+ S="${EGIT_CHECKOUT_DIR}"
+else
+ SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ # FULL_VERSION keeps the full version number, which is needed in
+ # order to determine some path information correctly for copy/move
+ # operations later on
+ FULL_VERSION="${PV%%_*}"
+ S="${WORKDIR}/emacs-${FULL_VERSION}"
+ [[ ${PV} == *_pre* ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="27-vcs"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+ sys-libs/ncurses:0=
+ acl? ( virtual/acl )
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( sys-apps/dbus )
+ games? ( acct-group/gamestat )
+ gmp? ( dev-libs/gmp:0= )
+ gpm? ( sys-libs/gpm )
+ !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+ json? ( dev-libs/jansson )
+ kerberos? ( virtual/krb5 )
+ lcms? ( media-libs/lcms:2 )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
+ mailutils? ( net-mail/mailutils[clients] )
+ !mailutils? ( net-libs/liblockfile )
+ selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls:0= )
+ systemd? ( sys-apps/systemd )
+ zlib? ( sys-libs/zlib )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-misc/xbitmaps
+ gconf? ( >=gnome-base/gconf-2.26.2 )
+ gsettings? ( >=dev-libs/glib-2.28.6 )
+ gif? ( media-libs/giflib:0= )
+ jpeg? ( virtual/jpeg:0= )
+ png? ( >=media-libs/libpng-1.4:0= )
+ svg? ( >=gnome-base/librsvg-2.0 )
+ tiff? ( media-libs/tiff:0 )
+ xpm? ( x11-libs/libXpm )
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+ xft? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/libXrender
+ cairo? ( >=x11-libs/cairo-1.12.18 )
+ harfbuzz? ( media-libs/harfbuzz:0= )
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
+ )
+ )
+ gtk? (
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? (
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
+ )
+ )
+ )
+ !gtk? (
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !motif? (
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ ) )
+ )
+ )
+ )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+
+BDEPEND="app-eselect/eselect-emacs
+ sys-apps/texinfo
+ virtual/pkgconfig
+ gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+ !app-editors/emacs-vcs:27
+ app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+ if [[ ${PV##*.} = 9999 ]]; then
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+ configure.ac)
+ [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+ einfo "Emacs branch: ${EGIT_BRANCH}"
+ einfo "Commit: ${EGIT_VERSION}"
+ einfo "Emacs version number: ${FULL_VERSION}"
+ [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+ || die "Upstream version number changed to ${FULL_VERSION}"
+ fi
+
+ eapply_user
+
+ # Fix filename reference in redirected man page
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+ #AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ strip-flags
+ filter-flags -pie #526948
+
+ if use ia64; then
+ replace-flags "-O[2-9]" -O1 #325373
+ else
+ replace-flags "-O[3-9]" -O2
+ fi
+
+ local myconf
+
+ if use alsa; then
+ use sound || ewarn \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
+ else
+ myconf+=" --with-sound=$(usex sound oss)"
+ fi
+
+ if use X; then
+ myconf+=" --with-x --without-ns"
+ myconf+=" $(use_with gconf)"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with toolkit-scroll-bars)"
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with xpm)"
+ myconf+=" $(use_with imagemagick)"
+
+ if use xft; then
+ myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
+ myconf+=" $(use_with harfbuzz)"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
+ else
+ myconf+=" --without-xft"
+ myconf+=" --without-cairo"
+ myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is not set."
+ use m17n-lib && ewarn \
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+ fi
+
+ local f line
+ if use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+)"
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your version of GTK+ will have problems with closing open
+ displays. This is no problem if you just use one display, but
+ if you use more than one and close one of them Emacs may crash.
+ See .
+ If you intend to use more than one display, then it is strongly
+ recommended that you compile Emacs with the Athena/Lucid or the
+ Motif toolkit instead.
+ EOF
+ if use gtk2; then
+ myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+ use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+ else
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+ fi
+ for f in motif Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"gtk\" is set."
+ done
+ elif use motif; then
+ einfo "Configuring to build with Motif toolkit"
+ myconf+=" --with-x-toolkit=motif"
+ for f in Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"motif\" is set."
+ done
+ elif use athena || use Xaw3d; then
+ einfo "Configuring to build with Athena/Lucid toolkit"
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+ else
+ einfo "Configuring to build with no toolkit"
+ myconf+=" --with-x-toolkit=no"
+ fi
+ if ! use gtk; then
+ use gtk2 && ewarn \
+ "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+ use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+ fi
+ elif use aqua; then
+ einfo "Configuring to build with Nextstep (Cocoa) support"
+ myconf+=" --with-ns --disable-ns-self-contained"
+ myconf+=" --without-x"
+ else
+ myconf+=" --without-x --without-ns"
+ fi
+
+ econf \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+ --without-compress-install \
+ --without-hesiod \
+ --without-pop \
+ --with-dumping=pdumper \
+ --with-file-notification=$(usev inotify || usev gfile || echo no) \
+ $(use_enable acl) \
+ $(use_with dbus) \
+ $(use_with dynamic-loading modules) \
+ $(use_with games gameuser ":gamestat") \
+ $(use_with gmp libgmp) \
+ $(use_with gpm) \
+ $(use_with json) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
+ $(use_with lcms lcms2) \
+ $(use_with libxml2 xml2) \
+ $(use_with mailutils) \
+ $(use_with selinux) \
+ $(use_with ssl gnutls) \
+ $(use_with systemd libsystemd) \
+ $(use_with threads) \
+ $(use_with wide-int) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+#src_compile() {
+# # Disable sandbox when dumping. For the unbelievers, see bug #131505
+# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+#}
+
+src_install() {
+ emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+ mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+ # avoid collision between slots, see bug #169033 e.g.
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+ rm -rf "${ED}/usr/$(get_libdir)"
+ rm -rf "${ED}"/var
+
+ # remove unused /site-lisp dir
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+ # remove COPYING file (except for etc/COPYING used by describe-copying)
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+ if use systemd; then
+ insinto /usr/lib/systemd/user
+ sed -e "/^##/d" \
+ -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+ -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+ etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+ assert
+ fi
+
+ if use gzip-el; then
+ # compress .el files when a corresponding .elc exists
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+ assert "gzip .el failed"
+ fi
+
+ local cdir
+ if use source; then
+ cdir="/usr/share/emacs/${FULL_VERSION}/src"
+ insinto "${cdir}"
+ # This is not meant to install all the source -- just the
+ # C source you might find via find-function
+ doins src/*.{c,h,m}
+ elif has installsources ${FEATURES}; then
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+ fi
+
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+ X
+ ;;; ${EMACS_SUFFIX} site-lisp configuration
+ X
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ Y (setq find-function-C-source-directory
+ Y "${EPREFIX}${cdir}")
+ X (let ((path (getenv "INFOPATH"))
+ X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+ X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+ X (and path
+ X ;; move Emacs Info dir before anything else in /usr/share
+ X (let* ((p (cons nil (split-string path ":" t))) (q p))
+ X (while (and (cdr q) (not (string-match re (cadr q))))
+ X (setq q (cdr q)))
+ X (setcdr q (cons dir (delete dir (cdr q))))
+ X (setq Info-directory-list (prune-directory-list (cdr p)))))))
+ EOF
+ elisp-site-file-install "${T}/${SITEFILE}" || die
+
+ dodoc README BUGS CONTRIBUTE
+
+ if use aqua; then
+ dodir /Applications/Gentoo
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ mv nextstep/Emacs.app \
+ "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+ fi
+
+ local DOC_CONTENTS="You can set the version to be started by
+ /usr/bin/emacs through the Emacs eselect module, which also
+ redirects man and info pages. Therefore, several Emacs versions can
+ be installed at the same time. \"man emacs.eselect\" for details.
+ \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+ strongly recommended that you use app-admin/emacs-updater to rebuild
+ all byte-compiled elisp files of the installed Emacs packages."
+ use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+ machine would satisfy basic Emacs requirements under X11.
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+ for how to enable anti-aliased fonts."
+ use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+ it into /Applications by yourself."
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # move Info dir file to correct name
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ readme.gentoo_print_elog
+
+ if use livecd; then
+ # force an update of the emacs symlink for the livecd/dvd,
+ # because some microemacs packages set it with USE=livecd
+ eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
+ else
+ eselect emacs update ifunset
+ fi
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ eselect emacs update ifunset
+}
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
index ae1a569e5bee..31c1ba51542a 100644
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6688918acf66..c4d5b9dfb06e 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
deleted file mode 100644
index 26742c324c99..000000000000
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
- sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-
-pkg_setup() {
- setup-wxwidgets
-}
-
-src_configure() {
- ECONF_SOURCE=gui-wx/configure econf \
- --with-wxshared
-}
-
-src_install() {
- emake docdir= DESTDIR="${D}" install
- dodoc docs/ReadMe.html
- newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
- make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d5b9fb02d091..4cb3237847e6 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libalkimia/libalkimia-8.0.3.ebuild b/app-office/libalkimia/libalkimia-8.0.3.ebuild
index 65225f915781..7b390a36dfba 100644
--- a/app-office/libalkimia/libalkimia-8.0.3.ebuild
+++ b/app-office/libalkimia/libalkimia-8.0.3.ebuild
@@ -7,6 +7,7 @@ ECM_TEST="forceoptional"
KDE_ORG_NAME="alkimia"
KFMIN=5.60.0
QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -66,3 +67,11 @@ src_configure() {
)
ecm_src_configure
}
+
+src_test() {
+ # Depends on BUILD_WITH_WEBKIT, bug 736128
+ local myctestargs=(
+ -E "(alkonlinequotestest)"
+ )
+ ecm_src_test
+}
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 22b568ff29b6..ab1b2fa6c137 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ fordfrog@gentoo.org
+ Miroslav Ć ulc
+
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index c0c6baf2b949..b3efd76a4f91 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -1,6 +1 @@
-DIST happstack-server-7.1.7.1.tar.gz 78293 BLAKE2B d75dbc1d81c9b496671ffaba6d652aae2fb36801efeafe5a831a02b4feedbad4002b42eea53ad94ccf9e2861bb0772b8ccc8b1c3c9e582b3dd048ddd30e5b455 SHA512 d43c22421e3468fc5fd9e943088db9df3ca394dd964aaa1b9caba998a1e94923956912cdf46fd17cc99969f03097d24b5426f83dbec58585b366478ff46dd5b4
-DIST happstack-server-7.3.9.tar.gz 79473 BLAKE2B d32a9882b8570b8871cd2b3e00605776c747f498be1eaa3a561a1df8b0294a807691e0e33ef50e4a32c49fd4c4a10612fb62a39692d3d4cd9942d251853302a5 SHA512 3bbfa96e17d5e452604c81f1322a3dbec9a44eae76c448e6a79843c05a079c5d081d58a7d126d8bd2957d774899b6678eeadc17fa161f58046296299b1a1c7a2
-DIST happstack-server-7.4.5.tar.gz 79941 BLAKE2B 8b02cf9af538c45782d36e098b2f235ae4763f7206ff644e8b21aaae821480083706904754268d5288e370a8df5f9fcbaab2080515684e782170d28ba8d58ad6 SHA512 52aa4261abe1cea3211add541b6831e0d586dcfc1e24d6d22ac7b69c10fd26ddaa93b2582ee586d9bb8dbef88b7f2e135f874a5ac65d0085d406fa6fa7a6b618
-DIST happstack-server-7.4.6.1.tar.gz 81027 BLAKE2B 618b3b146740efac35d63a1bbf6b8ea176ca8b945ed1693b9b5022f727635aea5442eac4201bb44ace3ac6a91281c73c881140f54ca063a2f7bfb97800fb5cae SHA512 499975de4919b38301ad065e260d22edb8aca116252a9004a631ec122efaf92b779ebfb7a6480aabad23ba0602e723f3ef78247a274489b073525831d8b72593
-DIST happstack-server-7.4.6.2.tar.gz 81122 BLAKE2B ad0b0f4bd9308782dfc0dd91d329e331055f6610ac0c225794d6580d05eb44742a289add593ffec9487bf4220f861e515a6a2307915c5ce4d5a61df743dbf6e2 SHA512 6fb34bbb3a03e985d53a253db523c01f2f2f1e319e8528f9ab8cd4c9ffeeaeca4d3768f154c9eb12419b87bfd9007ee38ae195a8c265867b1526da3e353722b2
-DIST happstack-server-7.5.3.tar.gz 81971 BLAKE2B 33a59e695bf1ec3944b6565cce05cb6b87c2ba3ca56e22fa9e29c7def4a7e561e7935e1fcb979db4a09beb5f58482ac293025970372c684af86b0884416a7f38 SHA512 61edd4474e1476d85dc3ab6e4675d544029bf088babac9615b1fc5d582be0af2326497e7a33b44cd5cd9a097b23b20f5817a3d500555f3ec70ef464f3c2a7591
+DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
diff --git a/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild
deleted file mode 100644
index 89f22a81ddb3..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-#hackport: ignore-flag network_2_2_3 ; flag for old network compatibility
-#hackport: ignore-flag template_haskell: non GHC compiler
-IUSE=""
-
-RDEPEND="=dev-haskell/base64-bytestring-1.0*:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- =dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- =dev-haskell/monad-control-0.3*:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- =dev-haskell/sendfile-0.7.1:=[profile?]
- =dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?]
- =dev-haskell/threads-0.5:=[profile?]
- dev-haskell/time-compat:=[profile?]
- >=dev-haskell/transformers-0.1.3:=[profile?]
- =dev-haskell/utf8-string-0.3.4:=[profile?]
- =dev-lang/ghc-6.12.1:=
- >=dev-haskell/network-2.2.3:=[profile?]
- "
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- )"
diff --git a/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild b/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild
deleted file mode 100644
index f825a535bbeb..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
- dev-haskell/time-compat:=[profile?]
- >=dev-haskell/transformers-0.1.3:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.4.1:=
- network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- --flag=network_2_2_3 \
- $(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
deleted file mode 100644
index 3ced33df3d16..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
- dev-haskell/time-compat:=[profile?]
- >=dev-haskell/transformers-0.1.3:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.4.1:=
- network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- --flag=network_2_2_3 \
- $(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild
deleted file mode 100644
index e635067bf7b8..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
- dev-haskell/time-compat:=[profile?]
- >=dev-haskell/transformers-0.1.3:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.4.1:=
- network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- --flag=network_2_2_3 \
- $(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild
deleted file mode 100644
index 04cc300189c7..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
- dev-haskell/time-compat:=[profile?]
- >=dev-haskell/transformers-0.1.3:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.4.1:=
- network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- --flag=network_2_2_3 \
- $(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
similarity index 86%
rename from dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
rename to dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
index 70766b403fee..ca46057156f8 100644
--- a/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
+++ b/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +network_2_2_3
+# ebuild generated by hackport 0.6.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
+HOMEPAGE="https://happstack.com"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
@@ -40,8 +39,9 @@ RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-lang/ghc-7.8.2:=
- network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/network-3:=[profile?] =dev-haskell/hspec-core-2:=[profile?] =dev-haskell/smallcheck-1.0:=[profile?]
+RDEPEND="dev-haskell/call-stack:=[profile?]
+ >=dev-haskell/hspec-core-2.5.0:=[profile?]
+ dev-haskell/hunit:=[profile?]
+ >=dev-haskell/smallcheck-1.1:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hspec
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/base-orphans
+ dev-haskell/hspec
dev-haskell/quickcheck )
"
diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
index 99269fc1f1d7..c940876935c3 100644
--- a/dev-haskell/json/Manifest
+++ b/dev-haskell/json/Manifest
@@ -1,2 +1,2 @@
-DIST json-0.9.1.tar.gz 22568 BLAKE2B b1c73771e24ccafb2019ffff61e392f2eec18768c4bdd09f1a5ee8275c92d8982cda3fab4d91222f726fae65324776c9e79ccd602dbd4ac9c435749d61a1015e SHA512 537257fed476683d0657c6474e465ca437e43e36b60ab132c0f584cece99a18d222ef9a33171543689ba5589434bc78cf2e0e5ff550804ff8969052d09430d57
+DIST json-0.10.tar.gz 22622 BLAKE2B 4ee854a80738b6d12e027ca8562ac365bc6192532682d9b8997a8887b70d2e19553535fec6c7ab6ecf119262d6f7d229dc4217ac867dcac8dd3158c80606c727 SHA512 4015693c363810701114a222207083ab9610ebd1196d24f0eb8dcad35af54e9067259ca412b131eaa986b8dbfbf0ce62058ca4c31aeeff29fdf21f17e8d86e90
DIST json-0.9.3.tar.gz 22562 BLAKE2B 8947d2b4bea1ee86eea19e25b73b991d186274c7a6beaff09e8f346756e870d440c4511c599d6ee5f82df08975076e47f0f528cc03cabb5063fb768506b9a660 SHA512 836ae920ef19e0cff5b617a579090ea1d760e253513d3fb28c56650a1fa413c0bd852165be487c211a52be6246eac3241a97f729342223be10275917a34230a6
diff --git a/dev-haskell/json/json-0.9.1.ebuild b/dev-haskell/json/json-0.10.ebuild
similarity index 71%
rename from dev-haskell/json/json-0.9.1.ebuild
rename to dev-haskell/json/json-0.10.ebuild
index 5156dfc46bd9..55a5773eba27 100644
--- a/dev-haskell/json/json-0.9.1.ebuild
+++ b/dev-haskell/json/json-0.10.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -14,22 +14,21 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
-IUSE="+generic mapdict +parsec +pretty"
+KEYWORDS="~amd64 ~x86"
+IUSE="mapdict +parsec +pretty"
RDEPEND="dev-haskell/mtl:=[profile?]
+ >=dev-haskell/syb-0.3.3:=[profile?]
dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- generic? ( >=dev-haskell/syb-0.3.3:=[profile?] )
+ >=dev-lang/ghc-8.0.1:=
parsec? ( dev-haskell/parsec:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
+ >=dev-haskell/cabal-1.24.0.0
"
src_configure() {
haskell-cabal_src_configure \
- $(cabal_flag generic generic) \
$(cabal_flag mapdict mapdict) \
$(cabal_flag parsec parsec) \
$(cabal_flag pretty pretty)
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
index 8bb7fe90bc27..fdec5f1e3899 100644
--- a/dev-haskell/json/metadata.xml
+++ b/dev-haskell/json/metadata.xml
@@ -16,7 +16,6 @@
between Haskell values and JSON.