diff --git a/Manifest b/Manifest
index d11b0b6f6718..d01c0c8634d1 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29451 BLAKE2B 232dd9724144605817549d5b41811736cb7a29fea763216c95a04d73a3219bc51addb82da73f76484b7ac29c2de4caf13f656349973bc028b4a0243d91deba59 SHA512 80fcaba5042e0eee5fa7545be4b5458f678f75ded63f85e06bbf283b24aa86bf0806e94b41fa581c9dfb0653bee8b249712c1a71e514a09d67e66fb17d87afeb
-TIMESTAMP 2020-08-06T05:08:37Z
+MANIFEST Manifest.files.gz 29457 BLAKE2B a6c74c2bc88abb152247cec95bb356f006feea7759afcec9bd2ceb1559b4613e1a2e55d0b680ab84056f75a8e4f1bda74f5ef7e3d7f4161967a66404bc367a72 SHA512 4990c60e0adccf2a3c7041e11858981ef3caeaa8a97bc8cfc2e544a32aad5c68d70e4bd70e2975b78de1aab48826c15fd5f1baf990338051582b1c619b8b3c05
+TIMESTAMP 2020-08-07T07:38:41Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8rkFVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8tBQFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmFQ//dkcbEgVY3O1pI03c9jhfuZTBoaNn/VdyML7pIvjRTCWUG+dwqLWrVjrG
-3hfBN2hXt/i1Gdde15PaGJMzmLkGOeNvKRE5lN4hjuQVkZLpVxJwDo957Rq4UA2t
-XJIqSwa0HCCYbNweA05NA0yQEbeO1Bl9wXw8pToZfN3ilHXb++HZN2B6/8heScAl
-Qd19t9plfbn1S2tYN4bM+r4PxDjo1ofazWylrfcPER7NBB0oHI81Nk3OY5ZcVnVz
-qhrgUPg3/G7cZTBlRU7n/AeKYV6zpnBHBzlTG1+2ny4oXyzOFq61AgiCcJH4g2o5
-HOEzDZh236/2H43RUXo3cGvMClzCu4lx23uVUcehxmuxyXD6Kzu/5nMhiyc9J2qQ
-GPoBdyOibPVzlQEUtuzSiVL2EcqWAP09sru4OyrOELlg26PSUO2kW0paR/hr3jk4
-ntK7Nn/0xAqJ95TSRjLl6R49xtlDZcW/SG2bGThsI+rTOEUthbRsLE6dpD0HpuaW
-txKAKwU0jcm7dbrxhMSfTUhTrqpVOEykUzaY52mw4DVYeUE0NfcA3XsFlHCWaKp7
-kQqg61QAEqtcAVqB4rDxUHkFmJmi1bLQtQ1PZBhz42NahGrjFQdMozdwlyeNzSm5
-gdzPWZh8P1efNW4TQMTaLDq4y1nV2stQj/zFp/7nJS+JwBRKss0=
-=MggF
+klC1BRAAgdmm49Oa/ZHvKVxFsZ/lO8o8e31Es9lIrNh8qnB30W2C+Xjhm0kEc1Mt
++CzArbfOucSzLN3of7OL7Adfp+P/4ar+L6VODg52VLU1P8raRCOx0OLIlr5IgFtT
+56uD5ZpAArNkjthiR8SpcRTvkY/KGdNon61+NoSfpZCB6R+weOttDAWa8f1phlVy
+l/wYcKhOUzljMcXnfUmrZajixM8rDRUhU//zxycTQubAOvDz6FFvzKOV/DeXmKnz
+WR91RFtRdgUtGgJAA76/6qcBzH8KbvBuHVKiL5HHjiZorPvt+oeox8LmtLvAYbnA
+9G/G9dA/J1XJGaNBDdzLsKNcMH7mBoMwITOtQStBT6hxITHCJBA6w+LdaIwxox+h
+cBAsMj+U5cYFFU06k3NfCNQnfWy+PQgphFfkolsNbsxdO3MSP4d7tx6N55dJivND
+eRvfpNpQeG7zLolbfN3L5wPW2VR2z+R2Mc/DeybDErLtBQc0Lvq0l41k570TUaAI
+etpMYM8KTSVHU7ERCp34pVj7cMiti0dkXT8VzfgSE/tI5dcoqy26HFs2L3r2U0xw
+YGP2Fiy68AUbaXHLyYn3OKpTqqHRkM26qY5eBQeT6ByD9q5TW7Nt7tQ4ib9MiPDw
+v66/Fi8v5YZfozu+mFARkXrbz2LAJTvYLPrD1H0GgU9XBpw0u3M=
+=pUuV
-----END PGP SIGNATURE-----
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/acct-group/unbound/Manifest b/acct-group/unbound/Manifest
new file mode 100644
index 000000000000..3952c56b77cf
--- /dev/null
+++ b/acct-group/unbound/Manifest
@@ -0,0 +1,2 @@
+EBUILD unbound-0.ebuild 183 BLAKE2B 1ee8a392311cf7447df33283b232ea23af7b5f544d51379867f399482991527c8bf9ed2b1dda98f7f500776b4f5fe788677f2a1962a05a653e3781a96b08dd35 SHA512 b823dd2f2d38a3795a3ecd5f32ada5d0484dea74726cc71b1888b8e959677706e1e055ed44490330ce6a01f82d28393642fd30d747a61cbe1b99c391d928668c
+MISC metadata.xml 362 BLAKE2B 1fe72826bff07ec16390a67529eaa770332ebab559fda7d08ac0a5ff6077af64441390ed2aef1e3f5618ae9ea0271538f91196eed580aab2a7afd06fab8413ac SHA512 9f29773d521a77bd9049b1cdc7748814ba389184a5a4b69946ad8f47c3a74526c26787e90abbb4bca19eb9d20067cce1fa7de35c30246da7b45015049125aeb0
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..8d8c1c12b296
--- /dev/null
+++ b/acct-user/unbound/Manifest
@@ -0,0 +1,2 @@
+EBUILD unbound-0.ebuild 315 BLAKE2B 36993b58d0602164884f3343c105602bd535489b42de04359c2db8bf2c2670a05aaa7c1352cc3ec99081795f63a9cceef65dc9648141d3cf8bed845c4829ce41 SHA512 2002d227d8ce62b3c211afb72518c65926ecec508d4938b4f9cdcfc9bd92f56761ad6245d7ce74512f01fd9a2c9853dcf26bfcc6bed6ee79888c00d3411e898d
+MISC metadata.xml 362 BLAKE2B 1fe72826bff07ec16390a67529eaa770332ebab559fda7d08ac0a5ff6077af64441390ed2aef1e3f5618ae9ea0271538f91196eed580aab2a7afd06fab8413ac SHA512 9f29773d521a77bd9049b1cdc7748814ba389184a5a4b69946ad8f47c3a74526c26787e90abbb4bca19eb9d20067cce1fa7de35c30246da7b45015049125aeb0
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/Manifest b/app-admin/conky/Manifest
index acd29fc3075e..580294a6300d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,9 +2,11 @@ AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f
AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
+AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
+EBUILD conky-1.10.8-r10.ebuild 4820 BLAKE2B 8900e0e3752030f9e6f5e4af8f8d0670afec4f2dea2eb10c7f7b1db8ee3662349307d347a432dd0856ca097415bfff753a13694ff6092152ea909097b2cc3ae9 SHA512 564e081243c567097107f06ed79ef8adadbb7ecf8a4c4a13ac6d33ce550769b971c34a7b8565ce750ba046fd643fe4ae84434fb0b0ad7407432596e84afa1402
EBUILD conky-1.10.8-r9.ebuild 4775 BLAKE2B d26874074e404db1402fe0f524173c1e3f3dd3933fac5079057f39fd8d31de1072fe7addb11f3a8f766286d3241158db43639e825418caa731e304d66b10663b SHA512 68543176a72084c976383b7898a06dce3b1048066d1e2a22e814d43bcc690dd119cee5aaa94bf173b0e723bb04cacfbf5aa0b7da18ad9bbb051b59e064dd8dcb
EBUILD conky-1.11.5.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
EBUILD conky-1.11.6.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
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 5dac8b744b19..c56c05802879 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,7 +1,5 @@
AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13b0628ebb8caea6c69e72adb3102369ffe41721acfef5ba2656689fd10ee0cae591291e9d20cd1e SHA512 e55477329fe5045b85451abd695d13cb6d67cf0b75f0f786503c6fba850d0cae9e853fb976dae35e65f570fda625bc8984714a0cdd6c23801c917184dc5a32f2
-DIST graylog-3.3.1.tgz 129279195 BLAKE2B b3894a453d369f200951d260c0229cec7dbbeb01fcd5df1d8be354c0669c32c1ae3f435a7bad2fc92823f2408fd6e06eded19a56442d6eaa636bd8401f8573a9 SHA512 9e99784e4c349965aafae8c153bd843007dadf664febe7088cfa7561568841d6acb73592d5f57feaece683ea667a535124cdd49e6ed3a05bab13d07239c8b3dd
-DIST graylog-3.3.2.tgz 129297286 BLAKE2B a09e8211f39cf5ea57bd05c49ccd2efba4d166e20bbd2bfa9f52d2de0768d54821a002453497545bc8022ee161c8a69080cf8f99d6988eb1a6e56f7ee13fdb9f SHA512 6422f15d75067f5639d1d3c181c29429bf10f2f499179df304441ff1b01a7cc0b29a27361837c7b2ef8b6d33fbd3448fc759e123f59843391838daf3ee353824
-EBUILD graylog-3.3.1.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
-EBUILD graylog-3.3.2.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
+DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
+EBUILD graylog-3.3.3.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
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 7d3f9970cb5e..ab367cb1a188 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
@@ -888,5 +889,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
EBUILD helm-2.16.7.ebuild 10056 BLAKE2B e29a8a1186299115249d6b9adcd9a28150fa2348b37f24f2ef2806ed36fec668095dfb0f823029bc4ce1844ae54730a7febff27fe4146f85992a9b1964e223b1 SHA512 a5153becd363133eb0b28bbedaab64794634756abfadbe5ed1a0e90ecd2b5445eebf8a45d0898846edb063b27b1cfb7c9c115b33d12e63f9d1aa36670cbd83d2
+EBUILD helm-2.16.9.ebuild 10054 BLAKE2B fcc90a27f2b63aee31e55c6e6424304679deb42c567f03183108617b5ee2003cd26492a85d11d5dbe08670c629e201b1ceeeff638956730579c7ef13a2b7f38a SHA512 1a6ddaffd1201d2c201d4363306367505b35f7c648997d0915ce00684e7b01e7cf07dace0213a521525b2ba836a008eb900c9189bae86abdd53ee7d1dc2b15db
EBUILD helm-3.2.4.ebuild 43316 BLAKE2B 48427880dec41160461298495d6a1263b28a4e419f34031e580ed5a05066f1376086ad312841f4a911b2bf891f71daff957e29f05678375e4715f0f675dd19a1 SHA512 4a6bec3ad4282fe7a1f1c6cb5a7349342bf8d114cb4dc3d7f3ab2439b3d4e5e66197c5e84d62c7c1c906fc4b880198c3c2c3da385a3bbfbbc3caf316666bc5b8
MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
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/Manifest b/app-arch/engrampa/Manifest
index 292a86fc9a36..d401c8258293 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -2,5 +2,5 @@ AUX engrampa-1.22.3-gcc-10-fno-common.patch 526 BLAKE2B 38fe4aa06e6a0d2a5a3a7238
DIST engrampa-1.22.3.tar.xz 1407412 BLAKE2B d6963da4c18137600c26cff01b2a42d2aaf9a8a435779593b7712e6f7ff920fd25b5fa462edd3d321d63f131b3e4a4486a6f795f2392f6679ae3ef9b343fe8e1 SHA512 fd110b2bc188207645985a6f788b8e618cb4910a275950dfb17c0bcc42eff8765a4c7a36760dec2636485685a7a2f4adefb8e2c83537d1b3a819582e3878c9db
DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce
EBUILD engrampa-1.22.3-r1.ebuild 1709 BLAKE2B 0f4cb2a3697db9312e27c0c56948ac802b64cfe1d0849b513a2a3701b1a94997877020b44cfebb13b8196357089273dd8c414e618868c8d91ea8b627a54bda16 SHA512 0cc3737e8bc631c78a75122b6e3cdcdaf67c94e2b8a11eaef8b9a22a5c4619ddb2e260a7585c6b76ec4b08da74b09b7511d33a46c2ced7530b88b6d89efaab42
-EBUILD engrampa-1.24.0.ebuild 1706 BLAKE2B e6504459167554f6a7b613ef48a2f5fc67962818205a8830daedf5af46b5c18666a307fedd74b490017ca61d38a990be0bb8e2d90e8978e8e6dd6913654fc08c SHA512 f4d709b14061235b1c9cf51f446ca71021849f1ca79bfd392b26419d334465c514abe618e5cc720875588c4205eb82c773116a5aba44354aaf37390d388b9c65
+EBUILD engrampa-1.24.0-r1.ebuild 1720 BLAKE2B 1531fc29b54d2da788e3593659ca211fec90b31aa7cdc7c6886681e7440da305b99d6160ddb9ce31491832082ce68a0143861366b0560464995cbcf1a345a88b SHA512 3a2d0ff185ef36fa23328517c1f317a8819a59d6546853b183bf5cf29d01da6a8fe1d05f37038aff078d9aa550bc9e04c14db1228a57e7692e4c2bd9bd0bd9fa
MISC metadata.xml 590 BLAKE2B a67378188ec008cbb9e6790dc02a042f0ae46e3f5c1bd2a277923bf3a05682523f884e1d9858f6406430cd54a6c33754a5dd695acb360bc99f7939bd3160e931 SHA512 9c3b2fbe1667d3408600a10b63be3141136acabfe6ed53a637ff5fbeff50a44ca7f0463b48597dc1473eb29ae31e7f222e11cc68432fdc12f34c7bca38bb89d5
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 99df50d4d83e..009311f00540 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,6 +9,7 @@ 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
EBUILD emacs-18.59-r12.ebuild 4461 BLAKE2B 894572f7e472d2f79ffa2baef17602763072c0b4fe20e511208a346dbe8a655e6674be680c96a96a9d1312d84eaed8647d8c194037c990869c954f5791ac4f30 SHA512 c5b153cc299fdb5568301794aea6943cd39be2a7b3dafa5d39c8d3debd6a3a48279592b9bd116f8079335105e691b52a3dfe10f94f8777b4a404af4678088d1a
EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f76eea114f7e1d1619e884383680bfa2926966664c3a298bdf75dbb85f3b90dfc94b51f1b7c7669978c7e630dabc SHA512 e1ae3906e405d95e724ca3b79655a7e27eb4881d7a5589a7df383caf96a24f26f275f043ce54c0478130a711b0e1d06108c3943613088969f976883ab5fd9e5c
EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273
@@ -16,5 +17,6 @@ EBUILD emacs-25.3-r6.ebuild 11100 BLAKE2B 18140ddfd34e3434632cb6953a64764df34950
EBUILD emacs-26.3-r1.ebuild 11887 BLAKE2B c598a530fcb8c470d8f8d4d3a1106bd8acddb2d03e660be00282fa173d87c68585ca7cf171d64c3d11bdf0cdb5e3ef7e2b54db67fb93af03e66f9575802d5032 SHA512 40e57173380373d8855f6f599d25417dc468da51483109054d1df4b8eea85a53f10e85f958e405d8bf7948bc61e19afa412da7a51755f7ea3c907bd598aa7359
EBUILD emacs-27.1.9999.ebuild 12891 BLAKE2B f9efb774772d3a8a28dd60c803269ffe617d59860d9d0bca8b31848d3ad9ee1944a77bd1b5d3f071e982c14cfc65964cc44163cd7e78a0e93836a239965e9e76 SHA512 769ddef2fea56a1282028ed995453e50dadfb071fe31dd817337d3fbabfeb6523510cfa394f9b27313aabcdc1dffdfb45ee49ce57d603adccab0167402ccaa77
EBUILD emacs-27.1_rc1.ebuild 12851 BLAKE2B 74d127ba6cb7ca328d073947af28afb4c8b2cd848cf5cd8103a7c0b0f06188f00ae16691e2cf6e93448d0d6148fe5bfc4f8818994e02b42e662435b4604a26e1 SHA512 f80b006e4d41de89f6ba17b29a4b629181fa116f7ba8c39c675fc687436bce83c3e2a884c4a17409f4e2ff36db23294823c6140c86fa306528507095219f709e
+EBUILD emacs-27.1_rc2.ebuild 12851 BLAKE2B 74d127ba6cb7ca328d073947af28afb4c8b2cd848cf5cd8103a7c0b0f06188f00ae16691e2cf6e93448d0d6148fe5bfc4f8818994e02b42e662435b4604a26e1 SHA512 f80b006e4d41de89f6ba17b29a4b629181fa116f7ba8c39c675fc687436bce83c3e2a884c4a17409f4e2ff36db23294823c6140c86fa306528507095219f709e
EBUILD emacs-28.0.9999.ebuild 12871 BLAKE2B 7aa3322befb032b60349d2b5ba2311429b3110428130cd0552bb2397dfd7c89ebad55f8f6f9fc576287c1af162e7d43145393be3e693c27e3fdfad00102e37bf SHA512 11d00e05d8053659dc025755262f46c9d8e4b37aba4492b366f9bda19edc5e9a46932a543410377c9dc6d17a01495b36592bb9f163f5d3fa968aa16e5ba27b03
MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
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/Manifest b/app-editors/pluma/Manifest
index 82f21ca0b64a..abbd87f40025 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
DIST pluma-1.22.2.tar.xz 3262288 BLAKE2B 0a7af4318ec11aa6a01dd14ed071975b6a961747c1abda9120912244f3fd530c5c06e2fc9dad6ad23175c119e35c1380e88be4b9bc1e331485b646dee87af8e1 SHA512 a68b79713f649def15ea29e58e041d70bb6d756a356743f6e06d8dd680f7b39e8bcdd90c68cbe5c517bead7f9263d7596954bc595c3a2501edf0d0ea421c9992
DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
EBUILD pluma-1.22.2.ebuild 1763 BLAKE2B fdaa40798715c30416e583d6ce689f2c16694f5d3ea74a9da722680f44ff2f6a8cb5d037b316617a58b4758ffc70c091acf621735471312f3b2c8034f4f807a0 SHA512 9966f165a8a795a5bc0f79d9c8092a4189a21955ebe958d4e07eb24be0ef7307dc3e3da1ccb89483af7abeab63dd697767031423eef98d35006d6b43151883b7
-EBUILD pluma-1.24.0.ebuild 1782 BLAKE2B 5338be90c3f64ec38bd7deaa99a813269dba08104c5577a96560e170a3402df4de0d85b6ddddeb0f223a4390b519b90696dc2eedd019c329e30618efc52dc4a3 SHA512 026999eb91c75206fdcef88ba1b3844278b5519ac3c3b957effb23e2b7506b27ec6d0040e5018493aa4f176ac57ccad139ce18d75336b8bdefc837a47b357eec
+EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2
MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
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/Manifest b/app-misc/golly/Manifest
index d4816c71c6cd..d92fcccfa630 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -4,7 +4,6 @@ AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1cc
AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
-EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
EBUILD golly-3.3-r3.ebuild 1349 BLAKE2B 3ecc2e4808a8ff7831dd868403df970dc599f2e8330819507b3ec5e8bdbeefd186af96d1932104276f7a9b4d58caf2248b6d0b140f11035fc70ac85fd297e725 SHA512 c86877d3f72acd958888e68ff5c263ea3d503f101769542bb4b7a741aee68fa2412524599c5dcd528deff0e79788731ca1041def490283007c7690568b512b35
EBUILD golly-3.4.ebuild 1371 BLAKE2B 15dcc3839e2d8cea284b55df93f86a2bc9c3e332cf42811ac7d17202567625cd8acdeadd725a2836c36082a56305ed601c3fc46e432794d32773cc16bff0f5b3 SHA512 06440ac25965dd04571c8c87c816ae63d6228fe792acf34048198b261ead92fff6dbc477b929795eb7a6ebdceecaa9ba5e527d5f239d1ad4d0dbcda6e63ba71f
MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
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/Manifest b/app-office/libalkimia/Manifest
index a63afa7ea9e1..fa17e711f39e 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -3,5 +3,5 @@ AUX libalkimia-8.0.3-no-financequote.patch 6420 BLAKE2B f30f9de62f71a22764738173
DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
DIST alkimia-8.0.3.tar.xz 212780 BLAKE2B 4863bd2fba7e92518618da250b08772e288697eab9e45980c72c4a29d51f3df94899ead344a9dd5f16ea73cab8dc5596c696156f7da678a030623e77c766949c SHA512 04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e
EBUILD libalkimia-7.0.2-r1.ebuild 888 BLAKE2B 38d97a237f8fa4685f70406b29b14c79108ef9c92e279f745733cc0242a8c708da84afc9d77536980eb265732142fb37ad26b839ea15e0cf41a9fc206a334341 SHA512 0bffdaf405a4ef13ca20d35787ac73856a0266909d693a48261a55cf49c1296a7561f2aecc1e001eac721b9afdb7d3b49323f324767c376c015483cb200aefb9
-EBUILD libalkimia-8.0.3.ebuild 1729 BLAKE2B 87b639266136ac2b558378d2fde5baf1ab4d04fb7f7849ed5f1d41df868b700e066a800426d80296b27ba196523dec471c54de0605d887e985ca6ccfe646565d SHA512 b81af15a235bcdb1739d63308d756cc1d1e9ca56ee6718b80157ad2f436efb9d8038ea5e99ccc85d54695c5d8514a00fa218616dcaa9a23fd3a7d1f39d76c6aa
+EBUILD libalkimia-8.0.3.ebuild 1881 BLAKE2B f46ec3394d39a04c1e72b8a69de048faa8abf32c300c9fca1f23e990fe96a8f4da6cd57a417434b4149570ba1537dfb377cb86a885a1e5a44835af3ba2daf9d6 SHA512 42212a5d647afea1d5ee294517778af5af93bd29208fb4a63a52d240d1dec599df7f14ddd0465f94f2875fb9047215ce2c0dbe42a73e0ab53b72536735d8118a
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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/Manifest b/app-office/scribus/Manifest
index 0f9744e8666a..c5f0f953f3c2 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,4 +5,4 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
EBUILD scribus-9999.ebuild 3986 BLAKE2B f856409e29e5d57bb527f463ddada1e7461f48d16c872fec92328e781ef5a9e130b1c8fc0d06ffac59262ad28f22f7a9fb4cd387b96c0172b4cf6eeed72b205b SHA512 31fa1efd6797d803f6e5db8703fe3d40f2978f87dc9229872f5313b01ebeb6febb98d4f15ebf5c5a9afaf60d4e7de90b80b0d48e91c7e55915e66a703dd6f186
-MISC metadata.xml 794 BLAKE2B be37a04974d765182337fc441d7f1c601e3ce415300842dcd8fed51506d044f3e8b67040827d498c0c7769d70b880de5c49f8f316831f3f9d755e5b8660893ea SHA512 f59cf0fd453ad24cd4153fce9ecab73b58910d069626950dd7336ce36e465ad499246ae322b19f02cc717fffffa55e3905724cc32f328c7a0ff1f835a1ba5f61
+MISC metadata.xml 881 BLAKE2B 3cbd9331bb4a2a5c04529c21f9fbe08fc02ad12317b93867cc57e3b4a9d11ccd37f2842b63f6a609d093cf9f4e395a4ab412250d422c61f282339f4af78c33dd SHA512 571c8e45e1bd4cb783e635db4bf6e870dfc1efd593df275c61820ed9f9135659e5486d5c702d0f283323a8944390fe9f1b49b8929e92cd37b02a66b6b6a67ed9
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 efac4ffeb8a1..701a8dc9e623 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -1,13 +1,3 @@
-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
-EBUILD happstack-server-7.1.7.1.ebuild 1751 BLAKE2B 104c05aa4debd9fbd6f34c9dbf6860bede76afc920ccc753cfcd0ff5460e74a1c9f341e83dbfc0ad529b9cfc372be08e5b153bd6578521adad6f887ea90390e5 SHA512 a92af1638ed1398fab158ecdc627784c4a928c42c267cdc856502a335b3b0158a4b75e8aa573fbe438b39fed8c7f29b543dcee7bfcc2871c9b44abdb0b480a93
-EBUILD happstack-server-7.3.9.ebuild 2142 BLAKE2B 8c429fb3f54b2a42f479137b9d61982bce660e3ae4eee85ba63e1a02c54a4d7953f5b090e6953d4808af0dfd79f4336bff79bb5202349cda42a5c75102697ce5 SHA512 abb4faef18b1d82d726e272d8c5e6c28807b5207ced91bdaee3d214a482c63da7cf89efb42ecb90874ff22aa1c5fec01a42c4617e16896b69f9bc3449935422e
-EBUILD happstack-server-7.4.5.ebuild 2314 BLAKE2B 156785ab7464710db13145f4483edeca159a90f06bac284481f232d6e17084d67f07250f7f36c08147a2e12175e873eb343c315ac2d653599c7ae6a15f23baa2 SHA512 23c21302e795daffd7f88c177086bd831afdb7004484b22974a0ef9b6e4d5f76ba147e808df95439ca4f8e18b550004b9b090d7d60ac901cf7a694671c7c26fa
-EBUILD happstack-server-7.4.6.1.ebuild 2314 BLAKE2B 8921b0b8b4882684661c4ee983d78f9e6f7d0c88f0f469450a2d216722ebbc5269b3f941459a4878fb4da3fae65ee22c7560e860a81b2016dbd99fb1839e9bd0 SHA512 bb3c9bdb9dcf2199a87f7d8159c696647ef1410651b682034b5ef8229f07558cd4e1d282687d904786a4a840921c82fd3b56c1245f26b92b6295c232745ea196
-EBUILD happstack-server-7.4.6.2.ebuild 2312 BLAKE2B 36da2ef9f5426a102233eebf605642ba8c8e59b5662a1843346c84047020d29987037e07971e5c34b676e136435969602ffd15322030365796e159b18d14a871 SHA512 d0847696d5a9ab34556a84b43bc53f5322bf1a4ecb0eb22cd3dc25779cdb040b4df19dab5bd4911a2c5358d19f54a18da42174cf11128fdaef980793da47d099
-EBUILD happstack-server-7.5.3.ebuild 2236 BLAKE2B 120280c6f8d71343692fb21594e88de4c039a2b7705a6b8d364e07be528002c05fec8fc11bc55d9c08834a2efb30164d6684c9e035c0432ef265f887ea07971a SHA512 0797b8ef8fdc203e8ec936690ed84de7e520904953adff47a750117c0db56cb477f97d22ab5aba160d0ed9c62ed016e7219565c18ec8081dca4c9c95792d48a6
+DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
+EBUILD happstack-server-7.6.0.ebuild 2268 BLAKE2B deba298727d88769becf6c5a0337a774c0e45f5004d224c6a1cbad33f3d9b1f037a4c4831ea5dda714b820db6838a30d4442b3a0352d598f1ff22a3d1ef56a67 SHA512 b21bc776e44188d8381e679cbf73b3f14b852248efe7f76fa8ea2642bd225f5af6fcf71b8e59c382edbcb3a4e571560220050e8520b651019b69148848c306d1
MISC metadata.xml 783 BLAKE2B 51a13d512979778ff2fbfdad3eaf90e5ec64aaf086aef3e7a65f4ad544e718b5d08e68505b3446ba3c3fcec76a00e957ea9d534c85ab2f31d1f02088391eb7c8 SHA512 c85819776184a2a11e2ee9f4217000cafcd1c8f357f8875829483aa5ca16796cac2ccb113a392dde6b1653eb1478498320f931551e48fb59468bdcccf5a2248c
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 9349acbaa5a9..9b8967af5779 100644
--- a/dev-haskell/json/Manifest
+++ b/dev-haskell/json/Manifest
@@ -1,6 +1,6 @@
AUX json-0.9.3-ghc-8.8.patch 5054 BLAKE2B ed3b6efe93cb37697379e5c0b0953ead8cd270000f7c87b0db58861d834d0b8edbd6039b7de0b3d376c4b5cd5152d9982e60f93c81c31abf97879654ed644bd6 SHA512 0cdaa654826c2baecdcf1771090b58440ef4177d8fac76da774eecf7599526bed142ee6f58cf2b67fba57ed1b3c0b22b7140425712551dc8e41a99014534c206
-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
-EBUILD json-0.9.1.ebuild 939 BLAKE2B 046bcbea49ced4194453282d8e5820132a0fa89db8181774d91c4c8e0c43e3415841b0d6627a9cc13054038b50a8d1557840b4384c283f7dec2c569f877d780d SHA512 89d3f5cf001d3d8b3ab0854fe15416bc5397aa0f7342fefd9420bbea4058455db9b2fbfcdbf11cc3d8228a096ef7c9ebdf14e991ef60f60da2d90338069f7fd4
+EBUILD json-0.10.ebuild 868 BLAKE2B a870a5ff89c1265c22c8621918cc84c25ee5de4a4841df4fa76624321bc7cb23615c5eb526d7a6e79a1148cef402d0179c66424514e80d74a5d60f90a7956044 SHA512 75aa38da49b78111fe1ddef098a6ac278f8146f34e8516f2bfda7494b992c9953d4e90c0c0efa2bcbc7217711b4cbafd76669440792bbfb4b5f13df2be11e413
EBUILD json-0.9.3.ebuild 934 BLAKE2B f412b14cf615bd6f257a8487b86ea54eddf1d51aee36323c5e9e5995d053df9e7fbe0026c87181b13fb02199ef8447a1d7815f143650c6b821ebce1fdba7488d SHA512 b97f1335d4aa9e0d237848d6052181265adcd390cc5189fd1258d49746f11023959878764e943670c2c8035c7678ac4a273b07328c72c9b5db72576871f678c1
-MISC metadata.xml 993 BLAKE2B 6cb77b20e36e3fb4aa09ed7f55f13b5199b4b152a2c7c625e7267b94016a2929b5064b6e38c3d0f6802cf5400dc802b4adc4e37d6de4823b2d02eea81459edbc SHA512 19724eb01ade1dac4b6e12271bfa698aab1ad16d4abc250114a4e17908ddf2bbbd788509ff5123745926bf229d0836e0046c3aa43b2ab6997088222c84a0b0a2
+MISC metadata.xml 902 BLAKE2B 3a7c5f63c7998cf5e9df237b45a4bd10fba1bc06e9bfa89d24d6d332743a9a6ac3c5b9d05473302236c855bc9c3576189c49f4c3e36ae8f3b007bd43125a3cbc SHA512 1e8813a4a4182c04cb81dc8670ba5017c3ec28f34f722d8a33926145d58ed6ae14203db997048208bac03eb50281020701084591d379046fb9d2c2b8018bd2ae
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.