diff --git a/Manifest b/Manifest
index 9227c9e9ae11..05d5f8119d58 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29479 BLAKE2B 7bed7994b3a62d639be3d43047798df3701e4858b8526984b3b7ec51f07cc4d5933799707d8a60c3579f52077013449824e2d58e2d0153fcc47a1c6f39898831 SHA512 1890bb5bbfdcedaa2b1afecf27c850f425db3cae5e351f634ccf409053d89d025a8e88f52598ee76b0598a7e539c7d7ffcb03435144088eb40f0d14057341ea8
-TIMESTAMP 2019-11-13T13:38:56Z
+MANIFEST Manifest.files.gz 29475 BLAKE2B 6b557113b15793d0345b4ba1db52a2e08f7324d773446b850013038a871bd80933e5ac3835ba7c1e0f79b5f075ff1fa591dbd005d7de5b64beec78b2ac3f732c SHA512 e2ec6c3f75a18f37e7ff92b90c83fe9958003ee5e1f8d7a7372003ed1524e0e7040b9361e1ff6b6c6a45968d2763f46c2c99324e044047619a0cc477194afccf
+TIMESTAMP 2019-11-19T05:39:04Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl3MB3BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl3Tf/hfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC0lxAAj2qmYKfnEZHFIJAbWQ00igLg5/k0qfrXAITF6m9pHa+hA6VGmbEpjo6F
-2UMeJHdkqr7k/Ay80ttZv3C1g+f8GiPgp/+rugfi3wGrK6D2IHczSL4MVZDsYJrB
-0cOZ12+banaqXdgQp9ocHlnGP78+ZS+i+3Ssq+gWz83TBYaHx3BOEu+1ohqLpQNf
-b8wh0eG237SNkjuHdNM+D5jqbhPA5wulQ0vuZwwVCz2uNKU/EsmsrudCIecWk9IR
-mx7dcJ5oliso5Ih5tJ1z/Q9jHTve5GjgubiVEacEtg22MQJPN9h5ATVWcsurjxmT
-Uk0fref6Y0C7R5UCzokMHY0M7wP60NNHaWEs/5ji7CGlzXq1VcVVbJs06ClHyhze
-EtB/wff+KINfvKPZ3Mnd0Y9ea+KOhEnhhYoSN1s7G2WAflXLpYBhz72DFeqUBSoG
-3QZ4U5EYo7nFKh4PL5XDWg4ECuU3hGBIotl/Y1EYc55VJPxw//QGtfbJXWRl2yb7
-kNlQOiX1vvm3AjryEMR/uw/DXbJ3Ch7oVbBrqcLWN7NLsRLfJUi8slNEU9SNYdme
-AbwI9H4ytCqbqDFSTRIz5fFl/xojUEdzIyYmZTTF7cgO2LVz6Huxxsm0CeVYjA5K
-EdllfeAOrpuy7e08d+KwjG6Ba8Ah4LK6SZ1NIIxa9qRfdaeEBEQ=
-=bxez
+klCi+BAApnZjBHYS8OgRhyGq1Zu/u6s60pNswGbZmAt3zV11czoMQYXze2Nq07oO
+Ati8B1juxPDKewm0AGfaVRyNW8QjgqmQXzm1QbY+uTAY7eEkgwgQGQmzblEo8IME
+PchFYphqP99RcQQlRNDEmHbhUK+0GmT/IMhljkIuQUZgJrhFvQp6ezEjbvzRTC5X
+vXehacmDhnSzxvppzeQr7m+MYObf4aM0t4Q9Usymb/3C7tJdpWNblp0PcyVst+a/
+Fn4hlCB94/4Ih6dq8WhGXUau5yqTn+nLg5CJtcIfEAy9wxkgK2WbBl0VbDNuG/3f
+FNIC1AtASEYGnNyPVaawo5ztsLIabXrnqrUZW5n3qkqyjrWB4AbE8S4JDUO2d0mT
+8ngBKo9AbX9BdjCeKWiSAoVzYbyGWyH6nWjCECOzudWXwKeie+g8MkzvACxxnK8K
+W6a+r0988Mt0GgkA+Msr99SL1B6aYt/q++Nk+wAgSNskJELenI8HP8wWBw6ZZpqw
++L3A+v/vQycIK+z8YsJJ9jjiPStqkY747ON8AdWlS20ANCC4JbvfObfs8vxkOKqM
+yC8lOopwnAfIj/DDUtnuGQ2UCnjm3arog4/yEr3y/6ph0dKiikyLCPgLuSPHjokf
+0j1tkIev57jiVPFi8roMyhOaWCsI/4/o1Emwkvd+r7TdDPLdjF8=
+=5G5Q
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 01a9c43065f7..c3b1efd4155d 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 52919a66bbaa..5dcf65b319ad 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/gamestat/Manifest b/acct-group/gamestat/Manifest
index febe98bfdc9a..44ffa7cd9508 100644
--- a/acct-group/gamestat/Manifest
+++ b/acct-group/gamestat/Manifest
@@ -1,2 +1,2 @@
EBUILD gamestat-0.ebuild 208 BLAKE2B 900008a1fb85a1359df36e18ef801f82da30069ee73dd325baa5abb583b041d033790bc019ff9f7d418d4870fb0e775b5085794c763bf50d161af9fa3a491f09 SHA512 d104431f593c2a66777469cd4039795abbb993ca21103c66eabda155887e876ce3ccf31c7690c248384af07262bb381fd0dd2325903aa1aa7cebcece247f72a4
-MISC metadata.xml 324 BLAKE2B a3bb2b7370c53367e56b50a74ac27a99d56f8ab09ae23f8205bf056fc10a3c1d3f22cf3fe7e8efa618068adddd5f824a1e3eef27092272dbb96a5da5498a98c1 SHA512 3cfe7bf54884320b8c178f9523606a91a64471c1c332a6af750e57300603da7138d3b2082fbbfa0001402b8716884a6fe4fa1da6880d7ad2c6a30d93e1610dac
+MISC metadata.xml 251 BLAKE2B 6b7205e717d4ffe9bf5eb49f5b7c0c6e918fd21c16040fb218d1c30c8d6e90ed842fcbcc629149fab946030bc980e13df1263322659956d8f80255dd82947a57 SHA512 be5f7fd63f27c0024465c10cf1587a5db3535b3e22e98df071d75be8a957d2e88b7c83da56bec910fe371c90354c1e17e7ceed017a115709aa835b8c89868004
diff --git a/acct-group/gamestat/metadata.xml b/acct-group/gamestat/metadata.xml
index 1caeb780975a..da724d0323e5 100644
--- a/acct-group/gamestat/metadata.xml
+++ b/acct-group/gamestat/metadata.xml
@@ -1,9 +1,6 @@
-
- ulm@gentoo.org
-
games@gentoo.org
Gentoo Games Project
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 337ff86f4c80..77db54da85a4 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 78d0e2a6ed49..18d0eb243295 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -5,5 +5,5 @@ DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c
EBUILD at-spi2-atk-2.26.2.ebuild 1023 BLAKE2B 61b044781a10a1b5f8d09a587e5ae7f216469a0aa5602db43b1b3e84adc64075f92d50b7771606ef758b40b68e5d8ab311457596346aa3fa456809a40c029d7c SHA512 7639f2a05c71eb2beb9bde53e5b39a978b1915914c0473c97cb371c4836f7022003b141d81c01df8aa3ed96f347bbff5a2199039058d96b19b2f617ba397733f
EBUILD at-spi2-atk-2.30.1.ebuild 977 BLAKE2B 765f061f0dcac3f1bf4fd7615a25501ab9e49e261f359814bfb0849d4c73ceee3d25d12a1db2d9420c6bbd3dd317dc64cd0324cb81e904dba2eceafdc083a6e3 SHA512 03406d21a6148baa19d38e61b7b5fa35874d1c06f67a0b09dd5a32f275e9549772f71616e3e31c852a0c7731524a91b95255df27249d1842ac5383ae42028c08
EBUILD at-spi2-atk-2.32.0.ebuild 997 BLAKE2B 968cad87bbf41e2d4c04036d92703233091c3a9ee4ee36b3a7a8335f8dc074c7d3e7840507fe0e466a1ffb3a27a6170011630267ee35a0e005461f1854ecde40 SHA512 dd61e81115812c5074115c1e424c7c973b2ddee7187990d3d44b7977623b1f5ee0852e034818e619c863d85f6eb874d5ab81f20ffec58df7edda88cb9dc054cd
-EBUILD at-spi2-atk-2.34.0.ebuild 997 BLAKE2B 50917ddc3f3b4de29bc986799e54ed921d7f704879ffb81a1f33a6698e17953c7c614db1056308411d6f88146efeacc1f4aff4c800de567f09fd1ad7a7c05589 SHA512 b301c2e6ac908343e99df00776a38785c1af0976fc2f716e825be4095d138790eb38cdd8559c0edd55cdf352efed0008f9f1294cfc15c59ddca38a6ccfd68364
+EBUILD at-spi2-atk-2.34.0.ebuild 999 BLAKE2B 17bee5d2f38162b6f546704698fbf66daedfb5533f9a20e71a464526dda4ba008f5b945bb06c37b166eb923592816984ce097172514e32fe9f49a398fc3e1bee SHA512 8ec3822af64c4364ba3e9effa75878846e0a27d31e55d893d49783c0a0fbfdd6d61e6baa748d81164085dfb43f36a5ed0750e7412e39ac40dcc64e27031f3334
MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
index 2a9349ea14eb..f0a7e15237e5 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org meson multilib-minimal virtualx xdg
DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
HOMEPAGE="https://wiki.gnome.org/Accessibility"
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index bcb63061a750..17181b617608 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -7,5 +7,5 @@ DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f6048
EBUILD at-spi2-core-2.26.2.ebuild 1584 BLAKE2B ff8551dc308b17ed9a176c7731edc55071cf1a07824b88445caca75c77d0c1be1ff3da7f73635caf09def845f9c625edc21f4e9d2ea1cca6775f569139dd6d25 SHA512 6e23445b170ab56c66fcafc97be94a485866cbfe7236edd889d08915d29b35882eb7e4888b633e619513965c72090617b40f09b0269341d68536675cc5f0c553
EBUILD at-spi2-core-2.30.1.ebuild 1496 BLAKE2B cef0e969a5277a05522d74f7e5215276e01acfe4f5f745c5439308a94295569a43544a6a196f691e9c355973a5421a088d770b0bbefef7b4280fff797daf71c1 SHA512 dbf19f739e1460cb9bf45b636bc321835e21db7319cbc391c6a2210c74a21ff0fd2462f87bfadfaf1850f32e78dd072704232054baa98839b25d08586c024994
EBUILD at-spi2-core-2.32.1.ebuild 1495 BLAKE2B 8230af2aaf0bc436b828f26be682d7be729a97a828ce234c2c2f1e5e06ea24aa500ae1f2ffc94a8ed2f1991585367d8b10b96ab5c1dbf40805a47ced7ad47f99 SHA512 69aa34e2dd32e9cfb5703c6d8cb95a86a0f4193cc22865caee72591699b0d189652fe14a1771dd306bd7a5e5bc5748575f4d32a626e4f0c529dabd6d83975ae2
-EBUILD at-spi2-core-2.34.0.ebuild 1495 BLAKE2B 8230af2aaf0bc436b828f26be682d7be729a97a828ce234c2c2f1e5e06ea24aa500ae1f2ffc94a8ed2f1991585367d8b10b96ab5c1dbf40805a47ced7ad47f99 SHA512 69aa34e2dd32e9cfb5703c6d8cb95a86a0f4193cc22865caee72591699b0d189652fe14a1771dd306bd7a5e5bc5748575f4d32a626e4f0c529dabd6d83975ae2
+EBUILD at-spi2-core-2.34.0.ebuild 1522 BLAKE2B 984d61b0604193e018161d33f41130965d4740f83285a19ff054461ee2b8bec6952daf9d183fd6ff1327eaf0b59dd6fe3798a6e299a0e31054c20c1639cbccac SHA512 71c45e02d51f45c33ba2ef7f32465985affcf31d10a9dd7240595b308aeef59018319a723582431c96d37373c83b354719b3ac405edf2ac4cb6264f95f0343fc
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
index 09737b71d1b7..a142399fb76b 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org meson multilib-minimal systemd virtualx xdg
DESCRIPTION="D-Bus accessibility specifications and registration daemon"
HOMEPAGE="https://wiki.gnome.org/Accessibility"
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="X gtk-doc +introspection"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
@@ -25,6 +25,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ >=dev-util/meson-0.50.0
dev-util/glib-utils
gtk-doc? (
>=dev-util/gtk-doc-1.25
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index c7d19614b66a..063de295d4a0 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1,2 @@
-EBUILD simon-9999.ebuild 2056 BLAKE2B ce24a11f4546204f91713d353b5f43e25aa152b2908b72d104a6a76c3e4d650621104f7059b82b25394c4bad416a30de61df4f08eb35b54e83dd10c3fe022c92 SHA512 e9644177580668ab9b063327ca63c0c7e87677af9fee050b17e495ec580ee238df5675dc3b130e6bf6283d13f795dc9f900ab573ae0ba6786d08f15d3e817276
+EBUILD simon-9999.ebuild 1939 BLAKE2B e61384925067d62645e423f6e30f60eeda947049a8d49b30f764044813712b6208e4f2746e392110c53519ff95f63e121c9982ffa9eaab93a17d2f1fd36ff173 SHA512 75f642f0b61f42746d23c4a4d6528aae615854262079921538047ef0918bdbeb38155b1602d4a9245ad359eee43e54bc0366bfc2ac294bfd864db0c19b6c2a0f
MISC metadata.xml 526 BLAKE2B 90a5578ad2dd40b107c0a810ac487cf2c952f056bc8c6bb109cfceda2b66cdfc2ccc027e741d2eb0a4ee77e9ac349f43f7724b126d077c988ba4dd3c0c940375 SHA512 ab2dbc917334c5877b7654179b0f28e7d2824d98ba68c62e13ab912f5c1010198b8891ea5764c9e304727ac18be28b758f23f414e145047f99caef335006659d
diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild
index 8c9e1d6bf7f0..3115d4658433 100644
--- a/app-accessibility/simon/simon-9999.ebuild
+++ b/app-accessibility/simon/simon-9999.ebuild
@@ -4,51 +4,55 @@
EAPI=7
EGIT_BRANCH="kf5"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+inherit ecm kde.org
DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
HOMEPAGE="https://simon-listens.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+ KEYWORDS=""
+fi
LICENSE="GPL-2"
-KEYWORDS=""
+SLOT="5"
IUSE="libsamplerate opencv pim sphinx"
DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep okular)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtx11extras)
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtx11extras:5
+ kde-apps/okular:5
+ kde-frameworks/karchive:5
+ kde-frameworks/kcmutils:5
+ kde-frameworks/kcompletion:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kcrash:5
+ kde-frameworks/kdbusaddons:5
+ kde-frameworks/kdelibs4support:5
+ kde-frameworks/kguiaddons:5
+ kde-frameworks/khtml:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kiconthemes:5
+ kde-frameworks/kio:5
+ kde-frameworks/kparts:5
+ kde-frameworks/ktexteditor:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kxmlgui:5
media-libs/alsa-lib
media-libs/libqaccessibilityclient:5
x11-libs/libX11
x11-libs/libXtst
- x11-libs/qwt:6=[qt5]
+ x11-libs/qwt:6=
"
RDEPEND="${DEPEND}"
@@ -65,11 +69,11 @@ src_configure() {
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
)
- kde5_src_configure
+ ecm_src_configure
}
pkg_postinst() {
- kde5_pkg_postinst
+ ecm_pkg_postinst
elog "Optional dependency:"
use sphinx && elog " app-accessibility/julius (alternative backend)"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0123976b9727..243bfa757dae 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1c57a3a3cf1b..5abc33755aa1 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,13 +1,14 @@
-DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
DIST ansible-2.7.14.tar.gz 10203158 BLAKE2B b0727a4e2bd4d2126305e2a529fcb9c938f062a19d473d6ddc4463a0ed1e1c6d444592660aa8bb3f05f8885592f8ae3b021a7b1e6ab43422c35f88f999ff4de4 SHA512 16705c965b03daeb4e6b6a0bccf0be976de60948b88c06e65449d2662dce1fbcbf796ca2b5f6ebe9884d19d918b6ec0e5b0edcb0ef606b7bae61bfa7699c7b92
-DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
+DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
DIST ansible-2.8.6.tar.gz 12689211 BLAKE2B 9c451037f705f2e591633b59700e89c6de672c43b4b12ee36de9dd4b3ac0e6a19f7e2cd0df9a29b7973f4192d85b3c48fc8915bb36dbd36d9206ee3ca5ccbb09 SHA512 8e29644b4651e72bd3fbd4ca91c2a36b76e5dde9bb445d3c6e0061c315eb66e1bc507729b70d82998c1cbb25f3ef0e20d281ab8354a047193e60bf4831938418
+DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
DIST ansible-2.9.0.tar.gz 14126941 BLAKE2B 409f94af0fa8483934b957cf31f3a762e575203f4f809c44cbf5c74cc945deb065f97374b93dd2aa03a8002b17d7da0bfad3ea80c11673b02be3d0179c34b7c9 SHA512 47e0738bbf9918254d7b33ddc0a8f89a101995ccc3cb846be9ff10bdbc7687fb8a5390d8b976b3ce17fa1325ab63a592161b026d5d943a01f8a5803fca67312a
-EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
-EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.7.14.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
-EBUILD ansible-2.8.5.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
-EBUILD ansible-2.8.6.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
+DIST ansible-2.9.1.tar.gz 14144123 BLAKE2B 20b288aed59221c63cbc345d6f1bb33770b864229ddfdcb3e3d7c5ddde0978b05f1139466945a92145772f1d659a43d406c7486df91f7f16135f66b7282761ab SHA512 fdb25017b96475a6c182bba2f32050f0eaa6f22d17f166b98ce0f0cb40fd12dbbc5ede9912624fa4c5d4a8de472b28c2eb2b569700537c7d4b4c568d7e38f21b
+EBUILD ansible-2.7.14.ebuild 1673 BLAKE2B 169728c5deacbe5b36f36dab8fe1f811473861587d6c0a037f1bb27dfcb40641222f51721e9f5b9d32109b0f94e730cbac4d46468ed2a8fac8373c682b568bf3 SHA512 756db7cf9ecfc0ea6f27d58e6b2fff9e691506f4930cd068802fb9cd90354e3fa29bde7b96c5cd00a20ca3f2f80472707e5dceda20b228b550ecc948b262556a
+EBUILD ansible-2.7.15.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
+EBUILD ansible-2.8.6.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
+EBUILD ansible-2.8.7.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
EBUILD ansible-2.9.0.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
+EBUILD ansible-2.9.1.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
EBUILD ansible-9999.ebuild 1709 BLAKE2B 1369caa197cdf61e86960af4f793d65f2e2842456a6711797b5bbafadec8c622d178ea820e9ab9697b08837e351d379f7aea86cc551ca1c18b048e575159fce1 SHA512 4850bad9088b5bc3366efefca3827519e23af617b35e9f14d275be505248511832e17ad0da69fa28be51d458a8d0820bce081698cf4fa91bcc44b20c72a6ce70
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.14.ebuild b/app-admin/ansible/ansible-2.7.14.ebuild
index 401feb026c7e..c7356498cca4 100644
--- a/app-admin/ansible/ansible-2.7.14.ebuild
+++ b/app-admin/ansible/ansible-2.7.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.13-r1.ebuild b/app-admin/ansible/ansible-2.7.15.ebuild
similarity index 100%
rename from app-admin/ansible/ansible-2.7.13-r1.ebuild
rename to app-admin/ansible/ansible-2.7.15.ebuild
diff --git a/app-admin/ansible/ansible-2.8.6.ebuild b/app-admin/ansible/ansible-2.8.6.ebuild
index b078e69e7bf9..b0307b32f958 100644
--- a/app-admin/ansible/ansible-2.8.6.ebuild
+++ b/app-admin/ansible/ansible-2.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
diff --git a/app-admin/ansible/ansible-2.8.5.ebuild b/app-admin/ansible/ansible-2.8.7.ebuild
similarity index 97%
rename from app-admin/ansible/ansible-2.8.5.ebuild
rename to app-admin/ansible/ansible-2.8.7.ebuild
index b0307b32f958..b078e69e7bf9 100644
--- a/app-admin/ansible/ansible-2.8.5.ebuild
+++ b/app-admin/ansible/ansible-2.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
diff --git a/app-admin/ansible/ansible-2.7.13.ebuild b/app-admin/ansible/ansible-2.9.1.ebuild
similarity index 86%
rename from app-admin/ansible/ansible-2.7.13.ebuild
rename to app-admin/ansible/ansible-2.9.1.ebuild
index 028f77e10f7a..29be3eba4da6 100644
--- a/app-admin/ansible/ansible-2.7.13.ebuild
+++ b/app-admin/ansible/ansible-2.9.1.ebuild
@@ -13,8 +13,9 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
IUSE="doc test"
+RESTRICT="test"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]
@@ -25,13 +26,18 @@ RDEPEND="
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+ )
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
@@ -42,9 +48,6 @@ DEPEND="
dev-vcs/git
)"
-# not included in release tarball
-RESTRICT="test"
-
python_compile_all() {
if use doc; then
cd docs/docsite || die
@@ -61,6 +64,5 @@ python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
- doman docs/man/man1/*.1
dodoc -r examples
}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index bc7ab071d9ea..2be145014973 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,10 +2,8 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
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
DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-DIST conky-1.11.4.tar.gz 2400814 BLAKE2B ad12ade96de5ed3575eba3d8a6e06cb8d30ed686e002f36c3a52a1d4351379546bcea2237792929de36d8c0c402eda977a8c0b5b36a0878fe001056d8d2c34b7 SHA512 191ffe4a50a8876a658163c83a45f722f07ca6a0b86ea3ebad369d58f4c2bb798e8afaef6c0643bcca90de546a7f3de4acf9d2e4b4a2b6366bf42de0ccaade3d
DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
EBUILD conky-1.10.8-r4.ebuild 4721 BLAKE2B d9c89dffa7d58e01261168329bf3ff262b0fea01d319b7e00da36d9a912198ca197e8895dd1e267fdd33e650cd52ac0857ccd7e0e30c79ebeb38fed05f181c1b SHA512 8d938d25188f1d16b088ec5b248ace639e52f23380a11ce725bb20ecf4417ab650f5699510d6229beb48c699763ab0ba9fc43cb9cfdb6c7b4081be3fa9ef6dbc
EBUILD conky-1.10.8-r8.ebuild 4772 BLAKE2B b8b7eb6a6dc3e381890663337613fa334d301bbf5192ad4d42b6f6fcdcd80971f6453f444f70e6da354cb745567a78f92d320de5deb87745e1e2b0ed9087d5f7 SHA512 c7771bf49e134d9a50c94df85f136814aa96507117812c99b05effa86d28be800479c04f5f6a4659f73ec03b374de7bae0ed1a12c216b3c5fcf7841153d1b023
-EBUILD conky-1.11.4.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
EBUILD conky-1.11.5.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.4.ebuild b/app-admin/conky/conky-1.11.4.ebuild
deleted file mode 100644
index a52ce080d2f9..000000000000
--- a/app-admin/conky/conky-1.11.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info readme.gentoo-r1 xdg
-
-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 bundled-toluapp cmus curl doc 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? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXinerama
- x11-libs/libXfixes
- x11-libs/libXext
- )
- cmus? ( media-sound/cmus )
- curl? ( net-misc/curl )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
- irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
- lua-rsvg? ( gnome-base/librsvg )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-sound/pulseaudio )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- webserver? ( net-libs/libmicrohttpd )
- xmms2? ( media-sound/xmms2 )
- || ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
-"
-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}
- doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
- imlib? ( X )
- nvidia? ( X )
- truetype? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
-"
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md AUTHORS )
-
-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 when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- xdg_environment_reset
-
- 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_ARGB=ON
- -DBUILD_X11=ON
- -DBUILD_XDAMAGE=ON
- -DBUILD_XDBE=ON
- -DBUILD_XINERAMA=ON
- -DBUILD_XSHAPE=ON
- -DOWN_WINDOW=ON
- )
- else
- mycmakeargs=(
- -DBUILD_X11=OFF
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=OFF
- -DBUILD_BUILTIN_CONFIG=ON
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=ON
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=$(usex ipv6)
- -DBUILD_IRC=$(usex irc)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=ON
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_XMMS2=$(usex xmms2)
- -DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=OFF
- -DRELEASE=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_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
-
- xdg_pkg_postinst
-}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 09a819531aed..017a9b0aecae 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -8,7 +8,9 @@ AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54
DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
+DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac
EBUILD consul-1.4.4-r1.ebuild 1585 BLAKE2B 1b776c067bfc59576f8c55a158fc39d3e661f51dec78c7551ad9eb3b8f11997f6a2240c7fdb9fdd15ab1e30199d23ed96b69510f9673ea036950cfc26ff82388 SHA512 1c49555ce01c0452d42c0d19f0d22438bc5f861584070d8d0d094c243d96e79a44530cb1a966d4684c3702140530614298ae4cd665fe87f392c2d92b057856a2
EBUILD consul-1.5.3.ebuild 1830 BLAKE2B 5d0354957f3f52c00f7f63f02e2d0d05528e11a39a5ef32f1c3cb1fb98f18c93d06c49e97a3fa828bb106ce54a6eb1b3106ca9060b31f5a9cd8ae552f3a89104 SHA512 e5039260bdda283f5d7f577cf69e454fe10351ac211bf88bc6681258950bc212a7d3ec014a748f0fa9ac5d8d10b12ae693f015f0c72b6666b8eef4a83df23ea4
EBUILD consul-1.6.0.ebuild 1830 BLAKE2B 1ee09c1896bebc44692a598e35deed9bc796b6c8a02190a98a6cb57a67e78eae2f487d23f39086459252747a537e49aace74275b011be48a374e512c404489db SHA512 a095c2487cf823c4f776d7b15610b819675a359ccabd3920b6a07715f1c0a2a61779f1488fbac55d171ac7581b397c0a09a9a7c257c7c591812742d79a68357b
+EBUILD consul-1.6.1.ebuild 1830 BLAKE2B 4592f85e488843fab9ec66ff4bc2b81e384a66fd523283332cc047e931aa18cb8b2dd91707a412656d4dadda9ba7664f502e369fd0d846524e347d971ff2b23b SHA512 43b1fc4d2ebb3b88e92217820899a3f4bc5586b953cb5fdc3f5282194d0e0398638ddaa08428dc6964a8bc2aaab6e55d80c3613e814469cdb204b4346ab324c9
MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.6.1.ebuild b/app-admin/consul/consul-1.6.1.ebuild
new file mode 100644
index 000000000000..1908bfe8fcab
--- /dev/null
+++ b/app-admin/consul/consul-1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="9be6dfc"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+ >=dev-lang/go-1.11:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+ default
+
+ # avoid network-sandbox violations since go-1.13
+ rm src/${EGO_PN}/go.mod || die
+ grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+ xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
+ -e 's:vendorfmt dev-build:dev-build:' \
+ -i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GOPATH="${S}" \
+ GOBIN="${S}/bin" \
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+ local x
+
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners consul:consul "${x}"
+ done
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 1ce2533026ac..f0cc0105821f 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -16,5 +16,5 @@ EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bc
EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
EBUILD fluentd-1.4.0.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
EBUILD fluentd-1.4.1.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
-EBUILD fluentd-1.4.2.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
+EBUILD fluentd-1.4.2.ebuild 1412 BLAKE2B d5cc7d2c2cfeb8726d6f61ee437f2017f8f4c67db49d0bd39aaa35374082b2c5336f3160838d542cbc4bcb82ef2244f1231eacafa438c1c791eb3741354bdeaf SHA512 4c8100bbda3e6c0b92c477c89d26d0f958b57a2285e8feb004d43f3f2b085befa5c845c43f96454ae9e08b5d98042b5f5dfc8a4ba0060b8c14f794dc95c960de
MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/fluentd-1.4.2.ebuild b/app-admin/fluentd/fluentd-1.4.2.ebuild
index 9bb8568d1ebc..137927eb85ae 100644
--- a/app-admin/fluentd/fluentd-1.4.2.ebuild
+++ b/app-admin/fluentd/fluentd-1.4.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -35,6 +35,9 @@ all_ruby_prepare() {
-e '/tzinfo-data/d' \
-e '/dig_rb/d' \
"${PN}".gemspec || die "'sed failed"
+
+ # Avoid test dependency on unpackaged oj
+ rm -f test/test_event_time.rb || die
}
all_ruby_install() {
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index f2b7b402313c..3f0df1bbd2b4 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,6 +1,3 @@
-AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
-DIST gopass-1.8.5.tar.gz 6561060 BLAKE2B 99d5ba9d5aed396eb4747461b64285d37544e7deaeb7ee7ebd6e3298a8746cdacbae4aa573d87d324703751d5a78efad2735954d8e2a2a8b53549985a4a9952a SHA512 1f451b10aa87141de635650489bf7227c252e10e5139dad274c95d5625db74fec0b8892a468800d3d3c5dd8b3d64f1c93bd6c75a0ba54fe5f6e630c77b2c6c71
DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
-EBUILD gopass-1.8.5.ebuild 1095 BLAKE2B ce53235ad3e59da78f578b2388372ce67131e66f5a55d444088cc41d261f9d311e04e1372accb5936d359a4871c1c54d0a90166d231b53665567dd99c9e4ee6b SHA512 f798a8efec8122f9dbbf1d3558123e13709dde9e33819ea0179ea2f407f0634e3c17fd6ffd7766c3cadcf36a9cea51ce2baccece160fba0302334d1a3b1d06db
-EBUILD gopass-1.8.6.ebuild 1041 BLAKE2B 04d26bf816ad93d9267177e12b3d86ef6f383a5c73ab9548d098b39b92ffa205e5a7924fb91bacd5f6510bb4475bec8a087ff095a5dcdb1578acdaa8c94914df SHA512 d73ae1d48ce585ae27abdec5ad52f1e95c6b9917fd5831c683765becf50565df5fe14380179f5f7027f9945d89e6fa60d6b7d9b2f562d09588885530705acd34
-MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
+EBUILD gopass-1.8.6-r1.ebuild 1070 BLAKE2B 12f537769ee1d9b7ad4ba9bc12387ebbdb60021ee1b0e7ade84d421527acfd3ab86c551ef2f052d79353a53d60d08c3a30fdd8c70053db9fff24bf4de8681445 SHA512 07c8aa0cf9162734c301e6ca5e2c72f183f05a7ceeda3f3b170d8a82ddded2ec3a4045eee21ece324b98444af95b1c8bf161ab918e9e6921accddcbfde0cc2f3
+MISC metadata.xml 247 BLAKE2B 5c44cfebd4e0f9255ed340e3945e531881706dde92572518052e5394653919667cd7f0cb3224e88e0a188426e95f88019353ba2536fc3cc7b5c8c8688e7fe552 SHA512 7ffbec6e8ce2268628d1afb0906d7b5c00288667bd96e948ed3253fe7b2adc99998b64e026874becafb8400b9e0334f22de51e7be791244b21670d0f98d00b36
diff --git a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch b/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
deleted file mode 100644
index 5780f17bf347..000000000000
--- a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Skip xc cli tests, 1.8.3 failed when run with no arguments for these commands
-but 1.8.4 doesn't.
-
---- gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-+++ gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-@@ -55,14 +55,14 @@
- ".templates.remove": {},
- ".templates.show": {},
- ".unclip": {},
-- ".xc.decrypt": {},
-- ".xc.encrypt": {},
-- ".xc.export": {},
-- ".xc.export-private-key": {},
-- ".xc.generate": {},
-- ".xc.import": {},
-- ".xc.import-private-key": {},
-- ".xc.remove": {},
-+ // ".xc.decrypt": {},
-+ // ".xc.encrypt": {},
-+ // ".xc.export": {},
-+ // ".xc.export-private-key": {},
-+ // ".xc.generate": {},
-+ // ".xc.import": {},
-+ // ".xc.import-private-key": {},
-+ // ".xc.remove": {},
- }
-
- func TestGetCommands(t *testing.T) {
diff --git a/app-admin/gopass/gopass-1.8.5.ebuild b/app-admin/gopass/gopass-1.8.5.ebuild
deleted file mode 100644
index 108b80c18f66..000000000000
--- a/app-admin/gopass/gopass-1.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
- dev-vcs/git
- >=app-crypt/gnupg-2
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.4-xc-tests.patch )
-
-src_install() {
- dobin gopass
-
- local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
- einstalldocs
-
- # install fish completion
- ./gopass completion fish > "${T}"/${PN}.fish || die
- insinto /usr/share/fish/vendor_completions.d
- doins "${T}"/${PN}.fish
-
- # install bash completion
- ./gopass completion bash > "${T}"/${PN} || die
- dobashcomp "${T}"/${PN}
-
- # install zsh completion
- ./gopass completion zsh > "${T}"/${PN}.zsh || die
- insinto /usr/share/zsh/site-functions
- newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.6.ebuild b/app-admin/gopass/gopass-1.8.6-r1.ebuild
similarity index 95%
rename from app-admin/gopass/gopass-1.8.6.ebuild
rename to app-admin/gopass/gopass-1.8.6-r1.ebuild
index 5ca88b63636f..46c28ea1f6fa 100644
--- a/app-admin/gopass/gopass-1.8.6.ebuild
+++ b/app-admin/gopass/gopass-1.8.6-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGO_PN="github.com/gopasspw/gopass"
inherit golang-vcs-snapshot golang-build bash-completion-r1
@@ -10,7 +10,7 @@ DESCRIPTION="a simple but powerful password manager for the terminal"
HOMEPAGE="https://www.gopass.pw/"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
index 06eb97b4a0f0..1c805237cf94 100644
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
gopasspw/gopass
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 0e48922d590a..f5f69fb0e3c8 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,5 +1,3 @@
-DIST kpcli-3.2.pl 197369 BLAKE2B 17a449c1727e8c9e79a5c45327debec1391e58012b2f94979a9431dfc45a0909b23f2e61717aaa2ea18153f420d8d8eba9fd4a5afa860b8478d58e044049322a SHA512 72374da627075a2a0a18932f0f4d48c77e23a8a3ac13599d7cebb6b3b685c2d1678bf8035651adeb471538b4da3825443a9e2a9a393e85be175637b0bfa611b9
DIST kpcli-3.3.pl 199249 BLAKE2B 6db8dff530c709600ac90ca77c8171bedb98dc0ff3822963cdd177000a0b23c46387613639205b85dfdcb710b5a9804fc5b2e205c1937952e8439f5bebae4900 SHA512 5a837891a29dc65f0900015124fe3fdd1b7b9878ed2094d7c299c24590feee8e704212bcabf45c63064f97deca1dd2da96aa80c5be4305692f181db45b7e241a
-EBUILD kpcli-3.2.ebuild 933 BLAKE2B e9a6198c62dcbe4a4c26aa6ae2421dfae0b0b149bb2d8c0c6cd802d4d432df699e8dc64baa415be77a530f3e95df74fc5c967ced9ae014487f9756429d1af032 SHA512 b8d077b1369186be0fd3edd9120980e6169596a6d27ee2e92e9f256feb714e43eefb30133e82df525cda29acea81be86f26457f016cc81c44b16f6b1018a8edd
EBUILD kpcli-3.3.ebuild 930 BLAKE2B cc613bf85aa23b3ef9fa0acc18a8c5ea374cc2fdd4ef79149d1052ca72d00a19a04c1ade328803acbca2dacf61aeee3225b3b769dc2e8f41c481507260fc8a2a SHA512 831bc7a99c57ef5e7987c7d21b00dc0c63f92e8c6a646618e751ee0afbc3ab0a7caa4ab2d5cd4a303c2c459f62283d511713041addf0317e003b8197c737048f
MISC metadata.xml 451 BLAKE2B d9b725122049d496ec367292c1f84973f7ecbdc8034e12a7995efabea8fc0be5ac5877ac7111eb2dd124a4748c203f83e3926ba5faa936f94be01395020d663d SHA512 6601863c3d6754d7bb1eb59fa76d79c5c250a2bd67deb12cb67e12ea67b5a7a59802253f852d0dc887ad4ef4d143849069c026104939e110749f81572c532478
diff --git a/app-admin/kpcli/kpcli-3.2.ebuild b/app-admin/kpcli/kpcli-3.2.ebuild
deleted file mode 100644
index 3218845456ac..000000000000
--- a/app-admin/kpcli/kpcli-3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND=""
-RDEPEND="
- dev-lang/perl
- dev-perl/Clone
- dev-perl/Crypt-Rijndael
- dev-perl/TermReadKey
- dev-perl/Sort-Naturally
- dev-perl/Term-ShellUI
- >=dev-perl/File-KeePass-0.30.0
- virtual/perl-File-Spec
- virtual/perl-Getopt-Long
- virtual/perl-Digest-MD5
- virtual/perl-Digest-SHA
- virtual/perl-Data-Dumper
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-Piece
- virtual/perl-Carp
- X? (
- dev-perl/Capture-Tiny
- dev-perl/Clipboard
- )
-"
-
-src_unpack() {
- mkdir "${S}" || die
- cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin kpcli
-}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 4fa9f83e74df..7bd3f138987e 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,4 +1,4 @@
AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
EBUILD lnav-0.8.5.ebuild 785 BLAKE2B 6983ddad1736c7d185b80407de989d928ec2709624ed18b8421170a0ec69ea19e858cc2d04f0250802219ffa0982bac843ce27e6fbfb49666b0bf481eac10887 SHA512 c6c62e21891014b3dbf6c0f8052020b5ececbe0190f45706e20cc0047c37d7a655d5afc959e3e93438a2127bf959057c92d12411de1a68fd2adfc7f0f3f73ecd
-MISC metadata.xml 332 BLAKE2B 2c99546c3e0f0ed5241279bcb00e56c7104b70b28991c50763ad3664d1d7ea2441a1b3f973c44f267c80dbc98eb3593579fa49092a0ed77d34d04503942338ac SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7
+MISC metadata.xml 248 BLAKE2B f43caae91fdb7709fd690343aa8f6de7880ab1ef1c7b717ea6d1bc6768484e18ea97546c841220f69af0b3752ea3557b68f38b429728f691ee205ee30f83ab6b SHA512 bacfc47ac1d4936a25b259e444a7ad11d8bb103794cfeefcaeb1b4a779581390a71b2041d651f143bd389f0dcb63d11e1e2d2fde71672a296f5740f5e3d3d7bc
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index a78cad49a983..0d9564d8f11e 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
tstack/lnav
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 1c527d9d276e..84cb9f90fb7a 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -5,7 +5,9 @@ AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84
DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
DIST mcelog-165.tar.gz 308405 BLAKE2B 8e6cf59bfa3a5c667c1b709f9c0c5c82f8710ff1aa7c5758c1573a2c832030bb31735f8dd5a53fab26745739cdfac3001cb7a752df579cf452874d19e9e7da65 SHA512 466a07a90679380783524854934d6d66cbc53474616de9141cd36dd2a3b757cacccf1db50c8d4cd54763cea63ac9c09daf6e27ccf3bcf17d62da7fc3396281eb
+DIST mcelog-166.tar.gz 312451 BLAKE2B 430630f6f693ae22961bae2381117dbb6d3bca228d6bdcbbe007d2a2681cda53f8c29cf18b98a47a88d36fd059e3e08aff5b9ad22243d7ce5083f5643768b0e6 SHA512 35514188cf4932b4ecffb8d8149534367a424adb76f03833d53d3c2a0dae2ca89de90d071e48ed67a17a8a70a67efc14aa186280e9145b7572887dccdf9a01af
EBUILD mcelog-162.ebuild 1367 BLAKE2B 7fb646e842316273c540c327b2bbdc1c7c7f77f8e4150406f56bf207b581f1e9c05eb19c93a00ca924707f4af4b263665e81ca0f771e635340dd6ebfb6e1c9e6 SHA512 8d1e0e8caa4a685c1323a52c02a81f8de194c69fda836a3f70bba95b7c95fc18914c01cd2c0b76a25c849df4011c422216944684d1c9dc09774590ae788a3707
EBUILD mcelog-164.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
EBUILD mcelog-165.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
+EBUILD mcelog-166.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-166.ebuild b/app-admin/mcelog/mcelog-166.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-166.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 1569aab53f73..19936b1c9714 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -2,5 +2,5 @@ AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e
DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
DIST mcollective-2.12.5.tar.gz 1517727 BLAKE2B b5d91c748bb1bfc63c7c040fb067d7ba39badede094d975f0b87587fe3a6c5bb6757a5be73f887be5d83f99dfefb0272bd48da6c9e79b4aee34c8d5f51e2e6c5 SHA512 639458d83b3f25d9aa433c205b9d16ded5ec689c1efb4827457fc3075c000d7abc2b70c9c8cf741c8bea03c1e47284015e69bf834e7a5670c68a40097e45891b
EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
-EBUILD mcollective-2.12.5.ebuild 1646 BLAKE2B 43acfccf46e4f0cdeddc5020474b8c8d86a4fb24268afef2fe1c405fad13b2523825219f8c5e7c1828ba1a751c755063aaaef603fc683d721047e5c122533ee8 SHA512 e58345d7913a40989f2d66536eb15e7cce2325a2791a6e0ed6001d8ddabdcae5a9dc90bfb8763b9a5013b4cd60b2208962f7673cb3194013180b4ce2ce6cf391
+EBUILD mcollective-2.12.5.ebuild 1653 BLAKE2B 4a2814c96670825f66b52c71126dd83799827011768705c5ea50e383718f42cfd8867575ec474486f8d3fb773c210828a7d5148ac871ed8288fac1fe9c58d3bb SHA512 547be0bc8e379027e069fb3a93bd00cc4647bfa33ca009558652a6480b31c83519cb9f8577997977124dfa37cd4ceb17ac634ddc5b776e0d85f4d59995f9ba18
MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.5.ebuild b/app-admin/mcollective/mcollective-2.12.5.ebuild
index efeca85ce465..689393b26c69 100644
--- a/app-admin/mcollective/mcollective-2.12.5.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.5.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
inherit ruby-ng
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1dfd1df42f8b..086eb60494ef 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -4,19 +4,10 @@ AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10
AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
-DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
-DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
-DIST rsyslog-8.1908.0.tar.gz 2952939 BLAKE2B c6784753262a71f30f32fc35ad3e3e75fa2af271bdb0a62c2d4796d3d0413c7f619052a5e33c52c5f3b22aa474d14b7bb06e9c502944f914e708265835fd90ff SHA512 66b6755e1f5a610ed8ec3f8fad1ee227f8ff34618a8f2660a801e6f9aa734980190fbffd8144ac30d63f8297a06e86ada65ba838242d8a006bca8e30f56dce80
DIST rsyslog-8.1910.0.tar.gz 2957635 BLAKE2B ea350d3fb923c2f7d2799942fec6a77ef893fa12bc95a5b1428b8e280d96b562cd864469ebf13ee57e9ea89787765a4bb13d155460defc73a3a85b17ad6a5ab1 SHA512 85f5df91a6357ecb38708b4d569d26804a50ca28c928a636ac7749595f1a7105c3450fbd521835a436ebdfdcac33a33986e09a09026745ea4d1a2897406770d5
DIST rsyslog-8.1911.0.tar.gz 2967162 BLAKE2B 6c15436cf6751267de38662b2c5d524dc7f90add4ed1aa7102811d197c2d86847316b58ed626fe0ab2b731c445fbcfb328464a2b1b7c4c3afedccb103267f772 SHA512 8414901a5072cb2cc28d35802c9e22d0f9c88f2ae15985a087a86b0e4053471b02d43bcc95d0c466719105e0a5ee683927af3842b9487f27ddddc1ca00ed713a
-DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
-DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
-DIST rsyslog-doc-8.1908.0.tar.gz 8082984 BLAKE2B 7f102a215b0c51b961a4e44e97c8a3cd9966215dba44a194a5ff925b8a2b1ad3389461e2de3dae6dfb770bc36c9a31747298bdb7e975d6fa86ca209c9e314ac3 SHA512 d826013de671c895be7becd2a7c5ce1fb218149c6128d486116be6a01fc69099026f5a277b30fc57e626aeb4038e00b17abcad9a45ea3c9838e7041de9d991a5
DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0dd9d03be46ebd1b1261e54add70ab680afe0b356f563ea9e10148aed17667fc0b729e2fa8f7ff7cff3e4cec9d0da209a8 SHA512 e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf99698f10ef4790e76c9f6f329763215d5a1d47918008ade3e8ff8b7d4fb3ce1220cfc6f307ebc1dbf85697c3d92f7b855023 SHA512 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df
-EBUILD rsyslog-8.1904.0-r1.ebuild 12569 BLAKE2B 119a617375da61a37962edddae9f20888fcac469325b77f07c15141d471a00e62f6647b94d9837990ad7bccc0e85fb071de8b63f411245f9759f2163677fa663 SHA512 2a6514fbe431f61c29a8f261f528458c05e82398a34b4cd810c36cadaf5d355f7678f530f52d9236269eab01c990703b2bdfe2c6b6b8d3ea0005f1f168587a54
-EBUILD rsyslog-8.1907.0-r1.ebuild 12546 BLAKE2B d562cb749a8632d6399613667f786dabf472b65b112a5775a9f2977b3a513b25f50454419fb62ff02648e4dc1acf5fb226b7d01d62e70bdbcd1de69f6c6cbb97 SHA512 9d683b5267a57653bbc7f8caff1b8e60e78b6e7dbfc6cb2ba7f63ac80776b75cc1d3ba84c27a9659cfd48e568c01af97423f5450af6173e94a9bb9ae38eda95c
-EBUILD rsyslog-8.1908.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
-EBUILD rsyslog-8.1910.0.ebuild 12545 BLAKE2B b5ab0e992ba314a05fb413f2a7c41ff425993f871a1164e5495c766d02f5f507539d05dfa4d28ad7400c50500a7ffc0e5572a67f636074ed61b451d905f883ee SHA512 8700879fd2851c3aaf9ac20e92132b667ccaa7152060e49f43b736f42d6df3ef698aa92d202be65b20d4bd5d72a78b0788234eaa2c14abd13a2252ac0133bc9f
-EBUILD rsyslog-8.1911.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
+EBUILD rsyslog-8.1910.0-r1.ebuild 12536 BLAKE2B 2147c994faeb43c6e0acb5f82d487b6aa8ccb2403c30302908c73a411902b06847e3a443b15f21d23e9f08b1ae31e39691be21e677fa2cee3f6587c3f8889769 SHA512 1af0bfa5d77472c08b28fc0205e204120c5155d032f6408d8254d648faa296d71a38e88abb9c13be9e1589f69fae151bf22a932a69954eae2ffbee1f07003774
+EBUILD rsyslog-8.1911.0-r1.ebuild 12540 BLAKE2B 392ce256f3d6f812bee477e90fa7d1bdf8aa04175c28c5dd81ad5e8d82f1ff112fe7a4386c4ee0f11c59cee550c47bba6d7ce4d68343e409ec690c7f51ea97e8 SHA512 b0448b8cb4e0ea7736a65c26aa4bc23d3e879c953af68e5e6b23db8f7d8c4f860068c399c89fefc08d05660f1563937d3b28e32414016ccc4ff6375d3d71b51d
MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
deleted file mode 100644
index 3ba9c5d75708..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
- inherit git-r3
-else
- KEYWORDS="~amd64 ~arm ~arm64 hppa x86"
-
- SRC_URI="
- https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libfastjson-0.99.8:=
- >=dev-libs/libestr-0.1.9
- >=sys-libs/zlib-1.2.5
- curl? ( >=net-misc/curl-7.35.0 )
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
- kerberos? ( virtual/krb5 )
- kubernetes? ( >=net-misc/curl-7.35.0 )
- mdblookup? ( dev-libs/libmaxminddb:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
- mysql? ( dev-db/mysql-connector-c:= )
- normalize? (
- >=dev-libs/liblognorm-2.0.3:=
- )
- clickhouse? ( >=net-misc/curl-7.35.0 )
- omhttpfs? ( >=net-misc/curl-7.35.0 )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
- redis? ( >=dev-libs/hiredis-0.11.0:= )
- relp? ( >=dev-libs/librelp-1.2.17:= )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
- )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? (
- gnutls? ( >=net-libs/gnutls-2.12.23:0= )
- openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- systemd? ( >=sys-apps/systemd-234 )
- uuid? ( sys-apps/util-linux:0= )
- xxhash? ( dev-libs/xxhash:= )
- zeromq? (
- >=net-libs/czmq-3.0.2
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.24
- virtual/pkgconfig
- elibc_musl? ( sys-libs/queue-standalone )
- test? (
- >=dev-libs/liblogging-1.0.1[stdlog]
- jemalloc? ( =dev-python/sphinx-1.1.3-r7 )"
- DEPEND+=" >=sys-devel/flex-2.5.39-r1"
- DEPEND+=" >=sys-devel/bison-2.4.3"
- DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [[ -n "${EGIT_BRANCH}" ]]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [[ -n "${_EGIT_BRANCH}" ]]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- cd "${S}" || die "Cannot change dir into '${S}'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${PN}-doc-${PV}.tar.gz
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # https://github.com/rsyslog/rsyslog/issues/3626
- sed -i \
- -e '\|^#!/bin/bash$|a exit 77' \
- tests/mmkubernetes-cache-expir*.sh \
- || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
- eautoreconf
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-debug-symbols
- --disable-generate-man-pages
- --without-valgrind-testbench
- --disable-liblogging-stdlog
- $(use_enable test testbench)
- $(use_enable test libfaketime)
- $(use_enable test extended-tests)
- # Input Plugins without depedencies
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without depedencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmcount
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmrm1stspace
- --enable-mmsequence
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-fmhash
- $(use_enable xxhash fmhash-xxhash)
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmlastmsg
- $(use_enable normalize pmnormalize)
- --enable-pmnull
- --enable-pmpanngfw
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable clickhouse)
- $(use_enable curl fmhttp)
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable jemalloc)
- $(use_enable kafka imkafka)
- $(use_enable kafka omkafka)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable kubernetes mmkubernetes)
- $(use_enable normalize mmnormalize)
- $(use_enable mdblookup mmdblookup)
- $(use_enable omhttp)
- $(use_enable omhttpfs)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable gnutls)
- $(use_enable openssl)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable uuid)
- $(use_enable zeromq imczmq)
- $(use_enable zeromq omczmq)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- # Sometimes tests aren't executable (i.e. when added via patch)
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [[ -z "${_has_increased_ulimit}" ]]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv ${FEATURES}; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/README.gentoo
- )
-
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
- default
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- local CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [[ ! -d "${CERTDIR}" ]]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1908.0.ebuild b/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
deleted file mode 100644
index 09eed323e458..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
- inherit git-r3
-else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
- SRC_URI="
- https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libfastjson-0.99.8:=
- >=dev-libs/libestr-0.1.9
- >=sys-libs/zlib-1.2.5
- curl? ( >=net-misc/curl-7.35.0 )
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
- kerberos? ( virtual/krb5 )
- kubernetes? ( >=net-misc/curl-7.35.0 )
- mdblookup? ( dev-libs/libmaxminddb:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
- mysql? ( dev-db/mysql-connector-c:= )
- normalize? (
- >=dev-libs/liblognorm-2.0.3:=
- )
- clickhouse? ( >=net-misc/curl-7.35.0 )
- omhttpfs? ( >=net-misc/curl-7.35.0 )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
- redis? ( >=dev-libs/hiredis-0.11.0:= )
- relp? ( >=dev-libs/librelp-1.2.17:= )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
- )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? (
- gnutls? ( >=net-libs/gnutls-2.12.23:0= )
- openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- systemd? ( >=sys-apps/systemd-234 )
- uuid? ( sys-apps/util-linux:0= )
- xxhash? ( dev-libs/xxhash:= )
- zeromq? (
- >=net-libs/czmq-3.0.2
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.24
- virtual/pkgconfig
- elibc_musl? ( sys-libs/queue-standalone )
- test? (
- >=dev-libs/liblogging-1.0.1[stdlog]
- jemalloc? ( =dev-python/sphinx-1.1.3-r7 )"
- DEPEND+=" >=sys-devel/flex-2.5.39-r1"
- DEPEND+=" >=sys-devel/bison-2.4.3"
- DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [[ -n "${EGIT_BRANCH}" ]]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [[ -n "${_EGIT_BRANCH}" ]]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- cd "${S}" || die "Cannot change dir into '${S}'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${PN}-doc-${PV}.tar.gz
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # https://github.com/rsyslog/rsyslog/issues/3626
- sed -i \
- -e '\|^#!/bin/bash$|a exit 77' \
- tests/mmkubernetes-cache-expir*.sh \
- || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
- eautoreconf
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-debug-symbols
- --disable-generate-man-pages
- --without-valgrind-testbench
- --disable-liblogging-stdlog
- $(use_enable test testbench)
- $(use_enable test libfaketime)
- $(use_enable test extended-tests)
- # Input Plugins without depedencies
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without depedencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmcount
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmrm1stspace
- --enable-mmsequence
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-fmhash
- $(use_enable xxhash fmhash-xxhash)
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmlastmsg
- $(use_enable normalize pmnormalize)
- --enable-pmnull
- --enable-pmpanngfw
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable clickhouse)
- $(use_enable curl fmhttp)
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable jemalloc)
- $(use_enable kafka imkafka)
- $(use_enable kafka omkafka)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable kubernetes mmkubernetes)
- $(use_enable normalize mmnormalize)
- $(use_enable mdblookup mmdblookup)
- $(use_enable omhttp)
- $(use_enable omhttpfs)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable gnutls)
- $(use_enable openssl)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable uuid)
- $(use_enable zeromq imczmq)
- $(use_enable zeromq omczmq)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- # Sometimes tests aren't executable (i.e. when added via patch)
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [[ -z "${_has_increased_ulimit}" ]]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv ${FEATURES}; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/README.gentoo
- )
-
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
- default
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- local CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [[ ! -d "${CERTDIR}" ]]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
rename to app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
index 53c2faa29103..85601a397b5f 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
@@ -47,7 +47,6 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
mysql? ( dev-db/mysql-connector-c:= )
normalize? (
- >=dev-libs/libee-0.4.0
>=dev-libs/liblognorm-2.0.3:=
)
clickhouse? ( >=net-misc/curl-7.35.0 )
@@ -319,12 +318,12 @@ src_install() {
newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
+ insinto /usr/share/${PN}/scripts/mysql
doins plugins/ommysql/createDB.sql
fi
if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
+ insinto /usr/share/${PN}/scripts/pgsql
doins plugins/ompgsql/createDB.sql
fi
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
deleted file mode 100644
index d8a51113e54c..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
- inherit git-r3
-else
- KEYWORDS="amd64 arm ~arm64 ~hppa x86"
-
- SRC_URI="
- https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libfastjson-0.99.8:=
- >=dev-libs/libestr-0.1.9
- >=sys-libs/zlib-1.2.5
- curl? ( >=net-misc/curl-7.35.0 )
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
- kerberos? ( virtual/krb5 )
- kubernetes? ( >=net-misc/curl-7.35.0 )
- mdblookup? ( dev-libs/libmaxminddb:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
- mysql? ( dev-db/mysql-connector-c:= )
- normalize? (
- >=dev-libs/liblognorm-2.0.3:=
- )
- clickhouse? ( >=net-misc/curl-7.35.0 )
- omhttpfs? ( >=net-misc/curl-7.35.0 )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
- redis? ( >=dev-libs/hiredis-0.11.0:= )
- relp? ( >=dev-libs/librelp-1.2.17:= )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
- )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? (
- gnutls? ( >=net-libs/gnutls-2.12.23:0= )
- openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- systemd? ( >=sys-apps/systemd-234 )
- uuid? ( sys-apps/util-linux:0= )
- xxhash? ( dev-libs/xxhash:= )
- zeromq? (
- >=net-libs/czmq-3.0.2
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.24
- virtual/pkgconfig
- elibc_musl? ( sys-libs/queue-standalone )
- test? (
- >=dev-libs/liblogging-1.0.1[stdlog]
- jemalloc? ( =dev-python/sphinx-1.1.3-r7 )"
- DEPEND+=" >=sys-devel/flex-2.5.39-r1"
- DEPEND+=" >=sys-devel/bison-2.4.3"
- DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [[ -n "${EGIT_BRANCH}" ]]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [[ -n "${_EGIT_BRANCH}" ]]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- cd "${S}" || die "Cannot change dir into '${S}'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${PN}-doc-${PV}.tar.gz
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # https://github.com/rsyslog/rsyslog/issues/3626
- sed -i \
- -e '\|^#!/bin/bash$|a exit 77' \
- tests/mmkubernetes-cache-expir*.sh \
- || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
- eautoreconf
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-debug-symbols
- --disable-generate-man-pages
- --without-valgrind-testbench
- --disable-liblogging-stdlog
- $(use_enable test testbench)
- $(use_enable test libfaketime)
- $(use_enable test extended-tests)
- # Input Plugins without depedencies
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without depedencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmcount
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmrm1stspace
- --enable-mmsequence
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-fmhash
- $(use_enable xxhash fmhash-xxhash)
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmlastmsg
- $(use_enable normalize pmnormalize)
- --enable-pmnull
- --enable-pmpanngfw
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable clickhouse)
- $(use_enable curl fmhttp)
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable jemalloc)
- $(use_enable kafka imkafka)
- $(use_enable kafka omkafka)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable kubernetes mmkubernetes)
- $(use_enable normalize mmnormalize)
- $(use_enable mdblookup mmdblookup)
- $(use_enable omhttp)
- $(use_enable omhttpfs)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable gnutls)
- $(use_enable openssl)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable uuid)
- $(use_enable zeromq imczmq)
- $(use_enable zeromq omczmq)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- # Sometimes tests aren't executable (i.e. when added via patch)
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [[ -z "${_has_increased_ulimit}" ]]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv ${FEATURES}; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/README.gentoo
- )
-
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
- default
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- local CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [[ ! -d "${CERTDIR}" ]]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1911.0.ebuild b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.1911.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
index 09eed323e458..b1ce46d2e2f2 100644
--- a/app-admin/rsyslog/rsyslog-8.1911.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
@@ -318,12 +318,12 @@ src_install() {
newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
+ insinto /usr/share/${PN}/scripts/mysql
doins plugins/ommysql/createDB.sql
fi
if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
+ insinto /usr/share/${PN}/scripts/pgsql
doins plugins/ompgsql/createDB.sql
fi
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 0552f5679b8e..d30c246a2cc2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,7 +3,7 @@ DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca33
DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
EBUILD sudo-1.8.27-r1.ebuild 6605 BLAKE2B a27d6c43fbc7db19d41e566c5f7ea6d1d1a206b78f899f45218897f1823463b85cb3e85dac0ac37f667ec4f6cf22c6d8114635a4d430fab4a2d0e18e58039e6e SHA512 ff13c6e8825d0554977a13a331f7156c1d886202de4646de1385a1d85d69a84ed17c672836dc7993ed768a375bbc798d68032f7ab975396cfff614b3d0f8b73f
-EBUILD sudo-1.8.28_p1-r2.ebuild 6944 BLAKE2B 38f05416e25847f8adf2ddb24535e9f169c1a8813ccd3fd46364082d03c4f83d594ec3b40ac7a11ab23fab3213ff1485a7046eb762ce89a58c8f7ae4861e1b14 SHA512 51586f8eefdbaee8436702279f9e548c1d13e1104bab08a038283e0155b513e1e98b081208d8bd40afe0f0d68485474f7027462e95edbbaf3b96fa4e625f355d
+EBUILD sudo-1.8.28_p1-r2.ebuild 6943 BLAKE2B c4baa7977a7c46094d586fadfdf767c8b19a907f8431bf24ff7ed386bd4dfaaf270f3e9fb2b75d82a863a04ee69930b379b8a13515d25482cb24897bf11b0321 SHA512 aa59c884faa68e2905fdb84e9147fd2ccf1983649552dbaea456f0c529ae1dfe4b6b6aa1775d3c5124b82ebcb93086310ce76c884f2c210d67869a034a4f0bb3
EBUILD sudo-1.8.29-r2.ebuild 6956 BLAKE2B 4065346eafcaf93f22182bb168b5ed753e65a59f2d5469c48883d19c962bd4754cff648d10bdd404d0ba846f74944670c194ad5740edcaafb605a596d214f664 SHA512 c034ce70c59e5d1bd51b1f9514aa410e372ad987776ec4447b368448770a677b548fd8aec27477f2e0c64ba050617714489f7406977e4cb762b9a14c815affb6
EBUILD sudo-9999.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
index 944044c91291..f13176729974 100644
--- a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
fi
fi
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index b135cec01488..24872253fb2a 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -5,10 +5,14 @@ AUX sysklogd-1.5-build.patch 626 BLAKE2B 03fe37ad2095f88cfa5cf3b79ece26acf4d70f9
AUX sysklogd-1.5-debian-cron.patch 913 BLAKE2B 20c0fc489b5ed90576f02f400817537ba6a59dd3521de2bacbc97964748792069bbeb1a656e4384ce8edfca320c9f212f4f04f2c4c49374f9cd5b0b59bb30c2f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0
AUX sysklogd-1.5-glibc-2.24.patch 279 BLAKE2B 635ad71844161a13f5c95e670db49c486a856556f10ccd04ea7f4b9cb1252aa9788a2f4e17864d4e0155fd3ca148862a48ce0c4808e389d37f146087088e60be SHA512 35d92a0f1665d38201bdb2f4d4c0e5f17a6086f7a38e489ac4820cdff166419992253fa6c73e321c73e209e4b41a6e2363e19060ef48f18fef8c5ea65ac2664e
AUX sysklogd-1.5-syslog-func-collision.patch 2273 BLAKE2B 7aa2ccaf4bb1663c7c71f0d9f67c17f39b6c61b4706352bf779eb9a790e2fed8753afeaa4c2234739513500383593ee2f59a87485378fb554589e0e9a77f61ad SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc
+AUX sysklogd-2.0-optional_logger.patch 3378 BLAKE2B 4df2518398354ca74282fc75b2f6d0b17a3722677291927f4b4b4b1895db5cf5bac77cee931448fc63ec12f22f8c673461c469d31bd62f11eb21c5895859a477 SHA512 008b2ba7a9b6ad9459f8283952b81b3353b4c211e626d520112148e2b47bf2ab26c935960bc7157b758da9005c3e06582b4339db4ec36d4c4c019e566d6d12ab
AUX sysklogd.confd 113 BLAKE2B 392d4c0ac09d5dd85d01e4d57cb541271e3c09ce90671d6bfcbecfde64184c94603929bee0fe3ae2d65af2b6283919b8a6517c1e551f870d4c0e25bf1ffad051 SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c
AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e
+AUX sysklogd.rc8 1666 BLAKE2B 0cb57bdfcab672347e278d1782a8385ac8515b0487ed370141994c504a30909d3279123a36565078626c02f90a405bbe276082605dead68f0a7510bd6927f2d9 SHA512 9f66fabfc339c1bf2f44b3be81915533a57d1da2782d3135c830e149efdb0cfb8463e2432ff5810b7105dcc186ad3d2efee0b6b64da7449df7efc54aecbd312d
DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
+DIST sysklogd-2.0.tar.gz 465822 BLAKE2B 030ce2e65287d215d376937aec590715abcac06dffef735038c31ee102eb00d5c616bfd2f3d378e53ef6ae4aa062e9802aaaca84a6f5598b43da35ee722d37ac SHA512 25b55b8ea47280c11959e03d5a8c592e1b02764b4aeb722ef9782d84116475f1bbba96d6db8c291b694d99c7970e2e7615e7cd48b8fef6dff4f9ae825e18d030
DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
-MISC metadata.xml 378 BLAKE2B b2ff06a70503694dcc5349aebb2d043cb74c10463e137c7bdd9ee6b5c1241e67fab49c201d08858b200a3007bea36e1d0ae1460e569b0b9e6f8281cf39c58c48 SHA512 9d7311cf197ebeec7e989d97d08a35360242ee0aa467e38e1715c6a425e1e279ddd75da8e2856c1238f357741d67bd67d07841425d7dcc3f8f964def8f02d15c
+EBUILD sysklogd-2.0.ebuild 1214 BLAKE2B 8e74010dd131b840401b6d7bf74dfefd558e412e06a637748a1b1617951bbc5ee9e1614c2f748d716853cba3aa50aa49e5cdcf23f28deace02b42b02a45a6da1 SHA512 938b0ebbcdea1a884a31a1f3d7048e1d0746c8a932e2486399b4a21447e09af312aebdfe21fd2f7239a48823a61a62e7674654bfe0f90312560697d7314fe1da
+MISC metadata.xml 459 BLAKE2B a6d23251dfdbf503bfccf368a95032d75a7778e87801e4129613f051600f1c44db2738fb16950cd75b9e6eeb76ad6441854b17493915b062c01a3eef574fd05e SHA512 32109c6696b5648af0248a6472485e23cc92cdffeb0e136581221edd39a819218a323f2765fba4e68018dd0d27bea0105e16e6754a8ca1239a82a2210bd6a66e
diff --git a/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch b/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch
new file mode 100644
index 000000000000..4e5580b0422a
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-2.0-optional_logger.patch
@@ -0,0 +1,101 @@
+From 227008ec0f59eecf3a962ebd9fbc27a0e475a4df Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+Date: Mon, 18 Nov 2019 12:08:26 +0100
+Subject: [PATCH] build: make logger and its man page optional
+
+There are other packages that provide a logger program like util-linux
+We should respekt that
+
+Signed-off-by: Lars Wendler
+---
+ configure.ac | 10 ++++++++++
+ man/Makefile.am | 6 +++++-
+ src/Makefile.am | 8 +++++++-
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 37c0bd4..e7acad7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,10 @@ AC_ARG_WITH(systemd,
+ [AS_HELP_STRING([--with-systemd=DIR], [Directory for systemd service files])],,
+ [with_systemd=auto])
+
++AC_ARG_WITH(logger,
++ AS_HELP_STRING([--without-logger], [Do not build/install logger binary and man page, default: enabled]),
++ [logger=$withval], [logger='yes'])
++
+ AS_IF([test "x$klogd" != "xno"],
+ with_klogd="yes"
+ AC_DEFINE(KLOGD, 1, [Build with klogd, default: built-in /dev/kmsg support in syslogd]),
+@@ -97,6 +101,12 @@ AS_IF([test "x$with_systemd" != "xno"],
+ [AC_SUBST([systemddir], [$with_systemd])])
+ AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemd" != "xno"])
+
++AS_IF([test "x$logger" != "xno"], [
++ with_logger="yes"
++ AC_DEFINE(LOGGER, 1, [Build with logger])],
++ with_logger="no")
++AM_CONDITIONAL([ENABLE_LOGGER], [test "x$with_logger" != "xno"])
++
+ # Expand $sbindir early, into $SBINDIR, for systemd unit file
+ # NOTE: This does *not* take prefix/exec_prefix override at "make
+ # install" into account, unfortunately.
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 8ee7064..8ccad31 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,4 +1,4 @@
+-dist_man1_MANS = logger.1
++dist_man1_MANS =
+ dist_man3_MANS = syslogp.3
+ dist_man5_MANS = syslog.conf.5
+ dist_man8_MANS = syslogd.8
+@@ -6,3 +6,7 @@ dist_man8_MANS = syslogd.8
+ if ENABLE_KLOGD
+ dist_man8_MANS += klogd.8
+ endif
++
++if ENABLE_LOGGER
++dist_man1_MANS += logger.1
++endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 85f747b..849e49b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,7 +16,7 @@
+ # with this program; if not, write to the Free Software Foundation, Inc.,
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+-bin_PROGRAMS = logger
++bin_PROGRAMS =
+ sbin_PROGRAMS = syslogd
+ lib_LTLIBRARIES = libsyslog.la
+ noinst_LTLIBRARIES = libcompat.la
+@@ -25,6 +25,10 @@ if ENABLE_KLOGD
+ sbin_PROGRAMS += klogd
+ endif
+
++if ENABLE_LOGGER
++bin_PROGRAMS += logger
++endif
++
+ AM_CFLAGS = -W -Wall -Wextra
+ AM_CFLAGS += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing
+ AM_CPPFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLOCALSTATEDIR=\"@localstatedir@\"
+@@ -39,10 +43,12 @@ klogd_CPPFLAGS = $(AM_CPPFLAGS)
+ klogd_LDADD = $(LIBS) $(LIBOBJS)
+ klogd_LDADD += libsyslog.la
+
++if ENABLE_LOGGER
+ logger_SOURCES = logger.c syslog.h
+ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
+ logger_LDADD = $(LIBS) $(LIBOBJS)
+ logger_LDADD += libsyslog.la
++endif
+
+ # Convenience library for libsyslog instead of linking with $(LTLIBOBJS),
+ # which would pull in pidfile() and other (strong) symbols as well.
+--
+2.24.0
+
diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8
new file mode 100644
index 000000000000..a6590d725a69
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc8
@@ -0,0 +1,94 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+ need clock hostname
+ provide logger
+}
+
+has_klogd() {
+ [ -x "/usr/sbin/klogd" ]
+}
+
+start_daemon() {
+ local retval=0
+ local daemon="$1"
+ local options="$2"
+ local fg_opt=""
+
+ case "${daemon}" in
+ syslogd)
+ fg_opt="-F"
+ ;;
+ klogd)
+ fgopt="-n"
+ ;;
+ *)
+ return 1
+ ;;
+ esac
+
+ ebegin "sysklogd -> start: ${daemon}"
+ start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+ -b -m --pidfile /var/run/"${daemon}".pid \
+ -- ${fg_opt} ${options}
+ retval=$?
+ eend ${retval} "Failed to start ${daemon}"
+
+ return ${retval}
+}
+
+stop_daemon() {
+ local retval=0
+ local daemon="$1"
+
+ [ -z "${daemon}" ] && return 1
+
+ ebegin "sysklogd -> stop: ${daemon}"
+ # syslogd can be stubborn some times (--retry 15)...
+ start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+ retval=$?
+ eend ${retval} "Failed to stop ${daemon}"
+
+ return ${retval}
+}
+
+start() {
+ start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+ # klogd do not always start proper if started too early
+ sleep 1
+
+ if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
+ stop_daemon "syslogd"
+ return 1
+ fi
+
+ return 0
+}
+
+stop() {
+ if has_klogd ; then
+ stop_daemon "klogd" || return 1
+ fi
+ stop_daemon "syslogd" || return 1
+ return 0
+}
+
+reload() {
+ local ret=0
+
+ ebegin "Reloading configuration"
+
+ start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
+ ret=$((${ret} + $?))
+ if has_klogd ; then
+ start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+ ret=$((${ret} + $?))
+ fi
+
+ eend ${ret}
+}
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 094ccd37b3fd..868e8ae726de 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Base System
diff --git a/app-admin/sysklogd/sysklogd-2.0.ebuild b/app-admin/sysklogd/sysklogd-2.0.ebuild
new file mode 100644
index 000000000000..60df329feb56
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="klogd logrotate systemd"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( ChangeLog.md README.md )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0-optional_logger.patch"
+)
+
+pkg_setup() {
+ append-lfs-flags
+ tc-export CC
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ # we have logger from sys-apps/util-linux
+ --without-logger
+ $(use_with klogd)
+ $(use_with systemd systemd $(systemd_get_systemunitdir))
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ doins syslog.conf
+ keepdir /etc/syslog.d
+
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+
+ newinitd "${FILESDIR}"/sysklogd.rc8 sysklogd
+ newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 50cd0b8c379c..01e273375b6c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,5 +5,8 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0 SHA512 1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
+DIST vault-1.2.4-webui.tar.xz 1919024 BLAKE2B c1fc1460d70f33695ce9f7571a701035b02a376e4d336a9e368190a5ec08dc3ef417d2553a0e3ca5e745721eef49caeaaf294bd8b44550938ab02c7d63460744 SHA512 9b431083b1850e6e18b5212f04cc2d9305832c02594984caef298b2b33e176b6cc7f767e9e137208e005778d249410e482cfe4b6f6bfdb6f2ba54de9bcc4c7f6
+DIST vault-1.2.4.tar.gz 27778766 BLAKE2B 536dd114c0268f91eb6b5c13cc30d22cdb9d1085c1378c6e39a6fcffeb4d5313363d225c85073a4da124962d6f7de8e4800a6648e392909a9595341ac178d94a SHA512 35a91088ac6949863e2de651edac19d73586acc2f42d14e48d3b41236d9458c95e60f8ec2285b3846ff04ebe59a4d4b308686151d758b5af8caad711441e2ee4
EBUILD vault-1.2.3.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
+EBUILD vault-1.2.4.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.4.ebuild b/app-admin/vault/vault-1.2.4.ebuild
new file mode 100644
index 000000000000..ba761e123410
--- /dev/null
+++ b/app-admin/vault/vault-1.2.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ webui? (
+ mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+ https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+ )"
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12:=
+ dev-go/gox"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+ golang-vcs-snapshot_src_unpack
+ if use webui; then
+ # The webui assets build has numerous nodejs dependencies,
+ # see https://github.com/hashicorp/vault/blob/master/ui/README.md
+ pushd "${S}/src/${EGO_PN}" >/dev/null || die
+ unpack "${VAULT_WEBUI_ARCHIVE}"
+ popd >/dev/null
+ fi
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN}/scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -i src/${EGO_PN}/Makefile || die
+
+ # Avoid network-sandbox violations since go-1.13
+ rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ export -n GOCACHE XDG_CACHE_HOME #678970
+ export GOBIN=${S}/bin GOPATH=${S}
+ cd src/${EGO_PN} || die
+ # The fmt target may need to be executed if it was previously
+ # executed by an older version of go (bug 665438).
+ emake fmt
+ BUILD_TAGS="$(usex webui ui '')" \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin bin/${PN}
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 81c6858f1bab..b7a873bc5f92 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index 8c7f7a55e4c9..e8e9f02cb1e3 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,4 +1,3 @@
DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
EBUILD atool-0.39.0-r1.ebuild 397 BLAKE2B 2f135263b9377ca21f8405695607667edcc7973155bf7417a1a389590b6e0259d40b3e664ece0fb3329cd83b06183bef09e0e0a6cc4eb4cfb99aa037b09865ff SHA512 4fedacf094bd90bb79cc0731eac449867fa6c59a8fdf6e7f42d15937a508136b1d1411f9a2508087fb9955f586616d4cb79a4c4ecd7c146639c55e07e294bf91
-EBUILD atool-0.39.0.ebuild 409 BLAKE2B e6d40c0322d1e7819fcbf9a4f0873306a97d07edbd6f00bbfb3b0fd107ffdda62d5fcf23069e73b93da7508dbd9db9ffa416aa40060bf13749fba7de79fa022c SHA512 ecf7cc68e9c5f3946b7e456c3223827f50a65c4ce4782e06bab6e0a8f28c9ad3bb88aeca4d1c2aecb8cf1fd2afe749f1991a45605172f501e71b24fea59917e3
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/atool/atool-0.39.0.ebuild b/app-arch/atool/atool-0.39.0.ebuild
deleted file mode 100644
index a6badc7cca4b..000000000000
--- a/app-arch/atool/atool-0.39.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="a script for managing file archives of various types"
-HOMEPAGE="https://www.nongnu.org/atool/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !app-text/adiff"
diff --git a/app-arch/atool/metadata.xml b/app-arch/atool/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/app-arch/atool/metadata.xml
+++ b/app-arch/atool/metadata.xml
@@ -1,8 +1,5 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 2d6247df9819..9d2c5cf1c376 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -3,5 +3,5 @@ AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11
DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
EBUILD cpio-2.12-r1.ebuild 837 BLAKE2B 70ea1ca2821538eef1d18bafffbade45ed9a93f6eec98a637e3fdf4d74bfb2f24bf50ef1e53160f5c03ad155875dbb0c4c3ddbb69fb7d4fd9a3f7e27e6b2c875 SHA512 fa86a064698a57a600cf60856e3690059006e96c45632a9910c025223e8bab2b4ead4031458374a8f9ed0ee2ef587e4de84f8e4fe2c175ba17bdb15049297c5c
-EBUILD cpio-2.13.ebuild 793 BLAKE2B 82b1c95ce460bf36f99b70e8171189dcb383085fecc36996659d1a962a58b0e5fde79989449315023e181699cdb6c9b82c606dfb185cc6760d64009b39876b6e SHA512 7dbcb73fbb31a1b2e18ca08079b33c503533cad5a4033608a646e2da26dd3a6673677dedd60ea1bc57081d350d0504f210ddd98e0b8b6ce7bd48fbb4ec485e3b
+EBUILD cpio-2.13.ebuild 792 BLAKE2B f137dc225e1a4ad4efcdc8b515f0352c97648984c6492d2c62ccf8802e8bad94fc090696f26103bd82bedd26a1084f5a0b062a5f2ce5ca0a4421bb69df7ce6dc SHA512 5558aada96cb7c975e0739150341376ec036d6416b13d820875ca13c6c9bf641bd19d4e1c23cb01d7d9d5a572cabfc48420adcd8813e2f4ba1742527eefd9bd2
MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index d953e62ac0b1..30557dbd0433 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
PATCHES=(
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 78464e515ce8..1f6678ec0c07 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -3,5 +3,5 @@ AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec2
DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
EBUILD libarchive-3.3.3.ebuild 3603 BLAKE2B 01906589b7af8002258dd85ea51c46588b3c070d20d1480a5b892224c97b428ccd89c0690da086ab0adb30d0da134fed23912a2b83da28cb99c9a1c09e79ad68 SHA512 4393279fb4a17caede13888365798253954a0275812a444586d06ca34ea640321e6d3df06a0e0f4d27f6ee8bde5be6be15c719a1e0a931a122bc868dd9b338c5
-EBUILD libarchive-3.4.0.ebuild 3744 BLAKE2B 6f0c2d804f827efe9fa4d88c6b93b926df772b8bf6126e2e9761bfc70d8e73df9fb99f413c63f8db17529ac660abea5ff6cb9e656b829386826d4139423c8567 SHA512 36b596296e99a9f2cd14943d1c03fcc6cef10be3dde5de2e308302f58c04bf5fa936f821b9578eb337719a10179ebf811e1cc420e71cacf4cf27544791f6b906
+EBUILD libarchive-3.4.0.ebuild 3743 BLAKE2B ad53026271c50eb521b135a54a16645e9e58b594f94af7c10818379b16a141df9babcc410c0082dcc08a5d0d5bb0d8bbe2b8bcc4281d91faecdbc8b3a0f4b3f7 SHA512 8b19c6166dfe2b8b921396bcd771ff53fa2e58cedab0b77182c76b7a5bd97cf6a4374fb3cd184eaddd23b4858ec531af3545f150049463142484dd5b7aea5338
MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild
index e4dee241b418..0c7029be909e 100644
--- a/app-arch/libarchive/libarchive-3.4.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
RDEPEND="
diff --git a/app-arch/libpar2/Manifest b/app-arch/libpar2/Manifest
index 4e86ecc99a5a..697036c207c9 100644
--- a/app-arch/libpar2/Manifest
+++ b/app-arch/libpar2/Manifest
@@ -1,3 +1,3 @@
DIST libpar2-0.4.tar.gz 516613 BLAKE2B d5102ca9b9a25c77bc63524c04b0cb25ad3dd44e63dc0fd92ac7744d00b0044b79df4737428350ff2ea4f65acb212bac8f983d299bb5a934fc7f916994b61a98 SHA512 36d6f91bb3ea94dca1c4c45be41d37662a928bed39edace1a38ae0ad167804308d252a9fe49c2babb194b297fa4671654532add3758b7d7d528161cdceb278e6
EBUILD libpar2-0.4.ebuild 673 BLAKE2B 2c57135fe1ccb2d1668b4c502c853c01f07cecd7821b11df2839eabe652ae1235306d711f03c52aa4491e7ad94afa6aade5e0ab22334ab154a479b478214e52a SHA512 756949f83e667ca42be78185128ceb7183c9dd1010f1efc37d7faccdfac9872acfbcff1bf606e0aa80d319a66dc725734dfbe78371e515f1117fe89455fd741b
-MISC metadata.xml 331 BLAKE2B 0a33f3aec55ef11330ecae9aa5e55fca141fe1cd07f100f846be7d8b6ff29da81caae4df35e9ae995683633b5de8c225628d084958a799ff6cefe62d0a790a59 SHA512 4f615121ef89e72ea1c0a9a38e197ffef0edcd9603ec716e56c933acb24e5958f574a911319d389d94b4faba8fb4815aae7dbe46979f9d922cb71e2352162191
+MISC metadata.xml 247 BLAKE2B f36ba7172ecfbb46f1f1a1f6c6015e300c067f625c1b0592ccc92d7337d8d4776448ae2cb804d418d1b06386ac73783ec50ef3270073515183404d3da22112c7 SHA512 e2f319264d0fe33bad3c55c2acb1173279825f3f03bb37b605fba2aed087fe288edce6f6eff7562349123a9a4c6d319961c702c708f2f35a1f3f0342301d6cae
diff --git a/app-arch/libpar2/metadata.xml b/app-arch/libpar2/metadata.xml
index 1cb3032538b0..679fb9b86733 100644
--- a/app-arch/libpar2/metadata.xml
+++ b/app-arch/libpar2/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
libpar2
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 88149e8439f8..226560973733 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,5 +1,5 @@
DIST ncompress-4.2.4.4.tar.gz 32571 BLAKE2B 6b404b350e46635856f7329a1e5eefcf38ce1f16137c35ca2226ab8add12ff4d94a289642b0a3f2ff59cc584c2f54bc330756df63f41fd34c958eb173b8eccba SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be
DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
EBUILD ncompress-4.2.4.4.ebuild 717 BLAKE2B e7674f1828c2887ebbd0e19df0511055f318eda353a379d7d5e695c9e54b88024cd1e7a1edc20dcfa5d6f3473622d446fde1680901e732d27b799d2e72a8de13 SHA512 b7190ac40d5e63ee28697cc49f9678195e189efc1f23fefe088230b82b314bfba274dea7fe2149b84f87fedf7f04e38676f1f9293690e358682fbc002227201d
-EBUILD ncompress-4.2.4.5.ebuild 717 BLAKE2B 24530dc9b4495e0f8c0ae05b739894106dcdf668727cff825201977e6e5db1b581c94da4127fb6f97017e7f1a47d14e06e432e4d50328482c4483caf0d17545d SHA512 aa28ed7b06cc7343feadaef80a487d95de9e05e587b8533da684f19f847be8df6994729872ed72bf67821d676cf21fd15151cde25054a42fac6f5690a778caf8
+EBUILD ncompress-4.2.4.5.ebuild 716 BLAKE2B 1e180fd841b7ff5bbe2bdd0cc9b08c126a090e584dee5589500922927a89f069c389187c93cfff1ce7314574a6a4cf23a3abe834c2dd28443ab59bb9d900278f SHA512 7d97921fe9a236b43814f413fa503169f8c5cede193bd26ffdf5f785aa14223177493b956a26f8deb268bba47392f64e2afa0d889e3bfffec82725428d7306b6
MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index 1607df227059..6019ac2140b8 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_compile() {
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index b68caf9eb0ed..b18cc8074b5e 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -3,5 +3,5 @@ DIST par2cmdline-0.7.4.tar.bz2 3129835 BLAKE2B 5cdc03a71d3db04928eb818037f66e4d6
DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
EBUILD par2cmdline-0.7.3.ebuild 782 BLAKE2B e47827829b2b16d5c92913d1408fba4732a398e34fe5e6eb2735a9254919a3de757568ca02af751e17bab4b23eb4e3bb984169da9d96eee84be0d7b57f3d7e67 SHA512 ab03cd0dbac07acbdb43e2a0d681c6e73469ea137ff9bf1f9340f3c85d1823a3ad3e15312682bde3cec2f5f4eadb1605e1a91544e69c809d6f46814d3a4731e6
EBUILD par2cmdline-0.7.4.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
-EBUILD par2cmdline-0.8.0.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
-MISC metadata.xml 425 BLAKE2B f0f51687772e2555fb17f45d60b41cf8350fb6598c35c544ee9e110e8dcfdf89288fb3fd506080f678a25d98e7dc1e8fdc891efbc81a5bad1ee8bdc89466e233 SHA512 9813ec014f97b8c9ead9021596d60d724e5f4427ed266ab430535b172cc50636d623d44648af1d05c532b38299aab49de91d03c6658a937ed724b161f629da8f
+EBUILD par2cmdline-0.8.0.ebuild 781 BLAKE2B 02b2278d62e1d22ce1eb4bf95b3d527f04abd2a0d28ff1f396e8155ab68458177277e753e6d6fa6068b48c9d28c2b7009c6c719fcb8e8149c0d1797debd6c85d SHA512 4632ae21bfc409bb1883e0ec14baec1219ae009fe9a6544d0e53d315dd896b3a9e1ed1b976c2ddbf8c85f1a7e5f3845c8c0a113cbe12ea2f0bd57eb5222a206c
+MISC metadata.xml 312 BLAKE2B 866807207b8dcb08229ab359bf221a77d9ea691eadf983bb99c2852b1b56fb43eac8a34eaa5776e96debc394f8eaa99ac6d215a730def6d2a5d1f672c74e7237 SHA512 575b9efb72218bc82100ef9d466711207c1e24b6ca81f9d31414cb90456d5161b0ffcefbbef16371f3095968463e0fe6528879d1f782b6c7336d16e29d1f9e77
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
index 39157a67ffd1..09a2860b01fe 100644
--- a/app-arch/par2cmdline/metadata.xml
+++ b/app-arch/par2cmdline/metadata.xml
@@ -4,10 +4,6 @@
swegener@gentoo.org
-
- radhermit@gentoo.org
- Tim Harder
-
Parchive/par2cmdline
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
index 5dfb2290f555..8084c6df5416 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="openmp"
DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 1256deb6abfc..7a2e0d04beca 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
EBUILD pigz-2.4.ebuild 960 BLAKE2B 9e3186757ee7fbde628e318a721dda2388242db71755ee9852f3c1d5cb5755e7ae2154e70a0fa6446c76cadd637dfdbc02b7311dea860f203b90749620f9d08f SHA512 a6c4239dce45de1f74acff365def819c3537dba716e4fd76be1d08ddf8cbf9717d9d9d37c2cb8a778dfcaaa76c98bbd9e3c6c2896e0e12515f8624e741ba2c4c
-MISC metadata.xml 577 BLAKE2B 00e7995f3a4724227abc66b81ff56b83dd41b3ed173e80267b6d739f7db140f19b31c81420177e430ded0f9f38cf8c7cc527bf092d438ce5cb3ab867da1b6695 SHA512 5f825b9a9b0570d7687f2296e36f8dae325755e2d5895701cf621f2c01ec8db892932811f4b151231dab547380d96d234f715537a911887ce9bf144b7cf54532
+MISC metadata.xml 582 BLAKE2B 8eda723dcedcc22db1de0108f5df5d2c17e2be1a699a27c98f8d59e7af5e5392db29d60a1a5c269341924dfcdaaf48d2679ebfd59fcef9dcc200d35451ec7d04 SHA512 f0484c020eb5fd92997e667764389c25f8dc35f3406a4e1f624ed7a59a30aa0e5b75cb356e85b405a8faf04a7f7a7b2c97ad8c4463051d219cf652049d0c8e60
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 09caf7efa571..185deaf2583e 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -2,8 +2,8 @@
- radhermit@gentoo.org
- Tim Harder
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
A parallel implementation of gzip for modern
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index c15b986c3d44..6bdbf28fc023 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,11 +1,9 @@
AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
-DIST unrar-5.8.1.tar.gz 228917 BLAKE2B 4b34fd35a371ea2784af0968a95270b04afbefd4968c74c44e88d7b79598fe05b01c331ce730cbfd2535d5a713049e7f4dfbd38d28266e957ae9995cf8ce54b3 SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612
-DIST unrar-5.8.2.tar.gz 229116 BLAKE2B 88bcc90e36d231dd35b066495967a116571ce25b6cc6ee73e84ded5a56fd74662e0c9da10a7e7025d2cecbdd1e47d84f303207b6a466c1488168f523e7fb23fd SHA512 09f12f141925aa99d74d4a0a0f3bacdd5b53d174473346de317cf95c1f560ef4bad445f14d81d313f8a34e8400df6a76709d068b9cd23433d1f638935185ab0d
DIST unrar-5.8.3.tar.gz 229162 BLAKE2B 1515af301fdcbbe02d1ebf487b1a0ab7849919e0065f223ec78e69cf5fb9436778f184c9cdead927c37d41ddf779bc7c539259cc60b1e9db19225762af17ed27 SHA512 32ab5cd9135d968f2e908975e72e716f5aa8911ee53fbcade6cf9783eb22330dc0114baf5db148c223015498d28fa4c60446e0ccd8108856c6d089117a147669
+DIST unrar-5.8.4.tar.gz 229618 BLAKE2B 3b163a7d3a13dd5864ae729eef6c6bc171e45b0db4e716660b24a14ecf035572fdd1dc44a9c59d07d9fde87255b941f45d5b2e0aeffac3a53b021dc1cbd4b0f1 SHA512 dd3502662b443f05c7bd01a50806b9e3443f9bbba7d88ee8fe9ca0d671d93b0db8956b822ec25b9d827941313ef2ec5608f15934bab91cecbab1ccea9ae8129e
EBUILD unrar-5.7.5.ebuild 1860 BLAKE2B 4f15915fc48ee749a8c2b488fac6377446007354b1f5cf32c3ef277c8ad7618520bb49c266da733a850262bab18ccb98eadf4f3718808021a44682eb6775b996 SHA512 8a369ec848020f91ff1bd6f11a01b4d0970620f7927ad85b17140d2c30a4e656d0d1967ed7eca56071e109911d3ef1c438cce0dacbce64fcd3da2edcad76cc45
-EBUILD unrar-5.8.1.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
-EBUILD unrar-5.8.2.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
EBUILD unrar-5.8.3.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
+EBUILD unrar-5.8.4.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.8.2.ebuild b/app-arch/unrar/unrar-5.8.2.ebuild
deleted file mode 100644
index 7fce116316f4..000000000000
--- a/app-arch/unrar/unrar-5.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.5-build.patch
- "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
- default
-
- local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
- else
- sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
- fi
- sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
- mkdir -p build-{lib,bin}
- printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
- cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
- unrar_make() {
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
- }
-
- unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
- unrar_make -C build-bin
-}
-
-src_install() {
- dobin build-bin/unrar
- dodoc readme.txt
-
- dolib.so build-lib/libunrar*
-
- insinto /usr/include/libunrar${PV%.*.*}
- doins *.hpp
- dosym libunrar${PV%.*.*} /usr/include/libunrar
-
- find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-5.8.1.ebuild b/app-arch/unrar/unrar-5.8.4.ebuild
similarity index 100%
rename from app-arch/unrar/unrar-5.8.1.ebuild
rename to app-arch/unrar/unrar-5.8.4.ebuild
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 233c436ae7b3..bb6834cf29b7 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
index 2e7813694ead..c091fc640399 100644
--- a/app-backup/bup/Manifest
+++ b/app-backup/bup/Manifest
@@ -1,6 +1,4 @@
AUX bup-0.29.2-sitedir.patch 1186 BLAKE2B ae56baf75e32994afc6dfad386f19edfeed6d02918c572dfef2f4ecbe6c13c9e4e9a78819dbeae21c32fba1f7914b1ea43f41f52c2770c738e724ebe52031ff8 SHA512 1d1848bc24cc1216fde35ed3eabef52a0cef0a6c7c0be7d51d3829f413e0a26abd3441fc958e3461bbc5faad8b97e903e6f86f1de418b4d211996f213db5e37e
-DIST bup-0.28.1.tar.gz 377712 BLAKE2B b469af7b40807e1462c603c03078fc4e048fc300f74dccba9db4ee9d5b1cd385b3092c2bcc08b60ba798e4f401953ccb3217275c6afb3ebf8040e6e507fde9fd SHA512 b27a94eeee86366f9f97081611d8e0443686ed8c4070d45729ad4efe1d48ee9f528d3257bfd5d37d6243927f5b63d6b613bf5ae2c39117012979ccd5ccecf9d2
DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf
-EBUILD bup-0.28.1.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
EBUILD bup-0.29.2.ebuild 1243 BLAKE2B d291de78398bde7d4884a9d125d157db092f4ca5d21fdfedfc7a6278f20fc9ea39b6fcb04184214a735129b146257eb90db0d1065c87dddb983ce74971b51806 SHA512 cdee0ec7fbffc2a4bcccc6de0456a361eb6c9c189da936678b50cfbaa198638419fcf0d240494afc2ce29f04ed905e48cc953753fbd47e75015d70a0f2581af1
-MISC metadata.xml 404 BLAKE2B be0a8a5d858a23520e0927be152c1defea7c2df55d7f7d83a28652eeee7d0c0762f6b0d0671b0ec684cee2b1efdea864ca5a20167fb1d4396d427a9ae75f1185 SHA512 62266b2c5b320859e4283c23aac6c325036f1a83b51a314078ccad2b0e9b9360690e34d87f387bea86e8b98ecf1b9851744a57744c478bd7040b42adea517b81
+MISC metadata.xml 325 BLAKE2B 02b15157395396dd68b8020bfe90ee4c1a3f8dd6a093ee6a9873a34320bddb32a937d91bf509b363e4207fe361fee0115311656872d49523b55703d6ebf9704d SHA512 00eda495637d81b12b965a3890437a35030e3ea246d81615b6e4b598bcbe991343e5abf03cfae5072d0b0a58ec2ad9d4f1591a12907563b537c62c3f9119b177
diff --git a/app-backup/bup/bup-0.28.1.ebuild b/app-backup/bup/bup-0.28.1.ebuild
deleted file mode 100644
index f1071883fb22..000000000000
--- a/app-backup/bup/bup-0.28.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A highly efficient backup system based on the git packfile format"
-HOMEPAGE="https://bup.github.io/ https://github.com/bup/bup"
-SRC_URI="https://github.com/bup/bup/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test web"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-arch/par2cmdline
- dev-python/fuse-python[${PYTHON_USEDEP}]
- dev-python/pylibacl[${PYTHON_USEDEP}]
- dev-python/pyxattr[${PYTHON_USEDEP}]
- web? ( www-servers/tornado[${PYTHON_USEDEP}] )
- sys-libs/readline:0
- dev-vcs/git"
-DEPEND="${RDEPEND}
- test? (
- dev-lang/perl
- net-misc/rsync
- )
- app-text/pandoc
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-src_prepare() {
- default
-
- sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
- -i Makefile || die
-}
-
-src_configure() {
- ./configure || die
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr LIBDIR="/usr/$(get_libdir)/bup" DOCDIR="/usr/share/${PF}" install
- python_fix_shebang "${ED}"
- python_optimize "${ED}"
-}
diff --git a/app-backup/bup/metadata.xml b/app-backup/bup/metadata.xml
index 958844441602..1d0a6394f969 100644
--- a/app-backup/bup/metadata.xml
+++ b/app-backup/bup/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 84844e638073..54f74b24b794 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -5,4 +5,4 @@ DIST duplicity-0.7.19.tar.gz 1727321 BLAKE2B 6441a2ce777b3b08c52ede8602a73080be3
EBUILD duplicity-0.7.10.ebuild 1267 BLAKE2B cdd85dc1c3e0aa64c95f74f24ff7001856b455505ae51e1fa6f2a3abcc22ee1fabcabc28c9b3295f8aab1b710e9c4562e6014614a335c71971920ca4f83b70d6 SHA512 0d54e0a7573eb24f9a5d687605dea86db8ea341a64a3a1c3b9c6e633ea41e126d9ca73709e49f6c40b73aef1cea27b8ba964194010fd0ed28b0204c1ff658355
EBUILD duplicity-0.7.12.ebuild 1273 BLAKE2B a50c92e242971f614628e35f7a5aae330da3135b90cef0f6c9aea6a757b25754786b2d77b5ef1fce553b23a73a3a53b537250ede4dc5efd6dcf5c60fd9dc0a45 SHA512 ed81b75b9f407f33dd75450bcde00b94a5dc17ab6cb51808fef872d4d4d19b29f676aef440ba69b24835e1eab5e2b69196b8d8deb983f36916863be12b099cc7
EBUILD duplicity-0.7.19.ebuild 1268 BLAKE2B dc3546c00b5d333b9675d8d75bdfdb7ed5043f7909bc814be17b3f49328facd92d75aa30aaddcd50a6630327a85e0d5d1c5434282dafd3aa0045279130272d28 SHA512 e7b5ce1870df96a4a0a5fe0e4a78057afdea70966a478d5156a48254d6b6fbe2ff77b770919e870e0bb36984e724b97548d78a58ddf1bf8e7c01a86a5aebb1d6
-MISC metadata.xml 438 BLAKE2B 2ff1bcc823e556bb5371994032c2db75021b8d32d4e4d67ec89d0c1c92aea9cc8a50b01bce6a09dc5b9f0cbfe741267b40a6749b1d5ccb5258f31b3ccda233fb SHA512 d21a61eaada281cf520260d2868ef1dd3ddffa5d1dc6bc2feaf5c2daa8f8fda977d3527de0b5a7b862b18df7f0bbf6371bcb736fe751e5979ec95a66640e4756
+MISC metadata.xml 331 BLAKE2B 16d79a36ff3ea61821cee414d23ffd529912bb5d983e1c4229cc476077023c2cc672916fe87655d776bb4ee7c7133b47c1e6d9b378eb31b4f3ba33b8a49e43c1 SHA512 01bd526169862afeb5c7cfdbcce5f990c7eb35b29280e9e01de76b06b557645065bb7a40d1994ec8ef601443a21ac40446881f684961e335c26b26698718c813
diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml
index b9ff658008bc..6efa6d440510 100644
--- a/app-backup/duplicity/metadata.xml
+++ b/app-backup/duplicity/metadata.xml
@@ -1,10 +1,6 @@
-
- radhermit@gentoo.org
- Tim Harder
-
rich0@gentoo.org
Rich Freeman
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 75730ab9a0b9..20accf20d562 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 9fa720fcbe0f..b380924c276c 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,5 @@
DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
DIST cdemu-daemon-3.2.3.tar.bz2 83130 BLAKE2B 2be64beb662ebeb51d75a34bccece5f5eede8abe447d4d0be60bf1bbe4e1f9ac6eeaa67783f763f4966571cf4e13fb9b61610ead40d8a13842400f48bb3b1618 SHA512 a1c7fdea9e32e71591a29de98f28dd4d2d0ffb972861916ab287ff33f5f070da8fcc113b602e4b02fd08a72f7361ae85440ef5eb156e312a849cd716207026a7
EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
-EBUILD cdemu-daemon-3.2.3.ebuild 1175 BLAKE2B cecc90f640cd974e3cdb4720c4757113d1c94663a54f7d67286727b1dca9071ce5427259462eb3d356dc266667a839f879f7604a113ccf2e2972c76d123984df SHA512 14cbc522f9cf92e979f58b485c8e61bd21070d42416e2f54f3bb7ef29adca55067c47722ab7b5302c5cf395edbb0ab22a6b4d2efede68b11cadf50f6d8887d92
+EBUILD cdemu-daemon-3.2.3.ebuild 1174 BLAKE2B acc9567e6546ad5a43139b662f7bf11f0859884558f17bd8703213e53a63ecf578f229f683035a7da5d0f6aa5fb40d2bbf0b22f43bd5cb2790d66156dc58185c SHA512 2c59f3472f7c7663f24baf55e53db9d474201b7ca20ac7ae211907e5ca7e07e27416760cafd741f5c7a51418db91485e5cca586d4d7605cae336a86b163a9462
MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
index 1350c2f5c681..b538cf3f7ce7 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND=">=dev-libs/glib-2.38:2
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 648d80f1ecb5..9abcc54ec1fe 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -3,5 +3,5 @@ DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a2646
DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
EBUILD cdemu-3.2.1.ebuild 1081 BLAKE2B 33bb3596f62c2df6265e4313dd0fa84e52fb73d64cdcc938650c9a340b7b6c19505acaae17b4c61080bbdc578a834ac80b90f2027ee0462f345f66d1895f41bf SHA512 95642bbf73fd7a54dae54a4408275be33a55545b91af88db0e5e6890f03433d079309d0a4f28c32b44fa85332f354657391453fa57aedf623af8f6b77bbc4ea0
EBUILD cdemu-3.2.2.ebuild 1081 BLAKE2B 70bfa6055b171bb1502ecf1a2e00564cf1c2a9699689f6e35cf65410e14025db42bc567162e000ee40d32a881e2f01c13d2adf7a0a775ade15bd546367c9b406 SHA512 84b0acd9dab2d99032de8bfe366455c4e12f4bd07175fc71d24881ee23f81a132da5e84254bc3873723159aacf67a7ca87ed929e9e32f603649ec4294e03d62f
-EBUILD cdemu-3.2.3.ebuild 1119 BLAKE2B dee60330137faf7f4e59a4969cfcab868ae073d356f401f90dae14ebca364ff8c20793de04488f0bffd3736a1a9c40e236f6a2403e2a027d87e1bf83d7765f38 SHA512 5d7546c59d2af2a0338ab15c1cd767ccafed8fae90e91f63b93691fc28b698bb12e7eb29c03ca8a6d53745b1eb1937d7e490d04f63f771ba79f18460e41256ff
+EBUILD cdemu-3.2.3.ebuild 1118 BLAKE2B 30145b51fe5903d9f43fe4c734ae9303e8cd88b93200979e0019980f545fda87487de4b6c1494e5a47f0fff50bc4e1bab66f047e748e659c523d4e9e4aa452fa SHA512 bbd872e3756bec14c44708c65e84508daef94befb097eca6e98753f66b22b4be5ecde06a082f2765cca2dae7166b5180e46404c9a858b3619b17227cd47b72ba
MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
index 690af4a20977..0929becda5a1 100644
--- a/app-cdr/cdemu/cdemu-3.2.3.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="+cdemu-daemon"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 22bc29d97b4c..97f39431752f 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -3,5 +3,5 @@ DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc
DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
EBUILD gcdemu-3.2.1.ebuild 1124 BLAKE2B ca3230f358917866a2fb5708b459b33eeca45ea23a16d7c51c53b8b18a2ae3615f39a6a6f12d8fcc7a4be0a54155907dec68eddd5bb4b731c4fb5cb74eb54f37 SHA512 bbdd46cae47b5f06d428f0131403b2b2bb39e000f02035d298155d7c81bf178c5cafbbf612a4abd34b656b835ecd3bb68643e56efd507befc7734dccdc7ba380
EBUILD gcdemu-3.2.2.ebuild 1124 BLAKE2B 6e850dab70659ad96f92e4fd7a7b8a8da960633f0eb1d953aa3e8ef50f98fb15a102e49bcda067beabcd28ba1269196c7db351f17d572e120956add4aff9c25b SHA512 0c2d1c5db61774cd66944f1dcdc79e69900a78b0cda0440ae532b22c1565778e7697a19dbc90a9cadcf7d48aae811873f688fb634e54973c8668a120df390e81
-EBUILD gcdemu-3.2.3.ebuild 1153 BLAKE2B e5d9507480086ed92b0db30c0335ba37f0659d1e0612c0896560e0ca40cf59320b9ac90e00b8b53dd5d241de379cd5e93da47a1bc304dadd8c9c580cf6182147 SHA512 bcd419a25a55edb22901d00212673530ed5b4bc5df1d4b7eb6e676d40cfcf601589d7114148bec0d8e967dd381da9223dd719d0ec0911c5388c95730241b5a17
+EBUILD gcdemu-3.2.3.ebuild 1152 BLAKE2B 3f054867d54b70f0532f2505302a82ff39632b71c5ddef830428ccb6175990ed24f932e6b678aed89dd664c315d246ccb42e094c1a73b45e971f57a78139d4ad SHA512 c5570d54e35e2ed50d1164867e1b88ef6e3ab8e7fa3daefccc1ee0554516686fc0bc05eb7d6d458c148d821417eb83ecefc0b84f16811d0818aefee7648f98b9
MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
index ebf608985e2a..c5330923b91f 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index e74f04700237..3b94e56e2fea 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,3 +1,3 @@
DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
-EBUILD isoimagewriter-0.8.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
+EBUILD isoimagewriter-0.8.ebuild 669 BLAKE2B 4a50386e2413db78572acf5f65d05716713984069686ff87612af73fbc3f192276bc9d9136a5a03f08faf8af1be7d73bf60359d1b509877103b055d40ed60ae0 SHA512 e66929d8f1e74244a5746fd4229fc30aa2c38af19ee3fb21119faa06da05503906e2479451c9bed17be298915d5233ee286ef19af82fe8fbad8129670fd56b82
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
index 904e057d83fd..023d9ca94133 100644
--- a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
@@ -3,23 +3,29 @@
EAPI=7
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Write hybrid ISO files onto a USB disk"
-HOMEPAGE="http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+HOMEPAGE="https://community.kde.org/ISOImageWriter"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
LICENSE="GPL-3"
-KEYWORDS="~amd64"
+SLOT="5"
IUSE=""
DEPEND="
- $(add_frameworks_dep kauth)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
app-crypt/gpgme[cxx,qt5]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
virtual/libudev:=
"
RDEPEND="${DEPEND}"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 13a0c0573b15..3847cedcaefd 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 55f06acda7af..70b59ca3dece 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,9 +1,6 @@
AUX 90-ekeyd.rules 691 BLAKE2B 8c36ca2a6228e2fd6b203513a5f23f3e9b44193c46127c46def7110b0a3a3e020e6959cb4c3dd8bdbe0c057e389c37326011083aae0104b91f247a2932a3c915 SHA512 12d949e90af31992ac671ae42172a2169592dfba9b921ed684a37e7fe330bef44abb2c0a1a5df63ddde940b00fb10fa9cfba493c69614ce0f10aba4de78ea6d3
AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d853671e3670819e730648b12658b8364fafc39b41cdd1601a8ba1471c7f23b1c8cd9a330a7169049e890420 SHA512 3e8db66552a5c04045226debbf6a7add01301bf98bb26c48033f4bceacde82f25e449fced2d46667009165e9d2f327134e6c963142295d7ef065eaa47b383393
AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
-AUX ekey-ulusbd.conf.2 495 BLAKE2B 16ff2a3dec83f6623a2ed714e18db8c21885014c99d6409c39ec0745979b3ef10ae693114acdcda6697e1bfce9d9ed3cceed8abb2b4319f8ae29904c6e69a369 SHA512 9d4b5d594790d34ed4b513a00b60518c0770ccba87b159e1f9eaac382275658e53f5274ee24743e8d103bbe4a2351ce865157013e0dfeefa32e37fe4d2348677
-AUX ekey-ulusbd.init.2 900 BLAKE2B a9aa95448ff5d65d18689489bc14a2ddedc8f5ac858d28d569a58ae960196342c86893f903975bbe86fd9ea8a27950bbd36df91061fd8f8e146285bb18d27e51 SHA512 cae15995b8d8b66ef4209fe3cd8a14edcc2645b10dbb6f4da54e929a9347db675abcf9232841863c14a450789768247eda5929667021b5bada041365fbc1470d
-AUX ekeyd-1.1.4-gentoo.patch 6565 BLAKE2B b7fc5fe83eeb0d8f56d2d2a4ed00970502cac53d5c5e4c485b2b25af672b74f3c263c944a4b2abb2b710655f80276ed6aceec59b22ed76d72d6b280ffd1731d6 SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875
AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2 b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
deleted file mode 100644
index 15a641fa3ffe..000000000000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The userland USB daemon has to know the USB path of the EntopyKey to
-# work properly; in alternative to providing these statically, they
-# can be found by giving the serial of the key.
-#
-# The serial will also be used to set the default path to open the
-# socket to.
-
-EKEY_SERIAL=""
-#USB_BUS=""
-#USB_DEV=""
-
-# this is set by default
-# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init.2 b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
deleted file mode 100644
index ef52db2a6685..000000000000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.init.2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
- INSTANCE="ekey-ulusbd"
-fi
-
-: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
-
-description="EntropyKey Userland USB Daemon"
-
-pidfile=/var/run/$SVCNAME.pid
-command=/usr/libexec/ekey-ulusbd
-command_args="-P ${pidfile} -p ${SOCKET_PATH}"
-
-depend() {
- need localmount
-}
-
-start() {
- if [ -z ${USB_BUS} ]; then
- set -- $(lsusb -v -d 20df:0001 | \
- egrep '(^Bus|iSerial)' | \
- grep -B1 "${EKEY_SERIAL}" | \
- head -n 1 | \
- cut -c 5-7,15-18)
- USB_BUS=$1
- USB_DEV=$2
- fi
-
- ebegin "Starting ${description}"
- start-stop-daemon \
- --start --pidfile ${pidfile} \
- --exec ${command} -- \
- ${command_args} \
- -b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
- eend $?
-}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
deleted file mode 100644
index f1491362e83f..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: ekeyd-1.1.4/host/ekeyd.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekeyd.c
-+++ ekeyd-1.1.4/host/ekeyd.c
-@@ -209,7 +209,7 @@ open_foldback_output(void)
- return (output_stream != NULL);
- }
-
--static const char *usage=
-+static const char usage[]=
- "Usage: %s [-f ] [-p ] [-v] [-h]\n"
- "Entropy Key Daemon\n\n"
- "\t-f Read configuration from configfile\n"
-Index: ekeyd-1.1.4/host/ekey-setkey.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekey-setkey.c
-+++ ekeyd-1.1.4/host/ekey-setkey.c
-@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
- return mac;
- }
-
--static const char *usage =
-+static const char usage[] =
- "Usage: %s [-d] [-h] [-n] [-f ] [-m ]\n"
- " [-s ] \n"
- "Entropy key device long term session key tool\n\n"
-Index: ekeyd-1.1.4/host/ekey-ulusbd.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekey-ulusbd.c
-+++ ekeyd-1.1.4/host/ekey-ulusbd.c
-@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
-
- #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
- if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
-- if (r != -ENODATA) {
-+ /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
-+ if (r != -ENODATA && r != -ENOENT) {
- fprintf(stderr,
- "Unable to detach Entropy Key at %s/%s from kernel\n",
- busmatch, devmatch);
-Index: ekeyd-1.1.4/udev/entropykey.sh
-===================================================================
---- ekeyd-1.1.4.orig/udev/entropykey.sh
-+++ ekeyd-1.1.4/udev/entropykey.sh
-@@ -19,9 +19,9 @@ wait_for_usb () {
- COUNTER=$(( ${COUNTER} + 1 ))
- test ${COUNTER} -ge 10 && exit 1
- done
-- $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
-+ /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
- sleep 1
-- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
-+ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
- exit 0
- }
-
-@@ -34,18 +34,18 @@ else
- if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
- exit 0
- fi
-- if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
-- kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
-+ if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
-+ kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
- fi
-- mkdir -p /var/run/entropykeys
-+ mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
- wait_for_usb &
- exit 0
- fi
- # Update ekeyd with device operation
-- $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
-+ $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
- if test "x$ACTION" = "xremove"; then
-- rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
-- rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
-+ rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
-+ rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
- fi
- fi
-
-Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
-===================================================================
---- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules
-+++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
-@@ -9,10 +9,10 @@
- # For licence terms refer to the COPYING file distributed with the source.
-
- # Detect an Entropy Key being inserted and add info values to environment
--ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
-+ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
-
- # Detect an Entropy Key being inserted and extract serial number
--ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
-+ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
-
- # Add the /dev/entropykey/ symbolic link
- ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
-Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
-===================================================================
---- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey-uds.rules
-+++ ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
-@@ -9,7 +9,7 @@
- # For licence terms refer to the COPYING file.
-
- # Detect an Entropy Key being inserted and extract serial number
--ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
-+ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
-
- # And tell the ekeyd about the device action.
- ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
-Index: ekeyd-1.1.4/host/Makefile
-===================================================================
---- ekeyd-1.1.4.orig/host/Makefile
-+++ ekeyd-1.1.4/host/Makefile
-@@ -107,7 +107,7 @@ OPT ?= -O2
- CFLAGS += $(INCLUDES)
- CFLAGS += -g -Wall $(OPT)
- CFLAGS += -fno-strict-aliasing
--CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
-+CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
- CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
- CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
- CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
-@@ -148,7 +148,7 @@ daemonise_ulusbd.o: daemonise.c
- $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
-
- egd-linux: egd-linux.o daemonise.o
-- $(CC) $(CFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-
- ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index a3568aefdece..8391d88a67fc 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 1010 BLAKE2B 77ac6c43417fcdbfd8b67c3567d11b68188643f11935d3905ddd2fca0061b2681015c7e8ed5438a8f4d4e5f52d4046fae60f85d7b850e0a478e5d689175a5167 SHA512 214952928019988ab58f457161becf1cf86af888dbdf8b0cbe7db4569895c0fd900a3830092e5d374d0431d7be718ceefda44a624a0ae8e69beeb0c04cf5f854
+EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B 1f8127f94b0c3c79afb1c4f9344320fd7a62c89596f1caa4ef84fc60c62200d67cc8fce06ed65e065172ed892ef028d040e925a826873e94b49fe6be36fdf3ef SHA512 0ce333852db58648d251019e79df22374f37c56d3c9489552e99e4bdddec97820264d8b58a9fa98b8a805cca1963895445ebf92dfaba83051d129587388eea56
MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index 29db3f8f08ff..e516259e8f5b 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
IUSE="static-libs"
S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
index 7ea219167b97..68fea2abab05 100644
--- a/app-crypt/kstart/Manifest
+++ b/app-crypt/kstart/Manifest
@@ -1,5 +1,3 @@
-DIST kstart-4.1.tar.gz 269215 BLAKE2B 0d979953206e1598c121e21b2c52a123a4b5d93872ce8292638e21c5d9a4c1be0345990f1a74fa60e9a5ce58d6f166cca5ae525f97c67f7a908d73e7657d6fe8 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc
DIST kstart-4.2.tar.gz 296651 BLAKE2B 127bf28ef538681d188ae79ed67cedaa7d9022c1fe6741b3486ce7d5901c4a77d0aec7d00164240a79ffc70b56dd7fdeaf42e76dd2b02effe79bcad41ad8e271 SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552
-EBUILD kstart-4.1.ebuild 706 BLAKE2B 3f43a948aa353100c667e7629132bdbcf22d076d207442a7e0c97b690009dc4d3054811c1ea98af7046182227fb4d5024d1bb24b64e9848b7b983b4d8d6b7865 SHA512 2b8865c5460966d049363d1ddef18db1abbadb1c7e527b9a22dfcd4eac9eca6938485772756ad906183e076dee9d29ef459c2b877335196f81033bf1c5f01c98
EBUILD kstart-4.2.ebuild 661 BLAKE2B a317453fee5da7a9601e7c9b6ce4f04670a6e66f52e644b329bfa7712d94921aec81c239300ee986fc61077b417384cbd4ab13185d51242a157ca29d29d75a33 SHA512 90f6cfc5bc0b693e5af1f14d7c13d0fac4f6cf345c8ae1af9f6bd19b7ba3cae83194d9d0d253e702ca3275f24e7ae36d2ff058a66ad1714220f9efafe6507a63
MISC metadata.xml 807 BLAKE2B 9c7c0283dce5943b74d5d57b21fdfb11cd2f9b994ca1930e62997576e20e3a74cb468565824c44051b67fd87b44f70f08defcd834d2dc03e98b5de62289cf08c SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
deleted file mode 100644
index c80974b18abb..000000000000
--- a/app-crypt/kstart/kstart-4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
-automatically"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
-SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
-
-LICENSE="|| ( MIT Stanford ISC )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="afs"
-
-DEPEND="virtual/krb5
- afs? ( net-fs/openafs )"
-RDEPEND="$DEPEND"
-
-src_configure() {
- econf \
- --enable-reduced-depends \
- "$(use_with afs)" \
- "$(use_enable afs setpag)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doman k5start.1 krenew.1
- dodoc README NEWS TODO examples/*
-}
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 02773780a790..600426635066 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,6 +1,6 @@
DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
-EBUILD libb2-0.98.1-r2.ebuild 1813 BLAKE2B b33502ee6a1d2b4c5d5677eb20a3bed9fa5baedde38ca29959e3099801b4ac5054d5a5673bf019c185bad9dda0126564c2bf9feddc26a711e2c14c571ab24292 SHA512 dc73572def3a5351ce3bac09696baac93523b50c1f4b1e42343ec93112f58b342f1a7a1b6c450889d32249d8f48dd4de19516a8a6c080bfa1a51e618e18056b4
+EBUILD libb2-0.98.1-r2.ebuild 1812 BLAKE2B 01c49295346ecf7c2f80f3a689176b28ae60fd577bf0b51e76c0d227c502c93f06d90c2959de77df4c27d9c4f219443f201a4cc43a64e6f3ff35966c65ddcd43 SHA512 d1855184fca4bcf094b0ccbba0d5e5d25df28193e208b9df8208048e841358a7c2d7239635e8bc92a44e1f21ce03cf9b2ebf0161dc2890a92ec15b6c8884f40c
EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 120f51ac1f37..56d05cc6f86b 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
diff --git a/app-crypt/md4sum/Manifest b/app-crypt/md4sum/Manifest
index 9823e490de38..4a738bc57d95 100644
--- a/app-crypt/md4sum/Manifest
+++ b/app-crypt/md4sum/Manifest
@@ -1,5 +1,4 @@
AUX md4sum-fix-out-of-bounds-write.diff 271 BLAKE2B 44573278991d38979ca6f7d18b51be2d9f4150b1491c0650b0ae99d203be475a9c15bfcbdba1dab557a5467aff3c78a16b098d417905b24270164a9969d81ff3 SHA512 bcf06b6da80b67965547d359774c4462516dd69d36ed84723d9baaa93472405ed4d790ce687affa148be39157137ef46399e355540c18271f9164318f7731d65
DIST md4sum-0.02.03.tar.gz 26819 BLAKE2B 6e7fb76a21d13276a7444e1c1d1d0a05e90399dc7a99b3e2e6d24d1dc46f45b086b99d00e4c9e1821c4a82a9fe985e4823a235e254abba475bd639f98536aea6 SHA512 5a05760aa6a770d9f55a41e42bdf6801dcd67bc804ead5bd84aecc48e5ee5a7c8b01d4a1e1767a4cc1f8695d66ed16c6a1f09b58d236c27db317f227e02e3762
-EBUILD md4sum-0.02.03-r1.ebuild 684 BLAKE2B 95fbc4bae123d46598ec172dfa01b2c8eb7229e8ef4d508483e4240c840043bbb0d78bf7cfbec7c09167bb679c027ddc36a1b7568a20235ef06e04422e6c9da8 SHA512 e6b07aa9a06e94010bc84e3534bb670a2946c0b7b5c503271a6524d4163cb90a55fcc8299ef80394598cebcc3a4674f4db143a9c600725051bfed4fdfb3d06c0
EBUILD md4sum-0.02.03-r2.ebuild 625 BLAKE2B 64d034954e34b51bea2dc9dc85372ece1ee5c5424d155c8dede791cdc28d273b58c9310e469277d4e165077bec785e0b8220f5be2855d9bbf34aaa3f9337b3f1 SHA512 98269dade29e683dbf9e0c044abe08c96b56e21b2754e0bad5a62f26b1d3a2c1e273fb14228da74c91fd1b9659093c3b09bdddb185e9e2c08c30db8865e18374
MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
deleted file mode 100644
index 089194c7affd..000000000000
--- a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="md4 and edonkey hash algorithm tool"
-HOMEPAGE="http://linux.xulin.de/c/"
-SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}/md4sum-fix-out-of-bounds-write.diff"
-}
-
-src_compile() {
- sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" \
- -e "s:install -s:install:g" Makefile
- emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
- mkdir -p "${D}/usr/bin"
- mkdir -p "${D}/usr/share/man/man1"
- einstall || die "einstall failed"
-}
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
index a0356460e3bf..6148cbf50b3d 100644
--- a/app-crypt/seahorse-sharing/Manifest
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -1,3 +1,5 @@
DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 BLAKE2B 5107eb37c57d8311390399fda59d8df76f59afc6b21f107dfb1cb38dd6c68ea25bda619b1898637ff009c0e9f7617b0557b86f0194ee2c8704d804aa9f8827f9 SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c
+DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
EBUILD seahorse-sharing-3.8.0_p20151117.ebuild 1574 BLAKE2B 6ac878db3280b82d833c40fc4f3f8009ec1b607b3dac020e0ae0e560c8762d76cd560f2e04a7ae914eaee3035283fc8abbe38e5a8c4e6cc34d590055d63a368b SHA512 809c041826a217365d5872f710bf51d0f8f99e3704e10916b5a70d56f50a0c282adbae120d51d9baaac0103363de54d95c3cbfb17617c3716185c44825a4d31c
+EBUILD seahorse-sharing-3.8.0_p20181216.ebuild 1505 BLAKE2B fd622edb1ade606341ae6a28950804a0bcbe09f4f7442655d9d344a2d09a3740f6a9ebb29a4a74e6389697bdb49b63f7e57295bab01b6b13caeca30189854178 SHA512 893298589e9f0355098d00f03d7929bf5eb2fd83e7cbd019734cbd5d81800a7651b34377270a051e447727e4f75b93c0aee51c193278472a9165df88fc4e1f95
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
new file mode 100644
index 000000000000..6aea8f21d54c
--- /dev/null
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes" # disable asserts
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
+HOMEPAGE="https://projects.gnome.org/seahorse/"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ app-crypt/seahorse
+ dev-libs/glib:2
+ >=net-dns/avahi-0.6:=[dbus]
+ net-libs/libsoup:2.4
+ >=x11-libs/gtk+-3:3
+
+ >=app-crypt/gpgme-1
+ >=app-crypt/gnupg-1.4
+"
+RDEPEND="${COMMON_DEPEND}
+ !=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-master-58db1e5b8615d74afaa5d888237ef6556368147b"
+
+src_prepare() {
+ DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
+ # Do not pass --enable-tests to configure - package has no tests
+
+ gnome2_src_prepare
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version net-dns/avahi && \
+ ! rc-config list default | grep -q "avahi-daemon" ; then
+ elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+ elog "system, you can start the Avahi daemon by"
+ elog "# /etc/init.d/avahi-daemon start"
+ elog "To start Avahi automatically, add it to the default runlevel:"
+ elog "# rc-update add avahi-daemon default"
+ fi
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9d32a6120fd3..2d53101a1142 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index e9784aa6c10e..e6c68f04f06d 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,4 +1,5 @@
DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
EBUILD myspell-nl-2.10g-r1.ebuild 1068 BLAKE2B 07b5a5187b01c547b9c440abf07dc640087942e8b3dfbc88e53731a34576d207392fce62869d6412cac2f0cd2df8d3f0f43c10677779d2b3647bf789aff829ba SHA512 9f18303300f7113147bec62b6fb9a851244a9c813b11a7b6ceabd381ec22fbaa65a0fff7a0b33bd38a25afda403ae78011209d58996693625bafd193c47fe8a1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD myspell-nl-2.10g-r2.ebuild 1848 BLAKE2B ad15f8890604b8c9c0b56f5b7fa61c65a1d89476ec07c45c42976de5d4e37bd404983115872a9d34198c12feefedc6582ca95939177a2d4829e152189d3b695e SHA512 cdfe793bbec4b8002f0b4f98883be0983f9872d1a204c639fcb3108a6cd5f5fbfc34be5df2a6a252f10b34abfcfce7fd23fa4e544dfca63421b8362a060139ae
+MISC metadata.xml 398 BLAKE2B f047111407075b709cbd357d58cd3446d789614b0a681b143e35f5ccbdd8bf952d343477338d2c20dd3ab5ccdf032451bbb54b1740c7961b8917f913b288798c SHA512 a4952c0811f78c57839110357feb9c82e71b53a47e66c80c7b574c7232ea3ec593f8d7dd8ce6d1015959ff45f4b74d0a9c57947443c916a6a565aa324de94310
diff --git a/app-dicts/myspell-nl/metadata.xml b/app-dicts/myspell-nl/metadata.xml
index 6f49eba8f496..0c4f24fb0663 100644
--- a/app-dicts/myspell-nl/metadata.xml
+++ b/app-dicts/myspell-nl/metadata.xml
@@ -1,5 +1,12 @@
-
+
+ wimmuskee@gmail.com
+ Wim Muskee
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
new file mode 100644
index 000000000000..2663c798ffb0
--- /dev/null
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYSPELL_DICT=(
+ "nl.aff"
+ "nl.dic"
+)
+
+MYSPELL_HYPH=(
+ "hyph_nl.dic"
+)
+
+MYSPELL_THES=(
+ "th_nl_v2.dat"
+ "th_nl_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Dutch dictionaries for myspell/hunspell"
+HOMEPAGE="https://www.opentaal.org"
+# Thesarus is not versioned at all, I suppose we could bump it with each dict
+# release, or when people say that the download uri checksum changed.
+SRC_URI="
+ https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
+ https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
+"
+
+LICENSE="BSD-2 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+src_prepare() {
+ default
+
+ # rename terroritory specific to just language, bug #607080
+ mv nl_NL.aff nl.aff || die
+ mv nl_NL.dic nl.dic || die
+ mv hyph_nl_NL.dic hyph_nl.dic || die
+
+ # remove dutch translated license so it aint installed
+ rm licentie* || die
+}
+
+src_install() {
+ myspell-r2_src_install
+
+ # make language_territory locale format symlinks to base language files, bug #699660
+ dosym ../hunspell/nl.aff /usr/share/myspell/nl_NL.aff
+ dosym ../hunspell/nl.dic /usr/share/myspell/nl_NL.dic
+ dosym ../hyphen/hyph_nl.dic /usr/share/myspell/hyph_nl_NL.dic
+ dosym ../mythes/th_nl_v2.dat /usr/share/myspell/th_nl_NL_v2.dat
+ dosym ../mythes/th_nl_v2.idx /usr/share/myspell/th_nl_NL_v2.idx
+
+ # Belgium
+ dosym ../hunspell/nl.aff /usr/share/myspell/nl_BE.aff
+ dosym ../hunspell/nl.dic /usr/share/myspell/nl_BE.dic
+ dosym ../hyphen/hyph_nl.dic /usr/share/myspell/hyph_nl_BE.dic
+ dosym ../mythes/th_nl_v2.dat /usr/share/myspell/th_nl_BE_v2.dat
+ dosym ../mythes/th_nl_v2.idx /usr/share/myspell/th_nl_BE_v2.idx
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f5bbba6f8275..53d93d083b46 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/zsh-lovers/Manifest b/app-doc/zsh-lovers/Manifest
index 381594414f0a..8ba0b1865a1d 100644
--- a/app-doc/zsh-lovers/Manifest
+++ b/app-doc/zsh-lovers/Manifest
@@ -2,4 +2,4 @@ DIST zsh-lovers_0.9.0.tar.gz 28883 BLAKE2B a9917c2441222ea27937e4bbcfc6ed4ab7594
DIST zsh-lovers_0.9.1.tar.xz 26632 BLAKE2B b5c5015e7e61c21452b688aa46529dd468beac5a034b844185e1a497778a1c83b9d8124551a7b0dfd0d441394b0bf71fe64f4af5af7add3956c0a2a2f79f01ca SHA512 16493f2ec095fbdb992188a732ca4205880fa10fc1f1ab6cde8cbd2a0977d95bb06e46d1635c0c9910c249bec024f3cd13a1f8c6597e5201ef8a26b80fac9c2f
EBUILD zsh-lovers-0.9.0.ebuild 764 BLAKE2B 1acdb93e945b536d0e4e391a1e4ea6c74a7286da39001fe56f12135f1785273c08781bb02b436a9c7605511d355ee1fd31a688bdeae4539009d46afcce504542 SHA512 e81e4bb58aae64e501ccec00c4d3c14964034dfaba49949b128377476463816980b630a69f0e86c60a1eba885aea380f54788b7f82696109b715bd3905925863
EBUILD zsh-lovers-0.9.1.ebuild 733 BLAKE2B a155f800abdaff45825bcceae37b6267a700026445d93956d7e1bec9e64618aecf6f433dcbe074dc83feeeebb6e6344306ca401955e0e8f0b6f15532c440e37d SHA512 896166fa7d8b184ff705d896125a2b86a7500d5d510aa1dede5dcdbcdafae7ad22f9b680bd153d6206bd5af2855abea4cd95f0ec54e386515d606f0ae3fd3d28
-MISC metadata.xml 377 BLAKE2B 6329163489737a50e5cbbf5fb0dfcd4099d97a5c675519bd86e80428aa51b89ae2c5a9329239a47a405bf6d94a61dce6f4e2acb27866ff708dc3fb4bce09d505 SHA512 b6b6d0907c374c74d7b3f3151f31ec989ce028d92df3d1d7f2e1fbabb6995ba27562d643ae7fbfd9102beb4b38fe231871eef46664e455ded7414bbfc94ceb11
+MISC metadata.xml 299 BLAKE2B f1beac851643d0019d60306dfb0b6a1c51b40dc01eff8e84f05ee3b5bfa8cb19e6fca8ed961e942408e7050687283d6c8be97fe5d5f8350e81061fadd3d3d472 SHA512 59aa41495732d3f0bbb7e21d0da310df10114938549f7a8ae8084570e5a30cfcb44cc3aa481627fd999b707cb0e016bb24bb27ff04831fb3f9c9d9509e6d902a
diff --git a/app-doc/zsh-lovers/metadata.xml b/app-doc/zsh-lovers/metadata.xml
index b657b06f7239..75d9ef005223 100644
--- a/app-doc/zsh-lovers/metadata.xml
+++ b/app-doc/zsh-lovers/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
zsh-lovers is a small project which tries to collect tips, tricks and examples for the Z shell.
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 982b268d86d0..96615c77f13e 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index 2e10e0a4959e..23da6e49aaef 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,5 +1,5 @@
DIST bvi-1.4.0.src.tar.gz 139202 BLAKE2B 151d86214aa93bb0a7f383c8de13b8a15fe2cfe7f5892dff52b80e362c049b49082abe846ffaf68ec69201bbffba2fdcc5d00f744756c49ecb26e16ab93bb13d SHA512 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6
EBUILD bvi-1.4.0.ebuild 476 BLAKE2B 8828fe7012383599a427032ec9d3fc89457e82cd7d6beaae56a9f2883c960c8c71e1ba6cbe57d4122f1440b2a650193f5bdde6e889358429e1ed90412bbedacc SHA512 642d892af5285215170595beb35aa9957fef14cf67230a8a79e03d1ac0bc92e836b84f7e2a30545f085376346b9571201fa7fec05acd37b8e8e0fea56f75f7db
-EBUILD bvi-1.4.1.ebuild 481 BLAKE2B f00ecc0cdbdb8e3bb9643f779d29076990d43a27c0cda590876e55b089e5eebe381caccf25075d78ed9befc98f63ffc25ec01cf6127d8ea6c3f25275dc8e2401 SHA512 095443eab987a90ec87200704d06a3198823aeb1d7dd0e8a84d03c17cce0617f64ce4f01ca201eb867d77579fe45a25a08d376f62219805bea98c0837e3c0c3e
+EBUILD bvi-1.4.1.ebuild 480 BLAKE2B 6816b80b12a61895a33fa4ae00a682d7ee2d14684ebec744ff969ab3c44b18f00baf3b55cd6a68ee473f33314cf70a110a703ef407354ec8892e7f98c8901d8f SHA512 aab8b3e7288b8dfdd87d3b910acf67bc8e025d791f3a32dd7741e5d47fd42eea75cb6508c2ec270b87098fd9ac3504f7cf107067466d85e68f4c36100cb3f15f
MISC metadata.xml 435 BLAKE2B f980e4c6f597a6328b959ab2664cc1de7f5f351d39e06a5383f63fa75933e42a45962184a56b5b3456a0ec9f05d6632b53174fc0bdd00fd92ee9a38eb4ed1a4b SHA512 3feab9fd6833b5503477acf55078027a14976e4a1647463a54901467e9ea40c22f3bb9d41acba1c2b8cfbe8819b2af310d2f19b9f1c0a3eb9a991cf001ea984b
diff --git a/app-editors/bvi/bvi-1.4.1.ebuild b/app-editors/bvi/bvi-1.4.1.ebuild
index 0606e3e15e1e..af99e391a102 100644
--- a/app-editors/bvi/bvi-1.4.1.ebuild
+++ b/app-editors/bvi/bvi-1.4.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index db1bd7cd67b5..79ab293a38b6 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,5 @@
DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.3.9999.ebuild 13132 BLAKE2B 181a4605dca4bada817c59f842c5d680670d0fba6b041d394c4868bce1eb0b6e423b2528b823f88061e28ebbc91778dcbf0cbe33b1eca466cce807a780c4ee9f SHA512 5d6d216bacb9db7f0df1a3812115598d71b959a8280d494943f01285016357af6652dec56747681a901b1e1f6cacf798efa202dd9c24b3bdbf862f7332e1f44f
-EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13025 BLAKE2B 651157980e1e743372c040a259b50e307e5bdb4d725bbc89df27c65f848352a896c7eeff841678eb11b2b512fb5143fc376f74c0168c03c3f6abe95948d1fb2a SHA512 385a6944dc33dfdabbcd98d88757fc7163285d417dbdf64a63a81d45161b1b8129d023b1330bbeaf3291d718cdbf5e55adb201969fda7b827bcb4c388c3f7241
-EBUILD emacs-vcs-27.0.9999.ebuild 13342 BLAKE2B 1cd1c1d1f357f88db5a4f5479fe9c789611ac512102bb6de5ef11a07e2a0f4b16b906dd7483e4fc8ccfec78e0884b5d8608c629ca26c197833b836f0a5e35e0e SHA512 5bd216667e2abcf1fed5b8d5dbc43a8a7b566e9999e213cb4785ca1cc8d667d470e89e4fac68d91f65653e2c79e06bfb52ffb1b3b830b982bb93a2399a987883
+EBUILD emacs-vcs-26.3.9999.ebuild 12769 BLAKE2B 57d01166ee809586a2b776051fe50a7b91f2f342b3b21c30d6f2eee47f7f840715712c9b2562493f68d7770b611532950a84e38ddb7b2beb93d56f3e9ab7fd81 SHA512 809f359d73aebcaf931cc13f4b2aef11b262d6fc4eee6bc7c561b062967d5658978e7071859d8ad9a32d92f5a9a8fd7b2ff7f37ad58fcf40316e8086399b6696
+EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 12608 BLAKE2B bff977f44f393c5feccb4c73e3eaab7782ad1e17ea24cb0577c11c7f75cfec17ce7e8186e9e0b8344497b762aed3a495623383e6cb896302e26ba881c31abd50 SHA512 1e436a3cf2ddde7de8382a8eced02645feff105a834bc2c6a8c0218c147ca2f9e747b5eb8b5f1a7833b8aa0a17235eefa413ac4ee5f0b3fba16d5abffeed88ee
+EBUILD emacs-vcs-27.0.9999.ebuild 13010 BLAKE2B 9850f3f1be341396fc1e580135c8ab7bf065f4347207d02d427978223669fb8e5eaede31eaeb6a9ac09eb96dbde8324a465380b0d40f8373b456855881cd4cc0 SHA512 d03fe2680c45af614bbff58f00a4db344b2868e7df88742f0f7d7c70661aacd26b7ce1133f417cbeee9efe257b480c0b322bc369e23b145e82386ffd9ca60cbd
MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
index 1b73de9ab193..5d69c80a079d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
@@ -379,18 +379,8 @@ src_install () {
pkg_preinst() {
# move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" || die
- fi
- done
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
fi
}
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
index e4a2a2cd7162..9880970c3fc9 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
@@ -377,19 +377,8 @@ src_install () {
pkg_preinst() {
# move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
fi
}
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index dc1e3f47c0a1..baa5e8dff5e0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -260,6 +260,7 @@ src_configure() {
--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) \
@@ -281,10 +282,10 @@ src_configure() {
${myconf}
}
-src_compile() {
- # Disable sandbox when dumping. For the unbelievers, see bug #131505
- emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
+#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
@@ -386,18 +387,8 @@ src_install () {
pkg_preinst() {
# move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" || die
- fi
- done
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
fi
}
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index e9b648122bf6..7a41c29bfa80 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,5 @@
DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-DIST gummi-0.7.999.tar.gz 578026 BLAKE2B b3305560d621eab029f0931dfc9978d0883acb886d89d2f9e452a60e465a10736191987523c47fe9f5373d7dd7d112383ebf7eaf030e6f0751197e535e461708 SHA512 1da2171cbb26b8be71c34dd7b1bc025813d35604e465caf67e480c3356a706991e6dcaca3bc99bb862895e4597186850c7d4f203a81a9532a4cd742cd2744dc1
+DIST gummi-0.8.0-rc2.tar.gz 581744 BLAKE2B c0665c8c2f8d6c0b4472ce4b9510362b942b7197ce205be763afe6272c848d4195a31b1cab0515d2d68ed517b153d943d52909744d9c91097d6fbc2a9a2b8793 SHA512 cc50a1d331dd93cca50aa50d2ceeeaa37740631b3cacbfc22d6b0a706bf8d9b00fb0935d1c712534108a3d7b32420e6bebf3f5592cd36a92b290f49b355d22fb
EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
-EBUILD gummi-0.7.999.ebuild 943 BLAKE2B 0c5e299fdccbf498337ab8d8498d6f0af2e91ef7a52e3a9988354b61f030b77d22d9eba4e214f8d2d3f6a01437e2c666abb0f851e36ef742927c7e9fc450be55 SHA512 bd3decbb0dd7e430ce5890099cb620472bf39f52a1f3248fcdada2a0c7dcfb19f8ac9bdb0979e6261abcb6345b898866b7177125e88d6f886590d472cb13017c
+EBUILD gummi-0.8.0_rc2.ebuild 1018 BLAKE2B a8e9750a0a9b9eb6abc925dcdb149c23798678c7f66b64c599bd9e6f9cbc8d36b40566b3b4d40b3f86c19daf3847627d621a7a33ec6679523e1457412f759e59 SHA512 978affb6525db5b0c28ce2c8a1d6199d6cba526a83ff8fea3e0072d5b7e90d60841490568716b2f8e7bead940ff53564f2268afcb272a2d3f2f8c362d4eb05b8
MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.7.999.ebuild b/app-editors/gummi/gummi-0.8.0_rc2.ebuild
similarity index 90%
rename from app-editors/gummi/gummi-0.7.999.ebuild
rename to app-editors/gummi/gummi-0.8.0_rc2.ebuild
index 1b970f9dfd15..480181fd2a3b 100644
--- a/app-editors/gummi/gummi-0.7.999.ebuild
+++ b/app-editors/gummi/gummi-0.8.0_rc2.ebuild
@@ -5,9 +5,12 @@ EAPI=7
inherit xdg-utils
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
DESCRIPTION="Simple LaTeX editor for GTK+ users"
HOMEPAGE="https://github.com/alexandervdm/gummi"
-SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
@@ -33,6 +36,8 @@ BDEPEND="
virtual/pkgconfig
"
+S="${WORKDIR}/${MY_P}"
+
pkg_postinst() {
xdg_desktop_database_update
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 6109f516844e..ca269c26d10e 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -5,4 +5,4 @@ AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a
DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
EBUILD hteditor-2.1.0-r1.ebuild 1219 BLAKE2B 9d8d214caffb1171cd951e2462e003e75eaa1f0e0e76b7b0cf7644197990a9471bb1d4560a99383850ae949391bba24cd57eec3bc961a7154890b42cad355a26 SHA512 0b3bc68e0fd55b6e178299c4541dc87ed073d1c3af6b5186c2f05ab6815bc249cd27c3e2aa387a5277d52cbf1985372d4e4daae22a38f5e45dcafa85a2c00932
EBUILD hteditor-2.1.0.ebuild 1173 BLAKE2B 4a61d5860885b2ef48f0f21621abea57429dd36ebbba36a6250954785880d8cdfd648a0827756ca38b25b33691fcc64afc06c11e7bf59d8823ac7068befa9d67 SHA512 6022aa8a28461dde621ff2a02695b1aecfb4473bc451a9555350f510773882534e8283e711c69037f1787a77f7483312e7645a0660940d60bb6eb968802bafb5
-MISC metadata.xml 459 BLAKE2B 36a72c5d6c9ffccd7ee46c8b372e8774b567a1747303c37af5aa00a3a1fe5e8db3d86fa7c97e4f3accb207375b4e6eecd3e92f995cd9a1d78abd1281172110f4 SHA512 9c266e7cd98ab8b6653f2820b7018235636e3ffc3bd455f905390cbfcc61dd8ca36d110a3214603c9450db909c248f9321ef89ab6af95a07f9cba97684f43757
+MISC metadata.xml 375 BLAKE2B ccf43aa4dc5a99adbe6e42bb0d66b18980a41d17d2d4573a2d84b513dbfb09071d0655a63ef8e5116d995309cf514e05a3854a0c9fc274cccee85bfd44b1d1f3 SHA512 3c255809cc0132d860134a072a8151651f663e2da8608489a225e1bf8e85dc76788ee5a760909509024fc97bc3c20fd1dee93bba54a297d435f35fab6f07d075
diff --git a/app-editors/hteditor/metadata.xml b/app-editors/hteditor/metadata.xml
index 81b6a3b2b878..bf3326bd646d 100644
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+
hte
https://github.com/sebastianbiallas/ht/issues
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index e7f19b89826a..7114a78a237f 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,3 +1,3 @@
DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
-EBUILD texworks-0.6.3.ebuild 1314 BLAKE2B c864909e3096a6b4c034b0d0e02013eb975895a117387099bf49f23b6cfd3c98c4167429d76d2556d0bb73ab389685c39afa8a63fca13cdf89022f5659c06d50 SHA512 b0fe735402a15e7073a1cddf94289c24ea48c2b38278d831c5dde8df30dfc2dd9f95099459d496262e649de1e77acd607e0b145f0ea558669afc5b276c69b864
+EBUILD texworks-0.6.3.ebuild 1391 BLAKE2B 7177a5f267eac24739cc32e65a0b241059b4417d8a5abaf5218fd7e7947afdc8c24c51fa4a1b0f08cbd12d15a7bf1df35d917270571f5e50900ca40cd04e9938 SHA512 a9a941ee5ec286d14d2c4ceedac19750bab836cff0ebf36d4b0fb7d8ccededd87f3e8a2f2ff87face5e475a0c43b9123cff5ba70a2bd9ef084682990a2077f0a
MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.3.ebuild b/app-editors/texworks/texworks-0.6.3.ebuild
index 63fc66eee9b1..8d35ffb49142 100644
--- a/app-editors/texworks/texworks-0.6.3.ebuild
+++ b/app-editors/texworks/texworks-0.6.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-inherit python-single-r1 cmake-utils xdg-utils
+inherit python-single-r1 cmake-utils virtualx xdg-utils
DESCRIPTION="A simple interface for working with TeX documents"
HOMEPAGE="http://tug.org/texworks/"
@@ -34,6 +34,8 @@ BDEPEND="virtual/pkgconfig"
S=${WORKDIR}/${PN}-release-${PV}
+RESTRICT="!test? ( test )"
+
pkg_setup() {
python-single-r1_pkg_setup
}
@@ -53,6 +55,10 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ virtx default_src_test
+}
+
pkg_postinst() {
xdg_desktop_database_update
}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c488abe8be25..43f074d7ca54 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/bm/Manifest b/app-emacs/bm/Manifest
index 7605cda7b7b2..1bb676e695e0 100644
--- a/app-emacs/bm/Manifest
+++ b/app-emacs/bm/Manifest
@@ -1,6 +1,4 @@
AUX 50bm-gentoo.el 205 BLAKE2B 4c4921b1b7939a0d3cc831297c6c1bef596392c31c7eac3ad2826d55b9a0edee67c4d9cf4a6e2b46ba754850cfd2b8aaecb352ac83ff4f6d45c6fe51405b3552 SHA512 b5c80ab592a9b78a3441494f6211801d3e001f77985ea2e78b982541f534780b12ff26fb6dd7cf7cb371cb8d3fa2fdf01b55227e40980b94a7e07a45dd583a8a
-DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
DIST bm-201905.tar.gz 23618 BLAKE2B 0770d571cae220215431d546892b9cebd03675565b24afad0dbfa9a74d50aaa73a6962b6bec81196700147f3fde835264c0727e7a4c02287fa3e4018ac133831 SHA512 81efd32572d0bcae2b0b91c277b4d634524f3c14c914015ebf06e5e9db2937c6d989ae65c745e214b2bc1a94d169433dede37a47519984e7211d9b8c4202a954
-EBUILD bm-1.32_p20140214.ebuild 520 BLAKE2B 57289c46c09cd99cf152d5c86ac9eec42898245435b771e811d88e79d9bebf17859930ab545d4c6f13cdf2e1fac2f57bedeb117bd885b6f0e5e1d9b080c5f8d8 SHA512 62ee21b034a43ac8640a19806276d931179ac17b43f56648dcd6059af9c3b2bc76cb6d0b8fff7b6be39c60f0825d9890df651871e68f20301d67817b6826dc90
-EBUILD bm-201905.ebuild 472 BLAKE2B 5775dd4e1e2616db85921e2a0256d1f120ac1d41bf59b6daacbc92ef0151dcc2d16ef0e941001fe48f7a936cf07ef7f9a8a466805b53027e34594f572aef384c SHA512 f7cedb4bf963637ad297b8a457dee96c7d09b1689d1176255c9593e2c2e6beadb82fc37a6016c28c3537092fce293bd90837a656b5fd3318d372a6921ce977f0
+EBUILD bm-201905.ebuild 470 BLAKE2B 641adbc40e6bcea4e147f790f1d878bcda786d9dfb02cdc7902d62f2167e731de7184263fec405e85c156f9857aaa02bbccdef811165f498ff4c8a464ff85182 SHA512 42d3a308a971aa4cf65a1a0b3bfaddb54730111c3f0090aaec810650531bfe90bafaa6de3834c61a594f7f4692c24ad61a2f49ac28b07528e16e73ef2111b715
MISC metadata.xml 445 BLAKE2B ce243d62639ee652b310e175715d81fb020cb41e4076970b03f895e728eb190fa1c2fa573ed2a995e406296cba21aa08fe4e92930a57062d56e7e0a68aef3a10 SHA512 d1a2573b8c516169b9d0a90dc89b650a4497080658d5af6fce70204c68b3c1b591dc724e9733957632727da0c014186d341a264c21665d6dbe0b021b87a2d201
diff --git a/app-emacs/bm/bm-1.32_p20140214.ebuild b/app-emacs/bm/bm-1.32_p20140214.ebuild
deleted file mode 100644
index 18f518b0505c..000000000000
--- a/app-emacs/bm/bm-1.32_p20140214.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Visible bookmarks in buffer"
-HOMEPAGE="https://www.nongnu.org/bm/
- https://www.emacswiki.org/emacs/VisibleBookmarks"
-# snapshot of https://github.com/joodland/bm.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-
-S="${WORKDIR}/${PN}"
-ELISP_REMOVE="bm-tests.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/bm/bm-201905.ebuild b/app-emacs/bm/bm-201905.ebuild
index 87402c182ff7..4f760ced1bef 100644
--- a/app-emacs/bm/bm-201905.ebuild
+++ b/app-emacs/bm/bm-201905.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joodland/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
ELISP_REMOVE="bm-tests.el"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index 782a2776ec76..ee81281c0c2b 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -2,6 +2,5 @@ AUX 50color-theme-gentoo.el 4375 BLAKE2B 0a17afad7fd9290dde1992e813711d9bed4b36e
AUX color-theme-6.6.0-emacs-26.patch 1956 BLAKE2B dc7f32c9b0485771f057fb0cd4ddc20f8f154917b3fca5294f535f0420429840ba172000e3ee89e79e3004310ffe36e105028250bb893b35d4866ac52c7a6d67 SHA512 2c20a9565019c0271c9ad8c56fdabd731be9bfce2b9841a1b4e140d44ed13337d14bcb1b7a793ed5bf866335e4212f3d7880bf8c561593a76a2c0990d8b81b0f
AUX color-theme-6.6.0-replace-in-string.patch 1173 BLAKE2B 4e27361d5212afd78e6b94b7b20c3e2512715a280a98fcecaef3b3202ca376b5749c37c3dfb3f1d27673a3421d12de6fc0d7b6c2ee07f1720a32d737558f1e2b SHA512 bdf1ebb03c1fc70bf78adf4886b005780d1c540ac59730e644111f5a3a925b6b05d2e910520b67ec768815f0fecca3a5e617472ca9e415900daf890ca77bc6d1
DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
-EBUILD color-theme-6.6.0-r1.ebuild 970 BLAKE2B 859260f9944cd15b0d0cbfc7128ea9b96519498486252845deb877997729d73a5e487108a2c2ae0ca4d844f5cbc474ef7a76f82d48421fa7fc081c2695654146 SHA512 fcde2a903f4e0e733311f7dc019baf3049e0e2ada53ef027530ed07a29e99a72dfa9df9fe004c5b69b560233c82702d744d166114bbf544f0a9f485bb612e4bd
-EBUILD color-theme-6.6.0-r2.ebuild 1020 BLAKE2B ba900834737e7610f9008fb194d1bf7fccb632e868f0e1126656f0f7fa27b4a7e56904dc94fe9978440d9c72a661ef6037fa9dc1974ee1287b79b6fa1403cd4f SHA512 40655880a381099f28c763e47b83d5b7d363f17bbefcdcfc0b9e2e4955253a4fbb120ddfb7585dd04889206a4adf02052f479c04a86e01c070fcf983ae39423f
+EBUILD color-theme-6.6.0-r2.ebuild 1016 BLAKE2B f6216e524b80de6812cd1d60b7fce1111d7c6e662a5aff456127669cfa4451e830eb5831eba60d411bb678b11bda3d8829209162c83e4e1df34e82741b1a2298 SHA512 0705e83f1af84b0899b2ab71efb047713d9932a98ed046a8f2930d310b303bee98317c7a2e88ce5b01b0f3e00dc0e0a2bb8cc5c34b922f393566bfb8abbcfa16
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
deleted file mode 100644
index 4f73df7cda67..000000000000
--- a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Install color themes (includes many themes)"
-HOMEPAGE="http://www.nongnu.org/color-theme/"
-SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-ELISP_PATCHES="${P}-replace-in-string.patch"
-ELISP_REMOVE="color-theme-autoloads.*"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
- elisp-install ${PN} *.el *.elc
- elisp-install ${PN}/themes themes/*.el
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc AUTHORS BUGS ChangeLog README
-
- DOC_CONTENTS="To use color-theme non-interactively, initialise it
- in your ~/.emacs file as in the following example (which is
- for the \"Blue Sea\" theme):
- \n
- \n(color-theme-initialize)
- \n(color-theme-blue-sea)"
- readme.gentoo_create_doc
-}
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
index 7ddb8a2caf50..edeb0e9d3747 100644
--- a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
PATCHES=(
"${FILESDIR}"/${P}-replace-in-string.patch
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 04281e5efcd0..afff2f3c9311 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50company-mode-gentoo.el 79 BLAKE2B c9b00690d98498b53fa329adf5279ee341c03c73cfd12b70e1474189cc9c9de07bca276ef9fad35f346825c4daab0212e8965069a2a0706cec690350df24fbf7 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99
-DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
DIST company-mode-0.9.10.tar.gz 85982 BLAKE2B 393e8ff31f4a88d1c156418bd0c827572ec078b833e78bd1007779961e9fb852737f12a5c1aeba154ebba53d81058bdc2871f7d88880aaa7dd8cb9692461c8fb SHA512 b6571c55bcf68a5e83e7c92c8b53e0ac6b4e84bce1246331a7da4495f4ee5c3ab38035310fd2eb7a87748db1c034996d99c7ead8aa831d552800642b31cf9fe0
-EBUILD company-mode-0.7.ebuild 1000 BLAKE2B 51b71a2a2d7988421156b6b415b935bfe153fd076d83904f6762cd02aed3c7b1318b228b0c960160cf4c640f37d51c5334877f24e4d5ef0fe49f2d36dd355416 SHA512 62fced23f0b40ab4d4b93c2102202c00e7dc85d4541cdbbea9bd78d65d71b07d301700fa944d2729d0e59f2537e10fece36509daf0666179158acb0293c10804
EBUILD company-mode-0.9.10.ebuild 510 BLAKE2B a4b4162357dc232a2614d4e942e07555b6281b8965e667ae39c721d2698b6ead847771a16b1faecee72dae707f7cf2d4fc571f10897f188f01672168e23d4461 SHA512 18aedf133e54a1a0fe9662aed54077e59546cf9bde74d8dd36846b37bf62ab9df217d9dad20d90cf3226098f9c25efbf16f477f82f46294dd902a5f7241e13c1
-MISC metadata.xml 469 BLAKE2B 08b950e54425d9c6fd0f2a58eea8aced42d9d7c0f657e34e950b3fd618af534900970356be21750adf7886e7fba34a041f5445e60f247dab4c763dc59d0c8f86 SHA512 e5da67fd1ae2089c6ba90c7bdc223c11e3e6e4eaf548dee77198a5ecadcd288aa2f91dccbda9bcfcbc347909d77f5a1acd77ce22b45efaab8f9c62729407713b
+MISC metadata.xml 370 BLAKE2B 1628845f0ee6e98db3af16a9c547f9b3273e19bf5d0a401c33eeeda05e245f4ffe723333b73f42e7112152e4c4045787dca44b22e41b6316dccbb5033190f84e SHA512 6eb79238a729a9b373738f398badfa7a41895f60536c577add191668523bedeafd8a34f774c14a188db175843e489a68fac6857bd7fef44e6596dcb5ffbdaf9f
diff --git a/app-emacs/company-mode/company-mode-0.7.ebuild b/app-emacs/company-mode/company-mode-0.7.ebuild
deleted file mode 100644
index 7b2e2231f50f..000000000000
--- a/app-emacs/company-mode/company-mode-0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="https://company-mode.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ropemacs"
-RESTRICT="test"
-
-# Note: company-mode supports many backends, and we refrain from including
-# them all in RDEPEND. Only depend on things that are needed at build time.
-DEPEND="ropemacs? ( app-emacs/pymacs )"
-RDEPEND="${DEPEND}
- ropemacs? ( dev-python/ropemacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md NEWS.md"
-
-src_prepare() {
- # Disable backends that require extra dependencies, unless they are
- # selected by the respective USE flag
-
- elog "Removing pysmell backend"
- rm company-pysmell.el || die
-
- if ! use ropemacs; then
- elog "Removing ropemacs backend, as requested by USE=-ropemacs"
- rm company-ropemacs.el || die
- fi
-}
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 166418c6cfac..3f2a9553630f 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -6,10 +6,6 @@
Gentoo GNU Emacs project
-
company-mode/company-mode
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index bafc132c2b0d..bab346a00234 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
-DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
DIST csharp-mode-0.9.2.tar.gz 52389 BLAKE2B 897d8bf3b9e0963647071628af874a77f7181592fe21f2094082c807cb33d26e43825f36cefcd100ad46dea67d217f99ec89e5f3e2c94a639553d7334ff39bc8 SHA512 da4e0aff63600c01d1571fea19d7892af1c3bd5366b97a1d9321853db7d52f04431f0c7c16371a0ef0f8296ccbf2baf0890ceb67e48a9159faf6fd6d10cb49ab
-EBUILD csharp-mode-0.9.0.ebuild 543 BLAKE2B c5ae548cd6b28a0e081a487f65f1e5942c9cb87e4a7bf13634c83d861009a80750907c0889ac7a8f90c8ad1f1ae7e9d307fd3a4e8220c8bba936e68572feb340 SHA512 21fd7b3183af0ec291b2406384050b7c07d07bcde4e2d0e2a6129357f1d5352000d2a0278a3b258ce75d8db4508498bf4991b99d56ae08b99872cdc202cd7ca4
-EBUILD csharp-mode-0.9.2.ebuild 542 BLAKE2B 0640f5e03cc11b420fecb52b6f04fb492bbce402c42a1bc2a7db5ff58010853a48eefafe741c4b9e96cc0b5bb4fbe3ef6465bc11d4201d0971fcf264fdba750c SHA512 d6a7fde9982213722c67d65766e9e555008dab2342625de96ee4da76d923a19e40abdec3b86427fa29bd673fc4b31c834ac543a8205421d2059ecedcdf744da7
+EBUILD csharp-mode-0.9.2.ebuild 540 BLAKE2B 1ce353c24d36286c139e7681a633e7bfc705cf992d8d393d29d053a130edbd78700e080515fda3a75c29ba9bcaaa44020e89d99df068af8d387c16e36a5e0a7b SHA512 b662d976dee79d73534c083fab34b9aa98a737c4c5390d051e9ed9d52225a6c6968475cacbd25e3c42a2268d5ecd282f5b304ad86bbab8a11b1f57bc97ab8007
MISC metadata.xml 365 BLAKE2B 198ce5e41bcc5190c96f1513cf4bae60b691294d6343542d42edbe21d087deb81a3a4e102949638d714039959dd0ffa660db142b3b68184e60d6693679bbb0d4 SHA512 43148e8901940998cdcc1667aa7027cf7235273d9dd276eb884a319c99ec2154700ab7c56f25301f23a0238004209f4da887d08c2f3088f71c0c89aca6bcfb66
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
deleted file mode 100644
index e73197cf3cc8..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="https://github.com/josteink/csharp-mode"
-SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
- elisp-install ${PN} csharp-mode.el{,c}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc README.org
-}
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
index d2dad1639c13..3429cd891bdf 100644
--- a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
+++ b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
index 35f0ad679925..167714e7138a 100644
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50csv-mode-gentoo.el 194 BLAKE2B 6232d9d6d6989647532b496f8c3304b256cd04ec12530a93518621094cc3c652a855dc822059df08ba5d4f6478017888978c5c5c11a495d2afb869dc9a0383dd SHA512 8aa137123c8eccc7551c946e7925ff3a54364acba46d29f401f96330ce97fff289f61e0544db4ed45ce677691d0fca5ed8302587ff4280ba8ff9906f58fec890
-DIST csv-mode-1.50.tar.gz 14379 BLAKE2B 8b3b60414aa8d6c54f18a0452c1f0d7ea4cb85311392f928e3ec99555b91cd9e7a47e4315b07df3970acf4c05b05b85e1a4e2e7b87b3bb8527904003f89ade75 SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c
DIST csv-mode-1.9.el.xz 17392 BLAKE2B f49ca9612857f8723d6bec35309fa8c357cfb62589404718141e1fa1cf9a7188c759441e7993dc8e2af5424055d2f68f99d7cff8bba80cf0a1ead9785213f0a8 SHA512 fcf008ba30589a57c362f8501a20bcb494ce9e971ff9e2d3833436658295c94af3bc55be8a32e83deed407c19143ca421a33b3a93d7457a272de34f1d758969b
-EBUILD csv-mode-0_pre20040823.ebuild 415 BLAKE2B 816263183d4bf4367d650d0973ba1ef82205a7c76df32dbf40c2015cc74bd6e14c206c93824ba2969d67cef063f75bd709097b711c1435ce528dd265194bfaab SHA512 c61ce99eeaad609a28433fb393a08bced2fcd20e1dd2545f7d0041d21954b06e1c3924d0d2c731fd7eb56c879a05844b8fb24632331a1d560fb799082111498c
-EBUILD csv-mode-1.9.ebuild 493 BLAKE2B 3af358dab70025170a9501d88fb448aa80efad751ed8d19ca56906db21552f255ef81dab961f9818a4ad47c1523fcf9d60a076c3d7252c4df72562c2fff4ab16 SHA512 899903817ca62ab896658c0c1e9cf3aeb52116a71b55c3f0f5ad117a31934d16b88733674b3bc5822f3fae2fc168b6c2202bcd5a10a1bdf65b8610c160c2211a
+EBUILD csv-mode-1.9.ebuild 490 BLAKE2B 99300e5416b7c7d20bd5d1b82c50afe9546b57cf34d7ab8a24332cd92132c4f4954bc2c4106aeb43e62bfb313e257100db730acec7ff5f5e31ddbe430a89a15e SHA512 923124cc454f897938de939b3df9cb37ce4fa5137d0ea2df43dfe8ee4e594ef25c6ea7589f34418e85da391caa5c0bca399e6e486a3a465bc0ea4c28760592bd
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild b/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
deleted file mode 100644
index 6feb8e47a5e9..000000000000
--- a/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_P="${PN}-1.50"
-DESCRIPTION="A major mode for editing comma-separated value files"
-HOMEPAGE="http://centaur.maths.qmw.ac.uk/Emacs/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csv-mode/csv-mode-1.9.ebuild b/app-emacs/csv-mode/csv-mode-1.9.ebuild
index e5de26a88e1a..8cfb088d507b 100644
--- a/app-emacs/csv-mode/csv-mode-1.9.ebuild
+++ b/app-emacs/csv-mode/csv-mode-1.9.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index 007f79134557..9bd4e2b07277 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1,7 +1,5 @@
AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
AUX d-mode-2.0.6-emacs-24.4.patch 323 BLAKE2B b24721dbd61cd5fe330e81bdb44258ce3e25e54ebc0215ed3edd28e5fdf282100c860e811a70868090288d780df925561c252c1582be7b26ae71ba905662c19f SHA512 254fb7b91ad4e355d70ab83b4b597293935d2375d895a78adc03155a69a2288a0bce2b9dc48244dfdbecc63d95724db50622e99ebb0562ad41cd6e828a4ea314
DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
-DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
EBUILD d-mode-2.0.10.ebuild 502 BLAKE2B c5af88b1f7fe35da321656764adf5d1fe59bb22f56223f55945a9d1b9e02232d230a386410d2c4c025794f9515eb4d4e7c3b8bd217fe2790861c9beaf57cf2e9 SHA512 306aacf4d9bc5fa4e2e3a4a1a9a276b4545d1c8c5511f5d96ffd8e775b1d55d7cf7c980f9fdbe8cc69c6a004f8d9c8c10eca50002cb37116bc429271e321a28a
-EBUILD d-mode-2.0.6.ebuild 543 BLAKE2B 37d9237b49b518888045033fa09548dfddaca372b0420c9d73942bc40b89f830e35da76a0040b53ea90737fbe04d51ef1ccabd6ce034b6dc4e4d315d94a9cd6f SHA512 d01e8cf839d377eb7195af98aaeecf00bca0b65b6bc1f3500bda3342f4c362f8c30745bba52f6c672040ab515cc512c75e1b379ab6c13b453085e83d1c5e485b
MISC metadata.xml 382 BLAKE2B ca4199b6d9d35540d53a4bc673fa59babecd80579ede4c227954492ef2591d6d09e0d3938629f21606c7547ed3155d733582a1298067ffaeaae20bc0b5218e28 SHA512 8a55a3ae2146d4ebeef5075312482f0962e8e219f73cc9997c7ba19978830d42ac22c02b84be34a377841858d9fc19d85ce9243546759e8666230e9c311347b0
diff --git a/app-emacs/d-mode/d-mode-2.0.6.ebuild b/app-emacs/d-mode/d-mode-2.0.6.ebuild
deleted file mode 100644
index 04e0ae831af9..000000000000
--- a/app-emacs/d-mode/d-mode-2.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing D code"
-HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
- https://www.emacswiki.org/emacs/DMode"
-SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/Emacs-D-Mode-2.0.6"
-ELISP_PATCHES="${P}-emacs-24.4.patch"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
index f64fd5135f92..d20d15940129 100644
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@@ -1,6 +1,4 @@
AUX 50develock-gentoo.el 141 BLAKE2B 01c017ba62c65d76dec01e4af0462bfb4030ff70f1cb085077263a19d96ac464684c3fa667822bb2d908f233857c49bc7eb66cd4bd470114ac1fa6841880b98c SHA512 8d6c1e118e4489ac2dfabe344f77491707bf3b9fbbe5a96dcd0f91a363d67200cd764c560c2722e857fc116cb89b404da75015e2086870690305419fd07dc2f3
-DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
DIST develock-0.47.el.gz 14156 BLAKE2B a0749689fec9fc5b5fc480a1a27eea83f9ab57ac232c8aa1054a1ac23a25fa56cb9728db0bfccad141f562721852f7c4717c1f0432c0af53f44128a551ccea87 SHA512 8864416d67cb37b8535dbb2fecc336b13434b2284a27142d59ff6789ccf32515d12369082b0d481f2999e868db72de603f79998d408239c35f7c9aeed8ef82cb
-EBUILD develock-0.45.ebuild 503 BLAKE2B 2a858dbe5c9acb75ba808142b690cf530e42e9b95d1d1fc2e3aa53373b8c099757c5c99595701ffa25ff03c60babe06d9b4533e78feca004c6f6be55147d6ae8 SHA512 e01d26533631eab1c78f5f67118ed197c6d85430806cefcb61d87b8c69b4a885624255b141a42de694cd85d25742df8740c199d6f46e6a0bb2c6bfafe376f454
-EBUILD develock-0.47.ebuild 505 BLAKE2B 048fcc0ec5738566c0135f0770a1d7f5aa2f1fba3c3320f53604a7b6e6bd57b2684a6d6e0530c7dc50334d0f944a676adf10fe190f6a49825361e029510e3e29 SHA512 604350a8c50396fa4586427b9498689a0c72b50379f3d2961762ad1d1fb168904e5c89fb86b2fc16f3bf17d25def4beabdebf544394d29f5e9aa13a450fdbce9
+EBUILD develock-0.47.ebuild 501 BLAKE2B 18adb3a24cbf7576650513f1a735771f523bd8d77e99666de0c369716f812190a594e147ddc969a6df5b034aa276d7342f4d618c0bad54e9beb495261a0f9ea0 SHA512 4ca50fd64d66f7ddbf4683529dfcc5f550a77eb7a194cd8ef907e27dd456a31e10dc9062b3ce27f8f24cabf93c10b79d8f7ed71e411b36677016c65559fbbe36
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/develock/develock-0.45.ebuild b/app-emacs/develock/develock-0.45.ebuild
deleted file mode 100644
index ba0d360dd591..000000000000
--- a/app-emacs/develock/develock-0.45.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs minor mode for highlighting broken formatting rules"
-HOMEPAGE="https://www.jpl.org/ftp/pub/elisp/
- https://www.emacswiki.org/emacs/DevelockMode"
-# taken from http://www.jpl.org/ftp/pub/elisp/${PN}.el.gz
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/develock/develock-0.47.ebuild b/app-emacs/develock/develock-0.47.ebuild
index c18c39943080..f2ac943d6c30 100644
--- a/app-emacs/develock/develock-0.47.ebuild
+++ b/app-emacs/develock/develock-0.47.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/Manifest b/app-emacs/folding/Manifest
index d2777a852916..b905279aff86 100644
--- a/app-emacs/folding/Manifest
+++ b/app-emacs/folding/Manifest
@@ -1,7 +1,5 @@
AUX 50folding-gentoo.el 221 BLAKE2B f0f0b88f59d0f493a468e9128028c525315b4d2f32bf000ac39838774c34c81bda4089e000d8b05ac151e42f6e2001f636b0e98bc02c3125e3ac46459c1cf777 SHA512 e5b9f16218988429da9fdf304967deba2fd76774b5c4eca9d372504cac225ab24de4c976dbca4203d335f06d2fe16043bb817c5a232e517c4c7416e1e9f52076
AUX folding-2019.0524.1621-info-filename.patch 219 BLAKE2B 9f54246d389fa2fd6d7e5a0bccbf806f6cc0d5bfad4173fa4361dba62f46bf51795c490976360c661167539e3075115e23052c2b5626a2ce1f05a59400bc4a88 SHA512 ebaad512e09c3755b0e628ea015ba718dd1354e8c3dbe6845d46c371b3f33bac9f0da7adf325642fe9cf131bdb892153b409e611548a750770322e0ee0e945c8
-DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
DIST folding-2019.0524.1621.tar.gz 70386 BLAKE2B 3025b0487b8f72459393348abf811b953cacedb292667f3bf30955bdc7d6f1055125d8e481fb0bb1be0e04e7c819dde3df091bfb8e50d4972685bb2adc18755e SHA512 807e544760f09eccf6322610d6e00d525caebec9542588948cbd84435ace09edeaec1a68cec781415dcb2528780a35887705eb80b5c2b61138284e6a250d220e
-EBUILD folding-2013.0613.1821.ebuild 449 BLAKE2B a04b276e46658f15f653f34b1b2e410e306780427bb907e4dfdc1be1019bd34e5a5c224c993651f446738cd0bf19874b7e197553ff22cfbffa951f7fce55b69e SHA512 99fda30529093f20ae92f92f72c5c45e18b2e68315bf51a8c5b1eb78657c1e9d3131cb75a65cfa67cbba79faea24f789a598ce6e2ae00f910eeee5a2fee34817
-EBUILD folding-2019.0524.1621.ebuild 605 BLAKE2B 28d007aca298abb468f0fa73f99cd4817fea7d02535af886872ba795e05d00fe85090bbe47372c6fceb9fcc4be046a0dbbebdf472b038c059f5768776d33ae34 SHA512 39cb12f0e0c93b27a8f0589832c9c348c160befbd019b9d50e8bc51ac488be4378177a0750f623630d0c8ef608ff9b31b0c275cc91e33905bfe5531259387180
+EBUILD folding-2019.0524.1621.ebuild 602 BLAKE2B c2385984a739599c38037de798e21d1c796d7234c836e3dfca42b4b5c7a7fb235d0183a10986abb29c447d71cea98147382e3355470812e2a83f84e87e09fe18 SHA512 b866b41344fc0039027810b80a3ace21d76d1dc6df50720ade10806294d23dea3d6e45c8ca33e5536b96dd38a30c1b51955dbb1a265a3a89ccd24a5014ac9804
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/folding/folding-2013.0613.1821.ebuild b/app-emacs/folding/folding-2013.0613.1821.ebuild
deleted file mode 100644
index d2888ffe7a38..000000000000
--- a/app-emacs/folding/folding-2013.0613.1821.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A folding-editor-like Emacs minor mode"
-HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
-# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/folding-2019.0524.1621.ebuild b/app-emacs/folding/folding-2019.0524.1621.ebuild
index 6a61c1ef18be..b2ac245e632a 100644
--- a/app-emacs/folding/folding-2019.0524.1621.ebuild
+++ b/app-emacs/folding/folding-2019.0524.1621.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaalto/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="alpha amd64 x86"
S="${WORKDIR}/${MY_PN}-${COMMIT}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 9cdcd39fef03..adf89b808acc 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,8 +1,6 @@
AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
-DIST ghub-3.0.0.tar.gz 62897 BLAKE2B 78962809f7bfd1236379f4e5520717378353f5c88d81a06b2526b6e11ccdd70d2411b38c81dc40a660aef20c116d277d4a72a31943a2aabca71ce3bd7672b844 SHA512 32051672c8a0fb907655c137b61efa63c9947e8216b3ee7c520ba606211ce361446d57996ea3949dac16456ea9431de1cdd1339f6b7a4d092bfcecb7acc0b893
DIST ghub-3.2.0.tar.gz 65346 BLAKE2B c3aa5195a574de870fcd757bf4efb4aaca6fd83fc06ede375e76915972686fe50fc8a7fa2ebf6f0e2b8f98b60857d36a7f99997c255dee30db49505ca3e90a30 SHA512 dc5a2807d17c2bf65e55f33ad2d00b459acb0e0033caacd5ac8ab9b15deae607c2c25d83c61626a62f50a09d45dbeb91c66299d725b8c3663a1767fd30c7c1c6
EBUILD ghub-2.0.1.ebuild 486 BLAKE2B 697286b9f7ae81e6f466208b636c339b718ca7e907350a0c76f9c87110632c20081f1dae994ccd31883d83c91bec1467a7d90130efb7fe09a2b71627e6304145 SHA512 fc9168ee1891f953bd5cd90c32e12f7a1146b53aec7f5c2e7ba32b21d44616aabfc8f075e7089575c7f60a4a88d84d04b112db470a3ad3d030cb6a41c7dbc66d
-EBUILD ghub-3.0.0.ebuild 582 BLAKE2B 86941a0fc4af26d2160e53adb1d51e3b5482c7ca89e3e7c2e80788640a5001d11069341a6503e176f69bc39513af2cc117955fd683856de07fa92c9d26c3d966 SHA512 a78393de917aa63fffda95841d23e276a4fe7a241a1e56b210948546bdb35c0ac7f723ae08abfb7edcf49f81f8768cae43c4a61b400d432c662924f9483fc52d
-EBUILD ghub-3.2.0.ebuild 596 BLAKE2B 903d6b457130f8b0794b94ec0ec4c2ed68dd1912aab0ae74092a39ff00b56440ba0d37a18443048c764296524e548830338300ef46a866400ffc3382043b2891 SHA512 4d340ba635ec97aabd9264eb2ebf9b9b7f1959f34c79504a796ddd38e5ae695d04d896bdcaeeaec9013a44e0a3277f7dc0def84a6d6ddcc50b40660144b8e7e5
+EBUILD ghub-3.2.0.ebuild 594 BLAKE2B 525b954b0ed721868b8c103904d51af3cc58dd79be779369e51e583902325b6941d76624c51818f3f1eaee72665e8a00aad2c190276c4efeae5fa328cefedf94 SHA512 89ab29b8e2b87ca07d4012ed4be91a6e73ac6a01ee42d4a66bddeb86b8a5568e43f273febac5c585e9259ce7060da72ad3569ee3a38094ce6d7f92b290208310
MISC metadata.xml 1296 BLAKE2B b58f88e8262157cef344eb119a5f3c265105c1f90ccfd40192a197b19ab911e086f00e259e2de5f14d8f02918e5e5516568cd95c4a0a2719dd3c7a235c52d38a SHA512 8e9fc9e9112bbc0d069978583e625909c12e3ea03d747fa3189c34ec35113d1d688fee50d0c0983c0eaef5eb884947132b5317d11b89c8f994efec4fef5abe33
diff --git a/app-emacs/ghub/ghub-3.0.0.ebuild b/app-emacs/ghub/ghub-3.0.0.ebuild
deleted file mode 100644
index 8b1abfbebebd..000000000000
--- a/app-emacs/ghub/ghub-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=25
-
-inherit elisp
-
-DESCRIPTION="Minuscule client library for the Git forge APIs"
-HOMEPAGE="https://magit.vc/manual/ghub"
-SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md"
-
-RDEPEND="
- >=app-emacs/dash-2.14.1
- >=app-emacs/graphql-0.1.1
- >=app-emacs/treepy-0.0.1
-"
-DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/ghub-3.2.0.ebuild b/app-emacs/ghub/ghub-3.2.0.ebuild
index 274ca19590d2..8099d9991c48 100644
--- a/app-emacs/ghub/ghub-3.2.0.ebuild
+++ b/app-emacs/ghub/ghub-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/graphql/Manifest b/app-emacs/graphql/Manifest
index 44b780d4af95..ea389cbddf8d 100644
--- a/app-emacs/graphql/Manifest
+++ b/app-emacs/graphql/Manifest
@@ -1,4 +1,4 @@
AUX 50graphql-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
DIST graphql-0.1.1.tar.gz 6021 BLAKE2B 62755fda880042e00942acc6dbf98219521c92d052eeb0c584e8bb83ae8fdcea46185270f5dff8c89762d11b409e31b42d4ae62ab6831b04437ac0de517f442e SHA512 53f4c8b70be07f38b3554c4488a98ccdb956a68585955c7afd9df52d9d39cfaf7cc0efcadae1f42099495b8729851d089cd03d4570ed2a91a3354dd19f12d5bb
-EBUILD graphql-0.1.1.ebuild 614 BLAKE2B 22128ed5fda8b6ca310fb408815234d9ba7bb9d7b60bc26bc3b049b4d85d1400bfb4862a31675d91af4148abf90280f5a7304d6fbde5584634e7aa339dab2bf4 SHA512 e32267bfce41965e8cb3c43a147980a55547330b5e9ffe70388f03598e9d56d392160383a5077a2550487356dedc0d09088a5407b5c4af82517b1208dbce5bae
+EBUILD graphql-0.1.1.ebuild 612 BLAKE2B 1800f3570462602ea3f4d6092b0b7d6f2f68ed3df9c9c008cdb6e585e3006e01489702fb171d770514f7fc223a00b860d8f46a8ac8ce8ea34515b80a02f942c9 SHA512 186dc499b4c7aa6bb0cf147fbd86818eea049c04ca3baace42ea02ca9c35c6acc7fd8fc3ba3585bf17eea8ce59117cff09502f91e637363467a5f189669c9bc9
MISC metadata.xml 550 BLAKE2B 267d363cc3676b0f8d1dca5703f6c7a8cfaebb1c6b714a2bebd1806e9b28b3a28f37fac15a1907d64fa9c6bc9813c5995f7591e965f3514963266de1a8c34f7e SHA512 534f483eead85b46f513cab779d6f2e0f4fef965de9e81f82735af4ab5d7c7c7db9d08411dd4ac2590031332b47742bd8d959d2ca3a561bc0131b23ba770ab39
diff --git a/app-emacs/graphql/graphql-0.1.1.ebuild b/app-emacs/graphql/graphql-0.1.1.ebuild
index 9ced070552ac..f559dbc5cc9d 100644
--- a/app-emacs/graphql/graphql-0.1.1.ebuild
+++ b/app-emacs/graphql/graphql-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}.el-${PV}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SITEFILE="50${PN}-gentoo.el"
DOCS="README.md"
diff --git a/app-emacs/hexrgb/Manifest b/app-emacs/hexrgb/Manifest
index 75d745108622..1c1d4f2e5898 100644
--- a/app-emacs/hexrgb/Manifest
+++ b/app-emacs/hexrgb/Manifest
@@ -1,6 +1,4 @@
AUX 50hexrgb-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
DIST hexrgb-0_p1019.el.xz 10156 BLAKE2B 0f6681460b5a2d631763324015004800d58ffa93852bbb1fb4f5e07eee89d8a5db8c2f416af7fc7b885a37c520b544e959814f693adb7b41b27e0a76d38dc6c3 SHA512 4c05115e6889035e699ba9f920b1bf4f638e3c9980477dbaddeca6ec45f5c2e8574d26745e1d570d002a5ed83e7dc3f389144d1fff5efbbf7247508278ae567e
-DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
-EBUILD hexrgb-0_p1019.ebuild 404 BLAKE2B 373ee89a1635741dc2a3fe8fea16071cc66012f6c2017c7d9bdc5ebf9c00c718597efa887f38e1a58b6b770ec990464e522d2efe06ee511db9f1b4f153210781 SHA512 1b4d5621c8e013bf21d69246ea4dadb1e365a8d2c104166d0e5027473037da04a4f5a90f5c6c67a9d82117bb9fab6fdedeeeb77de3c2fc65bb5838bdd9be7fde
-EBUILD hexrgb-0_p957.ebuild 403 BLAKE2B 393babe59dfa2937f17184141283dfeacabe5b99bd4a5bc5f6b546ed301573641ac9e0c02908af03b0704afc01f8bfac2f0123a9bc725529b3b1ed1f37ed84e9 SHA512 4b60ecd175075104257653b916d5c99724f5ca7b7000f4cded86641f745f4612115b7820dc888a626e40f453bed621e41902092f6e9663998abe5bd6720782be
+EBUILD hexrgb-0_p1019.ebuild 400 BLAKE2B bdab10c1f6d9dd4e7db4bf87a0fc95064cc7ce5a24a2a95d69f0c0cf7dee783b967ee1fc213a3e02d8dee53d13d684a514113419b6d780f3d6d24bbfb1eaab4a SHA512 d999aa18683704fc3907d69cf951e433b10be49bbef5c2aa415c9b44132f13d6162db1c9ad350bac95c758f058f2f6f55235218ae5112087656045524126bbe1
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/hexrgb/hexrgb-0_p1019.ebuild b/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
index edfcdc886c2c..d0d7dfb1622f 100644
--- a/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
+++ b/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/hexrgb/hexrgb-0_p957.ebuild b/app-emacs/hexrgb/hexrgb-0_p957.ebuild
deleted file mode 100644
index 0845e1e8af46..000000000000
--- a/app-emacs/hexrgb/hexrgb-0_p957.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Functions to manipulate colors, including RGB hex strings"
-HOMEPAGE="https://www.emacswiki.org/emacs/hexrgb.el"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
index deb46187c986..b1be3646940f 100644
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@@ -1,6 +1,4 @@
AUX 50howm-gentoo.el 73 BLAKE2B fe99991f69e8aa4c515aa458980b82fcba96f2dcc29d213b662c5d81231aa85dc288b3135dc375a099a57344646a3a9a0c0ad0eb57fec4f78f8ec0d1ddc1ce60 SHA512 575a4638fa232ced8b377e30bd405dd78a8d10194cb38f40041ff30187482cec2cecf94c8f9da95031848e6c0379a2d845ed7b9eb159b63ed0a0737afa627a82
-DIST howm-1.4.3.tar.gz 552747 BLAKE2B 26ddf709fcbcefb962a3cf447c1ccaef61b2407cb875be49a7a207159db5c2425fff953859c2c77ec36250e73d9da17647667d2e0a4448ed0dc40bb25ded0635 SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189
DIST howm-1.4.5.tar.gz 565221 BLAKE2B a28e98e9b955c6172c7b9e51d8f157e22e87846cb2a2955d956f434c2a36fad7e0692c951ef3d37f57363d500d118c2eeaad55276656a8e543b72b8276317fa4 SHA512 b448bf8caeaf21bf1980862ed12541bd793369494a3e321bc5b77bb99ef63cc5ed2f70c54eaa60b427489e9b3fa9b0037d5cbe06449f87af924f245b7f8f2615
-EBUILD howm-1.4.3.ebuild 588 BLAKE2B fd5660cbfce9cbb9e2b3dc6f02caa61b8cc5d2547667f9894792380b021bbcc223fe5544a61d88e3411a85cb6893c6c60f74b183239123b04fe0fb27f1840a6c SHA512 19e8d992766b8a6b821d0787bc3a6f9f939d3d63a9d401e30b7507f3c32123a1c9165ccaeab471a35b5b258d349ab4d59516da8b1d7293e03901f596580b3728
-EBUILD howm-1.4.5.ebuild 589 BLAKE2B e8b7e0aa7f637daecac1eb2f47886aec8ca821e035d29d7b9018107da4bcb7838203638bddc4a43abc1a966be20ff5b0e624e9302ae1469fa0a2b513d9da686d SHA512 ee8f12b8fe05198a36f13f88f75f20b45c6927c9964d18654a28c8026467b43d4f58354bfdb55b692b8c7a65a82b2172452a64b0e1b744241801b27c426276e0
+EBUILD howm-1.4.5.ebuild 586 BLAKE2B 6f328010f39e208a8463f1a0e72ccbc8505b4bd6e1bda58607b3198bddfa0d643f85a5c46971ecdb0891aaaa36c65dba2ed146112796b989070aceed623fda51 SHA512 40f755ba685936fa2cc210bd5e5b8fbc1aad7c6677f585f847a3125fe36bc2a74f70d13d5c423553bf40840dc2b318f09fcb3f95742a20a7aedb6ecdac36c9fd
MISC metadata.xml 357 BLAKE2B cdcdb822544ef99c142c343a3a7b68b825bf32fa45ec34016b2cbc6736a83ad925cabcae1a73e7a87ed5ab2c8704db7a0446d8b97bea533083d5f0f88482cb65 SHA512 1fff5ee37f3d2bf46732a5f23c06db0267f7f38357602f5268c29fb840b9450b380057993cdb5e0c540cef9d4c0e3e6e8a5c0b618f02d2493d92b0f44aebba93
diff --git a/app-emacs/howm/howm-1.4.3.ebuild b/app-emacs/howm/howm-1.4.3.ebuild
deleted file mode 100644
index 345562c1563a..000000000000
--- a/app-emacs/howm/howm-1.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Note-taking tool on Emacs"
-HOMEPAGE="http://howm.sourceforge.jp/"
-SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
-
-LICENSE="GPL-1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
- default
-}
-
-src_compile() {
- emake -j1 ${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
S="${WORKDIR}/${PN}-${COMMIT}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index e6f859957199..47329e72f633 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
-DIST lua-mode-20130419.tar.gz 26242 BLAKE2B 25f75c70982ba2fb0077fb249501367f9dde3eee5ff7bb45c0d8d97857b6268c481652e06e5a92bd04d9b9fcac0fa3368dfbdc3efcbaefc34268aeb490ac6ad9 SHA512 e66ebe6c953e81b07a8f9d86264b1baa5e0b730a6d26b1acf7fb48ceb8cc0f008cdea0046d89e380fefefe0e0b189ef360280236befc79ade69e0622a2e7eb92
DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
-EBUILD lua-mode-20130419.ebuild 546 BLAKE2B 60be5c0bcb561e06115cb310c56c5f735375395ed4b6bff2bb78bd419f0eebc648c9013e5e2511e22c664cdf15eb2b725d599ae30b49ef3df9547ce5407d780c SHA512 5e2a0b48c79788285233f38103599ff8df12473ffebcd003765f9269ba995ba46af231d7c05eb90590a75f0ba3996def952df9bfc3dbe3a9d2d88d6a71555d57
-EBUILD lua-mode-20151025.ebuild 594 BLAKE2B 633f5ad3ce5db14476df1403f68e2ee3dc625fc5738a59409bc23190f83a7cd3990fd8f83509a5927d4a4eab4908d7b4a8e6bfa2de2cbb55a20aade2942ce405 SHA512 27996796858c792c56d48428699e27096535e58344f50aad1685170fab6f727bd79064f7acfeed2b04a913fec796dc16421e7c684dbe12ebdaab280937e83ba3
+EBUILD lua-mode-20151025.ebuild 645 BLAKE2B 3c6fa3bf5f11ddf6c2d2eb3948d175869f143a7f37df3ddf6b89070278ec5ff59f7f42dbd938a9e5430867e12b4f7a68f78bfe8fcf46efc5585fbb4063dc1c91 SHA512 972c7ab2327f0e3c83144eb9954041e86c92d54abdc62bdb447d514ffbbaaa39d86851a8e68e057daeb5d1494d30dff28f7ca9eff8a496a065ecac4997f9aaac
MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/lua-mode-20130419.ebuild b/app-emacs/lua-mode/lua-mode-20130419.ebuild
deleted file mode 100644
index 8ad6564b276c..000000000000
--- a/app-emacs/lua-mode/lua-mode-20130419.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs major mode for editing Lua scripts"
-HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport"
-SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${PN}-rel-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README README.md TODO"
diff --git a/app-emacs/lua-mode/lua-mode-20151025.ebuild b/app-emacs/lua-mode/lua-mode-20151025.ebuild
index 21ebdd4465f6..aa7286d9d56b 100644
--- a/app-emacs/lua-mode/lua-mode-20151025.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@@ -12,7 +12,8 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+RESTRICT="test" # tests require cask which isn't packaged yet
S="${WORKDIR}/${PN}-rel-${PV}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 1a0f1842a932..0aeb15ef3463 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,6 +1,5 @@
AUX 50mailcrypt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
AUX mailcrypt-3.5.9-backquotes.patch 418 BLAKE2B f907471a56450c25c7cf1d322c44d15b9aabeaff4430f38b888a3cf5526743712d4d85246979c7bfe70cc6a7ff4fd3ae11c4a2b0cb38bb31348cc45abdef08bd SHA512 752d1bb5bec8f46a0b4b429c8078f86f447ede299ef711a159479ef0f0f0647eafe8fee0ef4ecb321750d6fd92ab503137ea2853f511e153ea30643756eeb752
DIST mailcrypt-3.5.9.tar.gz 172073 BLAKE2B 02a911c0676464a670754cf8ddfccefa1ab9c69c680911ce63faa0affe6d3f72ad7d409f716a1edf326225f3378878caedfd4194201894baf05110d26acba533 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079
-EBUILD mailcrypt-3.5.9-r2.ebuild 997 BLAKE2B 11e03c3de9a7491dc287b30a297a0783e0f6de17a9dda7a5aabe6883a3562763cb7c7240cca74682d6189d3073860416d0255fc69f00fa5b9934207d42b723ac SHA512 0d0f778b87a6f8cf5b5f0a913aef003d464f0d2e2159482fef11c9e53dc25af9a1e0faf8742d4b2293dcf67312e2f43af5515c3877c0da1a34b0ce29d934a3b5
-EBUILD mailcrypt-3.5.9-r3.ebuild 740 BLAKE2B 4e85b91866f8fe7ede8757ed418a8c647538261f0d0a7a5c821e8f37309e8c467928fa22509fe76d4f0f6590b5be3069e8d744ead00a9de52c65f5145f2265e5 SHA512 a2ff51d9c9d97a49774d82cc6f26e8859d91dbee16a1be5a1a5843adb5efb76a1811920820e0e5f78ac5bee89c94b9f7d1249e2b482a81f770506d411674d11f
+EBUILD mailcrypt-3.5.9-r3.ebuild 736 BLAKE2B 41c6da1847f0e795f5bdd3d7c75b54ac6cd08eb9ccfcb4a511ad51bc3b910763327ff017172a343f805b0eca44d0d2b54a8fc621057bf68e616d02942a48aad4 SHA512 61850769f184c08cfd4c2aadfadf7b772fee1ed2ebd7076a79a3d9146086c4827bbcf6b85bb132641e79461cb14e076ed4f34ccbb83c0e3d9d594801ee1fca14
MISC metadata.xml 359 BLAKE2B 115dd3e46859edda7ac4b23892ba3fd9f76e2a0aeb0f667a37c0a410959048a3a99ddbf052155fdc55bb18cc5fbd8a72af18f7c4b312ddd9f27a25c454662c9b SHA512 0a6b9ca1957a37fcdcf322663a6ae5dcfa9f00810ca7f68548acb9386edcc78f0b7d01f1cd6b2bcf2d9f05a6d34b7add17e9418329072d184c7840aed0f50eb1
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild
deleted file mode 100644
index 60f6a2ed7f21..000000000000
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 elisp autotools
-
-DESCRIPTION="Provides a simple interface to public key cryptography with OpenPGP"
-HOMEPAGE="http://mailcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-RESTRICT="test"
-
-RDEPEND="app-crypt/gnupg"
-
-ELISP_PATCHES="${P}-backquotes.patch"
-ELISP_REMOVE="FSF-timer.el" # remove bundled timer.el
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- elisp_src_prepare
- eautoreconf
-}
-
-src_configure() {
- export EMACS
- econf
-}
-
-src_install() {
- emake \
- lispdir="${D}${SITELISP}/${PN}" \
- infodir="${D}/usr/share/info" \
- install
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry NEWS ONEWS README*
-
- DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how
- to customize mailcrypt."
- readme.gentoo_create_doc
-}
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
index d7231e393d29..3906d3b559fd 100644
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
RESTRICT="test"
RDEPEND="app-crypt/gnupg"
diff --git a/app-emacs/matlab/Manifest b/app-emacs/matlab/Manifest
index 2eb5c41c001b..9443439d2faa 100644
--- a/app-emacs/matlab/Manifest
+++ b/app-emacs/matlab/Manifest
@@ -1,7 +1,4 @@
AUX 50matlab-gentoo-3.3.6.el 65 BLAKE2B a446c9099d378fe8b28650d64121e95869d008afd85a09869676c36d6bdb463f6cdb406be977464b0e4630a230d67b4d9f48b101e1ae8c843175551506a5981e SHA512 4f5af81cc3ee14572995ad0ccf6f30345d5fe57e375583dfa081f20155699d2655bf82a4296c920403bef0554a8514508ccbf1bfdb374ae841858c99c51487d7
-AUX 50matlab-gentoo.el 61 BLAKE2B a826b081eb0aff32febe07f31946cc427ece09616a982f9442465c1608816adb4e2dc565220e0a3e90dce8deacdd8443323dfcecaa4bb4b0a773ee2e254c0c4d SHA512 673f71817e587dd3c33073829a946b2ebcd90ef0444eb40d514cd4513f5942f7bd8e4f03eeededb171f6d53cff3fc818e8ddfccefdaee6c80f035b0bcf0254eb
-DIST matlab-3.3.2_pre20130829.tar.xz 92784 BLAKE2B 327c1a5126cd3f686b053f404122975578edb92bef53e6c6fadd6ff27873646ab2e15ed5dc3aa34604c052675b9e0f47b82c4c89a72e1de017544a45e826e935 SHA512 b549314f71dd876453c395268a0ec1fca8d68ba8ae074ef45d0fb430afbbd6a45bc30a45bdd64be83dd44a0114d7f4ec8ca2f9acb250337fbdc407691d0a2c00
DIST matlab-3.3.6_pre20191010.tar.xz 111800 BLAKE2B e7960f09c51664ca92ee818ab9bbd946123f4527f5a24d31a4236e8cfe534e4cbcdd1cf49539794de79f00c369d3e440465080ab44a20e184b507e860bcf8e0d SHA512 e1997e23693e09cfcc1461c328d70494f9e83c4d034bce983f6065eff4ce3c7c406e4d046c01dc5b31b0dca6c7ade32860504d4d596e04bcf72618dba5c07792
-EBUILD matlab-3.3.2_pre20130829.ebuild 473 BLAKE2B ab46d4cd9e60ecad9850aad877914c29d517e04b4a69fd354ab0ccab4e69fd5712743ecffa4906e585bf5d8aa743b2f4a76db8e0507da949150209ccff7dca4d SHA512 6e5f15ad7e081ad1c2b3b921954b854a4339a3257cbeda4a440066a0533389b656aa485dbcb123e31502aeeca49ed1e2ed6b1f7a8a3970ac757071fa330a5b27
-EBUILD matlab-3.3.6_pre20191010-r1.ebuild 566 BLAKE2B 0747b7b1e995506d8e1210a419488e680ecf29f9926d309aff0dc9955689b36e8b0b6eaeacd64f01731974ffc0bb9bf9ba516f763404e13380f786d0b76a50ae SHA512 45e6dbc6dec5f4be4611f5a444fbf1e38da39e7c3ae461a4825bb284c31c70653dbfef9b8e5e1fc6540be5f36000be96c1646b25a293fe1c80e2e9d005a24bf4
+EBUILD matlab-3.3.6_pre20191010-r1.ebuild 564 BLAKE2B 4db4afb9cdbcf01e88483c444aae8acce391b748606466a49e1ed075e853d98ff81671346eec8800a84b74cdb8f1c23696853182cf9f6085399748581082f677 SHA512 134c7647b099d63928947554dcd0fb843c788ae51940ead53d179fda379b8ee0c50cb9bf63e92335dbdd9e7f8c05acde722dd49b83c749ea79c197b37a1781eb
MISC metadata.xml 362 BLAKE2B 9f602fd377b19317a6d92083b224f007d5a2f997bbb17396cbd84e742e7cc6b9b0da1a28f7123984594d226f0978dabbe26ae6e0adad50630b90461315e9910d SHA512 bc473891af67b75c5ccd5943193e40bbfcee6d0aa21ab0a2a5f64d8a6833f3a6542e45282deffeb46a496d16d6f6e7ae21c353cb884904f682559b50233f259e
diff --git a/app-emacs/matlab/files/50matlab-gentoo.el b/app-emacs/matlab/files/50matlab-gentoo.el
deleted file mode 100644
index f15e838a2985..000000000000
--- a/app-emacs/matlab/files/50matlab-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'matlab-load)
diff --git a/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild b/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
deleted file mode 100644
index b0363bf6bfcf..000000000000
--- a/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Major modes for MATLAB .m and .tlc files"
-HOMEPAGE="http://matlab-emacs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-S="${WORKDIR}/matlab-emacs"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README INSTALL ChangeLog*"
diff --git a/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
index 33487fa8e1bb..aab9a5fa7873 100644
--- a/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
+++ b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
S="${WORKDIR}/matlab-emacs-src"
SITEFILE="50${PN}-gentoo-3.3.6.el"
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
index df66753f1337..32fdbac8ed5a 100644
--- a/app-emacs/mpg123-el/Manifest
+++ b/app-emacs/mpg123-el/Manifest
@@ -2,5 +2,5 @@ AUX 50mpg123-el-gentoo.el 121 BLAKE2B db0ee430cca004ac595670289feffb469d121b6056
DIST mpg123-el-1.60.tar.xz 34104 BLAKE2B f48a0ce460ee382b261accaf2188bb1dde7b17b1b09766cda7ef69f92d3e022a4390a7c9e9a97085f1c1e87377d114bcbdb29de512438ee3652baa0be0b413a7 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611
DIST mpg123-el-1.61.tar.xz 34216 BLAKE2B 3f0f85bbf0f5854b899aefb443f9b2b011dd5dd85c815fc8be723bade93be805b121e952cab3c56a3897bed41fa65988331c004537e565abcb660b6dd402a0c5 SHA512 96b50a8fc945c6811bce7b8cfa28fe235f2d2ddf9cbd1904c94f272f6df13a991761dbb4f186c1bda04720fb50115515361dbff4838e7623261719f2ecc6698e
EBUILD mpg123-el-1.60.ebuild 788 BLAKE2B 8b1b48881cb33ec77ce0f5a48e607d79be41f97a41674be54031a40ff4c57e39818858d353819ccf3629d09b9131eff586f9261325846799c17c0a1b3aaba3fd SHA512 84c5a6f0d2a75a039b75977b8e8acf39c710b509ed6b8e4cb531fccc16dbe9c48efce93b557a170e42203b524107315ac65c626aa7a5b7a851606dca732d1687
-EBUILD mpg123-el-1.61.ebuild 791 BLAKE2B 62c7aba32f82af283097315547a145b84d5645f04d6b208379b80ad6a37274007733211eff567c9cf477f42c650c68b58fda5c75fc2765b00fd69025ac2ac464 SHA512 98177d25e75fcd2b5425cf6e65ee9b8daec629bfb04aea1057be5fb39f9a780ba068f0a5a8eb4d28da1c2186e27a61897f43c9c0c281df56a7690dcd83ab93e3
+EBUILD mpg123-el-1.61.ebuild 790 BLAKE2B d0c4b6f87c7d4dbb3780036ecc9f25f2f40754fb0433fc4d425732c3bbb40d1ff99f2b8efa59fb037778fc14e57c26717f3654790d3987a1c5ab56a8cef1819d SHA512 00325ac60873c6454742b8cb7caddcb33be194f8491318484f7d79c75f0b69a7fcd21cc14206e3c618cd6b8bf49c0b142c5db1e33d632aeac368ce404a7b6dbb
MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
index eeba80891947..ddeb99a54e6f 100644
--- a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="mpg123-el"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
RDEPEND="media-sound/mpg123
media-sound/alsa-utils"
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 2d8a74d9bdd8..64e0bd6bb266 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,8 +1,6 @@
AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
-EBUILD nxml-libvirt-schemas-1.2.1.ebuild 1293 BLAKE2B 6dda0f1cfff26b8f85c21178ff5df4b6259ae982b6c4a2b5423d4bbc54410c2c118461aa56d4f9bdcdd34ff66ff5a772d2cf93bcca66f39ebe56bf65c21071b2 SHA512 265f6a389fc41b15d31fb257a77c7b7fe5e7796988b3aea592c5f2cf09fdcd321e151cd09ec2cbeb2403ddd86cf1029b0598264ff4fa0e764d58a73e813701a6
EBUILD nxml-libvirt-schemas-5.8.0.ebuild 903 BLAKE2B e25b2af04d2bebc9a2aaaf9da8e0d738e33421100812ab1b57caa6324e0951e45029b5a69d0eb9027b3ea85052ed21b14ea085466577254fc3c4f33357425664 SHA512 01dde717faa3ec8f74b5d825aabe207cf2a77afecc2735c689871e6f0281e4bc4a1da7db58ac581998f3521e47785ba5bf46a8c06942373eacb38109bd478525
MISC metadata.xml 389 BLAKE2B 5874fa7fb23c84408f3e1c975b11cfe88067da63a91d93447f26c682d868ad822e092a186a14cb17d3ca48f8543b64c86ea0086cc26d434e3b5d03e1bd0a5e26 SHA512 5def622fb849779446a7026e11f2f9216c70da203712c4611ac21b0c487adb050159a7775906da34184bed12e4d12033e730722d152670524b4c29bd422f9307
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
deleted file mode 100644
index 7c423e6fa2ed..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#BACKPORTS=
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
- ${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
-RDEPEND=""
-
-SITEFILE="60${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
- if [[ -d "${WORKDIR}/patches" ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/patches" \
- epatch
- fi
-}
-
-src_compile() {
- emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
-}
-
-src_test() {
- # No we don't need tests here... trang will take care of checking
- # the well-formedness of the schema files for us
- :
-}
-
-src_install() {
- insinto ${SITEETC}/${PN}
- doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index b328b496daa1..2ffbd3525af3 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
-DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
-EBUILD ocaml-mode-4.00.1.ebuild 490 BLAKE2B b2a0c837423ba5d494fd9eaee117e2bb29806ad5f0a337c9d0703809822cf4c428ab9963b152e56e95d06b559338cacd957aa82999dfa6a559c1711913047830 SHA512 76b528a6ab3a083d90fe5d5f0db6498c385da351b22a831a5f6458e7347bd2af08191cc0011e2eb522ffd365bae091a283ef0ff4477e2efbe30c0ec6ab16c651
-EBUILD ocaml-mode-4.05.0.ebuild 511 BLAKE2B 950256900b69e19ce86e2464600d15d9c68492b5f9514aed74903e3a983629583053b1758bfd1e95654c5114407e08f0396118801c0058b92111629de0a4596c SHA512 1c77f99fbfe57a7ff390f4421c17a623b7102edc2a0fe38560e173e4f2fcee20c83d7db9f6d708d55d00e4c725214e3f00e6eeafb2ab6a78f3e84b24182b4e8b
+EBUILD ocaml-mode-4.05.0.ebuild 501 BLAKE2B 52183567e04f4c0656719b69d20e0bcc820eb2a2f1c28061804675b1c14c69f39f9bd4e4c6b4ad616921bd8d8f48ed2e43cb23d40a0a5f98d3546973f415f17e SHA512 924e0350bed26c5e3f889733f751fbe544fa38fe6af033fe22bac769f9e5a1d0eddce488bee6fcf3fdfee314c700e5fdd19e67c5edfd53cf6132552d66038430
MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
deleted file mode 100644
index 07f4752a09a3..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_P=${P/-mode/}
-DESCRIPTION="Emacs mode for OCaml"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo-3.12.1.el"
-DOCS="README README.itz"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index b3a90a28f87f..3d1d870deb2a 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}/emacs"
SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 9956069a7c25..6228ad98c97d 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,8 +1,4 @@
AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
-DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD po-mode-0.19.3.ebuild 518 BLAKE2B 7fd00abaa49fdf402d9084b7449f6ba5f409dc8dd1113aa4dda96c7ae668a6b6ad9170dbe51b32e941b6d64fba9614347f9d67bfe5b1ff1d8f2328eac11ab4f1 SHA512 090475f391645e0ff024ee879ccaf00e9ed4dc4df7a3776b64963b046fc1ba3feb6e8c30a2b3c4cd3cecc6249a58e4e3cb44f0bdcb4211129556a47cc87d4cfc
-EBUILD po-mode-0.19.8.1.ebuild 528 BLAKE2B 7f766ddda170d39f8100e6ece184bf9d2cc93ecf8b4d455c0bf005a24303530b760b5497904800d1c634e6abe6b844c55a6b4732c76196ad06b2d025500810ab SHA512 93dae83c1307b1e8357e644364ce49e0f8b8cb7fb13670cde2462e4cbb74efd7ad67fdf49c4736817bd2f93b5aac091d8f4819c97cfcf0c9bb219a3936ea0951
-EBUILD po-mode-0.20.1.ebuild 529 BLAKE2B 57fda5ef7e064ad00837f0cac2f26e1af3a43365b68a050b2a9ee534b7913bbdf40cf2f22a482846ec9b7dbf757d74c4140f291e62f1d9bcda818e8eeb8ba0fb SHA512 2dd12994c3b6c7518575f1b83302948f44f139264291ca2347385d2a0b98e5b4be1ec6a30cb746fdbb760a1972f3f98f4ed435abbe898f13adea7443c193fc1f
+EBUILD po-mode-0.20.1.ebuild 525 BLAKE2B ffd65facd173abd17ef07b648914b0bd4d72edc83b438accaf562732e8a53463ad9ed58009c557e6b145389028669a72bb71976c88b6b3c07bfb0a8101b6a069 SHA512 d6545ce6076fca9d090ca66d8739878af200901c46df5389ed1514ee943055fd0ba07f76128a466c32c39390deefec7335e6e5d820e3ad1ac738199930566c41
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
deleted file mode 100644
index d3c04481635a..000000000000
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Major mode for GNU gettext PO files"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
-ELISP_REMOVE="start-po.el"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
deleted file mode 100644
index a6dc7af7e536..000000000000
--- a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Major mode for GNU gettext PO files"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
-ELISP_REMOVE="start-po.el"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index b74cb880bcb0..be2fb3af33e2 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
index 61ebb5ba2623..71f90a1b9972 100644
--- a/app-emacs/psgml/Manifest
+++ b/app-emacs/psgml/Manifest
@@ -1,6 +1,4 @@
AUX 50psgml-gentoo.el 295 BLAKE2B d2276bb66871f2dfeec692358fd49fa226c7141ff3b9e0020c05b7d873cf65fa1d4f117724ff3baf2ea3520bf85cdccd90129bf54da815bb44de19c279e0cddf SHA512 ecb9a8c544e0b5e287771d6538d36ab67076d0fc68b55bbc5428aa99b9c5f773f01499dad6f2d624d99648ddbb30518522da3f39d244fe30b4d884567114daa1
-DIST psgml-1.4.0.tar.gz 262246 BLAKE2B e888e7e13b39108efd19bbce41f3630015556ca9e5250665456866173302b5388add506694f28a6fa7e4e4572ce4596eec66762650f7203a14d84fcfbcd8ac7f SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44
DIST psgml-1.4.1.tar.xz 200512 BLAKE2B d2bad3e5e1d9e45f6327c064806a5c9eddc49d513bf04a0017ea3de865c3acbaec8b0b188860b4a6b435097f69e445ac92250b00b339212530cf0a7c8762b907 SHA512 bd73668341fc27dc1cecb67e4114bdb728512a35b6c834c5ad57efe4e6f3c5e0f83f9d87c55bb959cd0d9e2ec74d15d0e0ea786095bc834246e0cee646761681
-EBUILD psgml-1.4.0.ebuild 827 BLAKE2B e8425bab4b9f39686ba920f5c771a1a25565105cd1370ec6d7f2e5ea0587b5a3c0e3b614610d31e0bac5a82dae7b1142268fbfdb1fd0126d183358b5d02561ae SHA512 2e1778fa2efb8596b991314cfa0a3f43df0a9471aa3a4b44c8d8631d92479f3c14f3ab10b3dc911d27b46ee076c91c448e68ce621608b5c7463b3b7d664ef4a3
-EBUILD psgml-1.4.1.ebuild 825 BLAKE2B 618fcafa898fdbb6a91c1ff37045c740c6670cc32813b59c16e1fd808eac4704f1b49d7b4279b1cc895acb0956a45cf07b83a7de8d54992a73b955900704e321 SHA512 5335db6119f22a29eefd9b21eabd5de4b21c5c145f39e8bad057fe9c6f103d36d1ffe0ad7aeec53081c1bf5526b5a69e038ad5b3075e53a2f6361cda27c19daf
+EBUILD psgml-1.4.1.ebuild 822 BLAKE2B c4200db92ba23194a6257d2d5f8b12c91db86a54bec988a0f0cc7cadfc4f686f086ef625d29b87154d894149008daabf8dcd811d7c7445c674f1aaf96a4daff9 SHA512 e3223ef0091c1a037666bbb5578cb0429d56a2cf62a259e6dcaacbbb9323c7238a544140881de7930d8cb033733df55c54d7f4baeb6a795916adcd4565e76199
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/psgml/psgml-1.4.0.ebuild b/app-emacs/psgml/psgml-1.4.0.ebuild
deleted file mode 100644
index 4d38464f5803..000000000000
--- a/app-emacs/psgml/psgml-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A GNU Emacs Major Mode for editing SGML and XML coded documents"
-HOMEPAGE="https://sourceforge.net/projects/psgml/
- https://www.emacswiki.org/emacs/PsgmlMode"
-SRC_URI="http://www.fsavigny.de/gpled-software/${P}.tar.gz"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="app-text/openjade"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- ${EMACS} ${EMACSFLAGS} --load psgml-maint.el -f psgml-compile-files || die
-}
-
-src_install() {
- elisp-install ${PN} *.el *.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- insinto "${SITEETC}/${PN}"
- doins *.map
- doinfo psgml.info psgml-api.info
- dodoc ChangeLog INSTALL README.psgml psgml.ps
-}
diff --git a/app-emacs/psgml/psgml-1.4.1.ebuild b/app-emacs/psgml/psgml-1.4.1.ebuild
index 465c0edee1d9..86642ee85300 100644
--- a/app-emacs/psgml/psgml-1.4.1.ebuild
+++ b/app-emacs/psgml/psgml-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2+ Texinfo-manual"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="app-text/openjade"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 14e536315ff7..33a2f5ef8a9c 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -2,5 +2,5 @@ AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df5
DIST pymacs-0.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
EBUILD pymacs-0.25-r2.ebuild 1262 BLAKE2B 6e4eeff552b27f35f431d4d6fef5f101b54c7bccd9d5611178ba8aeb923f7fd47010f5ac27ea6e3c99f5c19740a5fe0aca551211377ec66e26135a70b70b1afc SHA512 2645b4972956b8f8888b1fd4daec39016414e8969c6f7027dbb2755f897a0b47ae6268b8fdcd54ac6b7a53a415a3afc6748a1cbe5b45e9c489918bf6bb39f39a
-EBUILD pymacs-0.26.ebuild 1348 BLAKE2B fb0d319688d2ffe7128cc527613b9b3c87c7b092af5e5170cf5fd5a193da136d45b9edfb13540fd92ee653ee0ba8286e0faea182c0a3d2b4fc5a416fd16a2ba0 SHA512 1f7c2b9a85eb7135ca64eef1b26d2d22a41268b6ca254c2e216c5c72e5369ae9bc68d0eff4bb4844a1036022f79c902316887e47d1fa4493f0dc9916ddcb08df
+EBUILD pymacs-0.26.ebuild 1347 BLAKE2B e58ee751ee531ff9f76eb3b9e0e425dc609e5611449bc821c6ed610e1b52806d688c05f875ca66103e12671b5cfda75f3c21aecfb32b97982c9fec76f5cf67ce SHA512 53cc9018790fd6edfa5b27f2958e168e35eb616c32f4433a4f1df3e92cd4fb86c522de7feb126b8f63820df71c9228c1ce3bc0ea6444f7c61a5b7ebdb6c4e3e4
MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/pymacs-0.26.ebuild b/app-emacs/pymacs/pymacs-0.26.ebuild
index 77c813340aeb..df7a7f94a969 100644
--- a/app-emacs/pymacs/pymacs-0.26.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
#IUSE="doc"
#BDEPEND="doc? (
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
index 61e319ea376a..3933cdf579bd 100644
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@@ -1,6 +1,4 @@
AUX 50quack-gentoo.el 443 BLAKE2B 54f22bb597de98c092a0f520f0da43ecb1c0b3775aa49058c6210116f0cb9a4820a4b29703e1b64cb6975984b3c5be596b5d94efbd0639c67208e864ec37e49f SHA512 724a1903e7c801e59af487059373225ab5c9da02bb912364566dcd468f06067aa722061bb5e1c9284cfae200538550d3e5fbee24de997720f47af4cae10f90d7
-DIST quack-0.47.el.xz 44508 BLAKE2B 36b05926e019d191a21bac6e8e0d8f2c0228a4decee807f3ed61b145db56af5bdede43708c5e04d1f65f261b7de645a40a02a95f0300b8673b454293011903e9 SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce
DIST quack-0.48.el.xz 44552 BLAKE2B c66cb3053b0ec9b2df6fefb3e383628e5c95a90a489fccd5a759c088e695f50e6ee1f12be213114aee99e91716e5f5549248a4188d85bbbe5546d958677a44d8 SHA512 ab6db23645c6c0582cfb9322139dcb2f45662473b1b32cc0eabda3243392e47b19cbba7a2ac3324519e877168e5694bb2d6ea76229a318d9c6c0cba4cc446dc7
-EBUILD quack-0.47.ebuild 368 BLAKE2B 5e126718546977ff957d913e5bd7956955cf6fab08ca976074350ce176a044c462c796c39ac06e855a032ca680fa0d94e8fdc61f9fcd477cd2a81f3489bbd0c0 SHA512 8d41f0d20afb492fcf9dc8814e5ec5970ac199422728a4d27da3918a226f424ef0f2845fdd89c62113f63a3d68a1096eb8da5828a8746c5606a2575cc667f176
EBUILD quack-0.48.ebuild 365 BLAKE2B 1794a881103b76d7f3e6a4d044f259e44f5fcf39660704a038766acd2489f75bb7f193839d076b581b60a57c1e3a5225f50bc7d83efe827a83c4b8f1785b70f0 SHA512 2eb35f6ac0ae198883f3368ac983828426f934d1a768f248f21099ae2d35116d59f42a15280d58d8ca4acc74ad7643bc87a1d0f842293b0a031450907aa8dc3f
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/quack/quack-0.47.ebuild b/app-emacs/quack/quack-0.47.ebuild
deleted file mode 100644
index 2cae951f4432..000000000000
--- a/app-emacs/quack/quack-0.47.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Enhances Emacs support for Scheme"
-HOMEPAGE="http://www.neilvandyke.org/quack/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 5f9894cfcdbb..5ef9d5cf523b 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,12 +1,8 @@
AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
-DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
-DIST ruby-mode-2.6.0.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
EBUILD ruby-mode-2.4.1.ebuild 505 BLAKE2B 59762ae1916eca477938b094557b0ee96c536e1fa0b20202d43b6b6f9f9f75066e9347d6f9ed83168ae169ac780c98ac7e6b43933e789ccf8f7ec5fe44d59483 SHA512 92636fdd139bdb68f96b063a6137bb7467f7cd0b608fe4951d5db59808d571377e93a8ab911acf93d020b4b206db90a5118eeb5a80ef12b035ee7fd62201ca26
-EBUILD ruby-mode-2.5.3.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
EBUILD ruby-mode-2.5.5.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
-EBUILD ruby-mode-2.6.0.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
EBUILD ruby-mode-2.6.3.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
deleted file mode 100644
index 17e27bf7d62b..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/ruby-${PV}/misc"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
deleted file mode 100644
index 6959b4080a38..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT=75bccbb384e6907df47ab69acdccb4536806c890
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/elisp-${COMMIT}"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
index 99884e87adde..cc70eb9089c6 100644
--- a/app-emacs/session/Manifest
+++ b/app-emacs/session/Manifest
@@ -1,6 +1,4 @@
AUX 50session-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST session-2.3a.tar.gz 26648 BLAKE2B 6380e9c31c37afc99229bbe63ce86f0e80340e093c9ec859adbc688e10e8e6f9b40153344fe02336e9336dcbc7c40e0a2337d82a90d0a40f161b5e4b062988a7 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a
DIST session-2.4b.tar.gz 21227 BLAKE2B 7caa73e2783bb871531e0a445fa0a93a6e422b81b5912fba9415eb94baccf8db0732f6cd05e9e3796ba7e9dc6b85e831169862215b14686580b86a613f04d006 SHA512 2474c063b07463c09d621d095c46f87256799046a0b5a4e8dba49382e9d7da74579dce725d376b8c32fd0935a519088ec5a401d6ea8062c3fead4e53efa7c5ed
-EBUILD session-2.3a.ebuild 634 BLAKE2B bce709f072f9a3b988707117914f21e737a7f72e2136b41d2b555e09092b4eb3e6f5a790af309a1a1aeef05bfde8f82a0bcb05e1ba8b4ea71f50b8de4465bcc7 SHA512 9e93e4950902c675a456cd18418c6c48546eab2e696f47817f16116aee0295e33ab5904f05a12ba597067c28cba75ecfe8fc5c89197aba577cb3884832036016
-EBUILD session-2.4b.ebuild 588 BLAKE2B 0c3be5287d97af4c54443faea883a92b4a37740a18d4dd5729f17cf5d331b200423c49eb6584b891ac09b6dbdfded6bdd0e381f13490f266616d4e7384cd6719 SHA512 6a773324a35bb9292186e554d737b915b7d8ee32d6dd8f325b3139d4a4fd0594e4dc14df4cea8849002bf2155dabaf6083536f4e3b0fe8552fa18b25958d1a6a
+EBUILD session-2.4b.ebuild 585 BLAKE2B b14d43339e5df6ab33f0608a818d74da1499715f2acb799224c6656c99822925882bbe27818d69980b4281c9d2d7a1d02afae88910df72eb857320ee1b9927f2 SHA512 16ffd833c3d5af7102d000c0e1dafd0cc7dd649c6fba5431ffc8a20d9bc9c759bd2371b5fd7bfa9ccaece9d39c9d49889fdfe5f18998f99ddbec517052c2e61e
MISC metadata.xml 363 BLAKE2B 4957fd40e9e3161aad4fb8784651fb49b64a8befdb8734944a75a5b4d3987cec07fcb951582b871eb382cc4270dda606ea8df2b72cfd0856468813091efb0f41 SHA512 cb7cd548a5fb5f36b2b3bab8eee175bb21903d2baefa4230806812a6281a5860b31afe0bde4345cb4e1f3918601a795ee0906ef22e2fbd2f5f7a03618c7210d5
diff --git a/app-emacs/session/session-2.3a.ebuild b/app-emacs/session/session-2.3a.ebuild
deleted file mode 100644
index 1652c1126531..000000000000
--- a/app-emacs/session/session-2.3a.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="When you start Emacs, Session restores various variables from your last session"
-HOMEPAGE="http://emacs-session.sourceforge.net/"
-SRC_URI="mirror://sourceforge/emacs-session/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S="${WORKDIR}/${PN}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="../INSTALL ../README ChangeLog"
-DOC_CONTENTS="Add the following to your ~/.emacs to use session:
- \n\t(require 'session)
- \n\t(add-hook 'after-init-hook 'session-initialize)"
diff --git a/app-emacs/session/session-2.4b.ebuild b/app-emacs/session/session-2.4b.ebuild
index 9e6d4b7720cb..47b871c16f90 100644
--- a/app-emacs/session/session-2.4b.ebuild
+++ b/app-emacs/session/session-2.4b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/emacs-session/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
S="${WORKDIR}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/sml-mode/Manifest b/app-emacs/sml-mode/Manifest
index 2c06f23fcb09..b383cae31a9a 100644
--- a/app-emacs/sml-mode/Manifest
+++ b/app-emacs/sml-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50sml-mode-gentoo-6.1.el 72 BLAKE2B e4b7e4fa2f440410e323da54183257aff3bf555ebaa5e1d3d579375b9bbc5e77bfa1af68e4d305013ca07d9a16df2618d3b5eca6035a42810f87f3abf8bfbab0 SHA512 f8b15038063e9419a5dbcb9b98696df8d431d86806e06d24645671d3c3b5b79c3c31e32330efbbbc0b72a38c841273a14f998bb62ca0cacaf3483507ec8d7444
-DIST sml-mode-6.4.el.xz 20512 BLAKE2B ec82b44e7e1ff9d4c89ffdec6d29afddb2bb5a62474dfef417409496fd374373aca53f3a850990972e888ec2dc006606a06c63e327316e28552273d7995cd38e SHA512 238c69cf34bdd9b825fdc00e65741a458e64bf4bf38ed96ba0518154dd92f25877d56d09f4c13271577ea8641ca828023db950db07a42fe1a02659527b65cb5b
DIST sml-mode-6.9.el.xz 20368 BLAKE2B 5b97c6620d97a60f29e21e8d69179e33f56b7410bf975238e23ef10d4c9e8d7dc250cb60d1799224ac6c81285f539cbb7f69b616763b347ed7140b9652b9add7 SHA512 e04143e1017317d6c6fb3ad7a26cd812bb45dd406a5fb679be21ae936ab57739bcf692585d5710a8e08c469a07728a20cb71ff1b53661c4040eb16df55c8be0b
-EBUILD sml-mode-6.4.ebuild 500 BLAKE2B b55d6c334be8bd80667740d582d2e3f18dab432fa5a559f900f2b2528f4c3e256972842d45bf92e1a73fbb9178aa0388e9d6bdda87f107345dfa9a2dd07fb671 SHA512 a1d7a446d46b78b50efd2d907efab0aa2363fc2742602e7c183cb8770d994c931597b6ae15c194da1b9d0909de26b1561c12a7e289e600f969772cdeca8f8590
-EBUILD sml-mode-6.9.ebuild 568 BLAKE2B d6d8ee1c09d45465fbbd0086fee2034170879e9b895c71b1705d6aca5a51f2d0f2ec8b4eca378b93d52922f6ea4e64d3c10bf9587ad99563ce120105542af866 SHA512 2e62badab973f399fd4f0757c5fe3a20da607fa0031e0200df200ea39bfc0363aa8cfd2d088bf601b49b59b0648bca462d9519963fc6d36014a8342f102d6f17
+EBUILD sml-mode-6.9.ebuild 564 BLAKE2B fa35ab165cf03d50ec4b591c7111f34d546aad0797458c7321282905065b8d4034d0fc7075b90e0168820b0175248d1ba9e866b719bae38eca19880953cefe2b SHA512 c34f1dea6470706f24a8f2cf2fb1a8434e893d815b0352ae633d0ee3024b5a5bf0c0e12bcd9996d249d0a3ba229174ae7d4b2767b97a3aada4b329878e93952d
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sml-mode/sml-mode-6.4.ebuild b/app-emacs/sml-mode/sml-mode-6.4.ebuild
deleted file mode 100644
index 7eb5bbb42718..000000000000
--- a/app-emacs/sml-mode/sml-mode-6.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Standard ML"
-HOMEPAGE="http://www.iro.umontreal.ca/~monnier/elisp/"
-# taken from https://elpa.gnu.org/packages/${P}.el
-SRC_URI="mirror://gentoo/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-
-SITEFILE="50${PN}-gentoo-6.1.el"
-
-src_compile() {
- elisp-compile *.el
- elisp-make-autoload-file
-}
diff --git a/app-emacs/sml-mode/sml-mode-6.9.ebuild b/app-emacs/sml-mode/sml-mode-6.9.ebuild
index dd9b5fb272ab..15655d5fb8ea 100644
--- a/app-emacs/sml-mode/sml-mode-6.9.ebuild
+++ b/app-emacs/sml-mode/sml-mode-6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
SITEFILE="50${PN}-gentoo-6.1.el"
diff --git a/app-emacs/sokoban/Manifest b/app-emacs/sokoban/Manifest
index f12087ca7f7a..224a4a6390ba 100644
--- a/app-emacs/sokoban/Manifest
+++ b/app-emacs/sokoban/Manifest
@@ -1,6 +1,4 @@
AUX 50sokoban-gentoo.el 127 BLAKE2B d0acfad9dcbc8f0a30c37ce1ac9dfac23c804e3830c1b6fd91188421dc785a5499d3b50c12df1e64145e8d45bc2fe7c8ce92d3e7a73c04de91ec6da6e0c44c0f SHA512 361a572d75a32639e37db650184a75dba80f8f63399d919bcf40252b04631e217e78663f03aa9e506f20bb2502816201d49cc6630be3c67177a6ff9895c7a24c
DIST sokoban-1.4.8.tar 71680 BLAKE2B faf7218dc4d1a629008b1d7fa79a9f747eeda056a89cf9e677f0b20a3dae1dad468a4f968da89be6a1daee0188ea36eb64e02c8a54f6948a89f5dcd039038c39 SHA512 bca8ba4c6357768bd3ec84d8093697acb0fcc84a565290f9517e844bc39301e9ebe7a0e8d3a2c9ef2304387ff539366048a2d2334990f1b7e3895ea1b113e613
-DIST sokoban-1.4.tar 61440 BLAKE2B b0348084517e4fddfe5adffc6fac3020bc7147983733354fe18bbe90bdd49e620dfb392385c0dbb7ffed47bfd05d6b9b28cdf1bd81cc182fde83b243d33b6415 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1
-EBUILD sokoban-1.4.8.ebuild 496 BLAKE2B dee56bbcaa1de921d71b07d68e36a08510cf5f286611d993fc015e95bbc1c3bd35068895f2ed1e2d2c7c3333c0b8e99c1bf191591683b4ae9518f167f8e56f32 SHA512 21a45e4552d266e152b671281ebc070206da4ac1b5e6b53b8199dc436bf62ddcf54a4fbc399a248cdc61668dab8ec40ccf2adbe24b1b9866e823970beed2ef08
-EBUILD sokoban-1.4.ebuild 497 BLAKE2B 60456af8f4c0b95589e0630fe43fcbf71ba82c385779b17e7ce00f32041ccec6d693c97da5dcc4f27f1c442520f10918442676b0cf4c7b4c1688ace0c9567514 SHA512 0a91ad19e78815c6ec523b5aa40379f3cdcfa2ee01ebeb1cebb2a825a34d57ff58c395446ad5cb86bcb923a4e4cea44f0af1126f29c87ec4260e4c81ed84f189
+EBUILD sokoban-1.4.8.ebuild 494 BLAKE2B 24d37874e9ed7eafee782abca8bba85d4d13e41ee60d730cd9a5c3b463aac00c27acf34dc9f02abd51fd05782e83fc96f00578e3343ce3d398f6d335e1bd434b SHA512 98d5bb3b67217a68bd83f2eeb49eaa2c3031c8be4fe4f04239e381244172277f82587c1dcae331522e243e9bdd6d885307f2c80657e4bf54cb96fd09260159ed
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sokoban/sokoban-1.4.8.ebuild b/app-emacs/sokoban/sokoban-1.4.8.ebuild
index b1a92acefeaf..65e15131a5bc 100644
--- a/app-emacs/sokoban/sokoban-1.4.8.ebuild
+++ b/app-emacs/sokoban/sokoban-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
ELISP_REMOVE="sokoban-pkg.el"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/sokoban/sokoban-1.4.ebuild b/app-emacs/sokoban/sokoban-1.4.ebuild
deleted file mode 100644
index 55c6a4fd9ec4..000000000000
--- a/app-emacs/sokoban/sokoban-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Implementation of Sokoban for Emacs"
-HOMEPAGE="https://elpa.gnu.org/packages/sokoban.html"
-SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-ELISP_REMOVE="sokoban-pkg.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog"
-
-src_install() {
- elisp_src_install
- insinto "${SITEETC}/${PN}"
- doins sokoban.levels
-}
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
index 54739fb7dd4e..2d15d7ab60f8 100644
--- a/app-emacs/template/Manifest
+++ b/app-emacs/template/Manifest
@@ -1,6 +1,4 @@
AUX 50template-gentoo.el 968 BLAKE2B ed1a12d4f1df94576e0ac7b03bc5a237ae0252ef247780c0fba30f2c4f4d5d72949a9dd9a32c7e91dc08db8e5175ab1138f4b3667397230171fc4d3c9fee79bf SHA512 a6c4fd122ae1daa7e0a07b259dba0581cdd7868d220c107c6979ef5f842659dc51c0573948979d9907241918686b48da4a89baff33abdcb12bfb30941a068396
-DIST template-3.1c.tar.gz 37903 BLAKE2B c6bcd602727d6a6bd60c1b26694b98b28f4f7c752c8c31cd2ad9359297265579b1317effadad956e5aba455b22714985367e84f3295528a1dcc09ff50bf9882d SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c
DIST template-3.3b.tar.gz 60370 BLAKE2B 7263faa93dee81f1a5214cebf20bef95dc13a69a8437438849c8377eec784881f952680b4ed52ebf6bbe7dc943a4e77aeb86722772698466aa76506e85ffd146 SHA512 7ca098e1be70ed75b78a7d5e0b216c1cf83d6b2873414cbd09af8aca09f275732ab811204094aed25bd03631590df2b9ddf614fc9df9b4e944ca8c62d6364c1c
-EBUILD template-3.1c-r1.ebuild 637 BLAKE2B c7650230d15b08ba5df4a15c027264bb6350fef406625a8d6c74fbf063c51a483f4566f7c6ae059ae1ad42a839148b6c4f379d1a9fed8c4b47a088cf740970de SHA512 601ef1ba2db841a2be31f8f0cb9049b5c4e596073284fedd82c79af20fb6ad42c145e64c8e61caa6bf14df0064e5414fbbf597e5a28497e9c1ca4461de6c01bc
EBUILD template-3.3b.ebuild 587 BLAKE2B e324fa957f984135d55097925aedee732d0d527f56007e60880ce7d7a111398a99f975f05a72e41226699b2b1dc63732ff55b54112e31b8965db4c4f561b11c1 SHA512 e855ce0bfe6b45ad1884356a2434a1cb1282495ccb75d0ec95a574cfaae0e45f514b2eddc80a5a8f273ba2af211f52d89a880d7144d56a449117c6371d123a05
MISC metadata.xml 364 BLAKE2B 51a9622045ca4a82d2ba9387fbba67f0c0e42de533bf282b0484c0fdc1e2f9abce019cf26ab9319ab6f22d9064698299ef2a253517153e6f19f68594659b1730 SHA512 ad25ac4e50e673d017b8c85ac0d69c0794995a17a915fab741e97d966d0478d4523f833f890afeb2d4e0aa31907fb25fc505b282f95fd7a223c2902a0e0b2086
diff --git a/app-emacs/template/template-3.1c-r1.ebuild b/app-emacs/template/template-3.1c-r1.ebuild
deleted file mode 100644
index 4de14534d3c4..000000000000
--- a/app-emacs/template/template-3.1c-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Use templates, decorate comments, auto-update buffers"
-HOMEPAGE="http://emacs-template.sourceforge.net/"
-SRC_URI="mirror://sourceforge/emacs-template/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp-compile lisp/*.el
-}
-
-src_install() {
- elisp-install ${PN} lisp/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
- insinto "${SITEETC}/${PN}"
- doins -r templates
- dodoc README lisp/ChangeLog
-}
diff --git a/app-emacs/thinks/Manifest b/app-emacs/thinks/Manifest
index 46d76e212379..a1481f7715fb 100644
--- a/app-emacs/thinks/Manifest
+++ b/app-emacs/thinks/Manifest
@@ -1,6 +1,4 @@
AUX 50thinks-gentoo.el 852 BLAKE2B a7418e25b5dac4daed3c9e1e70b689dfa0a9f4087a605ff50ea5fffd25906df22400fcf77066f30c19057a83d8d78c3efd8ac110ef1b0f8d19db95ab2c8f080f SHA512 c82105986cd349a7716ac1ee1b54f16101719aa6f14a3485ec7942b8704c6fd748e5eba708064607c15a50158df64d7591af90a7bdb38ba7e0ed6c0811ca9897
DIST thinks-1.12.tar.gz 3058 BLAKE2B 2a46e6a9896c62fbebdc62e81c68f14e589e0bebb5a4143578f01824be75cb3f94e6772f22bd1d9302305b87721515a6245b2a3f80d3c40a3936c15cfa8edd0c SHA512 31208821c25824cca53744afbce5ec3b94d799652811edac0a140d37c7bbdb7fbe1809be1c2b88a324aef1908493885fd7dcd9eb908440fe56bedc5c6c82ffed
-DIST thinks-1.9.el.bz2 2989 BLAKE2B 91fd4fe2b004625f758f0a3941228c0db6de37c637fcbf0456060e2a2f6e9c3618f6a815d9c649a87da286745f4831df21ebf225947d926f89ae20c49e3e8403 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802
-EBUILD thinks-1.12.ebuild 409 BLAKE2B d3e5898b423cf0cd5b0882a0ccecf659a6a5448aa3f688b4090ffb143f026249a43400444cda749c82b40c6f8fac2c8956c3937dacfd053f2515fea6f0313a30 SHA512 e0a1be1dfb7ff3ac21a591dcb989ce01bf45de5fa9ceb0e859137000a14229ec72a1b39ff67ac6acacbcd5dd0d19be60e277d4d1ed563eac96fefd0e993867d2
-EBUILD thinks-1.9.ebuild 407 BLAKE2B 6fbeafd2f21aa339197e2054b2379a16552d79ce88d6741323ff234a5839cb7af5f08528a8e3517e5032f15172c6f8ba171d9f2cc2a1f2925147ec9815fc4087 SHA512 1d6dc2def9daeb1fcc27568c46f93ed47f2270b7473788d05788446b63009022d5ec93e9ae99e5fbf7ee670644f385848a683f4da288966f0ce7941c7b374c24
+EBUILD thinks-1.12.ebuild 406 BLAKE2B 97626139187c2d323fae5ec0b3a82c4848c537bb6038653262934cfde16c23f1c4a0a2366004d5eb8c202a3361b41c94709582587282bb0e579c388eed6fed00 SHA512 06022f9f8d22865d526d396393a4419e63f7035a8b253a0c215f0f1dd99233e8db565c6c4b7f39c805850606c9847b2e945e2b38f17549a70f0eb80e0758b25d
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/thinks/thinks-1.12.ebuild b/app-emacs/thinks/thinks-1.12.ebuild
index 1786b9f42839..768485700357 100644
--- a/app-emacs/thinks/thinks-1.12.ebuild
+++ b/app-emacs/thinks/thinks-1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="alpha amd64 x86"
S="${WORKDIR}/${PN}.el-${PV}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/thinks/thinks-1.9.ebuild b/app-emacs/thinks/thinks-1.9.ebuild
deleted file mode 100644
index 4471d2d43248..000000000000
--- a/app-emacs/thinks/thinks-1.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Insert text in a think bubble"
-HOMEPAGE="http://www.davep.org/emacs/"
-# taken from http://www.davep.org/emacs/${PN}.el
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/treepy/Manifest b/app-emacs/treepy/Manifest
index 27bcfff45249..30f05437a062 100644
--- a/app-emacs/treepy/Manifest
+++ b/app-emacs/treepy/Manifest
@@ -1,4 +1,4 @@
AUX 50treepy-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
DIST treepy-0.1.1.tar.gz 125004 BLAKE2B 2aab285f0a0ce0d14cde0d6567efd062d4e2bf944421e8c4e5c3ef62965a43c7abc77d88c5baeadbe2cbe4e98dce9d563fc5b02abae8e83194dbb058d78db725 SHA512 70790f83e7f33846ca4c568c79c45bfea9a29cc92b717053eb2fa89a22a77578d80f31f19002c61d254d4b2c4c36f345324c0d631412477f09713b51124dfb83
-EBUILD treepy-0.1.1.ebuild 458 BLAKE2B b19bbfd27326fccfe2adbf1de4facd8936bc953e5255441eda908f4dd3edb45f2999d0fac07f21bcef3dc3dfec0702829da034de8106575b2238121e93361c62 SHA512 e9bbc5d8655f584c723993e5deb50991209848a52cf716ae19ec73b4f25c9d373f7010a7f290a5b2a00554bb0f75ff852091f1d1dc562aefddeb8fa9188467dc
+EBUILD treepy-0.1.1.ebuild 456 BLAKE2B 6646ce95b766db53c6bb74413666d46c93bd05f1a25e289bfa07d01cde6c20642dd965bcf5400b0dafaf1b2946a1810ac03841b700a77d25a908224df04b709c SHA512 762dd1bbd6fac5889e49d0cf8110e0fcf7067c2bf11f423dff4ed1831bd9cd671918a4e8bca56ee01ff9b9368824c6b650c4bb758290a06469b71f08662e645c
MISC metadata.xml 618 BLAKE2B 949af96bccf3ac8eae49864c76bac1d675d470e1b9ea9f4cd4a3fa674a97450a6591a08b1bb569a6c1ec477f20bd38b9d0a0808005c95bb6e0c919986d78692a SHA512 1289a6357bcda76f8bf2f7fc35638e2f6e26e3cdf895ba31acf66253bc827fbb7122c215ad795c68a9309574b97af0487bc3c7d81404e92be91adde9f4d6504b
diff --git a/app-emacs/treepy/treepy-0.1.1.ebuild b/app-emacs/treepy/treepy-0.1.1.ebuild
index af73e96d9363..60192956e0d2 100644
--- a/app-emacs/treepy/treepy-0.1.1.ebuild
+++ b/app-emacs/treepy/treepy-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}.el-${PV}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SITEFILE="50${PN}-gentoo.el"
DOCS="README.md"
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
index 0a91aceddac2..71bd0bef9ac5 100644
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -1,6 +1,4 @@
AUX 50visual-basic-mode-gentoo.el 228 BLAKE2B 2f92aeab71b89c7d0c00e925dc8775e102a482f354988a7d2b3a99cc76fcc0ad9b9284fb198d81f0c31eabe50cc6ad5d2009177351465263a32e3522681a3335 SHA512 61a40524cfdd2045fb5fd4022fb5a9c85859741f0eb310c12066f7574243779633f2a436bc9cea4a32883f78e01f256d4da1d649d8910c06ea26b7ae9e2bcd81
-DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
DIST visual-basic-mode-1.5.el.xz 17460 BLAKE2B d87cfe6c9952d728fe5807ac98284b6af518e47ae0da12a463227c4a15a12896998385e5c57adb0a2eee6b5642dc4853506a4d24fa9cb4c4d3eb8cb9562dd6c9 SHA512 f10480993b96fa29602cac51042ddc708d85c940d3ad405b2548037eab8af8d4c9b548cc3c4b770bb65681f150491d2b14255c65207050139d79f78a9a4bf888
-EBUILD visual-basic-mode-1.4.12.ebuild 435 BLAKE2B 3f5a036a44bf019d60213aba79f1e0d69f8360369ce3d3a2f1f58f74f37f11405a50215c040427507f868140d1cedede666eb267b9e98bb71e5d7a173d8f3a5c SHA512 74b142d4f789d30dc0111e01e27dc7221eaf082c9079d1c83be90ac3267e6fde8d194b4da9e54140751a6e32d117feee4a34cc38c839493f95fd912a96c71d94
-EBUILD visual-basic-mode-1.5.ebuild 435 BLAKE2B 0eeed24746b49017010ade083887d10bb5c48339283d5e0c52b9a2c601ca2abc65dfb066eea6e5ceb768e0968349aa2b20ee2fcd89333a27ff082e2519882a31 SHA512 df9516589fc81edfa0c085dc0eb0bfd17618f3b8a23355910ea306e562baaf5ae5f020d303e40558b42f97c836c06264167b3bdcbdc2c62ac0171afa56044077
+EBUILD visual-basic-mode-1.5.ebuild 433 BLAKE2B 05c10b1bf56abc1882d32354d499286459da9b2f8ce96711debf9a520196bcf8fbf5b9c877217cded243f0f7f9b5d88e1694ec541c439390e99569f4fc5304c6 SHA512 0a5e0be759a6dc2af201b6115cd56088c47f64743d0b1580dd9169ec57c5dc1b028f7b931173a167a3ba2f23184e37f353aec44591a8f29e7590938215e5fd49
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
deleted file mode 100644
index 44361f052a39..000000000000
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A mode for editing Visual Basic programs"
-HOMEPAGE="https://www.emacswiki.org/emacs/VisualBasicMode"
-# taken from http://www.emacswiki.org/emacs/${PN}.el
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
index 20c97abd078a..b78c5f849705 100644
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index 014af28747c5..3501ea801964 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1,6 +1,4 @@
AUX 50wgrep-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST wgrep-2.1.10.el.xz 8708 BLAKE2B f3881a5b774dd9bad6169f5621d4da4662127892786e708d31815cba2ff2f5a75170863ca5882cef67efb8e27964cab4176eda7c7ca561888edeb590943ae573 SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681
DIST wgrep-2.3.0.tar.gz 16241 BLAKE2B 83802934b36dfcad17e3486a7405cdd170b20bd6574d92032c92aa2a8ae84a2b6ce47313c8ca70327982bebc4fb78363181c66d1c745d2179ba84fc655c617be SHA512 2f817ef482d8ce98531494a5f19f477d7544bcc8b2747ebe184194a058c6cb26d571ba7de22f7e4307aa110806fa45f683b2363b1520b8fe5edaa05ce5ba8d61
-EBUILD wgrep-2.1.10.ebuild 576 BLAKE2B dc5197bbdf21aa1a8ca259360fec8e41317b2fd646c7da96466de3f3db36bde8224556c837a7441c6617a82875bb3616a33abc9f9b2f26bfb366541e1297c1a8 SHA512 c39b7177e3bfe8e71fb079dbf41560214971d83f7526fff5760be3c080f4014b21a8b5b0abe7f09dea64b4130e0a617817923079b66ffea1b2f50ef1bab198fc
EBUILD wgrep-2.3.0.ebuild 633 BLAKE2B 6d2f46e64aef16640e29b582f4336c4a8128f8330c8cd0ebcaa02ab0a10b8c44a4c00d29d8a4c7ce923adf569174afbe828564ce0eef8e33b526b9df0c712ed7 SHA512 034ad467b3136f32dc2a62f89886a42d932c72ef21de742c220eb768f722066bbb365e0917ddba6b132a55ccd41ed021e7b35006a81eba4c1260c56a66d2eed9
MISC metadata.xml 493 BLAKE2B c8676488f610b89dab42bd037c33e1fe6af7861ad188c28e4703c7b18665102a4b2270a5c746929cad1ba11522be8e523b80712a929bc38d1ecef71b3a8b6ba3 SHA512 8af6e19dda9919614f6bb5e1dbde585fc0128d679c1ad0685eed2cd43d93e38686f1c88f1c86f0b6dfc5cc12cb7ce25c97fb4d2766d6e2cb33b1915dc9356763
diff --git a/app-emacs/wgrep/wgrep-2.1.10.ebuild b/app-emacs/wgrep/wgrep-2.1.10.ebuild
deleted file mode 100644
index 69e3dc867b1a..000000000000
--- a/app-emacs/wgrep/wgrep-2.1.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Writable grep buffer and apply the changes to files"
-HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
- \n\nTo activate wgrep, add the following line to your ~/.emacs file:
- \n\t(require 'wgrep)"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 87ca15d4bf81..ef765ed7389c 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 0325ff2fca53..43694cdc65af 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,5 +1,7 @@
DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645 SHA512 07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975
+DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
EBUILD buildah-1.11.2.ebuild 1485 BLAKE2B 4f766ba24804b36bc976d4e1f767e469482ab8d9930b8a5488a57cd72b3644ca7bafe8d909d6e7272d73c99daf905a589bcb8b9032aeda9869e7d0bbd8ef1943 SHA512 7b10c0998a118d0e888222fe2bee26dcb2887b1f965a114f14a823b1ea8d917d55e6af657f68e003b779642f6205de43d72c4a3f119ebe8e5594a00241d3e858
EBUILD buildah-1.11.3.ebuild 1485 BLAKE2B 01285630eb57227136150c22ff37c364786541b891c0141614e5c08a19403257ec0f2e0c7947a011c9c72d066d0581ea46a09e8cd4714bcde069a78f990efec5 SHA512 0af5f84ecf95ae34df0ed7617cb7459f9f679021e388b7247bba13a16e18649f3a0ad1cd16deca6cd3b03aa40f3ef63884bce790ca7dd25c1c2222040806cf01
+EBUILD buildah-1.11.5.ebuild 1208 BLAKE2B eda40fe5008c05f0de349186a5701bb0759bbcf38f82cbdc7c4a5dc57b4e5d3fa9528683493d8e4786d5e981a8701510a4e2e21d178316433765c0f387a381d7 SHA512 bccc1c143aeec3b623709bca126072fa8cf0043e0dd85652527379f563b1c11283a5aed2d78c8899d3cf40900eb881069977884a5fa8ab7e0a3c5b5737a9dbf9
MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.11.5.ebuild
new file mode 100644
index 000000000000..2f7bb8f8c0d9
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="7c97335"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+ app-emulation/skopeo
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-fs/lvm2:=
+ sys-libs/libseccomp:=
+ selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+ [[ -f selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ selinux_tag.sh || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ emake all
+}
+
+src_install() {
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+ doman docs/*.1
+ dodoc -r docs/tutorials
+ dobin ${PN} imgtype
+ dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+ emake test-unit
+}
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index 4298fe5a2958..6311278f54e5 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,8 +1,4 @@
-DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
-DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47 SHA512 83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820
DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658 SHA512 7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f
DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
-EBUILD containers-storage-1.13.1.ebuild 3686 BLAKE2B e61c082b0de35a9cddd00e37459579ea0e98112a43a62187e1e45a19a62121df830af9f7d0a67460fa8bc71eb4295b6f8405ee21796168d18ee46033d5f11b34 SHA512 29f51afd336f77f80c75c5a99813e64d98e857b0eba4b932329eb94004657bb815e4c1a875bf9fa99da044265cd6443282eaeca79c04f59b58374c287c22a94c
-EBUILD containers-storage-1.13.3.ebuild 3699 BLAKE2B 045609a6d1b3ca7a0f17b860e5d4ff581cfb7d558406ab957e9684f05850e7fb654b5ec1e40fdc3d2dc5d51fae68aa2487c57500c5d71379f3ea62c97f8c8dd1 SHA512 65a39e7b91924a764eba4ef51eecdef7477bf45aae0e08e407f3a5f67b80426b9fdbeb585c3db5e9b6cf3a92ec0b41877da77ce45e66545da209ffb490f3c69b
EBUILD containers-storage-1.13.5.ebuild 3485 BLAKE2B 539646c67e3f3559b47d10f14924a708c6762ba2dedbb243e26507b1223cbb103d9e123d9c937dfe75af86885a2af5ce025ea5d5dc90c77bbbdc7e559baf8039 SHA512 4d23fee826634ab51e11f2208bb024ffab896143ce8027345e699e669ffb93ecbeffd1aa3c87c1a1f96741f963eecee0b997ad84cee0a37fda14adcaec6fdcb9
-MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
+MISC metadata.xml 603 BLAKE2B 97f54132ebad8af6ff29ffd35644f68faeca3f387025e6bfd7529e7d61582e7bbd8f4279c3608b6b8187e1f6a78c552d1bb9e828cfb2f6fe5fa6710e0730d2f2 SHA512 f65876cdaac00b0d5ed7524467b9cde201da0a3fdf17d959bb19bc2d98344ca013b93dd0d2ebbb24b585a9754b8d06711e0085092a3820bdfe238e26a64d765b
diff --git a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
deleted file mode 100644
index daa6f6e3484b..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-RDEPEND="
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- ostree? (
- dev-libs/glib:=
- dev-util/ostree:=
- )"
-DEPEND="${RDEPEND}
- dev-go/go-md2man
- test? (
- sys-fs/btrfs-progs
- sys-fs/lvm2
- sys-apps/util-linux
- )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
- golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- default
-
- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\ntrue" > \
- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
- sed -e 's:TestChrootUntarPath(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
- sed -e 's:TestTarUntar(:_\0:' \
- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
- -e 's:TestTarWithOptions(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -e 's:TestTarWithBlockCharFifo(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestApplyLayer(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
- -e 's:TestApplyLayerWhiteouts(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
- sed -e 's:TestCopyCaseE(:_\0:' \
- -e 's:TestCopyCaseEFSym(:_\0:' \
- -e 's:TestCopyCaseG(:_\0:' \
- -e 's:TestCopyCaseGFSym(:_\0:' \
- -e 's:TestCopyCaseH(:_\0:' \
- -e 's:TestCopyCaseHFSym(:_\0:' \
- -e 's:TestCopyCaseJ(:_\0:' \
- -e 's:TestCopyCaseJFSym(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
- sed -e 's:TestMount(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #678856
- mkdir -p "${S}/src/github.com/pquerna" || die
- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
- mkdir -p "${S}/bin" || die
- cd "${S}/bin" || die
- GOPATH="${S}" GOBIN="${S}/bin" \
- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
- emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
- dobin "${S}/src/${EGO_PN}/${PN}"
- while read -r -d ''; do
- mv "${REPLY}" "${REPLY%.1}" || die
- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild b/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
deleted file mode 100644
index 0e74471b34df..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-RDEPEND="
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- ostree? (
- dev-libs/glib:=
- dev-util/ostree:=
- )"
-DEPEND="${RDEPEND}
- dev-go/go-md2man
- test? (
- sys-fs/btrfs-progs
- sys-fs/lvm2
- sys-apps/util-linux
- )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
- golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- default
-
- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\ntrue" > \
- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
- sed -e 's:TestChrootUntarPath(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
- sed -e 's:TestTarUntar(:_\0:' \
- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
- -e 's:TestTarWithOptions(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -e 's:TestTarWithBlockCharFifo(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestApplyLayer(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
- -e 's:TestApplyLayerWhiteouts(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
- sed -e 's:TestCopyCaseE(:_\0:' \
- -e 's:TestCopyCaseEFSym(:_\0:' \
- -e 's:TestCopyCaseG(:_\0:' \
- -e 's:TestCopyCaseGFSym(:_\0:' \
- -e 's:TestCopyCaseH(:_\0:' \
- -e 's:TestCopyCaseHFSym(:_\0:' \
- -e 's:TestCopyCaseJ(:_\0:' \
- -e 's:TestCopyCaseJFSym(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
- sed -e 's:TestMount(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #678856
- mkdir -p "${S}/src/github.com/pquerna" || die
- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
- mkdir -p "${S}/bin" || die
- cd "${S}/bin" || die
- GOPATH="${S}" GOBIN="${S}/bin" \
- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
- emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
- dobin "${S}/src/${EGO_PN}/${PN}"
- while read -r -d ''; do
- mv "${REPLY}" "${REPLY%.1}" || die
- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/metadata.xml b/app-emulation/containers-storage/metadata.xml
index 17371971e525..ea691c789838 100644
--- a/app-emulation/containers-storage/metadata.xml
+++ b/app-emulation/containers-storage/metadata.xml
@@ -14,9 +14,6 @@
Enables dependencies for the "devicemapper" graph driver, including
necessary kernel flags.
-
- Enables dependencies for handling of OSTree images.
-
containers/storage
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index c9cfd96d9196..e54f64d478a0 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,10 +1,6 @@
-DIST diskimage-builder-2.27.2.tar.gz 421433 BLAKE2B 089e68b07c6f79e54b8fb30e7a9328a6c55d1abb5f77b6592cc0b29b30a44a83803bdde93631e95e39d7fc82d9b5ff3fb425a7b94821b96f56421cbde9f8b078 SHA512 e2cc6f24d5bbfdf741d6b6e7e216d0e9631d6394cf3f3f4d34ce8a78ba2ba2ddbcb0b1434121f7ab1bd3600194777a5538651d9039c3bca06bb8cc621f06f037
-DIST diskimage-builder-2.28.0.tar.gz 425808 BLAKE2B f3cceec35f019b248df8aaa94f70231dc51a9fed06cf93b16366536cfcf45b4477b7aa09371bb3cffe95f51c74d0abf9065285b7b74c5d805604c2b00df8f38f SHA512 6eddef513e8550fb6f90e917a504bac1166ef4355791bd9b0c10addebb8f84b783bf4e53dd472e6ed9acb5d3dcd951e675f4e9983ec4170c31afdb257b84e24d
DIST diskimage-builder-2.28.2.tar.gz 424565 BLAKE2B 77bad24f857de7fb17cb727f7f5168f86434e4cfeecef286da5b3351e9fdfeb0d1dc2472f800024a35adb40aa04155bb7cfa3a0772ed8186a21b31b582809312 SHA512 0bdce552a896834c97f2a982865a93f39f62d0ee68d001c60d320e831c25456a392b4510ed94d7123851dad262e5ccb38a541d0dda5d620f91cf9ab54776efaa
DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf
-EBUILD diskimage-builder-2.27.2.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.28.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
-EBUILD diskimage-builder-2.28.2.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.28.2.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
EBUILD diskimage-builder-2.29.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
deleted file mode 100644
index 20cf3dfed3ae..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
- >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
- =dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- app-emulation/qemu
- sys-block/parted
- sys-fs/multipath-tools
- sys-fs/dosfstools
- sys-apps/gptfdisk
- !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.28.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.28.0.ebuild
deleted file mode 100644
index 86d3bb124b34..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.28.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
- >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
- =dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- app-emulation/qemu
- sys-block/parted
- sys-fs/multipath-tools
- sys-fs/dosfstools
- sys-apps/gptfdisk
- !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 6eade4287c94..a4536f3f12b3 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,6 +1,9 @@
AUX docker-compose-1.24.0-setup-py.patch 1767 BLAKE2B 14ad1ab45fc11006a6054e4b5774990ba199344fc233f55b6ad034cf5fdce47cef96b15466c9b04cf33633a1cd34074db597b38b85d443499ff5264afc878a61 SHA512 1bd028ec272a8758ecec351590046919172a73d63b61643737438cda445f35caa2f85afed0b3ebe2c9092f5c7b1a84b1f340f661e4fcfa80301ef5d70f25e8bf
+AUX docker-compose-1.25.0-setup-py.patch 2127 BLAKE2B d01685c57eca8767e9936816b670da6297ff1d98f193248ea8f373f7b5237ca1db2147927dd4cd3320b8a72b3ddf958986ae76c13fb2439f059cf70e0b78b284 SHA512 424ef09f86af2c0c2d52866306d3bbb7aca17d0442d71e9d7ac6877f0cc139410191f24b877484a7ed2a416fa00d51bb4ff311114232a35afab36b870819af6c
DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86
DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22 SHA512 9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f
+DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d
EBUILD docker-compose-1.24.0.ebuild 2234 BLAKE2B 2b94a3071586d66a1e1ca477bbcc4d19f13f43446095df12fdc82148bfb246207e7017607fb010ad4edc5f2a15d04687c742b970888f22b396abdfc82b41732e SHA512 0099f3002d87799e0a678591078f29d67dd7545207763b170f168b5b8aed282daaba470dc802393142fb9b5185ba49dcee1d67440fef73a4afddf73b4df59d60
EBUILD docker-compose-1.24.1.ebuild 2235 BLAKE2B 04f88a55d885551f875c3e572dcf77df389673ef64170f051e8827b0a6de499f2503e0eb199bdc1eb4623472c170090c806c0c53d769ef886f1f6edf90ac6043 SHA512 fa02d983aa04adf0b4f832fa68fd0ad0f0cd23bfeec5a4a852f8efcf946f59650c71fda4f080faeae8c89102654c9f9e5d3e62955a09cd19d1a4168cbb2ae5d2
+EBUILD docker-compose-1.25.0.ebuild 2235 BLAKE2B e99355636c09ea135b9380935e6f77fad0dc767d30708e055f42f2f13502c9a1b30c7617e4a24750c041d78ee8cc62bca770fc698b0de6b450c8aa07a6916a32 SHA512 3d89ada9a941d58f0258b9eddcffab4088b3aea249edcb0421ddb299ed3c35295c9af79cd75f9174d12d03cf9144f2face1ef954467108e6a85e7793169b722b
MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
new file mode 100644
index 000000000000..bc3f9067249c
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+ test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.25.0-setup-py.patch
+)
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ distutils_install_for_testing
+ ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
new file mode 100644
index 000000000000..029dc54bb8f7
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
@@ -0,0 +1,70 @@
+From 8f2924d4146ddb1131e98efbee13a68b5445b7f8 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Mon, 18 Nov 2019 23:34:51 +0100
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 23ae08a..97a8fbe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,35 +30,35 @@ def find_version(*file_paths):
+
+
+ install_requires = [
+- 'cached-property >= 1.2.0, < 2',
+- 'docopt >= 0.6.1, < 1',
+- 'PyYAML >= 3.10, < 5',
+- 'requests >= 2.20.0, < 3',
+- 'texttable >= 0.9.0, < 2',
+- 'websocket-client >= 0.32.0, < 1',
+- 'docker[ssh] >= 3.7.0, < 5',
+- 'dockerpty >= 0.4.1, < 1',
+- 'six >= 1.3.0, < 2',
+- 'jsonschema >= 2.5.1, < 4',
++ 'cached-property >= 1.2.0',
++ 'docopt >= 0.6.1',
++ 'PyYAML >= 3.10',
++ 'requests >= 2.20.0',
++ 'texttable >= 0.9.0',
++ 'websocket-client >= 0.32.0',
++ 'docker[ssh] >= 3.7.0',
++ 'dockerpty >= 0.4.1',
++ 'six >= 1.3.0',
++ 'jsonschema >= 2.5.1',
+ ]
+
+
+ tests_require = [
+- 'pytest < 6',
++ 'pytest',
+ ]
+
+
+ if sys.version_info[:2] < (3, 4):
+- tests_require.append('mock >= 1.0.1, < 4')
++ tests_require.append('mock >= 1.0.1')
+
+ extras_require = {
+- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
+- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
+- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+ ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+- 'ipaddress >= 1.0.16, < 2'],
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ 'ipaddress >= 1.0.16'],
++ ':sys_platform == "win32"': ['colorama >= 0.4'],
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ }
+
+
+--
+2.23.0
+
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index e9145bc90430..ac2177b9ac76 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -3,8 +3,9 @@ AUX dosemu-1.4.1_pre20130107-fix-inline.patch 560 BLAKE2B 015ac356542cf8cdcb8de6
AUX dosemu-1.4.1_pre20130107-flex-2.6.3.patch 463 BLAKE2B d4bc8b47ce97742b0f162a0d03f9347a420ccd8c5d6dbcc92907cdb00654c73ebfaf5b108fd6ed4fb7528d4f254c7e125bc70292cce7634cb04baad27cade69d SHA512 51674b60fb341f56c7120a9349c9890a9770cdef524ae3ccf6795769fde31823b2b57aaaafd6111c236550c16caf53246773dda1cd71639887ffaa7093d95cc0
AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 BLAKE2B ec1e9a8d78ac041c33ae4b4c534a028fa47fc84b8383183006b2830cf28d1a4c227324d2dd0f6aa07c138fbbe3fb991d3ad76012ccd85da973c65b851d965f50 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a
AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 BLAKE2B a265263de5ccb12df7224343daba5d43786d7f522ae071057105e710d9cfab384a7020c0cdbb305f9da57ecf5ed8ae745ebf115f3cd0b370962e7054dc6690dc SHA512 53fe8b40bc57a2459dcd16d3fba9d81d1cdab498232afe0c19f612737861f88b2f98c584d4fa1a4548e273a38fc17d254f890a64f3112cb0433d7679e7afcdb3
+AUX dosemu-1.4.1_pre20130107-lto.patch 921 BLAKE2B 6b36f4e5502fb8b8202ab4396e6c9394d073a88843f3ad67d49bfc02130e6f15f793019e2532b98836975467951d6cf50b008b6401292d9495d55992f636b2fb SHA512 f8b2326abdff86b41e8125e9df242c08834c9f4d28c42ac90b45b409806fc9d453c951d22c2f61d5069844d6f0743600df42ca45d98e103798fbffc28485a0d5
AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2672 BLAKE2B 4ffc138e6cec18c5a57e2c32b462c7c435590e8539500590c1c6bbb33e3be5d60ee61edcbfbc20ce68210b9b6cbe1108dbdc8eaf851be2b5d5a84ed9da5f71db SHA512 fad2cd3d235e77b32224cfb72e5b71a94f8ddc0968a03ddfa5554b5f981ff69e93167ab8fcdc28d9940d04f1ac515dc7c02a5031658d46c37291314ede3c8ccd
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2702 BLAKE2B 4a9fe5d673ef17cc394b049db6651918acf69c04e8e36f61400febab1b1a9374f2d0425f7b923dd2e43609e0d60c7e8eccfc36371a6307da05d0f4857836e02c SHA512 ca8a6c37a7648287f16d0b315d30a5c0a32189f35f9788e115f8ef85b2890cf579ce56939045d2d122b8abbda8153944d6888ee9445fae9faa85c8ee85cae5a6
MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index d6de58d0a4b9..f25169144560 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}"/${P}-flex-2.6.3.patch
"${FILESDIR}"/${P}-ia16-ldflags.patch
"${FILESDIR}"/${P}-fix-inline.patch
+ "${FILESDIR}"/${P}-lto.patch
)
src_prepare() {
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-lto.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-lto.patch
new file mode 100644
index 000000000000..730ad4e5d5fd
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-lto.patch
@@ -0,0 +1,27 @@
+'asmlinkage' macros are supposed to make symbol available
+for calling from inline (or not) assembly.
+
+'static' keyword is not compatible to it and breaks -flto
+when gcc's LTO partitioner separates assembly definitions
+from C definitions. This causes symbol resolution failures:
+
+ ld: /tmp/dosemu.bin.h8Y59G.ltrans0.ltrans.o: in function `stub_rep__':
+ :(.text+0xe): undefined reference to `rep_movs_stos'
+
+The changes turns 'asmlinkage' into exported symbol.
+
+https://bugs.gentoo.org/700126
+--- a/src/emu-i386/simx86/cpatch.c
++++ b/src/emu-i386/simx86/cpatch.c
+@@ -37,9 +37,9 @@
+ #include "codegen-arch.h"
+
+ #ifdef __i386__
+-#define asmlinkage static __attribute__((used)) __attribute__((cdecl))
++#define asmlinkage __attribute__((used)) __attribute__((cdecl))
+ #else
+-#define asmlinkage static __attribute__((used))
++#define asmlinkage __attribute__((used))
+ #endif
+
+ int s_munprotect(unsigned int addr)
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index c593be3db4eb..13a311b76468 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -4,10 +4,8 @@ AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5
AUX free42-2.5.3-fix-makefile.patch 1902 BLAKE2B 1d8ae0054275bba2f8fa46aa8c6086e5b41dae17a417d8f0fbf14bb63fe9504577f67bd92b612665d414e55396ed6bc7b1ac36983b4dcfb32b4eb98514d0f768 SHA512 895fe2a42a8e1129dbc2bd8b523ae9235eb606ae8d48f53fd2689d9991ee1818334f66d154218592d9bc92b9e1d080b148ff6fca6f80295b0dd0475d9e1bbad9
DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42
-DIST free42-nologo-2.5.3.tgz 7406566 BLAKE2B a8fcad4738b46e5725e323eb7c16929c32fe0c72eccadf2f692950a3ee952f3b8f7e1e46d6e4eee4e822ca5a3b2c42adb09e2b43f0480c954aef87dc81b1edd3 SHA512 9a96bc5453f938ba806117ac3162db4f87d3584662c8a1aae370f17a06c1e92167adb2c2bb9bbd17b91473f272f8c031c7ffc1944247962571a94cb7063f0904
-DIST free42-nologo-2.5.9.tgz 7408535 BLAKE2B a64c925e5c93e396efc2a46f8d495201b039763269c9d326469f9b77435b6ef5a6b434f83a2c7017587ef7223724ed7986aafa60bcb542f79d20630eee0016fc SHA512 fba421b181649881092b398458e2065f9f133b76d88e140f046de805dd42a5ba513168cf2ecd4c94821e1b8374e596a2b696533d29c11ccae4106a14f1fdaba4
-EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
-EBUILD free42-2.5.10.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
-EBUILD free42-2.5.3.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
-EBUILD free42-2.5.9.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
-MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
+DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46
+EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
+EBUILD free42-2.5.10.ebuild 1039 BLAKE2B babccdc77920bbc8d34b991f3cd289324eec4f30b3810d1b3bd615492417e02b2e372c5548835477be9d7190d93cc370852abe99020769d6921f2872588a1891 SHA512 8c680066f1d7f235e5d0f3b69ce6f27fdacb8f950bc88076396f21f839a25ac6fb6fb28cbeb0e16c63c222819c882d6e912085956afaf980d8de4eae62700de6
+EBUILD free42-2.5.11.ebuild 1039 BLAKE2B babccdc77920bbc8d34b991f3cd289324eec4f30b3810d1b3bd615492417e02b2e372c5548835477be9d7190d93cc370852abe99020769d6921f2872588a1891 SHA512 8c680066f1d7f235e5d0f3b69ce6f27fdacb8f950bc88076396f21f839a25ac6fb6fb28cbeb0e16c63c222819c882d6e912085956afaf980d8de4eae62700de6
+MISC metadata.xml 525 BLAKE2B 19dca8c4cbe1777e905b4d4e6a410e08f6e22044428bc860534e98fbc31ab6b1469eaabd0e673c1b1229079871dbdbae267c01c211bcc85952ce0d79cbe61a22 SHA512 2bfe3994ec23d46f9cde4cf7dd66be9842315f2b104479114b3190edf7b09f0bbc5094c61eebe45b1a5330bf530ecb8505ccdff68b343a0bae048353b6efc24c
diff --git a/app-emulation/free42/free42-2.0.20.ebuild b/app-emulation/free42/free42-2.0.20.ebuild
index d9b18f97ed94..2bc7d946d94b 100644
--- a/app-emulation/free42/free42-2.0.20.ebuild
+++ b/app-emulation/free42/free42-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,8 +8,8 @@ inherit eutils toolchain-funcs
MY_PV="${PN}-nologo-${PV}"
DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-emulation/free42/free42-2.5.10.ebuild b/app-emulation/free42/free42-2.5.10.ebuild
index 67e64a2dd933..1b8978d0d0ca 100644
--- a/app-emulation/free42/free42-2.5.10.ebuild
+++ b/app-emulation/free42/free42-2.5.10.ebuild
@@ -8,8 +8,8 @@ inherit toolchain-funcs
MY_PV="${PN}-nologo-${PV}"
DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-emulation/free42/free42-2.5.3.ebuild b/app-emulation/free42/free42-2.5.11.ebuild
similarity index 89%
rename from app-emulation/free42/free42-2.5.3.ebuild
rename to app-emulation/free42/free42-2.5.11.ebuild
index 67e64a2dd933..1b8978d0d0ca 100644
--- a/app-emulation/free42/free42-2.5.3.ebuild
+++ b/app-emulation/free42/free42-2.5.11.ebuild
@@ -8,8 +8,8 @@ inherit toolchain-funcs
MY_PV="${PN}-nologo-${PV}"
DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-emulation/free42/free42-2.5.9.ebuild b/app-emulation/free42/free42-2.5.9.ebuild
deleted file mode 100644
index 67e64a2dd933..000000000000
--- a/app-emulation/free42/free42-2.5.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango
- alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
- x11-libs/libX11
- x11-libs/libXmu"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.3-fix-makefile.patch"
- "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
- default
-}
-
-src_compile() {
- local myconf
- use alsa && myconf="AUDIO_ALSA=yes"
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
- emake -C gtk clean
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
- default
- dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/metadata.xml b/app-emulation/free42/metadata.xml
index 2346aff6c159..f322ac9efa15 100644
--- a/app-emulation/free42/metadata.xml
+++ b/app-emulation/free42/metadata.xml
@@ -11,9 +11,7 @@
Un simulador de la calculadora HP-42S
-
+
+ thomasokken/free42
+
diff --git a/app-emulation/ganeti-instance-debootstrap/Manifest b/app-emulation/ganeti-instance-debootstrap/Manifest
index 07607a7ed45b..9dc40df12528 100644
--- a/app-emulation/ganeti-instance-debootstrap/Manifest
+++ b/app-emulation/ganeti-instance-debootstrap/Manifest
@@ -1,5 +1,5 @@
DIST ganeti-instance-debootstrap-0.11.tar.gz 67946 BLAKE2B 0dbf3d16ae4058f0093adcd0a33c473719cf6de267dbc4e99e3326a2885d57693e2d0408b1079681056be88c7db23ab168e38f38d4051e8847d3b552fa42d4a1 SHA512 d39ae29b49e3e0e25e9052ee5201d5aeeedfa229cc0b8674ea01a26b1b615b262c1464ca16b5268884a0fa28981e5126eec084d7bb9298a4b405574925b85b4e
DIST ganeti-instance-debootstrap-0.16.tar.gz 23020 BLAKE2B 8e96597ee94e5806de78ade571f5287e68c5442a91fb8ef3f6e2dbb95301e036fa79225b3c8a2517b05ff14eba0fb541c792556218d0f9a9346f1ebe524a6b38 SHA512 43197d034d719b81ea8737ea60763d43bf71bc9b15b0fbee60bd42e5b0c0f3821805986d4f564db91207a83c2396e87fe081180eec3a5da77d18f2d510fbff1f
EBUILD ganeti-instance-debootstrap-0.11-r1.ebuild 668 BLAKE2B 6c059e82edd5cc1c08b9af03e8758f75fc5c55210658032e76c1c147d703e3014d8020e45755134e09d9f70427fcabebcd65ee8d541b241e02cfaa728869738c SHA512 2afeeca81c5840dcfbb0b76d0dca9a62fb13d3788c573f2f37070385a7ad0d3b031a86b3b750f35b71fd66183862c133c220c9432c0b1222675954426656a9f5
-EBUILD ganeti-instance-debootstrap-0.16.ebuild 846 BLAKE2B 1958a53d66b67c49c2534e775cbefbeff8ce5ff43d8a3f5cd11ece43c9b2636b776b6e6e41178dc676ce7d38e13b09128f2fe8ea01940bb1efff8d27d903d7b0 SHA512 49a465b86bc87209fa0e55c6ad21541476a8b4a6f28b03c905ae9339f72de06109b7d389cfe92e811eda69ddf136efe92c3e7b2e1e9acc129b82b7ec1c090111
+EBUILD ganeti-instance-debootstrap-0.16.ebuild 842 BLAKE2B fb7886377dcbdd7d72cb1e685f0771f8954fbb68423cfcebcdb35a93c40ffc110b7e9ff638366a3db5cc2195de6061883cc95a6c16fda46d84704eb857db0f87 SHA512 12ca8bc73f4b12dd30875555440001a86d706e4d8aadbd8badca822c4ece9bb8d0d0a143996f2766386e3208904b3e64e47a9391684567b3c5ddbc897d608f16
MISC metadata.xml 693 BLAKE2B 8e67678f49377a1e982361b80d67e2af5b4a093996d7416e1ac98925ee3cd9f3a79fcd23f9146df831c55b6aa9aa8ed4e7c5e735d9fd191b48406b256757d340 SHA512 5cc8e1aa819d16acfd1645a8f4921343e931423af0e4e6414d92599d3d9a0ea301b1549a767b9c768cb7f35d9bf580657ddf25d1165ccf59cdda54e0099fbcb3
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
index 7bea16989fde..b6b769b1e5be 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ganeti.org/instance-debootstrap/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
${DEPEND}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 657b5fe226fb..99ada4deed8a 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,7 +1,5 @@
AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd
-EBUILD libpod-1.5.1-r1.ebuild 3947 BLAKE2B b2e0acf87c7d929a85fea55eb4eb01029e6a62cf50c3e8009941d360bee2089c2ff24ae7e42ef29e6b6b47b907e8996e52b842d9d7b935a3b2046226e82a56e3 SHA512 709f350e30b2512c4d9eb22729b0a6b66b94e7411ecec8429ebbe96ce6d974fe984b9590b3ea113279f10af9d07b42a46f3713915d7a7bcd0d42f72e28af28aa
EBUILD libpod-1.6.3.ebuild 3642 BLAKE2B 842ab44923c9850213edb42c270ef015c42547e4b3863642651befef70d14a08d29da2e0017d354bdf858124887e10904d9b8238830aff9ca980f0d1cd577820 SHA512 facb44cd7f15957fa067e467630e0f8afa2a2a7f4fd79d3903061af3c8932d28289c7a0b7733674077371213bce26bdf611b63e9bd0d67dc8fcac6568f9d79c0
MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.5.1-r1.ebuild b/app-emulation/libpod/libpod-1.5.1-r1.ebuild
deleted file mode 100644
index f1061d08281f..000000000000
--- a/app-emulation/libpod/libpod-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="00057929f5acfd98341964d85722383363376d52"
-EGO_PN="github.com/containers/${PN}"
-
-inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- >=app-emulation/runc-1.0.0_rc6
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- ostree? (
- dev-libs/glib:=
- dev-util/ostree:=
- )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- sed -e '/^GIT_.*/d' \
- -e 's/$(GO) build/$(GO) build -v -work -x/' \
- -e 's/^\(install:.*\) install\.python$/\1/' \
- -i Makefile || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/ostree_tag.sh ]] || die
- if use ostree; then
- echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
- else
- echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4fd252de5b35..485a85631f4d 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -5,5 +5,5 @@ AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb
DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
EBUILD lxd-3.14.ebuild 6838 BLAKE2B 19767cc66314b0faa5270a51fb0f5db7264c6f55bec02ddbed3673b3c051d16f9556d59da592b55b638b0e93d76fe549ac1ab24a5fe997d0af19c71f0ae4cb47 SHA512 8f7309e0eb05b64e6dbaf2c048511737d7df96d35bb1d0a340c9e80b2a025b3d49a37795303b02b4c0429fdfb43e881be22d1f4b555949a25c4e51b9607f3dbd
-EBUILD lxd-3.16.ebuild 8078 BLAKE2B 48585fc59909c1d404fbc1cb44e4c7ed4c49b78e2685dac1a542c9be44efffdd679c6bea7997cc0e52f0e434a4d96d1cedaf3ff53fc9e2bf96018da770484780 SHA512 03cd8e9a1e2da16f6f1b6720556fe781c96bd9376135cfdfca17bbd4028d31a71ff490bae8a6317e8bfea89394a87fd5b9505a8803fd80cdecd60f03764f96a4
+EBUILD lxd-3.16-r1.ebuild 8108 BLAKE2B d9bfc28cc66cd63f50431bafd7c958bdaf2c217ff13e8e9e87800459a465797feb222b50300b6e659236a19276b5da9dc7168b42ca0cdd1e5baf10db3955fd9f SHA512 8c1b5d9a630703d191ee45887d5d73a025ef9ecc42840009fc82fc088e21646cc70f3db8dd4c8f3ff9fd3043e028ecaa8f5b2e8d7882c42cf0876fd4f881603f
MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
diff --git a/app-emulation/lxd/lxd-3.16.ebuild b/app-emulation/lxd/lxd-3.16-r1.ebuild
similarity index 99%
rename from app-emulation/lxd/lxd-3.16.ebuild
rename to app-emulation/lxd/lxd-3.16-r1.ebuild
index 8c7e5f94a4d8..28b5695b2e9d 100644
--- a/app-emulation/lxd/lxd-3.16.ebuild
+++ b/app-emulation/lxd/lxd-3.16-r1.ebuild
@@ -11,6 +11,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+RESTRICT="!test? ( test )"
inherit autotools bash-completion-r1 linux-info systemd user
@@ -45,7 +46,7 @@ RDEPEND="
net-libs/libnsl:0=
net-misc/rsync[xattr]
sys-apps/iproute2[ipv6?]
- sys-fs/fuse
+ sys-fs/fuse:0=
sys-fs/lxcfs
sys-fs/squashfs-tools
virtual/acl
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 98e3246bb1f9..9445363caf48 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,7 +1,5 @@
-DIST skopeo-0.1.37.tar.gz 2766509 BLAKE2B 59e3f4cf37694b4ae59fe4eca6afd8abe4f7ab1aec3c0cee409be6f0f648fd2929092ee9b5a2b167c5041202dac908cd39f693d8ae8eebf621be47f302bd885c SHA512 e2de3c65f864572fe74ca55ee107703a49855f0da71c440784b06d13ed724456cf7bf30e18a5cb15cf2e136edc688b56321cf7838a2cc66f39c4ea9d9686441e
-DIST skopeo-0.1.38.tar.gz 2947365 BLAKE2B 1d2d6ea2ed677f2b068ecca9b8dcee9d31280acb3f7acd8e0a59321d178244b506f4124eba8dd0519a3f5b307a6001d05a093cdf93189eccb55cf7c9cc41895b SHA512 83e53eb7632761eb444d4f824b6fee7a2e265e386fd1ba58e2d3194750f794a0e1cdc94a76222d12f589f851c459b165756661a76c09cc9c7dd9b2d6fff2b39f
DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
-EBUILD skopeo-0.1.37.ebuild 1393 BLAKE2B 0053a48cf9c1f528756796d0ee32c1ad1a1f8e66321da6bfcab723cabc442457d1219cbabd374aa7f7456682fc4ce061ea4a4f9df804152e45f6aa5b50fd7b01 SHA512 720be9abb702fc76e9345c352bfb08f04d789e4347a3343385c23bdd33a0b37844949f0625aa52a1e324127fb7e1dcc82f53cfeee4722eb99a256dc02c533a63
-EBUILD skopeo-0.1.38.ebuild 1393 BLAKE2B fa6abbefdac30118fde931cb2e5bba8ecce43e1ad9b214c95188b98e4016e64424a6a71f05dc6c844ab30738660d3551304f667456dbf2518542c119c9ba6b94 SHA512 9e12e84ba18f521960d15d2818334abae3d3a10c3c3643e40a960a116f2f79cc61e72fa879d1272d3a0294a23f42edbd9a79c2383ba1a8ee3225bdbfd5193799
-EBUILD skopeo-0.1.39.ebuild 1420 BLAKE2B 1539f426834e83e3d03db609b1bbc412bdb80e3a5876ec512f2a52aa87cba0531f23feaf3298cc19870ce1d6c4b04c5a17d7efd1b971956c82a7a67ec891550a SHA512 8bf6867e89d837784c99a8f6ed0263f8e891de3a4dcd672c28f918d0ddd3bc070f816d8b8ed026da032fcca6e1bd210f583a44a35ca8765e0406e005d7d75acc
+DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
+EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
+EBUILD skopeo-0.1.40.ebuild 1330 BLAKE2B b8bdb403529f88d1d3f99a29f68ccebea176c0ddab364ed94dbcd8e11882571ac8d1257165854d2cccef9ea1deeb096bcd3ebc75d651cdd9a8b4df684480e56a SHA512 a40beb890444640523c70b3745dc82f7e0d935c6cfcfb86daae71daa79be1dd938c4089a7ad2bc8ce0f0f3db327d2c096d2527f045bdb87809b54a62893654aa
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.37.ebuild b/app-emulation/skopeo/skopeo-0.1.37.ebuild
deleted file mode 100644
index a3641ef7199d..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.37.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/containers/skopeo
-COMMIT=e079f9d
-inherit golang-vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
- >=dev-libs/libassuan-2.4.3:=
- dev-libs/libgpg-error:=
- >=sys-fs/btrfs-progs-4.0.1
- >=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
- local BUILDTAGS="containers_image_ostree_stub"
- set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
- go build -ldflags "-X main.gitCommit=${COMMIT}" \
- -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
- -o skopeo ./cmd/skopeo
- echo "$@"
- "$@" || die
- cd docs || die
- for f in *.1.md; do
- go-md2man -in ${f} -out ${f%%.md} || die
- done
-}
-
-src_install() {
- dobin skopeo
- doman docs/*.1
- dobashcomp completions/bash/skopeo
- insinto /etc/containers
- newins default-policy.json policy.json
- insinto /etc/containers/registries.d
- doins default.yaml
- keepdir /var/lib/atomic/sigstore
- einstalldocs
-}
diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
index 3af894ea4f9a..b26bcce76158 100644
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Command line utility foroperations on container images and image re
HOMEPAGE="https://github.com/containers/skopeo"
SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
diff --git a/app-emulation/skopeo/skopeo-0.1.38.ebuild b/app-emulation/skopeo/skopeo-0.1.40.ebuild
similarity index 80%
rename from app-emulation/skopeo/skopeo-0.1.38.ebuild
rename to app-emulation/skopeo/skopeo-0.1.40.ebuild
index d6afc826266f..3ee26d3ab1ad 100644
--- a/app-emulation/skopeo/skopeo-0.1.38.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.40.ebuild
@@ -2,15 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-EGO_PN=github.com/containers/skopeo
-COMMIT=37f616e
-inherit golang-vcs-snapshot bash-completion-r1
+COMMIT=be6146b
+inherit go-module bash-completion-r1
DESCRIPTION="Command line utility foroperations on container images and image repositories"
HOMEPAGE="https://github.com/containers/skopeo"
SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
@@ -24,14 +23,12 @@ DEPEND="${COMMON_DEPEND}
dev-go/go-md2man"
RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
RESTRICT="test"
src_compile() {
local BUILDTAGS="containers_image_ostree_stub"
- set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
- go build -ldflags "-X main.gitCommit=${COMMIT}" \
+ set -- env -u GOCACHE -u XDG_CACHE_HOME \
+ go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-o skopeo ./cmd/skopeo
echo "$@"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 47cb783cd104..d1dbc6cfca22 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -9,6 +9,7 @@ DIST wine-mono-4.8.3.msi 116183552 BLAKE2B 5e82c2e6e456311de817b7870e02d60abc3e3
DIST wine-mono-4.9.0.msi 94960640 BLAKE2B b60debd41ea33eee15ab1a546c526858b97cf4d5d896c856cce21f09210e3e10f1abf98dfb723abbe75657dd44011c1c793a08a329e037144d3266001739467c SHA512 76142fa7233aa3f8111df9112927e699cfc39f8bd0f02f0fc4d065eaeb37964f9e2b49bf53c406fa6ec72c247ab85ddba244ac97b4d6a377adeb63d9ae339e24
DIST wine-mono-4.9.2.msi 94981632 BLAKE2B b70a5177fad3c6ee2b04ef40105c7700a08339786a23d7378ba72005da5b3cb6b3a797f0173ba32224bcfd25a4bb0fa01c92a83b88e005973b33320717f5b31a SHA512 73e46ec57c7a78d8c32ead4698c299fa557bb97739ce22c9405f95f48f55d604743aa01cc64183c9f89f99aec6f04b664bac0ef96e6a436d38ebcd9d7cf3b329
DIST wine-mono-4.9.3.msi 95017472 BLAKE2B bf054bcff51e986ddb95788fdd1925ee13efe6e881089a23192d4ccb2527ccb2a2969917b9c3bb16a2161a2bd1d60c24605fd07e6c432f8f77c7c506222045f9 SHA512 4631d4e3b5118eb726f614e2f58f9e95f44bb97a1285fa726d3542d44e2a77ce818997ecb4de42e0d318d364d7c929f10d7c5176b59732e8b468e7695633706c
+DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b91740cb43942477c7bdcac382eafeb5fc9c3fe78191b19d81bc5f06dd5c33db7ecfbdaba5e6be69ed39a6827706 SHA512 d52a2cc1137eac87acdaecbb7a81b3d618cad9ad3d7bca5b29940b7432923bfc1497ec21501a05797ef52c6588bb9c5e312df5c02ede8448d1fe1f2880557fc9
EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
@@ -20,4 +21,5 @@ EBUILD wine-mono-4.8.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
+EBUILD wine-mono-4.9.4.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.9.4.ebuild b/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
new file mode 100644
index 000000000000..15aab248909e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}/${P}.msi"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2f4ce892b472..bf826550f2a6 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
-DIST wine-staging-4.16.tar.gz 9905714 BLAKE2B fe72d1123c7f418dc9702b113679de7d21a8f20b2bed5e9b2f7a2b411ca28b407e0d2d134dee19ee06414df7a3ccfaa784d5689e3dc79043544d17c6768e6a17 SHA512 8782e4aecb34443404b1ac02c6b1ba91887ad12f07c7960601f879b034937d5ee6f1c1493437e765804beed6e68fa20383f7c02a09534526cc5f4bb857048faf
+DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
DIST wine-staging-4.17.tar.gz 9914906 BLAKE2B a5a430588aaede6f6ac2e30710bf58d57100a37444a2610b57529116b2d9b88a6f4bcfb56ad71153734d8f1a99a70eab4cb568d3cfb6d5ce6198eb662e3cc201 SHA512 1f27511c8ff6619f4138eb3b2cd0cc1cdf42c0cd4206c68bdf792ae17c339611016e32babad121f0decf20331f7ce4400033be03c4db26cb6a4dc601c9c4b14d
DIST wine-staging-4.18.tar.gz 9917480 BLAKE2B 477da02f5177e7efad33ca30267b2a8755c493972c2ff4ebec32275b699a4c08fd9d4b72181f8ad87c58b1c120b7a7b47951057db36963bcd161afe10b1a89aa SHA512 e5ddb7ac09322b5f2c8e8facff9639699a6a3e72a96f4028e88e23e81f73c766bde1479e54a9a80bd7f33c7747a8220e2699f4dcfe55117b9832ff4cdba60a04
DIST wine-staging-4.19.tar.gz 9908545 BLAKE2B 36674228de808ac9d1f3f66e9274fd9de68173a6a1acca405eb08836a8a787e4e78465442ef6769c02f8fd2e20c3f059d59a1408ed3a8add8a91a68efd07b7bc SHA512 a47ae16dd39797b54011f942fe7e722897af7ddc0bed2bf2e39c46aecf60a02769f7287609c63b4c0c3f1c8e40172e0cdf3bdb53562a07d7a2b7ac53e570dbdc
-EBUILD wine-staging-4.16.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
+DIST wine-staging-4.20.tar.gz 9899451 BLAKE2B a90a71f8f68874822c7326eb13cd26e66dfce8afc6d8fc60f1cf86a20c1a8074178bbc618b540a4bac5168fb0242a0fe46c9167bab3e587462d78b706eaad15c SHA512 2ce4f6fa83fc275c83bc7f7bbd4b1a4ca65f7e55e16af40958635b8b2efc2b174baa79ed576ed09c4c13b572756fb6262f19281e5b72797c7e0f1f6c4dd1a4ee
EBUILD wine-staging-4.17.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
EBUILD wine-staging-4.18.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
EBUILD wine-staging-4.19.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
-EBUILD wine-staging-9999.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
+EBUILD wine-staging-4.20.ebuild 20292 BLAKE2B 73cc0437ec8cb6117a65bef1a48578ac5148634803a63b1491f94690f3ef98331505e56e7898ecb0fb96c84e14d7224ab9c94b4e0cfadcc088ad11f89d2a7861 SHA512 96bd9c1b21febb63516c47f8a8e8f460db1d1fa89c9340121891a69c81aaae18d1ddcfc2b535bc2e13109f8d8849acec35ad3dbb0083498e000e90899aa807c9
+EBUILD wine-staging-9999.ebuild 20292 BLAKE2B 73cc0437ec8cb6117a65bef1a48578ac5148634803a63b1491f94690f3ef98331505e56e7898ecb0fb96c84e14d7224ab9c94b4e0cfadcc088ad11f89d2a7861 SHA512 96bd9c1b21febb63516c47f8a8e8f460db1d1fa89c9340121891a69c81aaae18d1ddcfc2b535bc2e13109f8d8849acec35ad3dbb0083498e000e90899aa807c9
MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.16.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild
similarity index 99%
rename from app-emulation/wine-staging/wine-staging-4.16.ebuild
rename to app-emulation/wine-staging/wine-staging-4.20.ebuild
index 1c459adafb0f..a2a1c5872a75 100644
--- a/app-emulation/wine-staging/wine-staging-4.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.2 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 2d1bd8b5970e..a2a1c5872a75 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.3 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 5c9fa482e1f7..da0309fb5d53 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,16 +3,16 @@ DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f88
DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
+DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
-EBUILD wine-vanilla-4.0.2.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
+EBUILD wine-vanilla-4.0.2.ebuild 17334 BLAKE2B e2c442f0b2684f378ecea73fe436d4325b7e81c82132f3b78ef887faf17ffba6caa8f2e55f0eb9ac317938c5d65d1ebde865ec371266c14a9a4911d8ffe21669 SHA512 573416098fb899aea3698a58e95f549f73a8279764139acfd39401be42f8273fda8d7d1d761c5ed28c07273db13a3c4eab7105a711791e0999521fec9d70a7e0
EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
-EBUILD wine-vanilla-4.16.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
EBUILD wine-vanilla-4.17.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
EBUILD wine-vanilla-4.18.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
EBUILD wine-vanilla-4.19.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
-EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
+EBUILD wine-vanilla-4.20.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
+EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 78f6dd16ff0e..05f6213761fc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -21,7 +21,7 @@ else
MAJOR_V=$(ver_cut 1)
MINOR_V=$(ver_cut 2)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
+ KEYWORDS="-* amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
similarity index 99%
rename from app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
index 85ad8429a752..ecb350c90718 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.2 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d502188edebb..ecb350c90718 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.3 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 777b5be0535c..6aa0cb692a60 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -2,6 +2,6 @@ DIST winetricks-20190310.tar.gz 673467 BLAKE2B b6c6a6d28e49f9b2745ac623f9a9d35bd
DIST winetricks-20190912.tar.gz 679544 BLAKE2B 633c407f8560fa3aa38806befded957d0bf1276164483b08fb3ef285fe873531d6362ae6305f5a33a85891d75990e6e0271fe954358e49425c4f36f0f918f48d SHA512 a0017cc08c56a511e523116daf2024b1462460d00b3d07de87720c7912dccab3d953db3653d7d611c5ae3b457a45de8d36688ee703e805c1e1f5be5c0fa7739f
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
EBUILD winetricks-20190310.ebuild 1910 BLAKE2B ce6174352c8370e08edb836801010698fc2b717c438e8661818e2f0b6538f3af4ff647b7693e6a56e07b1d7db8732dd3e651d24ecd186e135603c521d8d0c6e0 SHA512 9fec59c039413af08fff8d8ee301607683fd9645f79b1bd4e4fdc52a0e93e40a1cc126dd160a7387722e22bddab1e8a2d90e4afc58558e3d3a7532176b0f7d26
-EBUILD winetricks-20190912.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
+EBUILD winetricks-20190912.ebuild 1911 BLAKE2B 5cdbf7f9364a82f7319f654fb0a118ab53abba5f8dfa56ac8598431ab501347de75b3d27ae4acf88b863d152761481ac24c1d8494e7a20ec81a7e2ded4c74b7e SHA512 2af034e96ac2f78b298895eb45d993b9a744c1faa1efb80b28bb660b180339de8c3158697900abe898616a675f316442535d9498e4acbafdf169b3b8abd95752
EBUILD winetricks-99999999.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20190912.ebuild b/app-emulation/winetricks/winetricks-20190912.ebuild
index 900a5b539221..3daf509e39bf 100644
--- a/app-emulation/winetricks/winetricks-20190912.ebuild
+++ b/app-emulation/winetricks/winetricks-20190912.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
wtg="winetricks-gentoo-2012.11.24"
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 239b1b673c06..15f0cd468b6f 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -8,9 +8,9 @@ DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f
DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
+DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
EBUILD xen-pvgrub-4.11.2.ebuild 5106 BLAKE2B 611e4797e596f5e7c5117fa284e7841319119bdf2745a63bdd743da993140225fa5e1dd026c8966dedec0a976bcd1c8419b7cac08f5efbad5d3243ac5653a7c5 SHA512 1dc318e1179a8e8bee5212c323ff887fd991b39f5803499cb8472d2d963eb7928ecb676fec674aedad34bd07a82d9188f1759e1a6751c5223eb52a703b410977
EBUILD xen-pvgrub-4.12.1.ebuild 4464 BLAKE2B e1194d9348aa2aeb0c269b86b658f2bf515f7cc15ac12836748a31e331e2714381ab8b266d7bd69947d33f9ddb48670dee6dd98dafa6a09d919ecfc64800d4fb SHA512 1ecddb92301bb9af5b9a30e0f978e8cb6768cd74b09b8ff7015c8b36b03cba53d81704d2f344b40918cd5ab4034056c9001051a8433d89c7642f8c18bd3d8a15
-EBUILD xen-pvgrub-4.13.0_rc1.ebuild 4503 BLAKE2B fd9752ef20e0dccdc551ae1313b81a36c48edc73aa13a7cc34bfc5d29c2a20343b761f79319864003588b65476f6d17d18c02bcfed01654d72ac3f8707591da4 SHA512 f7cbdc4be93d0de30617404cfd3273bf350ae5ada504b97482a871abb5ff2c785e87a14f132494acc3136a19d4119899c06edc760d68043bd210458479253cd7
+EBUILD xen-pvgrub-4.13.0_rc2.ebuild 4503 BLAKE2B fd9752ef20e0dccdc551ae1313b81a36c48edc73aa13a7cc34bfc5d29c2a20343b761f79319864003588b65476f6d17d18c02bcfed01654d72ac3f8707591da4 SHA512 f7cbdc4be93d0de30617404cfd3273bf350ae5ada504b97482a871abb5ff2c785e87a14f132494acc3136a19d4119899c06edc760d68043bd210458479253cd7
MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc2.ebuild
similarity index 100%
rename from app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc1.ebuild
rename to app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc2.ebuild
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index b89e0a2bbf3f..21076fbd729f 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 1842 BLAKE2B 4c0717dc3984f5c757b6ba6ca8a9a437f8af2a497d79d009122c353a784c543a312f5fc9864728a9cccc35f0c9383df8445b5ce2917f446efbfe9177deea598b SHA512 f3f7d575befe643ebf104ffbf97fab809afcc6f40b144c8d7d7b744e29297aa10982de9246b9f9326bccda9653babf9da2551edc4661a2975d5c0a34f8c15b42
+AUX gentoo-patches.conf 1842 BLAKE2B 0063e35773060d507ac2bbf2f3988a82bb7eda2e196242432db195074126ee5c6c9f8a351dc97a745aaa78785050d348d2e98510253a89fafe9c76c19794e200 SHA512 5995f495b2a0b59098b345655704e2866a25606c038912140845c16c6828bf6bf1bf099877c97bfa8ef20b3ea4115e2161acf9144a9d7b1adbe37cff944b72d3
AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -23,10 +23,10 @@ DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e6
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
+DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
EBUILD xen-tools-4.11.2-r1.ebuild 13855 BLAKE2B 60dd1de7438f5d1a0dc265baa413aa0ec2eca47c9d6ca31661d878b89fe5bdc07e3c27b0ee205fbba01f85522be0f99d792c091e6ebaf3be115aa7277036552b SHA512 7c98ff40a82cb23a9009e82c22dd267b2ee9697274d15f2af1b60fdc2e9e3606b2dd0a0dc7a7f8f6cb05578b1ff50182c438f83b1e2208ded5addd0089a2a0ab
EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
-EBUILD xen-tools-4.13.0_rc1.ebuild 14396 BLAKE2B 3a42d032b046b5d3f061263ea7b06f39603985a15f72bbfa767802328b7a53dbce964c16e3cea4d004a4e6b39e84efd9118cd647d5ad92b53c5023413b28bb3c SHA512 23ca66cf8b18d5fc932eaf1fdc82d84375b6531c37e0b2f3b10ecfbd5bc26f4447a81827f3b0200f990243b1a2672a3211546ad1b29e243bdac15618f449ef0a
+EBUILD xen-tools-4.13.0_rc2.ebuild 14396 BLAKE2B 3a42d032b046b5d3f061263ea7b06f39603985a15f72bbfa767802328b7a53dbce964c16e3cea4d004a4e6b39e84efd9118cd647d5ad92b53c5023413b28bb3c SHA512 23ca66cf8b18d5fc932eaf1fdc82d84375b6531c37e0b2f3b10ecfbd5bc26f4447a81827f3b0200f990243b1a2672a3211546ad1b29e243bdac15618f449ef0a
MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 1091565e0d27..8df9a094dfc9 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -64,7 +64,7 @@ ${_gx054}
"
# xen-tools-4.13.0 patches set
-_gpv_xen_tools_4130_rc1_0="
+_gpv_xen_tools_4130_rc2_0="
${_gx038}
${_gx027}
${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.13.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0_rc2.ebuild
similarity index 100%
rename from app-emulation/xen-tools/xen-tools-4.13.0_rc1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.13.0_rc2.ebuild
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index d3e7648364f3..cecf4a9b50db 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,10 @@
AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
-DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
+DIST xen-4.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
+DIST xen-4.12.1-upstream-patches-2.tar.xz 72316 BLAKE2B 6297a52ba39363b71115d1582af7ee05e5fb7aea7b0fb8717d717d212949ce2f249764f5dc3f992ce16b1f82118a8de2018e8dd3e8306bb18e82db6d141b9f9a SHA512 ff4c804c094bd86896e14f8288499a1cf86d7ddb10c566c3998b432787937d782f9ba94b9f0d7affc6ada891c1abeb0012f541d07ab93428b2bbff71c06eae20
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
-EBUILD xen-4.11.2-r1.ebuild 4043 BLAKE2B 04c7a09304e03180e86107c73adfe9bba9eec7e0bd86a30b87c5f178cfabeb5b78cba1cc4c2f89f53f09befd351e2197dcb534cdc563a55c1f3eb7f6e4635b8b SHA512 a0a2d719f1676bc413d959093ad8e1315c445d1d56abfc9972b1097ed425d8786f3d8e718ee2c3b71344b78a6b0f4cc2ff4a4498e8f0e8c5c5ce5162630e7b1c
-EBUILD xen-4.12.1-r1.ebuild 4044 BLAKE2B a95ddc09a99c6bae40719583478e1c0c5a5cf67e2d4b515a7eaf89ba8d03a9eb5d8c2864274fc8e1f52f7faea51720f33ed23180745fe564995e618143020211 SHA512 51af627bb780afd0abe555929f0e2fe169a1828187cd55d5241541ea91d0fcabd3af08dd48be19173e8104422beccc648fc986e7488b615de06b8babb507092c
-EBUILD xen-4.13.0_rc1.ebuild 4057 BLAKE2B 047c8bc7dabf02fb6b7b8487254b858547d53a8522de2f11b3d7b7fe3d9375eeef100321d6a610febb3bd9323e5b3ce862b99011a1fd0301e5646c0e737a5a36 SHA512 76e26c992c5b406dc03741d32ff99adcbfbf177e9cf6d148fd6819a65ed9b6da8b0206f4a17b3e576e28d0416d16c8cee99981216c10154a30f1e1aade8e6ff7
+DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
+EBUILD xen-4.11.2-r2.ebuild 4043 BLAKE2B f6078b8db946729457635852ba3abb93756afeb69f1021f2a68de434f0f8884c05103457957ba39a79937a1b46dac863dea8b2664445792c79d5a355fc448247 SHA512 8e1c63ed394eb742c77f2eaf3420c257ef44040721292cf5d075646dad778c0d7736040ce219ea0fc07371598dad77127e6eab54184a2a9a91ec116ee7633933
+EBUILD xen-4.12.1-r2.ebuild 4044 BLAKE2B d9ae35c3f6c563b96503f56029c5942a8b61aeec8d3f2099fa4715e88edf923737ff17d60e3e1f414864f2431367158dacda17594c091439c7c192f2959fedff SHA512 3edfc7fb349c512ce337377e2aa1c10b928d984f50c22661f25f199a077a988df395a8eb286d920864542ee00576944a0eb46ed29bc23cd0191b02494282df7d
+EBUILD xen-4.13.0_rc2.ebuild 4057 BLAKE2B 047c8bc7dabf02fb6b7b8487254b858547d53a8522de2f11b3d7b7fe3d9375eeef100321d6a610febb3bd9323e5b3ce862b99011a1fd0301e5646c0e737a5a36 SHA512 76e26c992c5b406dc03741d32ff99adcbfbf177e9cf6d148fd6819a65ed9b6da8b0206f4a17b3e576e28d0416d16c8cee99981216c10154a30f1e1aade8e6ff7
MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.11.2-r1.ebuild b/app-emulation/xen/xen-4.11.2-r2.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.11.2-r1.ebuild
rename to app-emulation/xen/xen-4.11.2-r2.ebuild
index 40dd9f3cfa95..aa1b1efd6311 100644
--- a/app-emulation/xen/xen-4.11.2-r1.ebuild
+++ b/app-emulation/xen/xen-4.11.2-r2.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="amd64 ~arm -x86"
- UPSTREAM_VER=1
+ UPSTREAM_VER=2
SECURITY_VER=
GENTOO_VER=
diff --git a/app-emulation/xen/xen-4.12.1-r1.ebuild b/app-emulation/xen/xen-4.12.1-r2.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.12.1-r1.ebuild
rename to app-emulation/xen/xen-4.12.1-r2.ebuild
index 5413034a7ea0..ffe55e4ccfcc 100644
--- a/app-emulation/xen/xen-4.12.1-r1.ebuild
+++ b/app-emulation/xen/xen-4.12.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=1
+ UPSTREAM_VER=2
SECURITY_VER=
GENTOO_VER=
diff --git a/app-emulation/xen/xen-4.13.0_rc1.ebuild b/app-emulation/xen/xen-4.13.0_rc2.ebuild
similarity index 100%
rename from app-emulation/xen/xen-4.13.0_rc1.ebuild
rename to app-emulation/xen/xen-4.13.0_rc2.ebuild
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 11a5686e9a9a..f0bec314eef2 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index 2b899c2247c3..42b99fded67e 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -2,5 +2,5 @@ AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338e
AUX blas.eselect-0.2 4952 BLAKE2B 14d60fdbae1dded65d6846f7e1fb6214994b7fce6d7d6340f9261e1e9081a46d21084c622ca2dcf2568dc07e0110b925ffc957e254d24850f741d943fa22f91c SHA512 a85f27c9808debaf9f47831c9d35194084bf0db818d3b8264532a7956b084633d9d462dfdda4a84f9a011721dbfc3abc419465e887a7ff9d17328f43a8f91790
AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
EBUILD eselect-blas-0.1.ebuild 679 BLAKE2B c07d921ceaf2e85409806ef4d8f72171df11a97c01117ff76b481435276224820e9d3ad8e0728a37539197c8ab1928e0c6ff480307a12714f846d9292339cde0 SHA512 275dc0fcdf02f270c906c5d3aa4eccb7ccf36b0dab519c12abc9967baa801fd6f392496fefb15950bf703888b0f51976acd17a2927435f5575d377eab88f317e
-EBUILD eselect-blas-0.2.ebuild 659 BLAKE2B 7bd81361212f9f71c8a2428728316a522f62292164994c0a7968a9c6c3b60479aa31f2bc06308f890b521aaf56926e856e94b3bb8bb9d1f3be29a067e56bbf1c SHA512 eb0f5a0f0abcf37504a7efa1581e38e26041b41155903a8688166695f813663df8a3563624eeb19f8a6b5ee3c5cf2dfb0be578362fa14ec9acb075dad4ec4d67
+EBUILD eselect-blas-0.2.ebuild 658 BLAKE2B 55a4cd1cddcfcc0449e1674a40bbfbdd4d21494c06def86230e7c5caaeaa0d9a4518836e288777b616e510d72064748acbc87b807a4364656775cd8f64475fc9 SHA512 ffb1eff07c711d618645dacd350d281e47e739f37382cbeeb63a64e21177ce7cc6e7162b85a57bc89bdeec28154a4dcf6725b52a15450ba4b7a3a25e7031e176
MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index 3e574756e84d..4b0f5d0583cc 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
# Need skel.bash lib
diff --git a/app-eselect/eselect-lcdfilter/Manifest b/app-eselect/eselect-lcdfilter/Manifest
index 0a4b4f286769..8468bb9a256c 100644
--- a/app-eselect/eselect-lcdfilter/Manifest
+++ b/app-eselect/eselect-lcdfilter/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-lcdfilter-1.tar.gz 17206 BLAKE2B 8ac9b6b85819104dd9ce25a08e28694497218372a63f65000591546aa51de94ad6dd03530f62e1e5b5bc8abf0090b9695e8cce04c6a2d37684d489fff983be5f SHA512 1f86fb2cc21ff9cc9b79c50578a02f7c461ae203533cc817dc733d0dde9ad43763267bb1703b9495ba6f46989e0446bb1cba39aaa705d3b605118f62cb0d2dfc
DIST eselect-lcdfilter-2.tar.gz 18365 BLAKE2B 25acb2f29c3248711fbe5cfd9ba9fa7489de246ff1a4b07121d45987650e89389bb12a299520181c2012ea74fd8f4b87b8d33dcf0ab1dfea8beebb5b8928580c SHA512 e17c475c860f0a3ad7249d21ca11c52f3226852ba042b83058baf6823242c4f8be0042aad52029757944fce6d816df386b928f2005ab87e0778d3ecb26ceec92
-EBUILD eselect-lcdfilter-1.ebuild 1023 BLAKE2B 72291e5887709a27af5908b0714588c4437685791efab287ce11f4a065b363550d7a3d12dc84df680d53d8434ffa7f75881aad5784acbe3263136b8b250c5887 SHA512 82bc5d6ba516df23a70f24094726b55698850948e7617be866eda04351cdaa9defd32e2fef880760c2028b536e6e7c11b4f36b3c376bd142000b54891e31e7fe
EBUILD eselect-lcdfilter-2.ebuild 1044 BLAKE2B bbb0cc28bb55aa0a31d2da2e264a7d3efe8d9dc834e334120deea372bab6a87649557aee9991904ae6a57e71b17e43fd605b934dbb3007f5e1cd854864bd75ee SHA512 012cc9dcc943b90fc9165213dbd2987bf9c53805d60443d839ceb652d2dc6177bb95f5134a640d56586baefc2c15e5094f51efa2df28db55a0cf087222b43aa4
MISC metadata.xml 337 BLAKE2B 9228fb77b981e77d2998e14e342da38e1c6f8a3211ff0907ff63004ba38d7347fd5e7ba76e3da1d7d619bc2e4a24e86ac8b9d22cc7f329b8af28603a0abb23b5 SHA512 4f60f1456c6e04af05a9f716dfed68d56462dcb599a50f6c4de38f6621d13eea013740e5dac04e1f0a8da5775eb429954f5dfe85bed6f7bbbad6e6a768cb5b12
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
deleted file mode 100644
index b75ec6b3c840..000000000000
--- a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit vcs-snapshot
-
-DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
-HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
-SRC_URI="https://github.com/yngwin/eselect-lcdfilter/tarball/v1 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-admin/eselect"
-PDEPEND="media-libs/freetype[infinality]"
-
-src_install() {
- dodoc README.rst infinality-settings.sh
-
- insinto "/usr/share/eselect/modules"
- doins lcdfilter.eselect
-
- insinto "/usr/share/${PN}"
- doins -r env.d
-}
-
-pkg_postinst() {
- elog "Use eselect lcdfilter to select an lcdfiltering font style."
- elog "You can customize /usr/share/${PN}/env.d/custom"
- elog "with your own settings. See /usr/share/doc/${PF}/infinality-settings.sh"
- elog "for an explanation and examples of the variables."
- elog "This module is supposed to be used in pair with eselect infinality."
-}
diff --git a/app-eselect/eselect-vdr/Manifest b/app-eselect/eselect-vdr/Manifest
index c0c2c8c50522..ac18c219323a 100644
--- a/app-eselect/eselect-vdr/Manifest
+++ b/app-eselect/eselect-vdr/Manifest
@@ -1,3 +1,5 @@
DIST eselect-vdr-0.0.3.tar.bz2 1899 BLAKE2B 837b1b2736b6ebf386f7a284a155d0d12509df97b4fc424926a1cdb0350358b5ba5cc73eea3069166c16f33c7707e54a6298b645f27e2f5a57f8879a5e349aed SHA512 6cd1c43271106d3dbe59c12148b0364c11a9767cb9ebb76e1647f707573d8fb875dfaa3ebd0b76523270e20c7ce4afd17d05dca0ef1dc4331366f49895498631
+DIST eselect-vdr-0.0.4.tar.bz2 1874 BLAKE2B 1f8f419b8e3468507ffefac7e2bd5c969a6e084500b77ff65a32a35be4eb76b9a1b988965c92a3c4cca22eda3a4553dda973b5a26645993b5198e859b732f698 SHA512 8c5aca0ce8fc1be04228e8e93b12438f1639d71e1b084f0bce1c3f730a3fb9aafa9429ffec21f3baf40c5759dadea2753e9af0b674230a407823203be7fb7656
EBUILD eselect-vdr-0.0.3.ebuild 503 BLAKE2B eaa1828b816445c3d87303fbb6ec77d4721ef23e500f243f737122fa49eacd6a04dbc944f48612b8fe8ae26d0e8354a1416e9c43f82d03426a4bdf75718827c5 SHA512 b77ea824749c1c70f49fac3f63a1f492ec2e2e1fdf06b217302edf7dc0e13846147fd25f9f2650956bd2bb9c11a323bd6f7d825376d80840a261fbd5ebd725f2
+EBUILD eselect-vdr-0.0.4.ebuild 480 BLAKE2B c65873010e6964ef8d69c9f2544cb96dfc149517267692f38ec9a86d78c6b3f611546d090087cb805ec8205ef4e96b2a21374c4b3622830032f4457012f0e051 SHA512 e449e6341bfa8c6cfc8e7a90fdf696eb7e345fb2ff7bba24d69a8974304190e16f573e32b54adce88ccc3ae1fa11bd4228134d50f60e2b6864b5cdeb9045ebd7
MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild b/app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild
new file mode 100644
index 000000000000..dc3714d45d08
--- /dev/null
+++ b/app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manages the VDR plugins"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="http://vdr.websitec.de/download/eselect-vdr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins vdr-plugin.eselect
+
+ dosym eselect /usr/bin/vdr-plugin-config
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 9e47f47b0339..5109e66ce79b 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index cdf87c43bc31..4d8a1c2463e1 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -1,3 +1,3 @@
DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
EBUILD libewf-20171104.ebuild 1367 BLAKE2B d849ef913c8594c57fe261ea98f83253a838ab4cecf9624d392c07188777b8cd96b83217dbf200b26f8780ed7e1d53910efc05c62c2a5a3a7b95d04d60c42896 SHA512 549cfb058b25cb55101e7be225c8bd5a0fe2b7411342f845c7ae6ec052b81544e68a61c758b67f1dbc0fd34cce41d9f918aa578460d64f01bd7c985954f37ee2
-MISC metadata.xml 540 BLAKE2B 2b706049733a8fa33e64f401f807e45bcf2f661d5de3c239f37e167ffb46c4869cb4245b0e57df41ddbe403b9d5ba61d731f890451c50c62e8b58f6c5d5e6bbe SHA512 8144789ad852df713ddf4279baa6ae5a145b4cc31d7711cb4d0e5ff3d8016fb9268ce83808aef6b61ca2dd082a2d5847d38df442fb1023c99d2d84f3beec4d8a
+MISC metadata.xml 461 BLAKE2B c63abb2e8246f2964c3034ec66790a3637202255b82e2a903db9a5620eb89c87fdbdf4404b7623842c57f9678e636f72ded24b96f43f8142ac602dafbec1666a SHA512 bf030256b8149f8d61b99e74a6df0a54dd99d81f03a6012c3d050255251657fd9f7d6d9fe36b8e6e5559ab370b6aa9181c9c9702a77bf973e7e60fd6321868ac
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
index 3ca92ec9afc3..7cf549041e00 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -1,10 +1,7 @@
-
- radhermit@gentoo.org
- Tim Harder
-
+