summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:52:04 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:52:04 +0100
commit71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa
parent6612a728ea11526a849618ec515ad57131d64416 (diff)
gentoo resync : 14.07.2018
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin28821 -> 28812 bytes
-rw-r--r--app-admin/Manifest.gzbin34467 -> 34468 bytes
-rw-r--r--app-admin/puppet/Manifest2
-rw-r--r--app-admin/puppet/puppet-5.5.2.ebuild2
-rw-r--r--dev-libs/Manifest.gzbin85262 -> 85253 bytes
-rw-r--r--dev-libs/wayland-protocols/Manifest2
-rw-r--r--dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild43
-rw-r--r--mail-client/Manifest.gzbin4561 -> 4557 bytes
-rw-r--r--mail-client/thunderbird-bin/Manifest120
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-52.9.0.ebuild164
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild164
-rw-r--r--mail-filter/Manifest.gzbin11018 -> 11013 bytes
-rw-r--r--mail-filter/dcc/Manifest3
-rw-r--r--mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch17
-rw-r--r--mail-filter/dcc/files/dcc.initd135
-rw-r--r--mail-filter/dcc/files/dcc.initd-1.3.140100
-rw-r--r--mail-filter/rspamd/Manifest4
-rw-r--r--mail-filter/rspamd/rspamd-1.7.7.ebuild90
-rw-r--r--mail-filter/rspamd/rspamd-9999.ebuild1
-rw-r--r--mail-mta/Manifest.gzbin2552 -> 2552 bytes
-rw-r--r--mail-mta/exim/Manifest2
-rw-r--r--mail-mta/exim/exim-4.91-r2.ebuild2
-rw-r--r--mail-mta/mini-qmail/Manifest2
-rw-r--r--mail-mta/mini-qmail/files/1.05-config-mini-help.patch16
-rw-r--r--mail-mta/mini-qmail/files/99qmail3
-rw-r--r--mail-mta/protonmail-bridge-bin/Manifest4
-rw-r--r--mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild42
-rw-r--r--mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild188
-rw-r--r--media-fonts/Manifest.gzbin35633 -> 35623 bytes
-rw-r--r--media-fonts/sil-abyssinica/Manifest4
-rw-r--r--media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild31
-rw-r--r--media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild2
-rw-r--r--media-fonts/sil-arabicfonts/Manifest5
-rw-r--r--media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild24
-rw-r--r--media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild2
-rw-r--r--media-fonts/source-han-sans/Manifest2
-rw-r--r--media-fonts/source-han-sans/metadata.xml8
-rw-r--r--media-gfx/Manifest.gzbin41919 -> 42235 bytes
-rw-r--r--media-gfx/ephoto/Manifest3
-rw-r--r--media-gfx/ephoto/ephoto-1.5.ebuild28
-rw-r--r--media-gfx/ephoto/metadata.xml26
-rw-r--r--media-gfx/fontforge/Manifest2
-rw-r--r--media-gfx/fontforge/fontforge-20170731-r4.ebuild2
-rw-r--r--media-gfx/gimp/Manifest2
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild62
-rw-r--r--media-gfx/graphicsmagick/Manifest2
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild4
-rw-r--r--media-gfx/hugin/Manifest2
-rw-r--r--media-gfx/hugin/hugin-2018.0.0.ebuild2
-rw-r--r--media-gfx/imagemagick/Manifest10
-rw-r--r--media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch36
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild185
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild188
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild185
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild188
-rw-r--r--media-gfx/imagemagick/imagemagick-9999.ebuild193
-rw-r--r--media-gfx/krita/Manifest4
-rw-r--r--media-gfx/krita/krita-3.3.3.ebuild2
-rw-r--r--media-gfx/krita/krita-4.0.3.ebuild2
-rw-r--r--media-gfx/mypaint-brushes/Manifest2
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild22
-rw-r--r--media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild22
-rw-r--r--media-gfx/openexr_viewers/Manifest3
-rw-r--r--media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch55
-rw-r--r--media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch37
-rw-r--r--media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch16
-rw-r--r--media-gfx/ristretto/Manifest2
-rw-r--r--media-gfx/ristretto/ristretto-0.8.3.ebuild2
-rw-r--r--media-gfx/termtosvg/Manifest3
-rw-r--r--media-gfx/termtosvg/metadata.xml7
-rw-r--r--media-gfx/termtosvg/termtosvg-0.4.0.ebuild21
-rw-r--r--media-libs/Manifest.gzbin66591 -> 66442 bytes
-rw-r--r--media-libs/adplug/Manifest2
-rw-r--r--media-libs/adplug/adplug-2.3.1.ebuild2
-rw-r--r--media-libs/codec2/Manifest2
-rw-r--r--media-libs/codec2/codec2-0.8.1.ebuild32
-rw-r--r--media-libs/hamlib/Manifest2
-rw-r--r--media-libs/hamlib/hamlib-3.2.ebuild2
-rw-r--r--media-libs/harfbuzz/Manifest4
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.8.1.ebuild2
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.8.3.ebuild109
-rw-r--r--media-libs/imlib2/Manifest2
-rw-r--r--media-libs/imlib2/imlib2-1.5.1.ebuild2
-rw-r--r--media-libs/libbluray/Manifest2
-rw-r--r--media-libs/libbluray/libbluray-1.0.2.ebuild2
-rw-r--r--media-libs/libgltf/Manifest4
-rw-r--r--media-libs/libgltf/libgltf-0.1.0.ebuild50
-rw-r--r--media-libs/libgltf/libgltf-9999.ebuild50
-rw-r--r--media-libs/libgltf/metadata.xml8
-rw-r--r--media-libs/libmtp/Manifest2
-rw-r--r--media-libs/libmtp/libmtp-1.1.13.ebuild70
-rw-r--r--media-libs/libqaccessibilityclient/Manifest2
-rw-r--r--media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild1
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild2
-rw-r--r--media-libs/lilv/Manifest1
-rw-r--r--media-libs/lilv/lilv-0.24.2-r3.ebuild60
-rw-r--r--media-libs/mesa/Manifest2
-rw-r--r--media-libs/mesa/mesa-18.1.4.ebuild540
-rw-r--r--media-libs/phonon/Manifest1
-rw-r--r--media-libs/phonon/files/phonon-4.7.0-plugin-install.patch13
-rw-r--r--media-libs/rubberband/Manifest1
-rw-r--r--media-libs/rubberband/rubberband-1.8.1-r2.ebuild47
-rw-r--r--media-libs/sge/Manifest7
-rw-r--r--media-libs/sge/files/sge-030809-build.patch8
-rw-r--r--media-libs/sge/files/sge-030809-freetype.patch4
-rw-r--r--media-libs/sge/files/sge-030809-freetype_pkgconfig.patch25
-rw-r--r--media-libs/sge/sge-030809.ebuild32
-rw-r--r--media-libs/vulkan-layers/Manifest6
-rw-r--r--media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch68
-rw-r--r--media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch97
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild3
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-9999.ebuild2
-rw-r--r--media-libs/vulkan-loader/Manifest5
-rw-r--r--media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch54
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild4
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild2
-rw-r--r--media-libs/xine-lib/Manifest3
-rw-r--r--media-libs/xine-lib/files/ffmpeg29.patch44
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch25
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch15
-rw-r--r--media-plugins/Manifest.gzbin53957 -> 53947 bytes
-rw-r--r--media-plugins/calf/Manifest3
-rw-r--r--media-plugins/calf/calf-0.90.0-r1.ebuild55
-rw-r--r--media-plugins/calf/calf-9999.ebuild5
-rw-r--r--media-plugins/gst-plugins-lv2/Manifest2
-rw-r--r--media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild2
-rw-r--r--media-plugins/imlib2_loaders/Manifest6
-rw-r--r--media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild31
-rw-r--r--media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild31
-rw-r--r--media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild2
-rw-r--r--media-plugins/vdr-bgprocess/Manifest2
-rw-r--r--media-plugins/vdr-bgprocess/vdr-bgprocess-0.1.0.ebuild6
-rw-r--r--media-plugins/vdr-chanman/Manifest2
-rw-r--r--media-plugins/vdr-chanman/vdr-chanman-0.0.9.ebuild6
-rw-r--r--media-plugins/vdr-ffnetdev/Manifest2
-rw-r--r--media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.2.ebuild6
-rw-r--r--media-plugins/vdr-lcdproc/Manifest2
-rw-r--r--media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild6
-rw-r--r--media-plugins/vdr-live/Manifest2
-rw-r--r--media-plugins/vdr-live/vdr-live-2.3.1.ebuild2
-rw-r--r--media-plugins/vdr-pvr350/Manifest6
-rw-r--r--media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild37
-rw-r--r--media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild37
-rw-r--r--media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild6
-rw-r--r--media-plugins/vdr-vcd/Manifest5
-rw-r--r--media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild30
-rw-r--r--media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild31
-rw-r--r--media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild6
-rw-r--r--media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild32
-rw-r--r--media-plugins/vdr-vdrmanager/Manifest4
-rw-r--r--media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild78
-rw-r--r--media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild4
-rw-r--r--media-radio/Manifest.gzbin4688 -> 4686 bytes
-rw-r--r--media-radio/cqrlog/Manifest3
-rw-r--r--media-radio/cqrlog/cqrlog-2.3.0.ebuild47
-rw-r--r--media-radio/cqrlog/files/2.3.0-makefile.patch18
-rw-r--r--media-radio/fldigi/Manifest2
-rw-r--r--media-radio/fldigi/fldigi-4.0.16.ebuild2
-rw-r--r--media-radio/flrig/Manifest10
-rw-r--r--media-radio/flrig/flrig-1.3.36.ebuild31
-rw-r--r--media-radio/flrig/flrig-1.3.37.ebuild31
-rw-r--r--media-radio/flrig/flrig-1.3.38.ebuild31
-rw-r--r--media-radio/flrig/flrig-1.3.39.ebuild2
-rw-r--r--media-radio/flrig/flrig-1.3.40.ebuild29
-rw-r--r--media-radio/gpredict/Manifest2
-rw-r--r--media-radio/gpredict/gpredict-2.2.1.ebuild2
-rw-r--r--media-radio/svxlink/Manifest2
-rw-r--r--media-radio/svxlink/svxlink-17.12.2.ebuild2
-rw-r--r--media-radio/tucnak/Manifest2
-rw-r--r--media-radio/tucnak/tucnak-4.14.ebuild68
-rw-r--r--media-sound/Manifest.gzbin61470 -> 61307 bytes
-rw-r--r--media-sound/asunder/Manifest4
-rw-r--r--media-sound/asunder/asunder-2.9.2-r1.ebuild45
-rw-r--r--media-sound/asunder/asunder-2.9.2-r2.ebuild44
-rw-r--r--media-sound/asunder/asunder-2.9.3-r1.ebuild44
-rw-r--r--media-sound/asunder/asunder-2.9.3.ebuild45
-rw-r--r--media-sound/elisa/Manifest4
-rw-r--r--media-sound/elisa/elisa-0.1.1.ebuild61
-rw-r--r--media-sound/elisa/elisa-0.2.1-r1.ebuild64
-rw-r--r--media-sound/kid3/Manifest6
-rw-r--r--media-sound/kid3/kid3-3.5.1.ebuild96
-rw-r--r--media-sound/kid3/kid3-3.6.0.ebuild96
-rw-r--r--media-sound/kid3/kid3-3.6.1.ebuild3
-rw-r--r--media-sound/mumble/Manifest4
-rw-r--r--media-sound/mumble/metadata.xml1
-rw-r--r--media-sound/mumble/mumble-9999.ebuild5
-rw-r--r--media-sound/puddletag/Manifest3
-rw-r--r--media-sound/puddletag/metadata.xml18
-rw-r--r--media-sound/puddletag/puddletag-1.2.0.ebuild31
-rw-r--r--media-sound/pulseaudio/Manifest2
-rw-r--r--media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild2
-rw-r--r--media-sound/pulseeffects/Manifest8
-rw-r--r--media-sound/pulseeffects/metadata.xml6
-rw-r--r--media-sound/pulseeffects/pulseeffects-4.1.3.ebuild61
-rw-r--r--media-sound/pulseeffects/pulseeffects-4.1.6.ebuild63
-rw-r--r--media-sound/pulseeffects/pulseeffects-9999.ebuild32
-rw-r--r--media-sound/qtscrobbler/Manifest3
-rw-r--r--media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch24
-rw-r--r--media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild5
-rw-r--r--media-sound/sox/Manifest2
-rw-r--r--media-sound/sox/sox-14.4.2-r1.ebuild2
-rw-r--r--media-sound/supercollider/Manifest7
-rw-r--r--media-sound/supercollider/files/supercollider-3.8.0-desktop.patch10
-rw-r--r--media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch75
-rw-r--r--media-sound/supercollider/files/supercollider-3.8.0-multilib.patch89
-rw-r--r--media-sound/supercollider/supercollider-3.8.1.ebuild116
-rw-r--r--media-sound/supercollider/supercollider-3.9.3-r1.ebuild114
-rw-r--r--media-sound/supercollider/supercollider-3.9.3.ebuild113
-rw-r--r--media-sound/vorbis-tools/Manifest2
-rw-r--r--media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild2
-rw-r--r--media-sound/xfmpc/Manifest2
-rw-r--r--media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild2
-rw-r--r--media-video/Manifest.gzbin28396 -> 28381 bytes
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/ffmpeg-3.4.3.ebuild488
-rw-r--r--media-video/gaupol/Manifest6
-rw-r--r--media-video/gaupol/gaupol-0.91.ebuild62
-rw-r--r--media-video/gaupol/gaupol-1.4.1.ebuild62
-rw-r--r--media-video/gaupol/gaupol-1.4.ebuild2
-rw-r--r--media-video/kaffeine/Manifest4
-rw-r--r--media-video/kaffeine/kaffeine-2.0.14.ebuild64
-rw-r--r--media-video/kaffeine/kaffeine-2.0.15.ebuild2
-rw-r--r--media-video/noad/Manifest10
-rw-r--r--media-video/noad/metadata.xml2
-rw-r--r--media-video/noad/noad-0.7.3-r1.ebuild4
-rw-r--r--media-video/noad/noad-0.8.6-r1.ebuild6
-rw-r--r--media-video/noad/noad-0.8.6-r2.ebuild6
-rw-r--r--media-video/noad/noad-0.8.6-r3.ebuild80
-rw-r--r--media-video/obs-studio/Manifest14
-rw-r--r--media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch28
-rw-r--r--media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch167
-rw-r--r--media-video/obs-studio/metadata.xml8
-rw-r--r--media-video/obs-studio/obs-studio-20.1.0.ebuild116
-rw-r--r--media-video/obs-studio/obs-studio-20.1.3.ebuild108
-rw-r--r--media-video/obs-studio/obs-studio-21.0.2.ebuild6
-rw-r--r--media-video/obs-studio/obs-studio-21.1.2.ebuild125
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild40
-rw-r--r--media-video/parole/Manifest6
-rw-r--r--media-video/parole/parole-0.8.1.ebuild2
-rw-r--r--media-video/parole/parole-1.0.0.ebuild2
-rw-r--r--media-video/parole/parole-1.0.1.ebuild2
-rw-r--r--media-video/vlc/Manifest10
-rw-r--r--media-video/vlc/metadata.xml1
-rw-r--r--media-video/vlc/vlc-3.0.2-r1.ebuild497
-rw-r--r--media-video/vlc/vlc-3.0.3-r1.ebuild2
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild2
-rw-r--r--media-video/vlc/vlc-9999.ebuild2
-rw-r--r--net-analyzer/Manifest.gzbin49604 -> 49609 bytes
-rw-r--r--net-analyzer/fail2ban/Manifest2
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild2
-rw-r--r--net-analyzer/munin/Manifest5
-rw-r--r--net-analyzer/munin/files/munin-2.0.33-nogitversion.patch11
-rw-r--r--net-analyzer/munin/files/munin-2.0.33-perl526.patch26
-rw-r--r--net-analyzer/munin/munin-2.0.38.ebuild417
-rw-r--r--net-analyzer/nagios-check_linux_bonding/Manifest2
-rw-r--r--net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild2
-rw-r--r--net-analyzer/nagios-core/Manifest2
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.3.4.ebuild2
-rw-r--r--net-analyzer/nagstamon/Manifest2
-rw-r--r--net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild50
-rw-r--r--net-analyzer/nagstamon/nagstamon-3.0.2.ebuild50
-rw-r--r--net-analyzer/netperf/Manifest2
-rw-r--r--net-analyzer/netperf/netperf-2.7.0-r2.ebuild2
-rw-r--r--net-analyzer/sarg/Manifest9
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.10-bool.patch11
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.10-format.patch77
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch102
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.9-configure.patch31
-rw-r--r--net-analyzer/sarg/sarg-2.3.10-r1.ebuild44
-rw-r--r--net-analyzer/sarg/sarg-2.3.10.ebuild68
-rw-r--r--net-analyzer/sarg/sarg-2.3.11-r1.ebuild2
-rw-r--r--net-dialup/Manifest.gzbin6720 -> 6717 bytes
-rw-r--r--net-dialup/ppp/Manifest2
-rw-r--r--net-dialup/ppp/ppp-2.4.7-r6.ebuild2
-rw-r--r--net-dns/Manifest.gzbin9219 -> 9220 bytes
-rw-r--r--net-dns/dnscrypt-proxy/Manifest11
-rw-r--r--net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild97
-rw-r--r--net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild1
-rw-r--r--net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild98
-rw-r--r--net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild104
-rw-r--r--net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd6
-rw-r--r--net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service11
-rw-r--r--net-dns/getdns/Manifest3
-rw-r--r--net-dns/getdns/files/getdns-1.4.2-stubby.service.patch16
-rw-r--r--net-dns/getdns/getdns-1.4.2-r1.ebuild77
-rw-r--r--net-dns/getdns/getdns-1.4.2.ebuild75
-rw-r--r--net-dns/knot/Manifest4
-rw-r--r--net-dns/knot/knot-2.6.8.ebuild (renamed from net-dns/knot/knot-2.6.7.ebuild)0
-rw-r--r--net-firewall/Manifest.gzbin5561 -> 5558 bytes
-rw-r--r--net-firewall/iptables/Manifest5
-rw-r--r--net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch26
-rw-r--r--net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch44
-rw-r--r--net-firewall/iptables/iptables-1.6.2-r1.ebuild121
-rw-r--r--net-firewall/iptables/iptables-1.8.0-r1.ebuild132
-rw-r--r--net-fs/Manifest.gzbin4695 -> 4694 bytes
-rw-r--r--net-fs/libnfs/Manifest2
-rw-r--r--net-fs/libnfs/libnfs-9999.ebuild4
-rw-r--r--net-fs/samba/Manifest8
-rw-r--r--net-fs/samba/metadata.xml1
-rw-r--r--net-fs/samba/samba-4.2.14.ebuild2
-rw-r--r--net-fs/samba/samba-4.8.2.ebuild286
-rw-r--r--net-fs/samba/samba-4.9.0_rc1.ebuild287
-rw-r--r--net-ftp/Manifest.gzbin4509 -> 4503 bytes
-rw-r--r--net-ftp/uftpd/Manifest2
-rw-r--r--net-ftp/uftpd/uftpd-2.6.ebuild26
-rw-r--r--net-ftp/vsftpd/Manifest2
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild2
-rw-r--r--net-im/Manifest.gzbin8744 -> 9235 bytes
-rw-r--r--net-im/coturn/Manifest4
-rw-r--r--net-im/coturn/coturn-4.5.0.7.ebuild71
-rw-r--r--net-im/coturn/coturn-9999.ebuild6
-rw-r--r--net-im/err/Manifest2
-rw-r--r--net-im/err/err-1.7.1-r1.ebuild78
-rw-r--r--net-im/err/err-1.7.1-r2.ebuild77
-rw-r--r--net-im/mcabber/Manifest2
-rw-r--r--net-im/mcabber/metadata.xml5
-rw-r--r--net-im/ricochet/Manifest4
-rw-r--r--net-im/ricochet/metadata.xml12
-rw-r--r--net-im/ricochet/ricochet-1.1.4.ebuild56
-rw-r--r--net-im/ricochet/ricochet-9999.ebuild64
-rw-r--r--net-im/skypeforlinux/Manifest10
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.16.0.4.ebuild116
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.17.0.2.ebuild116
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild1
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild1
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild116
-rw-r--r--net-im/slack-bin/Manifest8
-rw-r--r--net-im/slack-bin/slack-bin-3.1.0.ebuild94
-rw-r--r--net-im/slack-bin/slack-bin-3.1.1.ebuild8
-rw-r--r--net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild96
-rw-r--r--net-im/slack-bin/slack-bin-3.2.1.ebuild8
-rw-r--r--net-im/telegram-desktop-bin/Manifest8
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.0.ebuild)0
-rw-r--r--net-im/transwhat/Manifest3
-rw-r--r--net-im/transwhat/metadata.xml15
-rw-r--r--net-im/transwhat/transwhat-0.2.2.ebuild34
-rw-r--r--net-im/yowsup/Manifest4
-rw-r--r--net-im/yowsup/files/fix_newer_six_version.patch30
-rw-r--r--net-im/yowsup/metadata.xml23
-rw-r--r--net-im/yowsup/yowsup-2.5.7.ebuild29
-rw-r--r--net-irc/Manifest.gzbin9338 -> 9338 bytes
-rw-r--r--net-irc/quassel/Manifest2
-rw-r--r--net-irc/quassel/quassel-0.12.5-r1.ebuild184
-rw-r--r--net-irc/quassel/quassel-0.12.5-r2.ebuild184
-rw-r--r--net-libs/Manifest.gzbin34202 -> 34217 bytes
-rw-r--r--net-libs/aqbanking/Manifest2
-rw-r--r--net-libs/aqbanking/aqbanking-5.6.10.ebuild64
-rw-r--r--net-libs/grpc/Manifest2
-rw-r--r--net-libs/grpc/grpc-1.13.0.ebuild2
-rw-r--r--net-libs/librsync/Manifest6
-rw-r--r--net-libs/librsync/files/librsync-2.0.0-search.patch12
-rw-r--r--net-libs/librsync/librsync-2.0.0-r1.ebuild30
-rw-r--r--net-libs/librsync/librsync-2.0.0.ebuild27
-rw-r--r--net-libs/librsync/librsync-2.0.1-r1.ebuild2
-rw-r--r--net-libs/loudmouth/Manifest2
-rw-r--r--net-libs/loudmouth/metadata.xml5
-rw-r--r--net-libs/mbedtls/Manifest2
-rw-r--r--net-libs/mbedtls/mbedtls-2.10.0.ebuild2
-rw-r--r--net-mail/Manifest.gzbin18229 -> 18230 bytes
-rw-r--r--net-mail/dovecot/Manifest4
-rw-r--r--net-mail/dovecot/dovecot-2.3.2.1.ebuild291
-rw-r--r--net-mail/dovecot/files/dovecot-glibc226.patch84
-rw-r--r--net-mail/mailutils/Manifest1
-rw-r--r--net-mail/mailutils/files/mailutils-3.2-fix-build.patch70
-rw-r--r--net-mail/qmhandle/Manifest1
-rw-r--r--net-mail/qmhandle/files/qmHandle-gentoo-svc.patch17
-rw-r--r--net-misc/Manifest.gzbin60722 -> 61040 bytes
-rw-r--r--net-misc/babeld/Manifest3
-rw-r--r--net-misc/babeld/babeld-1.8.2.ebuild23
-rwxr-xr-xnet-misc/babeld/files/babeld10
-rw-r--r--net-misc/connman-notify/Manifest3
-rw-r--r--net-misc/connman-notify/connman-notify-0_pre20140623.ebuild38
-rw-r--r--net-misc/connman-notify/metadata.xml8
-rw-r--r--net-misc/curl/Manifest2
-rw-r--r--net-misc/curl/curl-7.61.0.ebuild247
-rw-r--r--net-misc/gns3-gui/Manifest6
-rw-r--r--net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild4
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild4
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild2
-rw-r--r--net-misc/gns3-server/Manifest9
-rw-r--r--net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch9
-rw-r--r--net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild45
-rw-r--r--net-misc/gns3-server/gns3-server-1.5.3.1.ebuild45
-rw-r--r--net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild50
-rw-r--r--net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild50
-rw-r--r--net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild54
-rw-r--r--net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild57
-rw-r--r--net-misc/gns3-server/metadata.xml2
-rw-r--r--net-misc/igmpproxy/Manifest8
-rw-r--r--net-misc/igmpproxy/files/igmpproxy.confd5
-rw-r--r--net-misc/igmpproxy/files/igmpproxy.initd20
-rw-r--r--net-misc/igmpproxy/files/igmpproxy.service9
-rw-r--r--net-misc/igmpproxy/igmpproxy-0.2.1.ebuild25
-rw-r--r--net-misc/igmpproxy/metadata.xml17
-rw-r--r--net-misc/ipmiview/Manifest6
-rw-r--r--net-misc/ipmiview/files/fake-java.bash24
-rw-r--r--net-misc/ipmiview/files/launcher-pre.bash3
-rw-r--r--net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild85
-rw-r--r--net-misc/ipmiview/metadata.xml12
-rw-r--r--net-misc/iputils/Manifest4
-rw-r--r--net-misc/iputils/files/iputils-20180629-musl.patch87
-rw-r--r--net-misc/iputils/iputils-20180629.ebuild178
-rw-r--r--net-misc/kea/Manifest6
-rw-r--r--net-misc/kea/kea-1.4.0_p1.ebuild (renamed from net-misc/kea/kea-1.4.0.ebuild)0
-rw-r--r--net-misc/kea/kea-9999.ebuild2
-rw-r--r--net-misc/memcached/Manifest2
-rw-r--r--net-misc/memcached/memcached-1.5.9.ebuild95
-rw-r--r--net-misc/netifrc/Manifest2
-rw-r--r--net-misc/netifrc/netifrc-0.6.1.ebuild71
-rw-r--r--net-misc/networkmanager-openvpn/Manifest4
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild55
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild2
-rw-r--r--net-misc/networkmanager/Manifest2
-rw-r--r--net-misc/networkmanager/networkmanager-1.10.10.ebuild2
-rw-r--r--net-misc/stunnel/Manifest3
-rw-r--r--net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch114
-rw-r--r--net-misc/stunnel/stunnel-5.48.ebuild95
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2018.07.10.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2018.06.25.ebuild)0
-rw-r--r--net-p2p/Manifest.gzbin9425 -> 9426 bytes
-rw-r--r--net-p2p/qbittorrent/Manifest2
-rw-r--r--net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild2
-rw-r--r--net-print/Manifest.gzbin6916 -> 6918 bytes
-rw-r--r--net-print/cups-filters/Manifest6
-rw-r--r--net-print/cups-filters/cups-filters-1.20.4.ebuild (renamed from net-print/cups-filters/cups-filters-1.20.2.ebuild)0
-rw-r--r--net-print/cups-filters/cups-filters-9999.ebuild2
-rw-r--r--net-print/hplip/Manifest2
-rw-r--r--net-print/hplip/hplip-3.18.6.ebuild2
-rw-r--r--net-proxy/3proxy/Manifest1
-rw-r--r--net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch26
-rw-r--r--net-proxy/Manifest.gzbin6217 -> 6214 bytes
-rw-r--r--net-vpn/Manifest.gzbin4709 -> 4703 bytes
-rw-r--r--net-vpn/tor/Manifest8
-rw-r--r--net-vpn/tor/tor-0.3.3.6.ebuild85
-rw-r--r--net-vpn/tor/tor-0.3.3.7.ebuild85
-rw-r--r--net-vpn/tor/tor-0.3.3.8.ebuild87
-rw-r--r--net-vpn/tor/tor-0.3.3.9.ebuild87
-rw-r--r--net-vpn/wireguard/Manifest7
-rw-r--r--net-vpn/wireguard/files/wireguard-openrc.sh45
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20180625.ebuild136
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild134
-rw-r--r--net-vpn/wireguard/wireguard-9999.ebuild2
-rw-r--r--net-wireless/Manifest.gzbin15563 -> 15566 bytes
-rw-r--r--net-wireless/aircrack-ng/Manifest2
-rw-r--r--net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild130
-rw-r--r--net-wireless/bluez/Manifest2
-rw-r--r--net-wireless/bluez/bluez-5.49-r1.ebuild2
-rw-r--r--net-wireless/gnuradio/Manifest5
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild251
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild243
-rw-r--r--net-wireless/unifi/Manifest14
-rw-r--r--net-wireless/unifi/files/unifi.initd26
-rw-r--r--net-wireless/unifi/unifi-5.6.39.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.7.28-r1.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.7.28.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.8.23-r1.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.8.23.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.8.24.ebuild70
-rw-r--r--net-wireless/unifi/unifi-5.8.25.ebuild74
-rw-r--r--net-wireless/unifi/unifi-5.9.12.ebuild69
-rw-r--r--net-wireless/unifi/unifi-5.9.4.ebuild69
-rw-r--r--perl-core/Manifest.gzbin7981 -> 7981 bytes
-rw-r--r--perl-core/Module-CoreList/Manifest4
-rw-r--r--perl-core/Module-CoreList/Module-CoreList-5.201.806.220.ebuild16
-rw-r--r--perl-core/Module-CoreList/Module-CoreList-5.201.806.260.ebuild16
-rw-r--r--profiles/Manifest.gzbin185631 -> 185959 bytes
-rw-r--r--profiles/arch/alpha/use.stable.mask5
-rw-r--r--profiles/arch/amd64/use.stable.mask5
-rw-r--r--profiles/arch/amd64/x32/package.mask4
-rw-r--r--profiles/arch/arm/use.stable.mask5
-rw-r--r--profiles/arch/arm64/package.use.mask6
-rw-r--r--profiles/arch/arm64/use.mask4
-rw-r--r--profiles/arch/arm64/use.stable.mask5
-rw-r--r--profiles/arch/ia64/use.stable.mask5
-rw-r--r--profiles/arch/powerpc/package.use.mask7
-rw-r--r--profiles/arch/powerpc/ppc32/package.use.mask4
-rw-r--r--profiles/arch/powerpc/ppc32/use.stable.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/use.stable.mask5
-rw-r--r--profiles/arch/s390/package.use.mask2
-rw-r--r--profiles/arch/sparc/use.stable.mask5
-rw-r--r--profiles/arch/x86/use.stable.mask5
-rw-r--r--profiles/base/package.use.force1
-rw-r--r--profiles/desc/enlightenment_modules.desc68
-rw-r--r--profiles/desc/python_single_target.desc1
-rw-r--r--profiles/desc/python_targets.desc1
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/use.mask2
-rw-r--r--profiles/license_groups2
-rw-r--r--profiles/package.mask110
-rw-r--r--profiles/prefix/windows/cygwin/use.mask1
-rw-r--r--profiles/profiles.desc25
-rw-r--r--profiles/releases/13.0/package.mask5
-rw-r--r--profiles/thirdpartymirrors3
-rw-r--r--profiles/updates/3Q-20181
-rw-r--r--profiles/use.local.desc127
-rw-r--r--sci-electronics/Manifest.gzbin8560 -> 8557 bytes
-rw-r--r--sci-electronics/kicad/Manifest2
-rw-r--r--sci-electronics/kicad/kicad-4.0.7.ebuild2
-rw-r--r--sci-libs/Manifest.gzbin41482 -> 41481 bytes
-rw-r--r--sci-libs/cfitsio/Manifest2
-rw-r--r--sci-libs/cfitsio/cfitsio-3.410.ebuild2
-rw-r--r--sci-libs/dlib/Manifest4
-rw-r--r--sci-libs/dlib/dlib-19.9.ebuild75
-rw-r--r--sci-libs/dlib/metadata.xml1
-rw-r--r--sci-libs/flann/Manifest2
-rw-r--r--sci-libs/flann/flann-1.9.1.ebuild2
-rw-r--r--sci-libs/mpir/Manifest2
-rw-r--r--sci-libs/mpir/mpir-2.6.0-r2.ebuild2
-rw-r--r--sci-libs/tensorflow/Manifest22
-rw-r--r--sci-libs/tensorflow/tensorflow-1.9.0.ebuild425
-rw-r--r--sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild417
-rw-r--r--sci-mathematics/Manifest.gzbin14838 -> 14833 bytes
-rw-r--r--sci-mathematics/calc/Manifest1
-rw-r--r--sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch12
-rw-r--r--sci-mathematics/glpk/Manifest2
-rw-r--r--sci-mathematics/glpk/glpk-4.63.ebuild1
-rw-r--r--sci-mathematics/why3-for-spark/Manifest3
-rw-r--r--sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch25
-rw-r--r--sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild75
-rw-r--r--sci-physics/Manifest.gzbin5869 -> 5867 bytes
-rw-r--r--sci-physics/clhep/Manifest2
-rw-r--r--sci-physics/clhep/clhep-2.4.0.4.ebuild2
-rw-r--r--sci-visualization/Manifest.gzbin5528 -> 5530 bytes
-rw-r--r--sci-visualization/paraview/Manifest7
-rw-r--r--sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch17
-rw-r--r--sci-visualization/paraview/paraview-5.4.1.ebuild282
-rw-r--r--sci-visualization/paraview/paraview-5.5.0.ebuild283
-rw-r--r--sci-visualization/paraview/paraview-5.5.2.ebuild285
-rw-r--r--sec-policy/Manifest.gzbin42561 -> 42539 bytes
-rw-r--r--sec-policy/selinux-abrt/Manifest8
-rw-r--r--sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-accountsd/Manifest8
-rw-r--r--sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-acct/Manifest8
-rw-r--r--sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ada/Manifest8
-rw-r--r--sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-afs/Manifest8
-rw-r--r--sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-aide/Manifest8
-rw-r--r--sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-alsa/Manifest8
-rw-r--r--sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-amanda/Manifest8
-rw-r--r--sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-amavis/Manifest8
-rw-r--r--sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-android/Manifest8
-rw-r--r--sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild24
-rw-r--r--sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild24
-rw-r--r--sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild24
-rw-r--r--sec-policy/selinux-apache/Manifest8
-rw-r--r--sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-apcupsd/Manifest8
-rw-r--r--sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-apm/Manifest8
-rw-r--r--sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild36
-rw-r--r--sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild36
-rw-r--r--sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild36
-rw-r--r--sec-policy/selinux-arpwatch/Manifest8
-rw-r--r--sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-asterisk/Manifest8
-rw-r--r--sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-at/Manifest8
-rw-r--r--sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-automount/Manifest8
-rw-r--r--sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-avahi/Manifest8
-rw-r--r--sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-awstats/Manifest8
-rw-r--r--sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-backup/Manifest8
-rw-r--r--sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-bacula/Manifest8
-rw-r--r--sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-base-policy/Manifest10
-rw-r--r--sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild122
-rw-r--r--sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild122
-rw-r--r--sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild132
-rw-r--r--sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild2
-rw-r--r--sec-policy/selinux-base/Manifest10
-rw-r--r--sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild161
-rw-r--r--sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild161
-rw-r--r--sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild161
-rw-r--r--sec-policy/selinux-base/selinux-base-9999.ebuild6
-rw-r--r--sec-policy/selinux-bind/Manifest8
-rw-r--r--sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-bitcoin/Manifest8
-rw-r--r--sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-bitlbee/Manifest8
-rw-r--r--sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-bluetooth/Manifest8
-rw-r--r--sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-brctl/Manifest8
-rw-r--r--sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cachefilesd/Manifest8
-rw-r--r--sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-calamaris/Manifest8
-rw-r--r--sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-canna/Manifest8
-rw-r--r--sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ccs/Manifest8
-rw-r--r--sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cdrecord/Manifest8
-rw-r--r--sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ceph/Manifest8
-rw-r--r--sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cgmanager/Manifest8
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cgroup/Manifest8
-rw-r--r--sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-chromium/Manifest8
-rw-r--r--sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-chronyd/Manifest8
-rw-r--r--sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-clamav/Manifest8
-rw-r--r--sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-clockspeed/Manifest8
-rw-r--r--sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-collectd/Manifest8
-rw-r--r--sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild23
-rw-r--r--sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild23
-rw-r--r--sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild23
-rw-r--r--sec-policy/selinux-consolekit/Manifest8
-rw-r--r--sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-corosync/Manifest8
-rw-r--r--sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-couchdb/Manifest8
-rw-r--r--sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-courier/Manifest8
-rw-r--r--sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cpucontrol/Manifest8
-rw-r--r--sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cpufreqselector/Manifest8
-rw-r--r--sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-cups/Manifest8
-rw-r--r--sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-cvs/Manifest8
-rw-r--r--sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild23
-rw-r--r--sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild23
-rw-r--r--sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild23
-rw-r--r--sec-policy/selinux-cyphesis/Manifest8
-rw-r--r--sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-daemontools/Manifest8
-rw-r--r--sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dante/Manifest8
-rw-r--r--sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dbadm/Manifest8
-rw-r--r--sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dbskk/Manifest8
-rw-r--r--sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-dbus/Manifest8
-rw-r--r--sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dcc/Manifest8
-rw-r--r--sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ddclient/Manifest8
-rw-r--r--sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ddcprobe/Manifest8
-rw-r--r--sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-denyhosts/Manifest8
-rw-r--r--sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-devicekit/Manifest8
-rw-r--r--sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-dhcp/Manifest8
-rw-r--r--sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dictd/Manifest8
-rw-r--r--sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dirmngr/Manifest3
-rw-r--r--sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dirsrv/Manifest8
-rw-r--r--sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-distcc/Manifest8
-rw-r--r--sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-djbdns/Manifest8
-rw-r--r--sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild23
-rw-r--r--sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild23
-rw-r--r--sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild23
-rw-r--r--sec-policy/selinux-dkim/Manifest8
-rw-r--r--sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-dmidecode/Manifest8
-rw-r--r--sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dnsmasq/Manifest8
-rw-r--r--sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dovecot/Manifest8
-rw-r--r--sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dpkg/Manifest8
-rw-r--r--sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dracut/Manifest8
-rw-r--r--sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-dropbox/Manifest8
-rw-r--r--sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild23
-rw-r--r--sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild23
-rw-r--r--sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild23
-rw-r--r--sec-policy/selinux-entropyd/Manifest8
-rw-r--r--sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-evolution/Manifest8
-rw-r--r--sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-exim/Manifest8
-rw-r--r--sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-fail2ban/Manifest8
-rw-r--r--sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-fetchmail/Manifest8
-rw-r--r--sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-finger/Manifest8
-rw-r--r--sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-flash/Manifest8
-rw-r--r--sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-fprintd/Manifest8
-rw-r--r--sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-ftp/Manifest8
-rw-r--r--sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-games/Manifest8
-rw-r--r--sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gatekeeper/Manifest8
-rw-r--r--sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-git/Manifest8
-rw-r--r--sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-gitosis/Manifest8
-rw-r--r--sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gnome/Manifest8
-rw-r--r--sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-googletalk/Manifest8
-rw-r--r--sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gorg/Manifest8
-rw-r--r--sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gpg/Manifest8
-rw-r--r--sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-gpm/Manifest8
-rw-r--r--sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gpsd/Manifest8
-rw-r--r--sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-gssproxy/Manifest6
-rw-r--r--sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-hddtemp/Manifest8
-rw-r--r--sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-howl/Manifest8
-rw-r--r--sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-icecast/Manifest8
-rw-r--r--sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ifplugd/Manifest8
-rw-r--r--sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-imaze/Manifest8
-rw-r--r--sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-inetd/Manifest8
-rw-r--r--sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-inn/Manifest8
-rw-r--r--sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ipsec/Manifest8
-rw-r--r--sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-irc/Manifest8
-rw-r--r--sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ircd/Manifest8
-rw-r--r--sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-irqbalance/Manifest8
-rw-r--r--sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-jabber/Manifest8
-rw-r--r--sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-java/Manifest8
-rw-r--r--sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kdeconnect/Manifest8
-rw-r--r--sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kdump/Manifest8
-rw-r--r--sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kerberos/Manifest8
-rw-r--r--sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kerneloops/Manifest8
-rw-r--r--sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kismet/Manifest8
-rw-r--r--sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ksmtuned/Manifest8
-rw-r--r--sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-kudzu/Manifest8
-rw-r--r--sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ldap/Manifest8
-rw-r--r--sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-links/Manifest8
-rw-r--r--sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-lircd/Manifest8
-rw-r--r--sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-loadkeys/Manifest8
-rw-r--r--sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-lockdev/Manifest8
-rw-r--r--sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-logrotate/Manifest8
-rw-r--r--sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-logsentry/Manifest8
-rw-r--r--sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-logwatch/Manifest8
-rw-r--r--sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-lpd/Manifest8
-rw-r--r--sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mailman/Manifest8
-rw-r--r--sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-makewhatis/Manifest8
-rw-r--r--sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mandb/Manifest8
-rw-r--r--sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mcelog/Manifest8
-rw-r--r--sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-memcached/Manifest8
-rw-r--r--sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-milter/Manifest8
-rw-r--r--sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-modemmanager/Manifest8
-rw-r--r--sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-mono/Manifest8
-rw-r--r--sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mozilla/Manifest8
-rw-r--r--sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-mpd/Manifest8
-rw-r--r--sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mplayer/Manifest8
-rw-r--r--sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mrtg/Manifest8
-rw-r--r--sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-munin/Manifest8
-rw-r--r--sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-mutt/Manifest8
-rw-r--r--sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-mysql/Manifest8
-rw-r--r--sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-nagios/Manifest8
-rw-r--r--sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-ncftool/Manifest8
-rw-r--r--sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-nessus/Manifest8
-rw-r--r--sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-networkmanager/Manifest8
-rw-r--r--sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-nginx/Manifest8
-rw-r--r--sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-nslcd/Manifest8
-rw-r--r--sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ntop/Manifest8
-rw-r--r--sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ntp/Manifest8
-rw-r--r--sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-nut/Manifest8
-rw-r--r--sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-nx/Manifest8
-rw-r--r--sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-oddjob/Manifest8
-rw-r--r--sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-oident/Manifest8
-rw-r--r--sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-openct/Manifest8
-rw-r--r--sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-openrc/Manifest8
-rw-r--r--sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-openvpn/Manifest8
-rw-r--r--sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-pan/Manifest8
-rw-r--r--sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-pcmcia/Manifest8
-rw-r--r--sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-pcscd/Manifest8
-rw-r--r--sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-perdition/Manifest8
-rw-r--r--sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-phpfpm/Manifest8
-rw-r--r--sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-plymouthd/Manifest8
-rw-r--r--sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-podsleuth/Manifest8
-rw-r--r--sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-policykit/Manifest8
-rw-r--r--sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-portmap/Manifest8
-rw-r--r--sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-postfix/Manifest8
-rw-r--r--sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-postgresql/Manifest8
-rw-r--r--sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-postgrey/Manifest8
-rw-r--r--sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ppp/Manifest8
-rw-r--r--sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-prelink/Manifest8
-rw-r--r--sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-prelude/Manifest8
-rw-r--r--sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-privoxy/Manifest8
-rw-r--r--sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-procmail/Manifest8
-rw-r--r--sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-psad/Manifest8
-rw-r--r--sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-publicfile/Manifest8
-rw-r--r--sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-pulseaudio/Manifest8
-rw-r--r--sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-puppet/Manifest8
-rw-r--r--sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-pyicqt/Manifest8
-rw-r--r--sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-pyzor/Manifest8
-rw-r--r--sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-qemu/Manifest8
-rw-r--r--sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-qmail/Manifest8
-rw-r--r--sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-quota/Manifest8
-rw-r--r--sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-radius/Manifest8
-rw-r--r--sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-radvd/Manifest8
-rw-r--r--sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-razor/Manifest8
-rw-r--r--sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-redis/Manifest3
-rw-r--r--sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-remotelogin/Manifest8
-rw-r--r--sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-resolvconf/Manifest8
-rw-r--r--sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rgmanager/Manifest8
-rw-r--r--sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rngd/Manifest8
-rw-r--r--sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-roundup/Manifest8
-rw-r--r--sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rpc/Manifest8
-rw-r--r--sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rpcbind/Manifest8
-rw-r--r--sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rpm/Manifest8
-rw-r--r--sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rssh/Manifest8
-rw-r--r--sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-rtkit/Manifest8
-rw-r--r--sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-rtorrent/Manifest8
-rw-r--r--sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-salt/Manifest8
-rw-r--r--sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-samba/Manifest8
-rw-r--r--sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sasl/Manifest8
-rw-r--r--sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-screen/Manifest8
-rw-r--r--sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sendmail/Manifest8
-rw-r--r--sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sensord/Manifest8
-rw-r--r--sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-shorewall/Manifest8
-rw-r--r--sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-shutdown/Manifest8
-rw-r--r--sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-skype/Manifest8
-rw-r--r--sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-slocate/Manifest8
-rw-r--r--sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-slrnpull/Manifest8
-rw-r--r--sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-smartmon/Manifest8
-rw-r--r--sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-smokeping/Manifest8
-rw-r--r--sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-snmp/Manifest8
-rw-r--r--sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-snort/Manifest8
-rw-r--r--sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-soundserver/Manifest8
-rw-r--r--sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-spamassassin/Manifest8
-rw-r--r--sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-speedtouch/Manifest8
-rw-r--r--sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-squid/Manifest8
-rw-r--r--sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-sssd/Manifest8
-rw-r--r--sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-stunnel/Manifest8
-rw-r--r--sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-subsonic/Manifest8
-rw-r--r--sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sudo/Manifest8
-rw-r--r--sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sxid/Manifest8
-rw-r--r--sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-syncthing/Manifest8
-rw-r--r--sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-sysstat/Manifest8
-rw-r--r--sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tboot/Manifest8
-rw-r--r--sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tcpd/Manifest8
-rw-r--r--sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-tcsd/Manifest8
-rw-r--r--sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-telnet/Manifest8
-rw-r--r--sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-tftp/Manifest8
-rw-r--r--sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tgtd/Manifest8
-rw-r--r--sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-thunderbird/Manifest8
-rw-r--r--sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-timidity/Manifest8
-rw-r--r--sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tmpreaper/Manifest8
-rw-r--r--sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tor/Manifest8
-rw-r--r--sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-tripwire/Manifest8
-rw-r--r--sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ucspitcp/Manifest8
-rw-r--r--sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-ulogd/Manifest8
-rw-r--r--sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-uml/Manifest8
-rw-r--r--sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-unconfined/Manifest8
-rw-r--r--sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-uptime/Manifest8
-rw-r--r--sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-usbmuxd/Manifest8
-rw-r--r--sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-uucp/Manifest8
-rw-r--r--sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-uwimap/Manifest8
-rw-r--r--sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-uwsgi/Manifest8
-rw-r--r--sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-varnishd/Manifest8
-rw-r--r--sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vbetool/Manifest8
-rw-r--r--sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vdagent/Manifest8
-rw-r--r--sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vde/Manifest8
-rw-r--r--sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-virt/Manifest8
-rw-r--r--sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vlock/Manifest8
-rw-r--r--sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vmware/Manifest8
-rw-r--r--sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-vnstatd/Manifest8
-rw-r--r--sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-vpn/Manifest8
-rw-r--r--sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-watchdog/Manifest8
-rw-r--r--sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-webalizer/Manifest8
-rw-r--r--sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild22
-rw-r--r--sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild22
-rw-r--r--sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild22
-rw-r--r--sec-policy/selinux-wine/Manifest8
-rw-r--r--sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-wireshark/Manifest8
-rw-r--r--sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-wm/Manifest8
-rw-r--r--sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-xen/Manifest8
-rw-r--r--sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-xfs/Manifest8
-rw-r--r--sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-xprint/Manifest8
-rw-r--r--sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-xscreensaver/Manifest8
-rw-r--r--sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild21
-rw-r--r--sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild21
-rw-r--r--sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild21
-rw-r--r--sec-policy/selinux-xserver/Manifest8
-rw-r--r--sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild15
-rw-r--r--sec-policy/selinux-zabbix/Manifest8
-rw-r--r--sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild15
-rw-r--r--sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild15
-rw-r--r--sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild15
-rw-r--r--sys-apps/Manifest.gzbin49198 -> 49689 bytes
-rw-r--r--sys-apps/ckbcomp/Manifest2
-rw-r--r--sys-apps/ckbcomp/metadata.xml13
-rw-r--r--sys-apps/coreutils/Manifest2
-rw-r--r--sys-apps/coreutils/coreutils-8.29-r1.ebuild4
-rw-r--r--sys-apps/dbus-broker/Manifest6
-rw-r--r--sys-apps/dbus-broker/dbus-broker-14.ebuild73
-rw-r--r--sys-apps/dbus-broker/dbus-broker-9999.ebuild20
-rw-r--r--sys-apps/fakechroot/Manifest2
-rw-r--r--sys-apps/fakechroot/fakechroot-2.19.ebuild2
-rw-r--r--sys-apps/fwupd/Manifest8
-rw-r--r--sys-apps/fwupd/fwupd-1.0.6.ebuild98
-rw-r--r--sys-apps/fwupd/fwupd-1.0.8-r1.ebuild101
-rw-r--r--sys-apps/fwupd/fwupd-1.0.8.ebuild102
-rw-r--r--sys-apps/fwupd/fwupd-1.1.0.ebuild104
-rw-r--r--sys-apps/fwupd/metadata.xml1
-rw-r--r--sys-apps/fwupdate/Manifest4
-rw-r--r--sys-apps/fwupdate/fwupdate-10.ebuild2
-rw-r--r--sys-apps/fwupdate/fwupdate-12.ebuild2
-rw-r--r--sys-apps/gptfdisk/Manifest6
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild18
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild21
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild56
-rw-r--r--sys-apps/idle3-tools/Manifest5
-rw-r--r--sys-apps/idle3-tools/files/makefile.patch22
-rw-r--r--sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123.ebuild20
-rw-r--r--sys-apps/idle3-tools/metadata.xml22
-rw-r--r--sys-apps/irqbalance/Manifest16
-rw-r--r--sys-apps/irqbalance/files/irqbalance-1.2.0-tinfo.patch32
-rw-r--r--sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch68
-rw-r--r--sys-apps/irqbalance/files/irqbalance.init.327
-rw-r--r--sys-apps/irqbalance/files/irqbalance.service.18
-rw-r--r--sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild48
-rw-r--r--sys-apps/irqbalance/irqbalance-1.1.0.ebuild56
-rw-r--r--sys-apps/irqbalance/irqbalance-1.2.0.ebuild63
-rw-r--r--sys-apps/irqbalance/irqbalance-1.3.0.ebuild7
-rw-r--r--sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild67
-rw-r--r--sys-apps/irqbalance/irqbalance-1.4.0.ebuild64
-rw-r--r--sys-apps/irqbalance/metadata.xml1
-rw-r--r--sys-apps/onerng/Manifest3
-rw-r--r--sys-apps/onerng/metadata.xml12
-rw-r--r--sys-apps/onerng/onerng-3.6.ebuild35
-rw-r--r--sys-apps/osinfo-db-tools/Manifest2
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild31
-rw-r--r--sys-apps/osinfo-db/Manifest10
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20170813.ebuild27
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20180416.ebuild27
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20180514.ebuild27
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20180531.ebuild2
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20180612.ebuild27
-rw-r--r--sys-apps/pciutils/Manifest2
-rw-r--r--sys-apps/pciutils/pciutils-3.6.1.ebuild120
-rw-r--r--sys-apps/portage/Manifest2
-rw-r--r--sys-apps/portage/portage-2.3.42-r1.ebuild288
-rw-r--r--sys-apps/sed/Manifest5
-rw-r--r--sys-apps/sed/files/sed-4.1.5-alloca.patch14
-rw-r--r--sys-apps/sed/sed-4.2.2.ebuild61
-rw-r--r--sys-apps/sed/sed-4.5.ebuild2
-rw-r--r--sys-apps/smc-sum-driver/Manifest4
-rw-r--r--sys-apps/smc-sum-driver/files/makefile15
-rw-r--r--sys-apps/smc-sum-driver/metadata.xml17
-rw-r--r--sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild41
-rw-r--r--sys-apps/smc-sum/Manifest3
-rw-r--r--sys-apps/smc-sum/metadata.xml23
-rw-r--r--sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild42
-rw-r--r--sys-apps/ucspi-tcp/Manifest2
-rw-r--r--sys-apps/ucspi-tcp/files/0.88-errno.patch13
-rw-r--r--sys-apps/ucspi-tcp/files/0.88-exit.patch10
-rw-r--r--sys-apps/util-linux/Manifest11
-rw-r--r--sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch105
-rw-r--r--sys-apps/util-linux/util-linux-2.30.2-r1.ebuild2
-rw-r--r--sys-apps/util-linux/util-linux-2.31.1-r1.ebuild213
-rw-r--r--sys-apps/util-linux/util-linux-2.32-r3.ebuild230
-rw-r--r--sys-apps/util-linux/util-linux-2.32-r4.ebuild238
-rw-r--r--sys-apps/util-linux/util-linux-2.32-r5.ebuild242
-rw-r--r--sys-apps/util-linux/util-linux-2.32.ebuild209
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild8
-rw-r--r--sys-auth/Manifest.gzbin11074 -> 11068 bytes
-rw-r--r--sys-auth/docker_auth/Manifest2
-rw-r--r--sys-auth/docker_auth/files/docker_auth-ldap-cacert.patch67
-rw-r--r--sys-auth/docker_auth/files/docker_auth-ldap-group-support-1.patch394
-rw-r--r--sys-auth/libfprint/Manifest6
-rw-r--r--sys-auth/libfprint/libfprint-0.5.0-r2.ebuild4
-rw-r--r--sys-auth/libfprint/libfprint-0.5.1-r2.ebuild4
-rw-r--r--sys-auth/libfprint/libfprint-0.6.0-r2.ebuild2
-rw-r--r--sys-auth/nss-mdns/Manifest2
-rw-r--r--sys-auth/nss-mdns/nss-mdns-0.13.ebuild2
-rw-r--r--sys-block/Manifest.gzbin11195 -> 11189 bytes
-rw-r--r--sys-block/blktrace/Manifest1
-rw-r--r--sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch91
-rw-r--r--sys-boot/Manifest.gzbin7884 -> 7884 bytes
-rw-r--r--sys-boot/refind/Manifest6
-rw-r--r--sys-boot/refind/refind-0.10.4-r2.ebuild2
-rw-r--r--sys-boot/refind/refind-0.10.8.ebuild2
-rw-r--r--sys-boot/refind/refind-0.11.2.ebuild2
-rw-r--r--sys-boot/woeusb/Manifest2
-rw-r--r--sys-boot/woeusb/woeusb-3.1.5.ebuild2
-rw-r--r--sys-cluster/Manifest.gzbin15699 -> 15704 bytes
-rw-r--r--sys-cluster/ceph/Manifest8
-rw-r--r--sys-cluster/ceph/ceph-12.2.5.ebuild5
-rw-r--r--sys-cluster/ceph/ceph-12.2.6.ebuild305
-rw-r--r--sys-cluster/ceph/ceph-13.2.0.ebuild2
-rw-r--r--sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch165
-rw-r--r--sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch55
-rw-r--r--sys-cluster/galera/Manifest8
-rw-r--r--sys-cluster/galera/galera-25.3.20.ebuild87
-rw-r--r--sys-cluster/galera/galera-25.3.21.ebuild87
-rw-r--r--sys-cluster/galera/galera-25.3.22.ebuild87
-rw-r--r--sys-cluster/galera/galera-25.3.23.ebuild1
-rw-r--r--sys-cluster/keepalived/Manifest2
-rw-r--r--sys-cluster/keepalived/keepalived-1.4.3.ebuild2
-rw-r--r--sys-cluster/kube-controller-manager/Manifest2
-rw-r--r--sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild47
-rw-r--r--sys-cluster/kube-proxy/Manifest2
-rw-r--r--sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild41
-rw-r--r--sys-cluster/kube-scheduler/Manifest2
-rw-r--r--sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild47
-rw-r--r--sys-cluster/kubelet/Manifest2
-rw-r--r--sys-cluster/kubelet/kubelet-1.11.0.ebuild43
-rw-r--r--sys-devel/Manifest.gzbin9499 -> 9496 bytes
-rw-r--r--sys-devel/gcc/Manifest2
-rw-r--r--sys-devel/gcc/gcc-7.3.0-r3.ebuild2
-rw-r--r--sys-devel/gdb/Manifest2
-rw-r--r--sys-devel/gdb/gdb-8.1-r1.ebuild2
-rw-r--r--sys-firmware/Manifest.gzbin5043 -> 5036 bytes
-rw-r--r--sys-firmware/intel-microcode/Manifest5
-rw-r--r--sys-firmware/intel-microcode/intel-microcode-20180616.ebuild212
-rw-r--r--sys-firmware/intel-microcode/intel-microcode-20180703.ebuild2
-rw-r--r--sys-fs/Manifest.gzbin22182 -> 22020 bytes
-rw-r--r--sys-fs/btrfsmaintenance/Manifest5
-rw-r--r--sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild45
-rw-r--r--sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild66
-rw-r--r--sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild60
-rw-r--r--sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch12
-rw-r--r--sys-fs/e2fsprogs/Manifest4
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild137
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild137
-rw-r--r--sys-fs/extundelete/Manifest10
-rw-r--r--sys-fs/extundelete/extundelete-0.2.0-r1.ebuild26
-rw-r--r--sys-fs/extundelete/extundelete-0.2.0-r2.ebuild29
-rw-r--r--sys-fs/extundelete/extundelete-0.2.4.ebuild15
-rw-r--r--sys-fs/extundelete/files/extundelete-0.2.0-build.patch23
-rw-r--r--sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch11
-rw-r--r--sys-fs/extundelete/metadata.xml15
-rw-r--r--sys-fs/fuse/Manifest2
-rw-r--r--sys-fs/fuse/fuse-2.9.7-r1.ebuild2
-rw-r--r--sys-fs/ncdu/Manifest2
-rw-r--r--sys-fs/ncdu/ncdu-1.13.ebuild2
-rw-r--r--sys-fs/ntfs3g/Manifest2
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild2
-rw-r--r--sys-fs/simple-mtpfs/Manifest2
-rw-r--r--sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild25
-rw-r--r--sys-fs/udev/Manifest3
-rw-r--r--sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch29
-rw-r--r--sys-fs/udev/udev-239.ebuild324
-rw-r--r--sys-fs/udisks/Manifest6
-rw-r--r--sys-fs/udisks/udisks-2.6.5.ebuild126
-rw-r--r--sys-fs/udisks/udisks-2.7.5-r1.ebuild124
-rw-r--r--sys-fs/udisks/udisks-2.7.7.ebuild118
-rw-r--r--sys-fs/yaffs-utils/Manifest3
-rw-r--r--sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch36
-rw-r--r--sys-fs/yaffs-utils/metadata.xml8
-rw-r--r--sys-fs/yaffs-utils/yaffs-utils-9999.ebuild29
-rw-r--r--sys-fs/zerofree/Manifest4
-rw-r--r--sys-fs/zerofree/zerofree-1.0.1.ebuild37
-rw-r--r--sys-fs/zerofree/zerofree-1.0.3.ebuild37
-rw-r--r--sys-kernel/Manifest.gzbin4410 -> 4407 bytes
-rw-r--r--sys-kernel/dracut/Manifest2
-rw-r--r--sys-kernel/dracut/dracut-9999.ebuild1
-rw-r--r--sys-kernel/gentoo-sources/Manifest28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.14.52.ebuild2
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.14.54.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.14.55.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.4.140.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.9.112.ebuild28
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild2
-rw-r--r--sys-kernel/git-sources/Manifest2
-rw-r--r--sys-kernel/git-sources/git-sources-4.18_rc4.ebuild40
-rw-r--r--sys-kernel/mips-sources/Manifest6
-rw-r--r--sys-kernel/mips-sources/mips-sources-4.13.16.ebuild4
-rw-r--r--sys-kernel/mips-sources/mips-sources-4.4.110.ebuild4
-rw-r--r--sys-kernel/mips-sources/mips-sources-4.9.75.ebuild4
-rw-r--r--sys-kernel/rt-sources/Manifest18
-rw-r--r--sys-kernel/rt-sources/rt-sources-3.18.104_p101.ebuild58
-rw-r--r--sys-kernel/rt-sources/rt-sources-3.18.113_p103.ebuild58
-rw-r--r--sys-kernel/rt-sources/rt-sources-4.14.52_p34.ebuild54
-rw-r--r--sys-kernel/rt-sources/rt-sources-4.16.18_p9.ebuild54
-rw-r--r--sys-kernel/rt-sources/rt-sources-4.16.8_p2.ebuild54
-rw-r--r--sys-kernel/rt-sources/rt-sources-4.4.138_p155.ebuild58
-rw-r--r--sys-kernel/vanilla-sources/Manifest16
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.14.55.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.14.53.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.17.6.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.17.3.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.4.140.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.4.139.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.9.112.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.9.111.ebuild)0
-rw-r--r--sys-libs/Manifest.gzbin15937 -> 15935 bytes
-rw-r--r--sys-libs/e2fsprogs-libs/Manifest4
-rw-r--r--sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild70
-rw-r--r--sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild70
-rw-r--r--sys-libs/glibc/Manifest2
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild40
-rw-r--r--sys-libs/gwenhywfar/Manifest2
-rw-r--r--sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild114
-rw-r--r--sys-libs/ldb/Manifest4
-rw-r--r--sys-libs/ldb/ldb-1.3.3.ebuild103
-rw-r--r--sys-libs/ldb/ldb-1.4.1.ebuild105
-rw-r--r--sys-libs/libcap/Manifest2
-rw-r--r--sys-libs/libcap/libcap-2.25.ebuild2
-rw-r--r--sys-libs/libchipcard/Manifest2
-rw-r--r--sys-libs/libchipcard/libchipcard-5.0.2.ebuild43
-rw-r--r--sys-libs/libosinfo/Manifest2
-rw-r--r--sys-libs/libosinfo/libosinfo-1.2.0.ebuild61
-rw-r--r--sys-libs/libservicelog/Manifest1
-rw-r--r--sys-libs/libservicelog/files/libservicelog-1.1.11.patch9
-rw-r--r--sys-libs/libsmbios/Manifest2
-rw-r--r--sys-libs/libsmbios/libsmbios-2.4.2.ebuild77
-rw-r--r--sys-libs/libunwind/Manifest3
-rw-r--r--sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch14
-rw-r--r--sys-libs/libunwind/libunwind-1.2.1-r1.ebuild1
-rw-r--r--sys-libs/obstack-standalone/Manifest2
-rw-r--r--sys-libs/obstack-standalone/metadata.xml6
-rw-r--r--sys-libs/talloc/Manifest6
-rw-r--r--sys-libs/talloc/talloc-2.1.10.ebuild92
-rw-r--r--sys-libs/talloc/talloc-2.1.11.ebuild92
-rw-r--r--sys-libs/talloc/talloc-2.1.14.ebuild88
-rw-r--r--sys-libs/tdb/Manifest4
-rw-r--r--sys-libs/tdb/tdb-1.3.14.ebuild60
-rw-r--r--sys-libs/tdb/tdb-1.3.16.ebuild60
-rw-r--r--sys-libs/tevent/Manifest4
-rw-r--r--sys-libs/tevent/tevent-0.9.35.ebuild66
-rw-r--r--sys-libs/tevent/tevent-0.9.37.ebuild69
-rw-r--r--sys-libs/zlib/Manifest2
-rw-r--r--sys-libs/zlib/zlib-1.2.11-r2.ebuild2
-rw-r--r--sys-process/Manifest.gzbin8829 -> 8828 bytes
-rw-r--r--sys-process/numactl/Manifest4
-rw-r--r--sys-process/numactl/numactl-2.0.12.ebuild65
-rw-r--r--sys-process/numactl/numactl-9999.ebuild6
-rw-r--r--www-apps/Manifest.gzbin15494 -> 15650 bytes
-rw-r--r--www-apps/cgit/Manifest9
-rw-r--r--www-apps/cgit/cgit-0.12.ebuild93
-rw-r--r--www-apps/cgit/cgit-1.1.ebuild93
-rw-r--r--www-apps/cgit/cgit-1.2.ebuild93
-rw-r--r--www-apps/cgp/Manifest5
-rw-r--r--www-apps/cgp/cgp-1.ebuild52
-rw-r--r--www-apps/cgp/cgp-1_p20180620.ebuild53
-rw-r--r--www-apps/cgp/metadata.xml20
-rw-r--r--www-apps/hugo/Manifest15
-rw-r--r--www-apps/hugo/hugo-0.44.ebuild101
-rw-r--r--www-apps/hugo/metadata.xml3
-rw-r--r--www-apps/kibana-bin/Manifest10
-rw-r--r--www-apps/kibana-bin/kibana-bin-5.6.10.ebuild67
-rw-r--r--www-apps/kibana-bin/kibana-bin-5.6.9.ebuild66
-rw-r--r--www-apps/kibana-bin/kibana-bin-6.2.2.ebuild62
-rw-r--r--www-apps/kibana-bin/kibana-bin-6.2.4.ebuild3
-rw-r--r--www-apps/kibana-bin/kibana-bin-6.3.1.ebuild69
-rw-r--r--www-apps/moodle/Manifest18
-rw-r--r--www-apps/moodle/moodle-3.1.13.ebuild (renamed from www-apps/moodle/moodle-3.1.12.ebuild)0
-rw-r--r--www-apps/moodle/moodle-3.2.9.ebuild121
-rw-r--r--www-apps/moodle/moodle-3.3.7.ebuild (renamed from www-apps/moodle/moodle-3.3.6.ebuild)0
-rw-r--r--www-apps/moodle/moodle-3.4.4.ebuild (renamed from www-apps/moodle/moodle-3.4.3.ebuild)0
-rw-r--r--www-apps/moodle/moodle-3.5.1.ebuild (renamed from www-apps/moodle/moodle-3.5.ebuild)0
-rw-r--r--www-apps/phpsysinfo/Manifest4
-rw-r--r--www-apps/phpsysinfo/metadata.xml25
-rw-r--r--www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild48
-rw-r--r--www-apps/wordpress/Manifest2
-rw-r--r--www-apps/wordpress/wordpress-4.9.7.ebuild55
-rw-r--r--www-client/Manifest.gzbin7050 -> 7043 bytes
-rw-r--r--www-client/firefox/Manifest3
-rw-r--r--www-client/firefox/files/firefox-61.0-mozHunspell.patch25
-rw-r--r--www-client/firefox/firefox-61.0-r1.ebuild378
-rw-r--r--www-client/firefox/firefox-61.0.ebuild375
-rw-r--r--www-client/google-chrome-beta/Manifest4
-rw-r--r--www-client/google-chrome-beta/google-chrome-beta-68.0.3440.42.ebuild157
-rw-r--r--www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild127
-rw-r--r--www-client/google-chrome-unstable/Manifest4
-rw-r--r--www-client/google-chrome-unstable/google-chrome-unstable-69.0.3472.3.ebuild156
-rw-r--r--www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild126
-rw-r--r--www-client/google-chrome/Manifest2
-rw-r--r--www-client/google-chrome/google-chrome-67.0.3396.99.ebuild32
-rw-r--r--www-client/luakit/Manifest2
-rw-r--r--www-client/luakit/metadata.xml11
-rw-r--r--www-client/qutebrowser/Manifest6
-rw-r--r--www-client/qutebrowser/qutebrowser-1.4.0.ebuild76
-rw-r--r--www-client/qutebrowser/qutebrowser-1.4.1.ebuild (renamed from www-client/qutebrowser/qutebrowser-1.3.3.ebuild)0
-rw-r--r--www-client/seamonkey/Manifest20
-rw-r--r--www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild403
-rw-r--r--www-misc/Manifest.gzbin3585 -> 3580 bytes
-rw-r--r--www-misc/multisort/Manifest3
-rw-r--r--www-misc/multisort/multisort-1.1-r1.ebuild4
-rw-r--r--www-misc/multisort/multisort-1.1-r2.ebuild29
-rw-r--r--www-plugins/Manifest.gzbin2258 -> 2259 bytes
-rw-r--r--www-plugins/browserpass/Manifest2
-rw-r--r--www-plugins/browserpass/metadata.xml11
-rw-r--r--www-plugins/chrome-binary-plugins/Manifest8
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.59_beta.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.42_beta.ebuild)0
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3486.0_alpha.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3472.3_alpha.ebuild)0
-rw-r--r--www-servers/Manifest.gzbin5546 -> 5541 bytes
-rw-r--r--www-servers/h2o/Manifest8
-rw-r--r--www-servers/h2o/files/h2o.conf29
-rw-r--r--www-servers/h2o/h2o-2.2.4.ebuild90
-rw-r--r--www-servers/h2o/h2o-2.2.5.ebuild97
-rw-r--r--www-servers/h2o/h2o-9999.ebuild12
-rw-r--r--www-servers/nginx/Manifest2
-rw-r--r--www-servers/nginx/nginx-1.14.0-r2.ebuild2
-rw-r--r--www-servers/puma/Manifest8
-rw-r--r--www-servers/puma/puma-3.11.2.ebuild67
-rw-r--r--www-servers/puma/puma-3.11.3.ebuild67
-rw-r--r--www-servers/puma/puma-3.11.4.ebuild2
-rw-r--r--www-servers/puma/puma-3.12.0.ebuild64
-rw-r--r--www-servers/tornado/Manifest2
-rw-r--r--www-servers/tornado/tornado-5.1.ebuild62
-rw-r--r--x11-libs/Manifest.gzbin21988 -> 21994 bytes
-rw-r--r--x11-libs/gtk+/Manifest4
-rw-r--r--x11-libs/gtk+/gtk+-2.24.32.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.22.30.ebuild2
-rw-r--r--x11-libs/gtksourceview/Manifest2
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild2
-rw-r--r--x11-libs/qscintilla/Manifest2
-rw-r--r--x11-libs/qscintilla/qscintilla-2.10.4.ebuild2
-rw-r--r--x11-misc/Manifest.gzbin47917 -> 48074 bytes
-rw-r--r--x11-misc/bbweather/Manifest5
-rw-r--r--x11-misc/bbweather/bbweather-0.6.3-r1.ebuild6
-rw-r--r--x11-misc/bbweather/bbweather-0.6.3-r2.ebuild46
-rw-r--r--x11-misc/bbweather/files/bbweather-asneeded.patch8
-rw-r--r--x11-misc/compton/Manifest2
-rw-r--r--x11-misc/compton/metadata.xml19
-rw-r--r--x11-misc/dunst/Manifest4
-rw-r--r--x11-misc/dunst/dunst-1.1.0.ebuild67
-rw-r--r--x11-misc/dunst/dunst-1.3.2.ebuild2
-rw-r--r--x11-misc/gigolo/Manifest2
-rw-r--r--x11-misc/gigolo/gigolo-0.4.2-r1.ebuild2
-rw-r--r--x11-misc/i3status/Manifest2
-rw-r--r--x11-misc/i3status/i3status-2.12.ebuild18
-rw-r--r--x11-misc/mugshot/Manifest6
-rw-r--r--x11-misc/mugshot/files/fix_env_spawn_args.patch47
-rw-r--r--x11-misc/mugshot/files/missing_default_face.patch18
-rw-r--r--x11-misc/mugshot/files/use_office_phone.patch18
-rw-r--r--x11-misc/mugshot/metadata.xml27
-rw-r--r--x11-misc/mugshot/mugshot-0.4.0.ebuild54
-rw-r--r--x11-misc/py3status/Manifest4
-rw-r--r--x11-misc/py3status/py3status-3.11.ebuild (renamed from x11-misc/py3status/py3status-3.10.ebuild)0
-rw-r--r--x11-misc/rss-glx/Manifest2
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild2
-rw-r--r--x11-misc/safeeyes/Manifest8
-rw-r--r--x11-misc/safeeyes/safeeyes-2.0.2.ebuild4
-rw-r--r--x11-misc/safeeyes/safeeyes-2.0.4.ebuild4
-rw-r--r--x11-misc/safeeyes/safeeyes-2.0.5.ebuild4
-rw-r--r--x11-misc/safeeyes/safeeyes-2.0.6.ebuild4
-rw-r--r--x11-misc/sddm/Manifest1
-rw-r--r--x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch54
-rw-r--r--x11-misc/xbatt/Manifest4
-rw-r--r--x11-misc/xbatt/xbatt-1.2.1-r1.ebuild41
-rw-r--r--x11-misc/xbatt/xbatt-1.3_rc1.ebuild2
-rw-r--r--x11-plugins/Manifest.gzbin28692 -> 28693 bytes
-rw-r--r--x11-plugins/purple-hangouts/Manifest2
-rw-r--r--x11-plugins/purple-hangouts/metadata.xml11
-rw-r--r--x11-terms/Manifest.gzbin4524 -> 4525 bytes
-rw-r--r--x11-terms/terminology/Manifest6
-rw-r--r--x11-terms/terminology/terminology-0.9.1.ebuild18
-rw-r--r--x11-terms/terminology/terminology-1.0.0.ebuild23
-rw-r--r--x11-terms/terminology/terminology-1.1.0.ebuild2
-rw-r--r--x11-terms/xfce4-terminal/Manifest8
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild2
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild2
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.3.ebuild2
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.4.ebuild2
-rw-r--r--x11-themes/Manifest.gzbin22285 -> 22263 bytes
-rw-r--r--x11-themes/experience/Manifest4
-rw-r--r--x11-themes/experience/experience-3.04-r1.ebuild2
-rw-r--r--x11-themes/experience/experience-3.04.ebuild44
-rw-r--r--x11-themes/greybird/Manifest16
-rw-r--r--x11-themes/greybird/greybird-1.2.2.ebuild40
-rw-r--r--x11-themes/greybird/greybird-1.3.4.ebuild41
-rw-r--r--x11-themes/greybird/greybird-1.5.3.ebuild41
-rw-r--r--x11-themes/greybird/greybird-3.18.0.ebuild48
-rw-r--r--x11-themes/greybird/greybird-3.22.3.ebuild54
-rw-r--r--x11-themes/greybird/greybird-3.22.8.ebuild4
-rw-r--r--x11-themes/greybird/greybird-9999.ebuild17
-rw-r--r--x11-themes/greybird/metadata.xml14
-rw-r--r--x11-themes/gtk-engines-xfce/Manifest8
-rw-r--r--x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild2
-rw-r--r--x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild2
-rw-r--r--x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild2
-rw-r--r--x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild2
-rw-r--r--x11-themes/qtcurve/Manifest4
-rw-r--r--x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild1
-rw-r--r--x11-themes/qtcurve/qtcurve-9999.ebuild1
-rw-r--r--x11-themes/xfwm4-themes/Manifest2
-rw-r--r--x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild2
-rw-r--r--x11-themes/zukini/Manifest4
-rw-r--r--x11-themes/zukini/zukini-20120806.ebuild36
-rw-r--r--x11-themes/zukini/zukini-20120817.ebuild2
-rw-r--r--x11-wm/Manifest.gzbin9455 -> 9460 bytes
-rw-r--r--x11-wm/dwm/Manifest1
-rw-r--r--x11-wm/dwm/dwm-6.1.ebuild81
-rw-r--r--x11-wm/enlightenment/Manifest10
-rw-r--r--x11-wm/enlightenment/enlightenment-0.20.5.ebuild142
-rw-r--r--x11-wm/enlightenment/enlightenment-0.20.6.ebuild142
-rw-r--r--x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild139
-rw-r--r--x11-wm/enlightenment/enlightenment-0.21.11.ebuild141
-rw-r--r--x11-wm/enlightenment/enlightenment-0.21.7.ebuild2
-rw-r--r--x11-wm/enlightenment/metadata.xml71
-rw-r--r--xfce-base/Manifest.gzbin2548 -> 2541 bytes
-rw-r--r--xfce-base/exo/Manifest4
-rw-r--r--xfce-base/exo/exo-0.12.0.ebuild2
-rw-r--r--xfce-base/exo/exo-0.12.2.ebuild2
-rw-r--r--xfce-base/garcon/Manifest4
-rw-r--r--xfce-base/garcon/garcon-0.5.0-r2.ebuild2
-rw-r--r--xfce-base/garcon/garcon-0.6.1.ebuild2
-rw-r--r--xfce-base/libxfce4ui/Manifest2
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild2
-rw-r--r--xfce-base/libxfce4util/Manifest4
-rw-r--r--xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild2
-rw-r--r--xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild2
-rw-r--r--xfce-base/libxfcegui4/Manifest2
-rw-r--r--xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild2
-rw-r--r--xfce-base/thunar/Manifest14
-rw-r--r--xfce-base/thunar/thunar-1.6.13.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.6.14.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.6.15.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.7.1.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.7.2.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.8.0.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.8.1.ebuild2
-rw-r--r--xfce-base/xfce4-appfinder/Manifest6
-rw-r--r--xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild2
-rw-r--r--xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild2
-rw-r--r--xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild2
-rw-r--r--xfce-base/xfce4-panel/Manifest6
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild2
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild2
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild2
-rw-r--r--xfce-base/xfce4-session/Manifest6
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild2
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild2
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild2
-rw-r--r--xfce-base/xfce4-settings/Manifest6
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild2
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild2
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild2
-rw-r--r--xfce-base/xfconf/Manifest8
-rw-r--r--xfce-base/xfconf/xfconf-4.12.1-r1.ebuild2
-rw-r--r--xfce-base/xfconf/xfconf-4.12.1.ebuild2
-rw-r--r--xfce-base/xfconf/xfconf-4.13.4.ebuild2
-rw-r--r--xfce-base/xfconf/xfconf-4.13.5.ebuild2
-rw-r--r--xfce-base/xfdesktop/Manifest6
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild2
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild2
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild2
-rw-r--r--xfce-base/xfwm4/Manifest4
-rw-r--r--xfce-base/xfwm4/xfwm4-4.12.4.ebuild2
-rw-r--r--xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild2
-rw-r--r--xfce-extra/Manifest.gzbin10965 -> 10953 bytes
-rw-r--r--xfce-extra/eatmonkey/Manifest2
-rw-r--r--xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild2
-rw-r--r--xfce-extra/thunar-archive-plugin/Manifest4
-rw-r--r--xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild2
-rw-r--r--xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild2
-rw-r--r--xfce-extra/thunar-media-tags-plugin/Manifest4
-rw-r--r--xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild2
-rw-r--r--xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild2
-rw-r--r--xfce-extra/thunar-shares-plugin/Manifest2
-rw-r--r--xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.0.ebuild2
-rw-r--r--xfce-extra/thunar-vcs-plugin/Manifest4
-rw-r--r--xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild2
-rw-r--r--xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.90.ebuild2
-rw-r--r--xfce-extra/thunar-volman/Manifest4
-rw-r--r--xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild2
-rw-r--r--xfce-extra/thunar-volman/thunar-volman-0.9.0.ebuild2
-rw-r--r--xfce-extra/tumbler/Manifest4
-rw-r--r--xfce-extra/tumbler/tumbler-0.2.0.ebuild2
-rw-r--r--xfce-extra/tumbler/tumbler-0.2.1.ebuild2
-rw-r--r--xfce-extra/xfce4-battery-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild2
-rw-r--r--xfce-extra/xfce4-cellmodem-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild2
-rw-r--r--xfce-extra/xfce4-clipman-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild2
-rw-r--r--xfce-extra/xfce4-cpufreq-plugin/Manifest6
-rw-r--r--xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild2
-rw-r--r--xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild2
-rw-r--r--xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild2
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild2
-rw-r--r--xfce-extra/xfce4-datetime-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild2
-rw-r--r--xfce-extra/xfce4-dict/Manifest4
-rw-r--r--xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild2
-rw-r--r--xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild2
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild2
-rw-r--r--xfce-extra/xfce4-embed-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild2
-rw-r--r--xfce-extra/xfce4-equake-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild2
-rw-r--r--xfce-extra/xfce4-eyes-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild2
-rw-r--r--xfce-extra/xfce4-fsguard-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild2
-rw-r--r--xfce-extra/xfce4-genmon-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild2
-rw-r--r--xfce-extra/xfce4-gvfs-mount/Manifest2
-rw-r--r--xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-indicator-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild2
-rw-r--r--xfce-extra/xfce4-mailwatch-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild2
-rw-r--r--xfce-extra/xfce4-modemlights-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild2
-rw-r--r--xfce-extra/xfce4-mount-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild2
-rw-r--r--xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild35
-rw-r--r--xfce-extra/xfce4-mpc-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild2
-rw-r--r--xfce-extra/xfce4-netload-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild2
-rw-r--r--xfce-extra/xfce4-notes-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild2
-rw-r--r--xfce-extra/xfce4-notifyd/Manifest4
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.1.ebuild2
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild2
-rw-r--r--xfce-extra/xfce4-places-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild2
-rw-r--r--xfce-extra/xfce4-power-manager/Manifest2
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild2
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/Manifest6
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild2
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild2
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild2
-rw-r--r--xfce-extra/xfce4-quicklauncher-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-radio-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-screenshooter/Manifest6
-rw-r--r--xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild2
-rw-r--r--xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild2
-rw-r--r--xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild2
-rw-r--r--xfce-extra/xfce4-sensors-plugin/Manifest6
-rw-r--r--xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild2
-rw-r--r--xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild2
-rw-r--r--xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild2
-rw-r--r--xfce-extra/xfce4-smartbookmark-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild2
-rw-r--r--xfce-extra/xfce4-statusnotifier-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild2
-rw-r--r--xfce-extra/xfce4-systemload-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild2
-rw-r--r--xfce-extra/xfce4-taskmanager/Manifest4
-rw-r--r--xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild2
-rw-r--r--xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild2
-rw-r--r--xfce-extra/xfce4-time-out-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild2
-rw-r--r--xfce-extra/xfce4-timer-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild2
-rw-r--r--xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild2
-rw-r--r--xfce-extra/xfce4-vala/Manifest2
-rw-r--r--xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild2
-rw-r--r--xfce-extra/xfce4-verve-plugin/Manifest4
-rw-r--r--xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild2
-rw-r--r--xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild2
-rw-r--r--xfce-extra/xfce4-volumed-pulse/Manifest4
-rw-r--r--xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild2
-rw-r--r--xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild2
-rw-r--r--xfce-extra/xfce4-wavelan-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild2
-rw-r--r--xfce-extra/xfce4-weather-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/Manifest12
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild2
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild46
-rw-r--r--xfce-extra/xfce4-wmdock-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild2
-rw-r--r--xfce-extra/xfce4-xkb-plugin/Manifest2
-rw-r--r--xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild2
-rw-r--r--xfce-extra/xfdashboard/Manifest2
-rw-r--r--xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild2
-rw-r--r--xfce-extra/xfswitch-plugin/Manifest2
-rw-r--r--xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild2
2152 files changed, 23061 insertions, 25144 deletions
diff --git a/Manifest b/Manifest
index 6cdcc7909c1a..23232d0dc4af 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 28821 BLAKE2B 050529f9e08f2bda56e5bd773a4f6b1dc4838d98b6157aa4090fafb9f62bced0f73010897598385f30e8a707e0b0ffaafe7a9d9d1f81124b03ea496b77cc42c6 SHA512 52b3ad14d07dbb5caad3ec292cdcc143e80a7978900865afcc2dda2596878b98b6539438b391f6b1e56daf3e0b4972f235fb011cc707be63a36e8e11b93925a0
-TIMESTAMP 2018-07-07T09:38:31Z
+MANIFEST Manifest.files.gz 28812 BLAKE2B 71dd1c6be8acbb996ea419aca6bc3af54593fe365507fd11552d16de4c66faad3ad3b2ea0df068d6b623556852dd00ad2f222c7860f3d674484bb24daf3dbb34 SHA512 9bb8ad1b905176e26f2b1d02887c45797859933a3a61dec6c6b404cac634e736c9573b0a5ee1e5d791f124ae20d14a91cddad56c51568d4637d8205cadd9740d
+TIMESTAMP 2018-07-14T19:08:37Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltAihdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltKSjVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBeJg//VEjb9vCHg0rSFsq3RdMABqJNOBOrgXxzHlQ31TInQk4X9wMukjspaMQI
-DO97PihNqVbWZlmstl8VFGtfsTv9u9QCC3n9dHQ14C9kUXSRh4nN4HA788qtGBU7
-T4phDhqlBfwwd/n0EefykpU6VcttFSUyuABbvoFYtqoVUykGop8QPIfiHB2eve/R
-X3bU8CkwR+HGsoGub1n+8FxTrii4ZppDKzw24+8TZWtflOIF8c3OkzZ/t5vfPyiJ
-s8SjxV9/rsD/9NZhG0UuJf126cNYEXP+Tiuq20bhGQzXonZTmlJlRu6tu3PItS4o
-iW3zJCgptuZ9xS62IYR36fhRYdLr3DprDtKJ4uNGcqdnLvhGr9Y/qdEy4fYTBY4q
-VasemCSCYaOpgpiHInucT6bpVbXreZa+Q26D81PxeztuEFcA1qG0tYJ/BVZmGkf2
-QCUvdmkwYMxYP3/IQfWlqAW1OZfo+LJ688/hm2RRGie0ip9fi7hE6ILf2NM2YaBf
-5who9HVgsZpd3LorI1MuUJ66zxoMf1yqiMXDJuTF15AwM9vsI2C7WfZbC7qvzRaa
-6msHI3ijbgitJyrkw66QXlVjUmVYFFoQoO/24wjIZ1xqN1S14lSRRhwu/bkLv71h
-CyueRwm1gmvMirHJRosOTSe8vgCz8cCGYzYByV9jmZgQPN8cPI4=
-=XWtj
+klCrixAArRkNp++8+iwUIG9OVEDkshfopBhDuFikmXyImzRWWl/Bk629vOEZEdJH
+VJq7ZxrirYAeTd456mP7wzG7zVbDICRTAk6gVnVScJjSmGcwxTpAJoikx38JNJmo
+KxLyz2+Oyd2YQ2F0NkNj3Mq16TcJWPv9NjExRjJ8zwGhCo+STn9SbffJbxeUaqLW
+uetj4jyaLZWJYHwgDlpSTZ3Njc+v6rUTiHVD5hKKpi8xfeFquj4UGj0GCp4osGd6
+CZ24/4LDK/gYfk1g62tbS15bgwkjk7D+vHlWaYah2+qpOhaliPBPMBWKpp1LFFjI
+qxyGqfvuLXpi8jzaxdxy/CrYOxTO52ujo+RkeNVtSG9Pf3scMiS2FP0GhojuvWlR
+e7d5AKi/CazHbDelCmge+uPbp8kEVLneuY0TwQncQZ0wLrrHkIdrYE2D9LqXbWqg
+WzN523nLzZ+0lxZvgbYRa4sO+p1ymvO7vmwMKIISCV/z5aMLl6iCRpTFd98dVWIG
+DpVr4yjm1NPLrF9GBS61C4ldbe8qg1F+zveVT71uuWIn2A3IQep6RIC2Ic0gpJdj
+BAOda85jVfsOAXpFq7VbfTB+GMo6j5GJ75QEPpulBZUua7eNI7Ir8IpiQ3k5cxzp
+K1dMSTfuDi+RcDq8UnUcu2qop5AsKqijqs1LfD3hPg9umkJRA+k=
+=8cEQ
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 57c4aff6c8fc..2e2e01cf5c3f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8069b346a040..db104becfcc5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 39ab484d5653..b71c56b88173 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,5 +15,5 @@ DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c3
EBUILD puppet-4.10.11.ebuild 5633 BLAKE2B f75ee3a7cb27288448f341a560e20b3b1246c37a690846bfda63d0ee9ea41600606a986160bb1967ad7c279a4d2204b54af1e45204e43725b4c1438ceb81e7a4 SHA512 90e2636f668b3227ece18ff03a16c28e7791c6ec192a87ca89395a03bc9182abdabb43ac6fc5261da7c4afd68caefaabe81549d39e7fd018cc0b5f307baded2f
EBUILD puppet-4.10.12.ebuild 5628 BLAKE2B bfca2da4591b9589a1b3e42e8a06d91d75a77ca05a57910544caad33b540fd1c8c0b7fa6be4b11ab67ee693daf7486fee9f63115679a513c09ef1e15b3727152 SHA512 e5fd6431a729d205ba1f6360cb2f46f877de7f27a7bc1cf299f1ec2a487a2d2a374d0c059294b1bf08d31b7187b420297b368d474fc0dcc243787b8cea19a431
EBUILD puppet-5.5.1.ebuild 3833 BLAKE2B 1fe39216139f93fc68ae0965596931a4d1ad1114d78353001a710d790a9fbdbe041f14ca3a04e7393c4355da33d3b2501e3e168d306aa0232bdc4fcd2547e134 SHA512 553ed1eea1b8acd1da19be01a7ff7f9d420c9c8b03b38bcdab125f1f02dde6b164caea44019fc3557f8d61ae3f22da925e30dd858402841714d6c17462cff98e
-EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 1fe39216139f93fc68ae0965596931a4d1ad1114d78353001a710d790a9fbdbe041f14ca3a04e7393c4355da33d3b2501e3e168d306aa0232bdc4fcd2547e134 SHA512 553ed1eea1b8acd1da19be01a7ff7f9d420c9c8b03b38bcdab125f1f02dde6b164caea44019fc3557f8d61ae3f22da925e30dd858402841714d6c17462cff98e
+EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.2.ebuild b/app-admin/puppet/puppet-5.5.2.ebuild
index 646ad4fb5351..8aa23c0b2c8c 100644
--- a/app-admin/puppet/puppet-5.5.2.ebuild
+++ b/app-admin/puppet/puppet-5.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7d7e7128751d..a3589196ee2e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 3e481ba87fc3..1a2449b81f92 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,8 @@
DIST wayland-protocols-1.13.tar.xz 99680 BLAKE2B 6bb0ecf08e6b0950c50ba40cffc07d79dd95244abc7d2622f9c232bc2b1cfdaeb9fb1e9f1650ff60defc99ae184abf47f13888f44f429136f2a631afe1c2d5e8 SHA512 f35c21da289038651b75af064ec7c10779158829f578e7320faf401e980da3c958d85e5bcad00994c574cac6319a3ab975aa5483a9b438f781b767bd6303e194
DIST wayland-protocols-1.14.tar.xz 99844 BLAKE2B 55298d24dbaa6cce017775313e9f4cfccbf3176d7ef24c786f1384111a274c3a0164ac753ebfb4e708094199105cc32ccb58cdb22711e0e0711441dde45883bb SHA512 78d2b47c462618ece0c9c19f250b28efb39436e715f624205c7705dbbae4f125ff2eafa2454e7dce527d3b13449dcb037b282bbbb9ea9d9f52809d6b8187a204
+DIST wayland-protocols-1.15.tar.xz 100816 BLAKE2B 22ab7291a4554345a40858d1051e4842ddf1b4442e4a5446f1d8ef4202c8e71307daec5a9a1cca18e7134329367063509286f85b40d9bfda52276945c5b799f2 SHA512 4a3dcd8f3219f3c43fb2399b33626a579d4fbfb94298fd5a831946e7eadfcc0538b6732f71cbc7ac2c2896362821efd5ac6b1392071b831fa80eb7b2f48845b3
EBUILD wayland-protocols-1.13.ebuild 876 BLAKE2B f543802c91996ea704080c339bd0c5cfc1d53469109c10cf86fbb0c897295ab83a56db32fc1f787e05a7a057fb8c8e8d7a27b78ec2839aee7f74e33caf30e6a5 SHA512 362458b84cc219b1711e6abc309d953124e19e9ee37549c380464c40e6ae969054b7ccc2bb26a20b8c0baccb0c7db9cf97271cc635308f3cde043bc61a40cc3f
EBUILD wayland-protocols-1.14.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
+EBUILD wayland-protocols-1.15.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
EBUILD wayland-protocols-9999.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild
new file mode 100644
index 000000000000..4948be07ff86
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+ EXPERIMENTAL="true"
+
+ inherit git-r3 autotools
+else
+ inherit autotools
+fi
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV != 9999* ]]; then
+ SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/wayland"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_test() {
+ export XDG_RUNTIME_DIR="${T}/runtime-dir"
+ mkdir "${XDG_RUNTIME_DIR}" || die
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+ default
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index d23220056c20..6b00c82646da 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
Binary files differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index ee9952dfd1f0..c6a7596ebce4 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,64 +1,64 @@
AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a850355fabf7d1a167f73f51c86fb77ef4ec651fa48cea3010752836feb51dc71c1ba787c95fe4deef SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f
AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
-DIST lightning-5.4.8.tar.xz 1891528 BLAKE2B 8b15d2058171d09b8fc1e992b48d36f024ae9405803c0626060bbdb75318a6ce652cc1b527cc2a30041c81f2ea215c63950912a8783d55e4042c2fcc270bfccf SHA512 9c36ad58ef77f9e7a1e34c07db0357d4db75a44c837068016e1413e31cc762f2cc1b4cf1edf8a78124077053db6ddddec68c17ba42da91c2a05dc87616f742dc
-DIST thunderbird-52.9.0-ar.xpi 604235 BLAKE2B 976fa2de5d2d132dd1aa835292c3991a1faaddd542a0eb9f72a75ae200c68edaccc921d5263a6c69324af8b189ada47f016863d1df147b3e54951fb7d3f1ad12 SHA512 50b9e878463ffdaae09fbe1e5567200892f20c3c593e9c53ac7524f58c688711e58b2cd8a668a5ae82e3cf96f0c178f5ff111d2f56f049bf3c771b881715a67c
-DIST thunderbird-52.9.0-ast.xpi 541173 BLAKE2B 3aa4e92287ba968f22d10c9fab41fc790042705544ddb998a43d91ac0912f9b028de63fe18cd982c40183aaddc628a4c547428db96c99df7e11e20223f573469 SHA512 70d8168751acf69915f3c6643feb23fce813a313243a392bd3979db24c4f8641b56f92a9f5861aa4224549ff621fadaf4b0f1ad924cf68b9daf6687d15d886c8
-DIST thunderbird-52.9.0-be.xpi 570932 BLAKE2B b2cbd5730b479e2839d463ba2d9b28b2807fe63d28225080e0900a4b284b752ad770475fa632b6dbffac2be151813c4bc4fa7142c1271a586637458fcd3c52c0 SHA512 a5d607682e7519634c6d8efb6e688c476f144287973aeb854f3dc708f07a05c57784a0d2e6416bae287b3315e5addb04384077f55398989d3b8fde24a1a8f826
-DIST thunderbird-52.9.0-bg.xpi 634897 BLAKE2B 099428e50c562e4cf1168d2ee9c322d6fa30294b53d191e5439c3bae740387b2ff3f88fd3b6e17c62d177e8947921d7a7257bbce6a0540dc99f2b93b00156e8d SHA512 b7111d9589aeaad76d7e7a315c9cff8eda9c543979252f295f1e10c502746eb29135246681b10182a389f7f60f1e7267de8a268a5f51bc57605f9def02ea7130
-DIST thunderbird-52.9.0-bn-BD.xpi 676901 BLAKE2B f56ae9db45b41641ee28bc7eae0e3a10702896dc22d5ebe822c61fb8a6032a0752ea950e575590857331ae4ab29b5121a38288c9ff78dba2d503a4ab6d86752e SHA512 aee603e3c82e7f8d7eab37becac87dd2b1e21282719cb7241d0cfce97ec4eed0d059e950a53790581ce225a94059b3d7603a3366ce7eb1cfe88d4039a201edc4
-DIST thunderbird-52.9.0-br.xpi 559380 BLAKE2B 0a774847076b503edd83c1f08d48c3cd5df5bbbf89ae7ac2d5b534bbfc5a30bca07a47de6ea9bf8b676ba44aa31019c2e3e98c4d1d7f177d92f16624a8966ddf SHA512 7f1812799616c533b3170f853b9a625887f850f8ef5a84cd3fc7d4342b4df410e278b7010cbbb6d788d1ed6efd4b5e636f96536bc3b2c7fe1daca2c0b1cf94e9
-DIST thunderbird-52.9.0-ca.xpi 569910 BLAKE2B 5b8fef430525d96b8d019280670717f35e86b53d3edec01c3034fca11cea05942147b8be247a465fcee13f860b345adaa42b26bce5ad087a67220763d69882f6 SHA512 e21b987728ddbcb92666fd1e20798fdcc9da6606bd8668f40048a82c49424005cc87fd05f74ca39a9ede8e130234631ac5b9e1403e095307d56c630c336433eb
-DIST thunderbird-52.9.0-cs.xpi 579150 BLAKE2B dc59cf7f00139ec1b24f1a7c2760a82c599479afdd807a9ffbc84b453cb0b7f4293d69ab340b997a2bc2c4b6680840507cc20de9cd7d1bc606a01f9d350d252c SHA512 5d55c94b8b2791fa6f2a37a0930716026df24c91722744934a4fa26f2f64dea1fb5d3fb750789db95ebf153303bd2fd93c96699894260413710d7487121abe24
-DIST thunderbird-52.9.0-cy.xpi 554858 BLAKE2B faecd9a7066e51c66946ddd3775530545bd8dcf139d6b983424dd51710c78f2e313bb1aa9629eb38e2dad312d30313b0b74d710f324f3a5176735bc7141f014e SHA512 c11fe8606ac053e04a6f7ca0d95636ecf03ac38ab5a5d1f2d11e1b11c26eda1b3834426a356dfa1c91c8746f2bc8294cdb361d433070e2ecbe5c14a17af24da7
-DIST thunderbird-52.9.0-da.xpi 543335 BLAKE2B 0aac6e64c8bb8005592c78d3770eceb86a42b6bda5db8558da4ae4439e28910c721116792bcdb1bd09e372e55c88abf7f9d5384ba2131e046534ea9ba05af178 SHA512 a467bc94cd2c2c7fe9720864b65846a3d66db422d789c412b641390437689bc3f9004b129c222a315d7c0b1f028dc5441479001a595e0188ebe52606fe2b86e0
-DIST thunderbird-52.9.0-de.xpi 555744 BLAKE2B be9314cb5cb702920bca07d846e5fc21e61ae08fcf1bede633683ebc323724c0bed20cc5bccb68af7cbfb2789df8b7275db79739dff9af0bec9ebe42c806eb11 SHA512 3f70eba9ae04bc7c60684768746cfac5f38665fe2094da8c285584e5181f1fef71f6e655149045c69e27ada42956011ab224da96745e22f51691fe367fee03ea
-DIST thunderbird-52.9.0-el.xpi 662965 BLAKE2B ffd00c0f28c5eca89c9e7663fabe363a4e45d340c0a5f54a386bd4cd35eae31bd66b5d9edc946aae55edce59cca5e33504d59d742b53ee754990bc4c8c13a6ea SHA512 6e71b7791d265d564e86b803922efe70e4a42789cdfbb6dc1fcdf4c64a537688f1650d0c3d3c552b71c744c3245aaae65a62b940cf536784f25e8a89d2e66420
-DIST thunderbird-52.9.0-en-GB.xpi 531234 BLAKE2B 9d950dc2c7ce5101d5741efbd2181e6cd71ad96194186cd361185c7bda78ab14713827e1b4b5ba1b201e5191e4238de3438a41c6b32444b47b3c45060a9c8842 SHA512 97790cdd2d8d5bd62830a3698cb488d04b9588fdcb7759f51818ce206d665fab93c706eea20719e2aba21a701eaa77461bebfc68029b8806e9556b135661f227
-DIST thunderbird-52.9.0-es-AR.xpi 565995 BLAKE2B e087ad1dab9c9ebc24c5b5569ae0e276b9c081d4562f5cb0716df4b9bd949bd397c3651fa5a6e4adbe48f54e2c9f95d0ea5419969b216bc83a70bd1393292a7d SHA512 d2f7f03a0acbc911d97567e1adbbacc01e0ee10b6e7611fa2897a7aaf91fc68ee33e386351ddc957c7133e8c0401683396781b498bac536cec4a94a640e3e8fb
-DIST thunderbird-52.9.0-es-ES.xpi 445464 BLAKE2B 18fa0a887e87f24281fd6ae0a002e5d2d7f19f14d60d82aaed9b8c999cb56805f295ecfed3dbc1a0cf4ec83c61b183de5f3834ef31ff1db76d48e6ec09c3dd8e SHA512 d612e94b077b1df62c59b75712bcaa64c668a2ae95db19eaa5b73bde9f716ce78d254513d9ffed42b21fd0d4e5792b01806597483e69a5dc1fde56a5630906a0
-DIST thunderbird-52.9.0-et.xpi 551661 BLAKE2B e76fe7368b035fd84c1b4d0e6b85c77d8df25511dface74719178272d3ddbee735e8914ced5a0a68d148c98e55d61c2e36f3536b72b26fdb48cdb7e92498b677 SHA512 9f732be17798c601973fc1b8bc31d59fa9f31eaea258d6dbf7573ab2b40d3952e9e28d7a5f2ada8d0c7ee97dce20517f4d8647862b113cfabac135d49bb92d1d
-DIST thunderbird-52.9.0-eu.xpi 555536 BLAKE2B e18deb4f741c3cad9e8745ab1de0b5da7e50b1da44f8a65e9715d9452b30daa63e43b298780c718804c7967a7e1fc46d00e11f65d5c259e1a0c757f7450ce63d SHA512 a215f0a0da9161be33a2da2026924d347168222d546dcc9a8496e207fae0782bc103d5e32c768a4be2fa00fb8a600964083e5eb732e6f91a88cfed888667d948
-DIST thunderbird-52.9.0-fi.xpi 550669 BLAKE2B 77283eb69f4e064454be71c9f7006ce66881d8d1f88a40f0f32897e76181b39f69e51185cb41c92415f889c9a91ec94e8f600263235cbb38621320023f491c2e SHA512 f916163f6f615b20a1e4a60fa21111286ab8df3a9f88e243de69925394674721c2808cee34020a95d58702d8f7d0ac629cbadbb10024db0de46132b9d55ff2da
-DIST thunderbird-52.9.0-fr.xpi 577560 BLAKE2B 84e08093afbf64bc8acc8f0d0832144cd4c872f48eaf1b70bb660309efa94df58bcfde61cc4d12216d36169001c2bf0bf400df0cde00819afe7d477992a95bd7 SHA512 2a7fe31fce0714fec73d63ed44cff7f357b150e06a4c61f4eb6397fd8b124edf5f4ba2c2af87d2d432979099151f161cca743b4d03eb9279800f1b6a67fca955
-DIST thunderbird-52.9.0-fy-NL.xpi 563632 BLAKE2B 9fbc5b548c5d233d46f383ff4032dc9e970615dbd23a38f6120b9bf336e6e808c05c01cdd51129f16bb562a718498771e452c5b4bc5730d72ec875f2f9ddb802 SHA512 2d82fe1882c51f42d855d5df2cf8cd74423fbe1548d8fa5cfd080c164d730f3cbd30cccb85fccb4ceb7d8cefa8b658470586c2f0efc2f034153340908109edea
-DIST thunderbird-52.9.0-ga-IE.xpi 583556 BLAKE2B a094da3f008b83e59d99e6d53d81b57a452899dade7ef64b9c39c7ebbba1b24c36607893584d329b2f3a037e1f22375e8bbfc395f3db009f018861aaa86c72f5 SHA512 526966c12347422157a2b0c5cf4fca55b0d84467bc4bf64538e125477e50d3a5b958e024e6ffc6e15e1a0b753ec20031550e634808cc4e543e9cfd1d1d03cd0a
-DIST thunderbird-52.9.0-gd.xpi 574065 BLAKE2B e08f307dd992621e535f7ef0a583907b9071007d9052a4209b574260683529d4c0c335bee127273b87546b56c3d927b06e53878d0f158e946653952a605066ff SHA512 4588aa8eb885380c46a66e0850e38b2c848a745d58be19b9e9efa61a93359152ec5708e0d576bd70c59a9c514c546524294a443958c404c1bc0a6dea6a7c054e
-DIST thunderbird-52.9.0-gl.xpi 575150 BLAKE2B 5616d69171d961652c8c2ba33fb726f862f7cbb41df15440752f7cb4127c14f49ac43f1ec55288d172ad31079772f714f702341969164661d46c03f72f505eae SHA512 236f185fbd15615e1b78b41b3e53c1b2445935c9dea0354f27961a301f08a987eaaa42f2e2f5f38f2e0dbb5213396b35d72665c5c80250122d963f2729001c96
-DIST thunderbird-52.9.0-he.xpi 592566 BLAKE2B e867d3928ff9a5a19dd327f8f49a9379f8fb27d2d9d22cb3318cfae70bb181e683fbf64dae2f496a4ffedbd1719c060efb2ca62bd3b5546e2b9615fe1934fc48 SHA512 2dc5bef2c35b425feaa32ffd0380375147d544259d40c8448fc0343d0f8b3a19fb30bc994ad752906dd0a72d0b8a301290afd89cc6e48b8ff52c860891356090
-DIST thunderbird-52.9.0-hr.xpi 564779 BLAKE2B 96fb69879096888987648bb21ddab91a57c9a676df4ca3503380c4fd88f73a179054ac2d8dbfca001d3e110eaa023c118b06893f4ed19a66b71d00475e8e80a9 SHA512 f1f989f08c5be8d80bbc214b07b5ce4e8979bf43bdd70b8dca41b4f83c9f7d7c775090ca667e0679f8fbcac84df839632065af90fd9ebd304097e45e5339bd88
-DIST thunderbird-52.9.0-hsb.xpi 582241 BLAKE2B 76520b8cd65f5aa8bfe1ec3cb05fa890e767944dd212974d60fe3d3a1bf6a8c7cb3227b1473f40c4b0d87be66408cd772d0f063d5c676771ad778977e239d0eb SHA512 67f7e38be24cde53b169751667105a97c6acc2ef7e6789f9e9018d18641ee2c1d94cc622c192094d91294694758acd9f6a2e80d2b01eee02dd381acf3664e79f
-DIST thunderbird-52.9.0-hu.xpi 586446 BLAKE2B a4cf73fd72ce36fa20384131e1fb7bfd31cb56750bd1a51fb8135ff14c1326512cafb74e9a2d464ab781b007bf0fee292a8948a5a0c4019b503c8b742ad7a404 SHA512 80cfca987519eb5ee0b2bf063fa6a371a338c98449d76a61c3848363401daeeaf173b0db8abc39fea787f7f896a4da9e37a1d654dfc52bab8ff820e851ccaf7d
-DIST thunderbird-52.9.0-hy-AM.xpi 629880 BLAKE2B 8586732234afaaadaadf4996c1d293d8ea44fde264e2d6880a8b05748538a74622c119160c214033d6e329fbfa0b942a6a326de5d1ed07ac53cbef150c1dc63b SHA512 4ae4afbadcac9341a6e5995a0597d7fb35f4d42241be554cebdd4d6a6fece160aac23cf4d939cb22959a2b85e685849a7043f81f3521f6547c34a876da2276ed
-DIST thunderbird-52.9.0-id.xpi 546526 BLAKE2B 23e955ede40bc8070479a553b8d8563a6d20ec76bc93ef7952a644b5a3c8ed9eb81f47c4be68f64a4885cfdebb5d31e5b4e595c08f794889c955c90a02a1819a SHA512 26706b3e30a6e539dc1aa667e593928a10ec6abdd8df6e714f0f72ec54371fd12b12f1f322e0a6e94b6d9954999cddcd9e999155684180993718e43bcd05c5c2
-DIST thunderbird-52.9.0-is.xpi 555712 BLAKE2B d1745843aa628d02be9fcae5eed744b1cc6c720846ccaf9372ccebea13977a357bba60ca8263b1cda9cb3d16c29bf3ca3e489c2e131d55bde6b7670df375b8d3 SHA512 655eb55ef961eb092892afc5f4217c5465f37c22f7475b02964f3ad6e10c139980bba452cec12224c5f4dcade65b736c4a7618f88d1d2047cba5662b27822fc6
-DIST thunderbird-52.9.0-it.xpi 455408 BLAKE2B 0d4a16c7261d79e95fc1e6ea6a84230882864144c414bc06f09b998c532495f05d910312294c2177d0a1eaadfefbef0726ee70db24a09c520e19bd5585192128 SHA512 e0d70a3f1d96a1cd8c7c45f381c8710c137ebe09cbc3fe7ef27d1aec0c632fe8733fb715a03d977112f2bfa38a892bbbaee30b45b009f94b6d34be6d61645d21
-DIST thunderbird-52.9.0-ja.xpi 630053 BLAKE2B 4f2a82a3b074c48db89076ea7b599e0167593acb6369aee219ece2bb496c39434e26d5facce8a6840768917171a295fa93ee166942ad5329a742a604c338035f SHA512 4cde8564df31275f0ee98503dbbfe378956fdc817c2d7228f43ddc7bb6396f2bdbf157813e17a2e3f9a979ccfbb09463775ca34925736fe4ca0e78014e3b9d9f
-DIST thunderbird-52.9.0-ko.xpi 595517 BLAKE2B ee1456b9fdc865be6bf51c57af56bfa78f71e6aad3cd2948ab32134cee6e7339acae90820ef26312539a1f9286a674ee6b2009a1d4d98d86efe9e3216376cf18 SHA512 5c112ddd291b0de8f843d859367223d6017a04bb41ad479ddfa6e2a29c187c01deecd49e9fcb6a73077c6da5d2a9ffdb07d0077c10f9a672981628ffb4c7aade
-DIST thunderbird-52.9.0-lt.xpi 580598 BLAKE2B 1aa38f1331cb859f164117698656ca7f064ca89dd5323c6a2b555774a794de89dbf14eb4ec2f009da6a64722251dca62f7b88d7d0bde3a2d901037eb58002507 SHA512 bb62b1f6e98d9873f98ab4d8e1892758097e056389c9d3d6267fc80727513f6943147c462314eb18793d61a7c6daa0b6dac498c65f61bdb7ed91f9b5a92ed68b
-DIST thunderbird-52.9.0-nb-NO.xpi 551104 BLAKE2B 50f18d882edce20b63dd4693f710729498c46db3fa7abf765e35a1d803c48aecb8f08f905aeb0fbd9f87a69b716a488ed2053ef246a96b959501372b93240d1a SHA512 3b4ffcddc3227cb3ea14eeb7c272816fbb1bc1fddf11b2c9198a251b77af7bbda665e96ebc02cd209169e3c27a866a0a2265e53643feeaed1fe1bd5b35a8397a
-DIST thunderbird-52.9.0-nl.xpi 557957 BLAKE2B f04c03b4923986e0dd93eb6877828561a1ea64aac41f8947da685cd0d6a34820759276d13cc6f9d10a15f91d89c569e5e3eba963822f3e2ef0195b1a069c00aa SHA512 3d75fb2a3934b48aa40bf40673e56f68fcf7185132c14fcfd5f667089266221eb080e55a3ac88ff1a67cb23a6d8ae3e46ae1c0fc4826f6f7d7343420ea7f75e7
-DIST thunderbird-52.9.0-nn-NO.xpi 551892 BLAKE2B 5ef7a94f71e03924f22c58f567e88c03494e35fc3a5935f45bb8e0b6ea18d002ecfff30891b86895888f267dedcc71d5d19465abf1da3d9edacbe7fb2e7bd6bc SHA512 7b91c65372f4c79efd99a01d8a20d57b5df7946c3510989f05ebebdfff858b231ff010cdfd3503d69b79da6546a79a1e208b111f32029c4ec70b7ae1acca5883
-DIST thunderbird-52.9.0-pa-IN.xpi 646568 BLAKE2B c1826adba2f53260d0f182bf141231b2f4b2ad39f6a6435ebf9a73f00a55db08b045eca23d52f6e406b718bf3d9b7b56f9f0a7c10c95bdddec8a7d9d0a9dd48f SHA512 f20585372f247fcea5f0eaba640feaca4368bb2c84144abbb784a1a9266b30778143ed948642946fde34c000d5fe1d06cc55f030449f89426731b43c83a559f7
-DIST thunderbird-52.9.0-pl.xpi 469901 BLAKE2B 1544ff8d2c87fc19b94a36ad68bbff02fcf58e5e01f72447ff3041950510288a1cb694f0b32ef745d2f9778289119ad4ff31ef07029d4083ef991e9712df2979 SHA512 bc125ea42aade77abc0e4cac23e076661babf92198a07f0aece67960e2f9245dc1e59c0e512877fb8b2c957810ff049b94ef078ac1fa2752bfd2c4c61ea52aa1
-DIST thunderbird-52.9.0-pt-BR.xpi 558224 BLAKE2B a4ce6421b9348bbd7832eec6292d6d4809d7085eaba74e9fdb82da5830360dd3a82547952f1795bde13541fd37d6778f73efeececac510c47828bb3c43917310 SHA512 fe9e044d4b0c03fa084c1380206c7b7697d1f1c181bf06256c2f3a43caeb3e8f10942e15ef8bf0589e4ccf788b4030464130f05bdb893baefac750256c3dc357
-DIST thunderbird-52.9.0-pt-PT.xpi 565624 BLAKE2B 99e61a6efa2e56a547e752eb9f7ba454ed4130e4698ec5aa5e907c7e288adc1549462a040117652d5871e20ef0862415bec1974c393ad1f1523cf3f2e626ec9d SHA512 b434e5e65d12da96ed4c9c08046650777ad8d10408b0dcf3065de3d9168e179d8bf98b5a673949ee33893a667da54ecfa904ecdc898f3c6e46a56218e6dcf497
-DIST thunderbird-52.9.0-rm.xpi 557605 BLAKE2B 5fcf0eedd83a419546c2a3f94d45f7105b3df7b4d274e74b18a3bad7454908396475dd5696f0ef5a0cb75be838546c8ba6438db56e0648436a1d123000877af9 SHA512 0740f6d595a7214b68a90d3077b55c4edd94d26bd278d04394d921e05ff719b0c664e88ef6b035f66c4b6d64bd6c439bf0c6b51c80bee0a6dc0eb479fb68fd56
-DIST thunderbird-52.9.0-ro.xpi 570529 BLAKE2B 33ed665aa087f8d1a3be9b80e6c0c020d24c1c22ee832c3e21ad44e306b521fb7b9d78025925a685c90a802be21b016648212b698c65bd5c8085b459991cc6b5 SHA512 9a7a4ff31763fc43e0f6e5a0664d3cc16ac74794cf2cb2f200446f4a8ffdeb4fd8bc632191f42d4610434c8315b683fede11593ac26047a9f9d26a5b96c6f0ac
-DIST thunderbird-52.9.0-ru.xpi 530670 BLAKE2B ef87fddfd4e1b01a128ca90e06e3e70473f89f4b682a1214e1c3018729e65342789321ab8ee76068d01b745afa37cc95b25f52790ee143fe95ced8d7d3170e43 SHA512 41bf73c0ce1cb325b46eb1c0c7a9a3edcd8509eae7cd1013a2e56147ba371ca12ff9e0e8e6ecd9615c2ae3c1534d30374a17fff28b1813b44c641cfb235eb53e
-DIST thunderbird-52.9.0-si.xpi 649010 BLAKE2B 347d4c20e70cbf437efe9e84634ec68b9d3e7a0dee44ee16318a35d2d99b14bb2ecea00a22d4826e2e18a13e64f2df0726d0d0e1c1bfa002d4fd87158b3b17ea SHA512 859024051568de4ef577a06219c397622f841d260ef4101a7e30285f559e929b995cc9f30951d437ddeed1328285884474875681ed803590a5d72ef67f798eb2
-DIST thunderbird-52.9.0-sk.xpi 583882 BLAKE2B ceddddb3517849b4a361d773973ef4e7c26663aa8121828e50c22db04296666821f7e49bce71792108a1d4046a24bf6b55abbf48086de1a8befcd29378373156 SHA512 e031a4aef7ec8930d2d2dfc12f0a94ec60d1b3f1d5aa4e298809efb80e478cdb17712979dc0a2df36f516860119f30eddaf78944bb7c6dbf20824295421d788c
-DIST thunderbird-52.9.0-sl.xpi 562834 BLAKE2B ea3705a1a6756e2a8de26bf41b2ef24b12a6b484221e549936125bcb0642991f8da2ff822ea9ef42316182168f9fc9fc844250f5a177ad0e40e449124d0f2bbe SHA512 b6a2358df2c43102b130c827bb5fd7e567e0f11c28d65b931a6f96553b2c8f1ef5cfd35783c4bb75e703c85021283e57b092f84ee7d418e50e949635825d2b8a
-DIST thunderbird-52.9.0-sq.xpi 570616 BLAKE2B 22a608983e0cdea39e0dec636e7af160a5b9afa4012a83c6207f0e4fbfab0632d9f58cee859f6047ab1b9ae437ac721e5cfebaa76104bc3f7f9f8d304bfd8777 SHA512 28b5d009013acaf16ef3b8a5781e34b207c9e4bc01edb4c7e1ed0dc0273d9deb3270b1ec05749f5e131bbc8883d976809057659d92b68c5375a4e9e04146d045
-DIST thunderbird-52.9.0-sr.xpi 609020 BLAKE2B 22df230ee19eda1945f359ec14b12a2ed56992d54ff8ea833a75117642078b7a67f45386864f1e9213138691a00eb62aa48b1033e6a1346b53caa95dc8bccfe6 SHA512 ab98bccbc87f0456fa12732817531887f18175521087632f350cd24d126fc94ea98b0c8155502db7676387f6c1961560954f5f4dc5351dfad65a24ee84b3675a
-DIST thunderbird-52.9.0-sv-SE.xpi 565777 BLAKE2B d53fc8e99065135aaaafbac2dca5f9ada472ce0d11bde4a84a54b2cc61c001ed0f95b6819dd5940eea8d8daff7e70bd45950212f89966cc8e9abfa1aa7380ee0 SHA512 ff30d6a220f8ff3dc8a3f7672bc814611ed9a7523498efbf101b86285389a2a3f4533485266ffb36dbd9844ef5272ddda9cd54efb90e71e44a033179cd41f982
-DIST thunderbird-52.9.0-ta-LK.xpi 675039 BLAKE2B 1c2dab5c68a812fc6344a5b25a120d5d502bf3772d509a28f661e183fb5196e69b42a899f88d1d9e99730c6d68fdc87d0a0a24e20f7465424ccf95e58b8839a8 SHA512 5bcd5a65d88657c44d60bce26550a6896319d007462ce4766901b03e5e1749f83f29dbb2e5989bb624db57bb4c51223d48fb1e815878bc4bf863cd46b93ea865
-DIST thunderbird-52.9.0-tr.xpi 569926 BLAKE2B 992ee9e0ca14a9a8a3d1a75eb8d5caad1fbf0cd463b33fc0e31329b43ca9620eaa06f519d5acabb7b71304ace3acd780a7360a184f7b34e5b66beca135224367 SHA512 b302f024a827cabf1e46b74892410f71c62a63246093bd3c014feb281bb46a7998af8ba75a7be4c2dd8857c574e653329b76246e34454bc2556992a7663d1697
-DIST thunderbird-52.9.0-uk.xpi 652855 BLAKE2B 980c0869662425d8a35e58e4cff2dffdc159020c11474891e7200adc796a08b1f20e0eb218e46471a7db176b61cb85903ed7356a0fda34da109352740d7d3c38 SHA512 1d6746d15085b427400000b1e20a691c9b7a4184f380d7fd516af83ff130a450538522d1d9819a7094237f3ad2d51373098fc178f7803be8c9aa62e6ae2ab257
-DIST thunderbird-52.9.0-vi.xpi 637164 BLAKE2B 3b1e661c3d7b628d201b73de0edd19e3bcb9979b9e9cad31ca3e62f00b5e9a661569507cf872ffd75ec1ee97e3bbc2c71c4915a5b05f538d2c3d9e4d49e9559c SHA512 90ec8dda5fdf491a2d81c0f675753f19f1c6289b42c08d5ea6b73e0148f07828d481723bef7a516ed67ac1c9bdaaa489ae9579782b389cbad4cbe76f4a19f1e1
-DIST thunderbird-52.9.0-zh-CN.xpi 593612 BLAKE2B bfeba596b07feafccf24da7fe945fdafe24d596818f601e189eca1d8dae4e98b6f57a4b3535d313fa0fc1629bc58a84ff688d824e3afd451c1fc4530b6a3be4d SHA512 2edc8f16f4dce60c5ab8f29758f380885dec06360d6c39f18aceeff2647da71c6c53f5bb3e4b718acfa17ad1692b87df7320cd2966c3de64b0091879337cd0fd
-DIST thunderbird-52.9.0-zh-TW.xpi 595729 BLAKE2B 33702ec38ee830913c9b27dd102c38d7f6b7ce5f0b68cab14a71941f6a86dbb9dc785c5324dfd04acc8f5fab3562c439f3efab95eee8401c061efa8f38d4a2dd SHA512 a8b9cf32945efb8ed958ac53ab11e327f8dba8af29ef7c18af66d4cc9c7d86bfbab3e44e61d14a5eb40b82d63c9ea3a875672bc96c0baf08d841df7b7e3dfba0
-DIST thunderbird-bin_i686-52.9.0.tar.bz2 51220347 BLAKE2B 468b8a9771f70f73c861f0220b9f7e92037cd5e75c30a0d5ed2b39f2fafa0fe9ae6d27f92020d7cc0ec184e562e9c1573f4b41e48d40d9c4531fe03a9d19e9b1 SHA512 fcd2d06dcd49a5b60284e0a370bb0e5cedfd01dbc06a9057a8063a0e84abde6a6c7a7779bc60e475629a33645b70b718508bbccfea76ff1e6be42c0052eb0e45
-DIST thunderbird-bin_x86_64-52.9.0.tar.bz2 49931149 BLAKE2B e6ef631dd8cb33c6be6e0cc632210e853610d7b4ba44ffa7ea38e6111ae22eb40ecf0ff4486cfc9e8c6846b8694fbcb20edf2e97a94326f437e488656e092d36 SHA512 4b6479bdf244cc7dbf175109b9b353d021728e53f16c6f172a6c9b5d2f1018a0bb5a69f1f0fb40d95fa7ab117497f20514f7795b7180b69506102b1a6d654888
-EBUILD thunderbird-bin-52.9.0.ebuild 4736 BLAKE2B 7995ed93b9d421a56b3e57267f42639eb772b57eed0610c60578a768c78662731ba9b51560534186968334dcc70d9e4099d2d796c58e06f6beb54a8fb129ee52 SHA512 043814c18b1076a447aadabffa21b35ad66ca30b1f3fcb857d325f2bdb2f7571fcd1d98e655a57fae912ba3fb93d2955f5deb496fcde947106e5c7f676854dff
+DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
+DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
+DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
+DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469
+DIST thunderbird-52.9.1-bg.xpi 634897 BLAKE2B d7faec512952ee336a1ada9552ec76721a89f9ed31a242bcd6a210b38a0c4b664fc212f7236a6e541386f70c3c86b7930fed91ad47c06d6045c8ff07181e2d50 SHA512 0b80aec2e54de435b74e5635ce2bef6f8546118f36346b9a845fdc8cbe653eb99ca8bf10e43facf3bc443de99474f20c39ae3d702e4c3d563a6ecbe2d4131d67
+DIST thunderbird-52.9.1-bn-BD.xpi 676900 BLAKE2B 97ead447ea6dcef7d7f367b56c3246846a8984d51887a4df75d9292cc0b1c86b1eb75e85fa0318c8e5372478f30e8c5ebb1653cc956e68928e3ced9ca0faab11 SHA512 8e560ccb37a55f3b538197a84b38494ea73454ef0fffa41e5c473e0efe4814b41f6d1279e75ca79d5c0370bc5717fffbeb20a544e46a5c42d9b837383c44e23f
+DIST thunderbird-52.9.1-br.xpi 559380 BLAKE2B 2dde76cfa4a6f3c133f64fb77b99b10248c00eb4f2faa6ff86965626318c76397d44d81c480230c46a031423cd968da86ce39e1725667818ca0af111f790303d SHA512 a492e7842fb8219fce68727e90b7fb5a94c245186896c519a72e67a5ce4b04b3dd11d1f635c3262978c9ad64be14ae26af7f1c7e8a3295c297eab4c47ebcf73b
+DIST thunderbird-52.9.1-ca.xpi 569910 BLAKE2B 3c77e9ea27b9500a073a98cb3f6d57bb56c56489133ec8193c162b768716da1527d566f3de17c83497226c47736dcba2080caf4375aadf14b4d29cf0a717a3c4 SHA512 a2a49a478f8474d7a89fe9540698890071402148624804f585e979784b244379ef751b9d1c1778756c8ff84f8aef3b42a4c7e4b4148d46a997b1457de52af3ad
+DIST thunderbird-52.9.1-cs.xpi 579149 BLAKE2B fed50ac7f7accdcc17a2a33806167cb308aea15daa49ac84a8077c965eac11590693cb4f0132bed908ecb29b11dac567c352c17ade1cbae2148ea5863f86d8c4 SHA512 2a90e406a9d075841908090a0121d97b0196d5128ebbad3e4ed5df499f859fbdd2822b1916829659ee1feac6d5cac87763de91c82ff2529ca5ffc7540788b11c
+DIST thunderbird-52.9.1-cy.xpi 554858 BLAKE2B a2efa3b9918fdc68422a565d6b67aa2f1540b4047c6ff875f85acf164f1d3276d98a27eef9263a13de368c2caf47b34025587ee570e394ba9c2f6820daecf76c SHA512 60b2bc9d44eb0d62733b44cf581ad9100ef8bdad69c3941624d185855834e3ff4626b540b3d4cc92eef6b2003daeb13b543466a2b2a5ebe267322de39be58ca2
+DIST thunderbird-52.9.1-da.xpi 543334 BLAKE2B e3fc284306e836b629257ed553153bc2912bcb866b22704d56c0ef1f8e134ad956befa0479c618b4459b251ae6f43b5d4d1213dd2a513c2a8cb6ad0a50d2119c SHA512 e310ab9d668162a80d3a8903d4ff40954611da9e257e44736150377a171dd3e53364dc08e13bd329929566d8f06b1b4570d8650c3292baa8be96d3bdaf18d81e
+DIST thunderbird-52.9.1-de.xpi 555743 BLAKE2B ec9940dab9a587cad409081f845c2c100eb6cee0221c61c7bb0fb17f5a66142eeaa2b0caae61527140deb8ce2cd177d065dc74f5f9060ef1deb9085fa38ff192 SHA512 3fb485594238ae26e79e81db2abb8037d43c7c090c6486a96bb9364374d7efd030a51a992e427f6d583b81d72cb356e07bd4d44bc93c95a971560cea5cf05d43
+DIST thunderbird-52.9.1-el.xpi 662964 BLAKE2B e4e44fc4587eb8389f3c1f5441cc1bf6f222b239354ac13bca12242e0538d79d0b503f0f916823f77985d1a6f7411eea8cd4d2a66d264485012b2b2be2d85dfd SHA512 ba3f35452cacfdd0327540ab1f48c45dac7e3204ced2a08dafde1b97a6b21653b7e11f21fa027a7408287fbb9854228e328283784a7419057fdbe346739c2834
+DIST thunderbird-52.9.1-en-GB.xpi 531233 BLAKE2B 98b524dbcd34081194028a18ae3e0395920d8ab9b0faf767e122b6767bf10452e240a21962bac477ddb460f1338046deb26c7d3e3ebcb1a47397da2d1e85cdc0 SHA512 c88bf8b7b45582cee6d391ef2e793ca6d931a73dd901b1320c266ca9404ccf875092b5e89c4cf5f3f2fd8d05f6fa37eccf493975a7e4e62b7cb2b445631a87d7
+DIST thunderbird-52.9.1-es-AR.xpi 565995 BLAKE2B b4dd2c879e887ec180fc536ed8d75a484986b243e4bc514373664f6c864916ec81d973a67da0fab76ec470ae3c08f4df019564346f3f5883308784d24df9d269 SHA512 621c4b2a1afb1750328cdbd86445fad394a45d610f7a59b1e66bfcb7d92c28ac8eec47662906b461a9aa2f51a8d445c86591ffdacf8455b7bd4094af90924ab4
+DIST thunderbird-52.9.1-es-ES.xpi 445464 BLAKE2B a52b8b19a4775b65ab503320792ed6b3eef92d0d25468cdca1a0a1136b9acb0540b76aad8fc632104e43683b19f7917ad222c0d10364a4feae006afff767f4d7 SHA512 ebe899cf7b21037701690c5239d8b3c28848dfe732b550177ef645e8afb8df900a4edd665625e33ff10e14451b6509537ca5c4c68411cc12939a5eb54bbddc95
+DIST thunderbird-52.9.1-et.xpi 551661 BLAKE2B ce1f0bbcf2ee30e1fb92c6441ff9b97756931b50eb349612c3a9ba403b1657ed0e3a754a58f01e255b647d9c9cd8435384895af993dcfec041280e1e255212ca SHA512 f135b4e0c69fe039b2843ea3d80df28bd9b1d542233935bbe3b4564a3da88d33f07bfbb4dfbe0bbde5666f7621056022b6c9e24a33a25d08b2f80139e064626a
+DIST thunderbird-52.9.1-eu.xpi 555536 BLAKE2B 62591d66044cc5807abde288d53e9aea2580a3ac0604972eb11d88893542e4a35d07fe34f7c135eea8759a4d2a207d2b18f2e7f359958796b0b2f95b1a63336d SHA512 7bbbde796dd3540fa52e0867e3ca62d4e8afa52899c77a1972b13f62a04625673d9493f2492725802908e478d611ce428bbe6aa912e75af64178033c5f298ca3
+DIST thunderbird-52.9.1-fi.xpi 550669 BLAKE2B 69e5b8322d39b70781294fb67fbfd7e17f527f68dda7cd3938f8ec80de66fadc60f63f4028c9b5eae6a22e7d9f08534fc5b8263e6120f0c0396c8d357664b39d SHA512 8be41b936ac46db288f31d49c42d7c1530b86206fe6272e0a83ecf2d68f025046ffe0241076f38bcbe55b52d982b60c15027e82fa108a3a3167838fa4c35159a
+DIST thunderbird-52.9.1-fr.xpi 577560 BLAKE2B 34b541b44a3a296180bf068f916489630b9d355b7442836fbeee26fd9261fd90ca5ded893c11badef2dd9afa63aa7701fb197243db46cc84afd0a0e26395a01f SHA512 121e73d4c91a180fb1a7159525274e3e81922828cb01d06ec5e939458f75d12fecc444e6ee06a864c1f2aca4b6d7234877606eb3d30c2d950ef1daf0a68da15d
+DIST thunderbird-52.9.1-fy-NL.xpi 563632 BLAKE2B d1be564211cb41a2897038b3796daca1d87fc9dd367422f6d34da34e6e594fbefa846fce33cfe6f8014a0471aff5ed036009cc8b8b30693e635de49040fc4e83 SHA512 ddee8c80ea0bfc8c3644ff16b61b7b9defbe000ce0d59020b776607f506970a6a94752d14c41b487214ed0544ed1aa3c87e88810763709a0a13a7e3d64319753
+DIST thunderbird-52.9.1-ga-IE.xpi 583556 BLAKE2B acf08c3db7db69422d50f239df51d7311b470620d3fafc8c87ed2778ef3464c4dface1ee773303b793dc617b839ab13dc210e6f743ae1a780f5045b2b1700d54 SHA512 7eb95bd2ebe319006453d9441eef83c72f3f100930770990f0a3401757c277de62258910be4b4c4010891a5b335a7455895845ea421a99c2591f1f51f0a8f2bb
+DIST thunderbird-52.9.1-gd.xpi 574065 BLAKE2B 4c91b7fefb0196592a233922c406609fd2618fd620393d7243cdb1e84839500683d9e900cbed8f5908cd6f2ff3fb139320e780ad978c657e2fb25a266a75454b SHA512 a37053cb56323ec9455f2c0605ee178335564b57c1d5436b58fedf2b30f6ff83f5803380925ce38375b24ded47268bded1e395aaebce56d985da27182a69ccd3
+DIST thunderbird-52.9.1-gl.xpi 575150 BLAKE2B 0e144388597a9cd02e7fcc2d0937a9b0bb6122767e7c95eb0aa1317292b5eaaa9e62e3a41197040f1407bbb49f1772cecb8f3d0499c524e47c06fd919cd25e2c SHA512 156b89f7a27b6bc6ba17c889c23822188770637f9a1bc0cf025e59abcb0558a60d8fc22567f4e45418fd095b5a1bb26b2d7b5eec9923a8c9a81ec5f6220c4b64
+DIST thunderbird-52.9.1-he.xpi 592566 BLAKE2B d9754c8712c07656378f0e2c655c50cbbaf4771c4c18dcb8b88676ea0cf8f8add7ff62fd929e034b5446426bbe6753c0128fc61561526913902d08331a2db705 SHA512 84d6b327bcea27294a4b9a1475a516da63cde3ba294026022a23813b4cbc60c8f99a99e7bba45381297277b25be3211dd12d7787dcf77af6e475fc961914634b
+DIST thunderbird-52.9.1-hr.xpi 564778 BLAKE2B 5f153149aaace7d2e064349d4a6ece05f483799e7a48025e6f01d8e236742bb8143498f532e56f98694f13687900f19290ef21d6d982dce0004097ba45ed2f4c SHA512 145885b1a9e938ad7668e080b7b190e5755da0a88115ed425c110d630d3eb6d33a822badde7817e0c5fa3a695c462c903be0999ec98dcfebeaea2258c4c7f3a1
+DIST thunderbird-52.9.1-hsb.xpi 582241 BLAKE2B 60397a0b526383452452f5e106e2e8abb11eb6f1feb6ac80e2b2dde1cc4b9972b9671dba1848bb0df4bfbb7672781219ecea7d5987bd294721c11ac2e4fcc917 SHA512 bb35005c9d4a7845e30f0f9f14b2ae71df3442720c5cfb6bbe9566dd1ab532b3f82a60090615e10c56b601913e2709218091213783302b2c84a6d04aea1fee50
+DIST thunderbird-52.9.1-hu.xpi 586446 BLAKE2B 752b687cda96dd4459bbbae217987e0778f7e49e5e2bf277260b8d6967bba6746996e18b563496d83fa4d7d9baa684e44e9aa1458b550f9a8dcf7383351c4555 SHA512 38578e0cac5fc1ff7cf9e5f7a7d5cd78771de734b3fd007c2306e963465fdedcf1032d0b5b17454d9aa9971ed95843c77178a4be4e08821779c04afff5eaf559
+DIST thunderbird-52.9.1-hy-AM.xpi 629879 BLAKE2B 7caa334d6a5490e6c3fa3b39365a3140403e2ecff504101dd5fc846b5024ed26373f183646a111fa08f90e1da8fa4f8355d4db525884d7377b2a5439a49dc867 SHA512 d3cdd5c47254728a358e0a5ceb775660ad4e52fea6b35f8a885650662c51d3e8c3c801ad23fa15c5d8c8620e2581010a09a53b90bf5d5383f6ccd2ea2499f4c5
+DIST thunderbird-52.9.1-id.xpi 546526 BLAKE2B b126a5fa5f292ea6212563401085c18995d18bf4a6277321e94ebb26010975de854c63b95a5a9fefd39379b066b940166f444bda83de37f5ebf5c9b7dea4cd86 SHA512 282afaa58ba6112217d1b2ec26d0a4f792af4d7c7201e7d900d9c558e7e2f709065f65909158058d8bade7756a6f611de06c21f974fb461d9321df1a8202d121
+DIST thunderbird-52.9.1-is.xpi 555712 BLAKE2B 8f141a65f2170e7ef106c9b9c6085d0331b62b5523e147767ec042021ec7ba9f90f0886114d33fe9ed694c185885c0eac908649d9b78a935898cef6815641f0c SHA512 ca34a1c0645d4e2a847055c47b2a507aeaf0b9ee8df24f58459f57ef7cc75970ab2caf00d4506420fbb15ccd277fae25a57a8b130bc5e1ade72cbf406f17209e
+DIST thunderbird-52.9.1-it.xpi 455407 BLAKE2B 65affdd8d7235b5dd36b68be0b8e385dd28fe1f924699227939b5c227e3c6eb768d0f0a67c27dba4581e4b9d793c95d854f834120f7b188cca5a0ae4124348cb SHA512 a80a004d18d6fcbb1656d8dd95b6d45176da601b7c00f8e62efca7716ad3887ed079e58bbe0f3b6933fe7338324c1cadb95930ec721a19c63d8ac01844a7aeba
+DIST thunderbird-52.9.1-ja.xpi 630052 BLAKE2B ff78665015749af1b6e23803b41564df887f001d4b8cede98f4af37d2061ffece8eb7bd372cf98a6cbcd088161d766e15ec55b44b1f4a458e57c0e2ee90461d9 SHA512 6028b000a5c855a90f985dc9bbf49dd17f88361fff17eb49becd45e8bd6b2b98123b5b253df91b4b851500011717c8cb46c9b278b794312a4ca8f3f2ca06d5c6
+DIST thunderbird-52.9.1-ko.xpi 595517 BLAKE2B cd444323c29258a631a0d6a3ef0211bd44eeb3e02ebb7ada915af7b7583c84c9234cb16b61068f565bd9769f70498d08511f68f92d3b83cd05aab27b9fb5a46d SHA512 64187d58dbc54a464b9271a912e81cb7f3201c3b34df7a6e41869495d5c6495b01d7cb93634e41e184bb117de84fd843c48aef62c272a9bb95cadc6b7f247fe8
+DIST thunderbird-52.9.1-lt.xpi 580598 BLAKE2B 4ff9c5ae68e2e1c7ef071e107a80178a1e7dc70f155b999b1106e644092e8f81890dda8c258f4d11c2697c39b60f62cd27dda360615998901cc141e7f771a166 SHA512 c4fe807b8fd74abeabcde8190ef25d7bfac5f9783c8dcad39fb2627c8b8d149c44aff8652e4e5496d6921f84ae988202a67c0e3dd5605bda77dbcc6df41578cb
+DIST thunderbird-52.9.1-nb-NO.xpi 551103 BLAKE2B 55262165764ad56b4258138bed8864da78cdbef8bb4b1d4e5ca4decb2e32aaa3d908849893a84dd50e6222396af016db5ac457cecf6207eb923ad33829c47d46 SHA512 7ed8a486013d3ea0ba8d4ef357ed640152412b07da6a376ca277e6a2e138c1594b50f5a0a984adce6af227e0b2634f056aab16d528729efb5dd94ea016c47dfd
+DIST thunderbird-52.9.1-nl.xpi 557956 BLAKE2B 0bfa945586c40769e242fc1d0b4c880adff796fd11584f7dbbc6cac886c99f4adc60fb50250f4849103c3c4cb53cf848a8978bd18b7bdbdaf9b49894758ef2c1 SHA512 f6e47d826a7214c7c54fe56db9b79feb3204504dee4c05ab9816c9db36725ac1c76f1f6e328fe296e1a39a2d8f0fdd4320401c19c9f087b8f76cf14a1c19a5b0
+DIST thunderbird-52.9.1-nn-NO.xpi 551891 BLAKE2B 111b2c7e933afad22e5dfb1b247c19d412f197bfafd37dd2e07315f8fcf1593b5077ee8880e6de6d17de5c09264c28d997809a6fcfb41a1aca4f99d7cbbc22f0 SHA512 1b15161baf948108e481432262de8d852b58b6f258870ed8e32895a16d8929ba7097af4a26aae3d89e2047118c36f0423d02bbe754c3b1b2db5163201ed024c7
+DIST thunderbird-52.9.1-pa-IN.xpi 646568 BLAKE2B 3d96d7a935b99b9e824031a07d735f4e43cb1559bd9ead738ac1b95052154afe5f365860e2acfda232acd9e0994ea5f1a0132caab1a08ac3bbd2dee536319bc5 SHA512 22ed1a5d0068437680586f9cc28546be38a1bfb32fbb057e0bc26228b9b4cb440e4693956e6e428465f2d511f4a690895ff6a878f5eee53eec3b3088ab75b6e7
+DIST thunderbird-52.9.1-pl.xpi 469901 BLAKE2B 2f84926881292bf659f0258def0f47dfa66c2ac85c27bebef75e2e08cf1304b4c56b41f0f8d0f3099f8c8639fe2e0943ccda5b661f75c2a5ec77eafc17041b91 SHA512 12bc800b8e4856e2323f864d38b347f80d401a3487966ae4312e807d4a455d7fe5061e9d6bcce6f109cc57bd29ced8dff469343cbc2db3003ff531cad14c5cdb
+DIST thunderbird-52.9.1-pt-BR.xpi 558223 BLAKE2B 89736dc1172be125a0e6c816993afb12bce02e532bca425d41a8fd1cc607b466f37111f56e65ef2b598a9face5c0393253ddcf2069b26e93250f40c8f7f2b105 SHA512 4472d3d0a6a8309b3fbd9e2ea7758716315ddbfa69e9ec1126a68594700d0d5bc90c9ebd1c2865c546cd05dc2236cdde643ddbf07fcb0f2e411c79e4903bb877
+DIST thunderbird-52.9.1-pt-PT.xpi 565623 BLAKE2B c4e0de5196f1fc6ee784e9cff6e6f68ee17488bdb2f71b1cc3491070895a302c410580b14bc0495dc02784078daae7b28ddae42e6b8658390596f4b1eb4de230 SHA512 d12ee7a2d285a8a718c052dee4e39405883a5d375bd1da82d2725ce8b82ca7b54a039471e570087674429cda524a2b74b4163f2a4b7eacd5b7e9fc42f172ab24
+DIST thunderbird-52.9.1-rm.xpi 557605 BLAKE2B a15f4d41e2f2874ebb7f9f7afb9ce6d1c68ab9eb0207914f271bf26a55ffcb870674b3afa4f2cac5a035b6298ce13d39e770a6117d9ee74d9253a648ac83e187 SHA512 7f743f1758d6f5d89ebe60c378fcd458ffd28effaf554c45299e35493b9369e289289415bab09d0468970b2d448260f146692f377f1211a0871118dbc23c9385
+DIST thunderbird-52.9.1-ro.xpi 570529 BLAKE2B 88cb03566eec131d559439f9b0c44f9f26f5fe8beb8c9a06ac2b0dac22d9fe57ace64845629cb293541c97bd4c40e13d6f9c6f6745f7adbea3185b95bc12e3af SHA512 9a60510fae45317e552f0daeb6edaa1b3b700386be51d813a73e5ea44f8f476ed2aca883c44d10237314d1ef59472a24ed305219dafe5588e52f13a4365853d9
+DIST thunderbird-52.9.1-ru.xpi 530670 BLAKE2B 0d040da7f5a7bc6eb62d7a1753e273b791ea7e30590d601026c7f68f198325e8b0fb9b3d2861232f6ea3b5630f96d12d335c51d378c05ae87383d784a1dd2d0b SHA512 3e836cc057afea31d9165d68c44452ccc39999a292bed6efdb33d6c3cd49a4d3363abfe5beff1c56de2b7b167f9cfdf0c03711f33b8faa27901dba37e3dd37c1
+DIST thunderbird-52.9.1-si.xpi 649010 BLAKE2B 75dd7a9441dd60acf6ff2045d2babb66c237589a2b83518b7a9deb62f60e9d0ca5ca13371a7c839d8cfe76aac7c8b0c7075927387ba63dc750525d60b9072064 SHA512 f4dd684686cd1cf929b04679bb30b129c7cfd70bb757d7e426e37ce4d8fdfa3a34add0e84604a565f360ea6cc1d1a1bda03a5a5cad81b15441d3352c0c93dff3
+DIST thunderbird-52.9.1-sk.xpi 583882 BLAKE2B 6598441de9fc83750c6435c8c876798257f5ce7aeb0487ea81b499dfcb2be0d131908c91597581fc12186a07d61a9f99d8226bf5ba0f3667efd3c66b37cfabf9 SHA512 3b9b0db7470503fba77b58f20e9f1fcbcb0217397fc41d523f8cf78a5e7dc62d1254e80e708cb069e37fba7bdac961095546cd4d158552a5446ed9b9cdc34bf6
+DIST thunderbird-52.9.1-sl.xpi 562834 BLAKE2B c95a113d8987277a32bb26f4d85df0d91cc35af570f7b1b87286fd09225052bcc52852c7b775f3eaabe87b1b6d8404992f7ce8763c01821a9621f4bd0555bcd5 SHA512 9ccc1893534632d640a07a1642cae9eb8c3e7c525848535d8a42bd6e957e548b32af69de7b20ce44610acd0041b0d9299085af78a16b4cfdbb3b11d4f8737875
+DIST thunderbird-52.9.1-sq.xpi 570617 BLAKE2B b25ad0a0c029bed7dd50a1ae37e77696d93e28551c61f2eacd241feb5892f84e974c16b341b9e2cc1a2a0cfa16df186f270364cf517ec1b381d05cbe73b8003a SHA512 1e12cedf57b105388836d4f89943c185a1dd246207fe05e05daa92469bee00a75d545d7b453deb32b80c640212cd74cbdf0b2f155ec3040962630a4efd2535c1
+DIST thunderbird-52.9.1-sr.xpi 609019 BLAKE2B 7110fae4b1ab1651a392d2b7237e002888faaa3862c784c823725e91037211356d81cd084b609351246dd3c5f75788cbabcecc307dc41efec87353177c420877 SHA512 0de5b43fab259f7d0edc2c98a6004a2ae4d5aac365b4c6e0a80ea0c67d979dc67b71526a9de3a88cba5654287e23c5b1c76c00889dc6fe6a45a49a9f214ae6ab
+DIST thunderbird-52.9.1-sv-SE.xpi 565777 BLAKE2B 53100f0d83ae759fc0e5772f209f8e612530bd584b3b8dbdda5fd6f19da125b04002949f6f47c4d0fa611f836e44b8a0475fd72f4187748bdb0c8ebbe27d5f4a SHA512 2e97d417616d191657c2bd025273fba996d38a1d273aadc17b60fa7e49e7e0396694997aee07ef9c0d16f520e1797e582b485ed20d9be71134a51dcacbb943f7
+DIST thunderbird-52.9.1-ta-LK.xpi 675039 BLAKE2B fde1d61f5529b4d60837ce0b567b82adbf0303dca55fcc7080ccd39ec9ce711aa975250c84f6fd27464992110da189ef83194430e789194ab19023a6a15b38e2 SHA512 06f4e3deca16a85b904639bc80736f2ee3d10e4339f8130f53784f2104cc6a98c2ffae5ace09dd094a96f626fb6dff72489432f6efb82c670782d83eb28ad20d
+DIST thunderbird-52.9.1-tr.xpi 569926 BLAKE2B bb54109cd592e0576b3d74f1ccaea0a9e84101d2af3773fed57c53ff530d2208ad0e23afd301cc533a1ee80be761aaee4a2137f37faad847a9815b27556739da SHA512 4419c08c1338e12a046660666157bbfc19e52e17be4158a6b5a8c100c41fd4a9f3d8bf167e0db9d3e6bc0ab14db74d259cf879577018d917c0a81ecef8274663
+DIST thunderbird-52.9.1-uk.xpi 652854 BLAKE2B bc5557a1df83f9b8ca0671fb7c76fe3a117f40b04a797171fa205b41f8fd0a54490b550c2d82e9dbe97b1a36c3804eec50962d541dbfc8b6acdef6e11e7effa6 SHA512 40a5179d4777c93482756c4c39bf27d4781c63501f113af4fb2aead6cde297701a9e0f7eade31bf66b5392d8446bcb091b5a7184bce57faadefb2143d18a808e
+DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2b47e3b02346b734e728adadfa4656e4197ceb3328de4c5a12a076dcc7b4b412b0a32e3cdef41d888865e471b2601f2 SHA512 dec44726008af723e44146abb89754f9fd0684e3cce0f0db07c05d8a100a8a862e5f7ad028c0f7d3594965ec35251e7c357ac212fb78570463bd8c18174658c9
+DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
+DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
+DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
+DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
+EBUILD thunderbird-bin-52.9.1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.9.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.9.0.ebuild
deleted file mode 100644
index cbbee7899c18..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-52.9.0.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.8"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
- amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
- x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-"
-# the below only works when upstream releases the xpi with all locales bundled
-# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="https://www.thunderbird.net/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="virtual/freedesktop-icon-theme
- dev-libs/atk
- >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- >=dev-libs/glib-2.26:2
- >=media-libs/alsa-lib-1.0.16
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10:2
- >=x11-libs/cairo-1.10[X]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/pango-1.22.0
- pulseaudio? ( !<media-sound/apulse-0.1.9
- || ( media-sound/pulseaudio media-sound/apulse ) )
- ffmpeg? ( media-video/ffmpeg )
- crashreporter? ( net-misc/curl )
- selinux? ( sec-policy/selinux-thunderbird )
-"
-
-QA_PREBUILT="
- opt/${MOZ_PN}/*.so
- opt/${MOZ_PN}/${MOZ_PN}
- opt/${MOZ_PN}/${PN}
- opt/${MOZ_PN}/crashreporter
- opt/${MOZ_PN}/plugin-container
- opt/${MOZ_PN}/mozilla-xremote-client
- opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
- #xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
- local size sizes icon_path icon name
- sizes="16 22 24 32 48 256"
- icon_path="${S}/chrome/icons/default"
- icon="${PN}-icon"
- name="Thunderbird"
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
- domenu "${FILESDIR}"/icon/${PN}.desktop
-
- # Install thunderbird in /opt
- dodir ${MOZILLA_FIVE_HOME%/*}
- mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
- cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
- # Install language packs
- MOZEXTENSION_TARGET="distribution/bundles" \
- mozlinguas_src_install
-
- # Install language packs for calendar
- mozlinguas_xpistage_langpacks \
- "${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- # Create /usr/bin/thunderbird-bin
- dodir /usr/bin/
- local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
- cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
- fperms 0755 /usr/bin/${PN}
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN}
-
- # Enable very specific settings for thunderbird-3
- insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
- newins "${FILESDIR}"/thunderbird-gentoo-default-prefs.js all-gentoo.js
-
- # Plugins dir
- share_plugins_dir
-
- pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild
new file mode 100644
index 000000000000..c669d7e37dea
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.9.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.9"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+ # ESR releases have slightly version numbers
+ MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+ amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+ x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+ https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+ dev-libs/atk
+ >=sys-apps/dbus-0.60
+ >=dev-libs/dbus-glib-0.72
+ >=dev-libs/glib-2.26:2
+ >=media-libs/alsa-lib-1.0.16
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.10:2
+ >=x11-libs/cairo-1.10[X]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ >=x11-libs/gtk+-3.4.0:3
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXt
+ >=x11-libs/pango-1.22.0
+ pulseaudio? ( !<media-sound/apulse-0.1.9
+ || ( media-sound/pulseaudio media-sound/apulse ) )
+ ffmpeg? ( media-video/ffmpeg )
+ crashreporter? ( net-misc/curl )
+ selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+ opt/${MOZ_PN}/*.so
+ opt/${MOZ_PN}/${MOZ_PN}
+ opt/${MOZ_PN}/${PN}
+ opt/${MOZ_PN}/crashreporter
+ opt/${MOZ_PN}/plugin-container
+ opt/${MOZ_PN}/mozilla-xremote-client
+ opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+ #xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_install() {
+ declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+ local size sizes icon_path icon name
+ sizes="16 22 24 32 48 256"
+ icon_path="${S}/chrome/icons/default"
+ icon="${PN}-icon"
+ name="Thunderbird"
+
+ # Install icons and .desktop for menu entry
+ for size in ${sizes}; do
+ insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+ newins "${icon_path}/default${size}.png" "${icon}.png"
+ done
+ # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+ newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+ domenu "${FILESDIR}"/icon/${PN}.desktop
+
+ # Install thunderbird in /opt
+ dodir ${MOZILLA_FIVE_HOME%/*}
+ mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+ cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+ # Install language packs
+ MOZEXTENSION_TARGET="distribution/bundles" \
+ mozlinguas_src_install
+
+ # Install language packs for calendar
+ mozlinguas_xpistage_langpacks \
+ "${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
+ "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+ # Create /usr/bin/thunderbird-bin
+ dodir /usr/bin/
+ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+ cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+ fperms 0755 /usr/bin/${PN}
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ doins "${FILESDIR}"/10${PN}
+
+ # Enable very specific settings for thunderbird-3
+ insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+ newins "${FILESDIR}"/thunderbird-gentoo-default-prefs.js all-gentoo.js
+
+ # Plugins dir
+ share_plugins_dir
+
+ pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+
+ use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+ use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 54ea9c575679..04fccf8c5c2a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
Binary files differ
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 9b0b6525dc6a..e64ae8a892e1 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,8 +1,5 @@
-AUX dcc-1.3.140-configure-fix.patch 426 BLAKE2B 25d25ac4a82b59a39559b7ffe45231f1f44ad9b610992722ea3eae525a20d94e29b3c9a46b46381e2983a78070978e1e6467327e7286eaa576007742ed3499eb SHA512 e6057fef60053a07013c5575422e46ad50004583385650f5b95593bbb45949779fe65c10776952eaa3edaa504d24a1243fa6be8026873b63a915bfccb0b8740a
AUX dcc-1.3.140-freebsd.patch 381 BLAKE2B 4324c87a09de1027b7df46bab82efbea28ae4f92d2a261d0ba44707a67b07b1d57d7aafad7be3e0bcf263928839b669151b2f7edd1413ab677337c4fe6376043 SHA512 b622085c54246cb38185262f851d611bad6e636d91a4a94ec7b966565a7d01a1a2a0445616eb3086f6c1d62a6c865e7248fcc828efbaaa70cdc7bbe2975c01d4
AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b746f5d35a6bcbeab6dcebe5deb1c4207b8b11dc0db34925cb93410b556508105cc4c64b6132 SHA512 15b7e4ded3e56e9d15509305df244e29ec7a6c3c163c49a4597e16274317d88f5aff5522984a2a3002f838d0220d04c2ea3def8d771712a11685408a4983d3b4
-AUX dcc.initd 3013 BLAKE2B b1ab4903350233bc79113ca3ab9c28f04d6a4f76755d53b583c0111553c1a6964a4e634bc442769f53779cf8d22b94648f6b95f2839ebbfb8f9ffd1af954175a SHA512 67127b752526edda0ef036d4874b73b6dc3d1c13fbcb29f301acccc4cee1dc2dafc32af1f61003cbb2f874b2853aec1075d04e730f90083ae452ad7c5525396c
-AUX dcc.initd-1.3.140 2693 BLAKE2B 4d39ab7127de001308f7c9c4e96fd3d78bc4bb8561e05e2eac349df596765762ba4670904c28dbd926ede065faca54c1e1dde46ecd33e64dd7b7fcd67c8d770b SHA512 70a012699b6a66dfe085a6a77497cc9c2b88b32dee51b1a691a8ed70cb467bb7308bb9ea9594f5582adb23199638401e6454e8760bb293019cd81ab538daf20a
AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
diff --git a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
deleted file mode 100644
index 41620929c61e..000000000000
--- a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid installing into /no/.
-
-Signed-off-by: Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>
-X-Gentoo-Bug: 388383
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/388383
-
---- dcc-1.3.140/configure
-+++ dcc-1.3.140/configure
-@@ -3256,7 +3256,7 @@
- withval="$with_cgibin"
- :
- fi
--if test -n "$with_cgibin" -a "$with_cgi_bin" != no; then
-+if test -n "$with_cgibin" -a "$with_cgibin" != no; then
- cgibin="$with_cgibin"
- fi
-
diff --git a/mail-filter/dcc/files/dcc.initd b/mail-filter/dcc/files/dcc.initd
deleted file mode 100644
index 1e64a16c6306..000000000000
--- a/mail-filter/dcc/files/dcc.initd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use logger
- need net
- before mta
-}
-
-checkconfig() {
- if [[ ! -f "/etc/dcc/dcc_conf" || ! -r "/etc/dcc/dcc_conf" ]]
- then
- eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
- return 1
- else
- source "/etc/dcc/dcc_conf"
- fi
-}
-
-start() {
- checkconfig || return 1
-
- if [[ "${START_DCC_DCCD}" == "yes" ]]
- then
- if [[ "${DCCD_ENABLE}" != "on" ]]
- then
- einfo "DCCD_ENABLE is not setto 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccd" ]]
- then
- ebegin "Starting dccd"
- ${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled DCCD but start-dccd is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_GREY}" == "yes" ]]
- then
- if [[ "${GREY_ENABLE}" != "on" ]]
- then
- einfo "GREY_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-grey" ]]
- then
- ebegin "Starting grey"
- ${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled GREY but start-grey is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_DCCM}" == "yes" ]]
- then
- if [[ "${DCCM_ENABLE}" != "on" ]]
- then
- einfo "DCCM_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccm" ]]
- then
- ebegin "Starting dccm"
- ${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
- eend ${?}
- for ((dccmtimeout=0 ; dccmtimeout <= 20 ; dccmtimeout++))
- do
- if [[ ! -S "${DCC_RUNDIR}/dccm" || ! -r "${DCC_RUNDIR}/dccm" ]]
- then
- sleep 1
- else
- break
- fi
- done
- chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
- chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
- sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid
- else
- eerror "You enabled DCCM but start-dccm is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_DCCIF}" == "yes" ]]
- then
- if [[ "${DCCIFD_ENABLE}" != "on" ]]
- then
- einfo "DCCIFD_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccifd" ]]
- then
- ebegin "Starting dccif"
- ${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled DCCIF but start-dccif is missing or not executable"
- fi
- fi
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [[ -r "${DCC_RUNDIR}/dccifd.pid" ]]
- then
- ebegin "Stopping dccif"
- kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
- eend ${?}
- fi
-
- if [[ -r "${DCC_RUNDIR}/dccm.pid" ]]
- then
- ebegin "Stopping dccm"
- kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
- then
- ebegin "Stopping dccd"
- ${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
- then
- ebegin "Stopping grey"
- ${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
- eend ${?}
- fi
-}
diff --git a/mail-filter/dcc/files/dcc.initd-1.3.140 b/mail-filter/dcc/files/dcc.initd-1.3.140
deleted file mode 100644
index 8fc4ac3540c3..000000000000
--- a/mail-filter/dcc/files/dcc.initd-1.3.140
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use logger
- need net
- before mta
-}
-
-checkconfig() {
- if [ ! -f "/etc/dcc/dcc_conf" ]; then
- eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
- return 1
- fi
- for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \
- SOCKET_USER SOCKET_GROUP SOCKET_MODE; do
- read -r ${i} <<-EOF
- $( grep ^[[:space:]]*${i} /etc/dcc/dcc_conf | sed s/.*=// )
- EOF
- done
- DCC_RUNDIR="${DCC_RUNDIR:-/var/run/dcc}"
- if [ ! -d "${DCC_RUNDIR}" ]; then
- checkpath -q -d -o root:root -m 0755 "${DCC_RUNDIR}" || return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- local atleastone="${DCCD_ENABLE}${GREY_ENABLE}${DCCM_ENABLE}${DCCIFD_ENABLE}"
- atleastone=$( echo ${atleastone} | tr -d 'off' )
- if [ -z "${atleastone}" ]; then
- eend 1 "At least one service should be 'on' in /etc/dcc/dcc_conf"
- return 1
- fi
-
- if [ "${DCCD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccd" ]; then
- ebegin "Starting dccd"
- ${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if [ "${GREY_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-grey" ]; then
- ebegin "Starting grey"
- ${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
- eend ${?}
- fi
-
- if [ "${DCCM_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccm" ]; then
- ebegin "Starting dccm"
- ${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
- eend ${?}
- local dccmtimeout=0
- while [ ${dcctimeout} -le 20 ] ; do
- if [ -S "${DCC_RUNDIR}/dccm" ] || [ -r "${DCC_RUNDIR}/dccm" ]; then
- break
- else
- sleep 1
- dcctimeout=$(($dcctimeout + 1))
- fi
- done
- chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
- chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
- sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid 1>/dev/null 2>&1 || return 1
- fi
-
- if [ "${DCCIFD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccifd" ]; then
- ebegin "Starting dccif"
- ${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
- eend ${?}
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [ -r "${DCC_RUNDIR}/dccifd.pid" ]; then
- ebegin "Stopping dccif"
- kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
- eend ${?}
- fi
-
- if [ -r "${DCC_RUNDIR}/dccm.pid" ]; then
- ebegin "Stopping dccm"
- kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
- ebegin "Stopping dccd"
- ${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
- ebegin "Stopping grey"
- ${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
- eend ${?}
- fi
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 9d574632ef11..21fc054d7d4a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,10 +6,12 @@ DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18
DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf
DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4
+DIST rspamd-1.7.7.tar.gz 4534430 BLAKE2B 83ba39b80293bf87f397e6b1b1cbec27e7c44f096a148b6d29c641d10b607b616865ec54c1a88dc55f620b17e8c69bcf8690ee509d1b9a517a923fe0afc08b70 SHA512 7436848b3fc0e2ef90dcc54b48c1c95d6a7753175f484297de2e77bd117a9858da09b2a50f8692f210e48421b604ef465311b97197b473823a87ac74337d7752
EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511
EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118
EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e
EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207
EBUILD rspamd-1.7.5.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
-EBUILD rspamd-9999.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
+EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
+EBUILD rspamd-9999.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
MISC metadata.xml 905 BLAKE2B 2b14bdf8077a435c70da3c7d3c259a457a2defa947674365ea9928b070efecc6e6aac2bfc3663d9125be6c4844e3dda0e79feeb8c96d7cf3495fb16605cbf39b SHA512 16d6df60d418d067d25b0ad42abdc9a0b36b4ac94ef96c3d3c48c725eab09ec59a2e9808a70065714f18eb6c7150ca8379763f0c5e14b04e3ed47c4167fb7e1e
diff --git a/mail-filter/rspamd/rspamd-1.7.7.ebuild b/mail-filter/rspamd/rspamd-1.7.7.ebuild
new file mode 100644
index 000000000000..e4b16db1465f
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.7.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+if [[ ${PV} == *9999 ]] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
+REQUIRED_USE="torch? ( jit )"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ fann? ( sci-mathematics/fann )
+ pcre2? ( dev-libs/libpcre2[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ jit? ( dev-lang/luajit:2 )
+ jemalloc? ( dev-libs/jemalloc )
+ dev-libs/libevent
+ net-libs/libnsl
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ <dev-util/ragel-7.0
+ sys-apps/file
+ gd? ( media-libs/gd[jpeg] )
+ dev-libs/icu
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
+DEPEND="dev-util/ragel
+ ${RDEPEND}"
+
+QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+
+pkg_setup() {
+ enewgroup rspamd
+ enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCONFDIR=/etc/rspamd
+ -DRUNDIR=/var/run/rspamd
+ -DDBDIR=/var/lib/rspamd
+ -DLOGDIR=/var/log/rspamd
+ -DENABLE_LUAJIT=$(usex jit ON OFF)
+ -DENABLE_FANN=$(usex fann ON OFF)
+ -DENABLE_GD=$(usex gd ON OFF)
+ -DENABLE_PCRE2=$(usex pcre2 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_TORCH=$(usex torch ON OFF)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+ # Remove mprotect for JIT support
+ if use jit; then
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+ fi
+
+ keepdir /var/lib/rspamd
+ keepdir /var/log/rspamd
+
+ fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+ systemd_newunit rspamd.service rspamd.service
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 1a20cc22321c..e4b16db1465f 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
jit? ( dev-lang/luajit:2 )
jemalloc? ( dev-libs/jemalloc )
dev-libs/libevent
+ net-libs/libnsl
dev-db/sqlite:3
dev-libs/glib:2
<dev-util/ragel-7.0
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b0aa6c4b2dc0..a3a087f998da 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
Binary files differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 2b0bbbfc445e..356e086dca17 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,5 +23,5 @@ DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ec
DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
EBUILD exim-4.90.1-r1.ebuild 12215 BLAKE2B 24752c4aa059d967300f5ab90f647e1f4b35e8e475bb3a436e6669aff6b552b78b290705658840ae1f4828d3f3a7c7a0114c7c4790421220c71e569d33f1175a SHA512 c33b0998024ecb9e25e95d4c22a474f8819c634d189736e8c9d8605d27bfba80275fb80c12db4be04ce67a3e2646c670a8c7f68c0aadf9937d626ad1fa0528be
EBUILD exim-4.91-r1.ebuild 12582 BLAKE2B 40a2a61532589db358ed6ca235e46a024d51c27af18458219369d4ca1a6cbbf33eca8b18b369303629441485a621753fd14c681737b198172c360feab88c5f83 SHA512 0a2cf3be8f22bf0b16a496ee4de78ddcb645b0abfcfa696e18de6506b7cbf3ccb292089e9c5475b4813c105ebdd81ec2ec0f8bce3195cb2bd936cf58ae04c662
-EBUILD exim-4.91-r2.ebuild 12671 BLAKE2B 66f6d04315a35b28c34ea34c4f58ae6f600aa6127e5ebaae723af91f86bcc1a00b8ad1c5f900990aff32dcc56ba5b5770790b9116542835da919f676739166e5 SHA512 6bc250f3c780d2fa56f0c3936350fe1c9ce7841a7e7aa4002e49a605357142e1f92d66c3a13e63c9c18737a04e2dc7d34a03f9164b957a62c57a39637e049037
+EBUILD exim-4.91-r2.ebuild 12670 BLAKE2B 67f4110962d7825cc0793a201412099da968971023dfeadfdc82fb46436e03461c78e810728e2e9b31ff9d2539f88fc6af1e68639f67bb3746c9255c9d5af749 SHA512 f0723d348e675f829946feb76000e20a51f81a11905035204bfc61462114fa539e389feec77d0a8492f02ef7c7211665c510878f0eb82be3a9a0b54b7a828f3a
MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91-r2.ebuild b/mail-mta/exim/exim-4.91-r2.ebuild
index b20c98daec69..f9c38b2c7137 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
diff --git a/mail-mta/mini-qmail/Manifest b/mail-mta/mini-qmail/Manifest
index c62bc32221ce..75cc7e3f399c 100644
--- a/mail-mta/mini-qmail/Manifest
+++ b/mail-mta/mini-qmail/Manifest
@@ -1,6 +1,4 @@
-AUX 1.05-config-mini-help.patch 672 BLAKE2B 3afc52bc1aedc2a0d7ccb57450ec2709e34a44f7eee05994ee0146a054f5ec7b33a67f82a83cc3f7ce2047c5a30649d5f26c6e57ca4d76d7e9af0179fa8e73bd SHA512 441519ac63fe6f1380f276d3550fdb51f7ca258b809fe07f65a006fafa48f62a0eea051e325d5ae7823847078f0e07087410f45b82e82b6c5d678f9dc8d50231
AUX 1.06-headers.patch 640 BLAKE2B 6dded7fbd55a779fa60378296819b7f24481ee65de174cc18015f2a0e56edcbe9756d40dc2af63d6651679b7dc73ef52088fb32f5381fc497985725335ad210c SHA512 09e684fe5ffd53acd2324b3975e9bc9a950b551d8fdb7a4d42f05697af411ef37a0851140c45e2e882fc890cf0fd28a77b46faacb428fb98dce22c5b15ff0b99
-AUX 99qmail 84 BLAKE2B 81bd3a3411945fc627fe14b6662450055db48e4f4e34086b58d52f026acdc14663128fffe35898824fc0345d2763af57af85d858c33915a6250f1fc978a4b6fb SHA512 ef7c83996a8714114353e0e2f4ace04a1d82e5e5324afc14b3e51f92821d8e2c535431f0bfc4c843f548572b73e3993e204ef78a97a555aef039aeec941124d5
AUX config-mini 961 BLAKE2B b6f89f19aa5a12b8d1dcc3df2db5409d59c892b06f58a6cc64063feb522b0ebce87d900627367f5723db6362be3ccc57f5defd6df89b3b2559a099d54c5b4ac0 SHA512 a98f18b0d705506e524d5959f296d9e47d44871b59cedb154cc0fb51283413f84ef2cf5db2786e3e4af7e1a80a55691437598b3ee8af014a4ae7ac8bccd60102
DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
diff --git a/mail-mta/mini-qmail/files/1.05-config-mini-help.patch b/mail-mta/mini-qmail/files/1.05-config-mini-help.patch
deleted file mode 100644
index 1b217dc9636a..000000000000
--- a/mail-mta/mini-qmail/files/1.05-config-mini-help.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config-mini.sh.orig 2004-05-05 23:24:23.468285864 -0400
-+++ config-mini.sh 2004-05-05 23:27:00.622394808 -0400
-@@ -1,7 +1,12 @@
-
- case $# in
- 0|1|2|3|4)
-- echo 'config-mini: usage: config-mini me defaultdom plusdom idhost qmqpserver ...' 1>&2
-+ echo 'usage: config-mini me defaultdom plusdom idhost qmqpserver [more qmqp servers]' 1>&2
-+ echo ' me - copied from the QMQP server'
-+ echo ' plusdom - copied from the QMQP server'
-+ echo ' defaultdom - copied from the QMQP server'
-+ echo ' idhost - hostname of QMPQ client'
-+ echo ' qmqpserver - list of QMQP servers IP addresses to send mail through'
- exit 100
- ;;
- esac
diff --git a/mail-mta/mini-qmail/files/99qmail b/mail-mta/mini-qmail/files/99qmail
deleted file mode 100644
index 469553953a16..000000000000
--- a/mail-mta/mini-qmail/files/99qmail
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH="/var/qmail/bin"
-ROOTPATH="/var/qmail/bin"
-CONFIG_PROTECT="/var/qmail/control"
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 059be6aa2439..17abd37c4a5b 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,3 +1,3 @@
-DIST protonmail-bridge-1.0.4-1.x86_64.rpm 47422421 BLAKE2B 0846ce606feec1402e606a3b1bbe5c4431f804afc07e24689c77bcc64f211fe756a6890598e79cb6f6169a41a20158f7685b8d26a10fb91926abc77a5681ae20 SHA512 6d366ac02dec8ae3fa2bf188eff7cdaf6155c30386c76d29771362b573b3f3abc0e26df837955cb5f56d51ed1cd1b0b603911886478b5cfc7a750b2ee0077538
-EBUILD protonmail-bridge-bin-1.0.4.ebuild 858 BLAKE2B 046e247d796a7f77fb1d4339ede81bdf363dfaff8c50510163bd1ca857c63f67c2f30415563a7b61f896718a4b8b063cee57c53b712c47b45948e12ffec1b147 SHA512 6c6a351cc1d26ce14833bff9b9a1ecc14279fe616f99ac8780872e9290670e8dc6fca8e13ff26d64d8204718dc227993b9fc81c4253fbbded9a276db9fade7d5
+DIST protonmail-bridge-1.0.5-1.x86_64.rpm 46864229 BLAKE2B bfd35880dd172dd4fc2352f28f9dc9e57049a114b15fbcc2f462c286e005276ac78b14ea2eab074f5e767aa39f6d58138d06118b8f5618d38e3aa977ceb7a725 SHA512 11a9230dd6ba9655b17cccc2a84529ea32852fe237e5174948aa711d9afe44fb3db3d29175933aa1f4dfffaf06207e6d38b815a0cce1f9d23e116a7cf9895f64
+EBUILD protonmail-bridge-bin-1.0.5.ebuild 7389 BLAKE2B d090d67090ff6b6ca211cfbd72fd4d89b4565856f1fa5a9951d6e9cc16a7873775abf0c32ce03c88ddf9821c69c932b90902618820e8f7b96d015f343e2db780 SHA512 fff9ad7bbfa8885feaea0ec84f3e19d3b1adfcf5e77e0d945cf9fadeef99cdf41d44d444b60752baf0cc41424730315734d710168196447cdd9eb30e720b8603
MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
deleted file mode 100644
index b00b93b20070..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- app-crypt/libsecret
- dev-libs/glib:2
- media-sound/pulseaudio
- virtual/opengl
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_install() {
- # Using doins -r would strip executable bits from all binaries
- cp -pPR "${S}"/usr "${D}"/ || die "Failed to copy files"
-
- dosym "Desktop-Bridge" "/usr/bin/${PN}" || die
-
- cat <<-EOF > "${T}/50-${PN}" || die
- SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
- EOF
- insinto /etc/revdep-rebuild
- doins "${T}/50-${PN}"
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild
new file mode 100644
index 000000000000..7f63cb22441d
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ app-crypt/libsecret
+ dev-libs/glib:2
+ media-sound/pulseaudio
+ sys-apps/dbus
+ virtual/opengl
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXext
+ x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+ # Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+ cd "${S}/usr/lib/protonmail/bridge" || die
+ patchelf --set-rpath '$ORIGIN/lib' Desktop-Bridge || die "patchelf failed"
+ patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+ patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+ rm "lib/libQt53DCore.so.5"
+ rm "lib/libQt53DExtras.so.5"
+ rm "lib/libQt53DInput.so.5"
+ rm "lib/libQt53DLogic.so.5"
+ rm "lib/libQt53DQuick.so.5"
+ rm "lib/libQt53DQuickExtras.so.5"
+ rm "lib/libQt53DQuickInput.so.5"
+ rm "lib/libQt53DQuickRender.so.5"
+ rm "lib/libQt53DRender.so.5"
+ rm "lib/libQt5Concurrent.so.5"
+ rm "lib/libQt5Gamepad.so.5"
+ rm "lib/libQt5QuickParticles.so.5"
+ rm "lib/libqgsttools_p.so.1"
+ rm "plugins/audio/libqtaudio_alsa.so"
+ rm "plugins/audio/libqtmedia_pulse.so"
+ rm "plugins/bearer/libqconnmanbearer.so"
+ rm "plugins/bearer/libqgenericbearer.so"
+ rm "plugins/bearer/libqnmbearer.so"
+ rm "plugins/canbus/libqtpeakcanbus.so"
+ rm "plugins/canbus/libqtsocketcanbus.so"
+ rm "plugins/canbus/libqttinycanbus.so"
+ rm "plugins/designer/libqquickwidget.so"
+ rm "plugins/designer/libqwebengineview.so"
+ rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so"
+ rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so"
+ rm "plugins/gamepads/libevdevgamepad.so"
+ rm "plugins/generic/libqevdevkeyboardplugin.so"
+ rm "plugins/generic/libqevdevmouseplugin.so"
+ rm "plugins/generic/libqevdevtabletplugin.so"
+ rm "plugins/generic/libqevdevtouchplugin.so"
+ rm "plugins/generic/libqtuiotouchplugin.so"
+ rm "plugins/geometryloaders/libdefaultgeometryloader.so"
+ rm "plugins/geometryloaders/libgltfgeometryloader.so"
+ rm "plugins/geoservices/libqtgeoservices_esri.so"
+ rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so"
+ rm "plugins/geoservices/libqtgeoservices_mapbox.so"
+ rm "plugins/geoservices/libqtgeoservices_mapboxgl.so"
+ rm "plugins/geoservices/libqtgeoservices_nokia.so"
+ rm "plugins/geoservices/libqtgeoservices_osm.so"
+ rm "plugins/iconengines/libqsvgicon.so"
+ rm "plugins/imageformats/libqjp2.so"
+ rm "plugins/mediaservice/libgstaudiodecoder.so"
+ rm "plugins/mediaservice/libgstcamerabin.so"
+ rm "plugins/mediaservice/libgstmediacapture.so"
+ rm "plugins/mediaservice/libgstmediaplayer.so"
+ rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so"
+ rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so"
+ rm "plugins/platforms/libqeglfs.so"
+ rm "plugins/platforms/libqlinuxfb.so"
+ rm "plugins/platforms/libqminimal.so"
+ rm "plugins/platforms/libqminimalegl.so"
+ rm "plugins/platforms/libqoffscreen.so"
+ rm "plugins/platforms/libqvnc.so"
+ rm "plugins/platformthemes/libqgtk3.so"
+ rm "plugins/playlistformats/libqtmultimedia_m3u.so"
+ rm "plugins/position/libqtposition_geoclue.so"
+ rm "plugins/position/libqtposition_positionpoll.so"
+ rm "plugins/printsupport/libcupsprintersupport.so"
+ rm "plugins/qmltooling/libqmldbg_debugger.so"
+ rm "plugins/qmltooling/libqmldbg_inspector.so"
+ rm "plugins/qmltooling/libqmldbg_local.so"
+ rm "plugins/qmltooling/libqmldbg_messages.so"
+ rm "plugins/qmltooling/libqmldbg_native.so"
+ rm "plugins/qmltooling/libqmldbg_nativedebugger.so"
+ rm "plugins/qmltooling/libqmldbg_profiler.so"
+ rm "plugins/qmltooling/libqmldbg_quickprofiler.so"
+ rm "plugins/qmltooling/libqmldbg_server.so"
+ rm "plugins/qmltooling/libqmldbg_tcp.so"
+ rm "plugins/renderplugins/libscene2d.so"
+ rm "plugins/sceneparsers/libassimpsceneimport.so"
+ rm "plugins/sceneparsers/libgltfsceneexport.so"
+ rm "plugins/sceneparsers/libgltfsceneimport.so"
+ rm "plugins/sensorgestures/libqtsensorgestures_plugin.so"
+ rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so"
+ rm "plugins/sensors/libqtsensors_generic.so"
+ rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so"
+ rm "plugins/sensors/libqtsensors_linuxsys.so"
+ rm "plugins/sqldrivers/libqsqlite.so"
+ rm "plugins/sqldrivers/libqsqlmysql.so"
+ rm "plugins/sqldrivers/libqsqlpsql.so"
+ rm "plugins/xcbglintegrations/libqxcb-egl-integration.so"
+ rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so"
+ rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so"
+ rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so"
+ rm "qml/Qt/labs/settings/libqmlsettingsplugin.so"
+ rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so"
+ rm "qml/Qt3D/Animation/libquick3danimationplugin.so"
+ rm "qml/Qt3D/Core/libquick3dcoreplugin.so"
+ rm "qml/Qt3D/Extras/libquick3dextrasplugin.so"
+ rm "qml/Qt3D/Input/libquick3dinputplugin.so"
+ rm "qml/Qt3D/Logic/libquick3dlogicplugin.so"
+ rm "qml/Qt3D/Render/libquick3drenderplugin.so"
+ rm "qml/QtBluetooth/libdeclarative_bluetooth.so"
+ rm "qml/QtCanvas3D/libqtcanvas3d.so"
+ rm "qml/QtCharts/libqtchartsqml2.so"
+ rm "qml/QtDataVisualization/libdatavisualizationqml2.so"
+ rm "qml/QtGamepad/libdeclarative_gamepad.so"
+ rm "qml/QtLocation/libdeclarative_location.so"
+ rm "qml/QtMultimedia/libdeclarative_multimedia.so"
+ rm "qml/QtNfc/libdeclarative_nfc.so"
+ rm "qml/QtPositioning/libdeclarative_positioning.so"
+ rm "qml/QtPurchasing/libdeclarative_purchasing.so"
+ rm "qml/QtQml/Models.2/libmodelsplugin.so"
+ rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so"
+ rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so"
+ rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so"
+ rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so"
+ rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so"
+ rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so"
+ rm "qml/QtQuick/Dialogs/libdialogplugin.so"
+ rm "qml/QtQuick/Extras/libqtquickextrasplugin.so"
+ rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so"
+ rm "qml/QtQuick/Particles.2/libparticlesplugin.so"
+ rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so"
+ rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so"
+ rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so"
+ rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so"
+ rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so"
+ rm "qml/QtScxml/libdeclarative_scxml.so"
+ rm "qml/QtSensors/libdeclarative_sensors.so"
+ rm "qml/QtTest/libqmltestplugin.so"
+ rm "qml/QtWebChannel/libdeclarative_webchannel.so"
+ rm "qml/QtWebEngine/libqtwebengineplugin.so"
+ rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so"
+ rm "qml/QtWebView/libdeclarative_webview.so"
+
+ default
+}
+
+src_install() {
+ # Using doins -r would strip executable bits from all binaries
+ cp -pPR "${S}"/usr "${D}"/ || die "Failed to copy files"
+
+ dosym "Desktop-Bridge" "/usr/bin/${PN}" || die
+
+ cat <<-EOF > "${T}/50-${PN}" || die
+ SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+ EOF
+ insinto /etc/revdep-rebuild
+ doins "${T}/50-${PN}"
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 2b217dd6be18..427f16559f7d 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
Binary files differ
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index d7ca09c9b818..ec479d009239 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -1,5 +1,3 @@
DIST AbyssinicaSIL-1.500.zip 1852827 BLAKE2B 59b29242f39fba70b60ca23363e82d093354deef9f8e46386fc5408994b9629b10b0400bdb860e5482a79cddd1ffa8b5057da62cafebfc128a49057abf195462 SHA512 56cfed3d41ea0a16d041b29f417296f4cc89f3fa8e718b3e352690a954168b018a5da68745f61db77395c292e92f8964d868c8824be5edfb24fb7539dcc62c59
-DIST AbyssinicaSIL1.200.zip 1021262 BLAKE2B cc4e55276c0cc07488d2721db0c6284422e9f98fa37d46672abce60e9124c9ce58d0ec71e00156585a3b83931ce45507188397f938da7afcd42e5f6c817cf551 SHA512 49c74476da85a38b0bccf341953198c5f5f750fbeaec724e2d50ea305d8c127b928304d7410b001997a3c91d4d5d5144c226c29873eae9e18de38cdfef7a6ada
-EBUILD sil-abyssinica-1.200.ebuild 672 BLAKE2B c5075b84c77739de6aa37f961e09ce5df2e62d3d33345472058785274dabe81995546d193eeb0ec448fab90766dc5d28be2c84cd303d89673ece35a52edde598 SHA512 d84dd83341dd345d3b241dc4a842ee982ff54734b8f49f1edbd96b333622a61d0a651197917b77ec25297bbb15f8a9040e4adf89019479788e3f804d616ebdd2
-EBUILD sil-abyssinica-1.500.ebuild 698 BLAKE2B 80c5592b30898e8172e260ac92d3cfd6617c3bd03128a991fc165f3e9b4704ef671411649159a5f1f6b9694b39d8817939d8360c27ceba7c18d9b5644ad840b3 SHA512 17fd256d7f1c0ac83cf6ff6638f72581bc169ab1218c7cd54e13137544930a4dbf4f409d1a71f673f2c30d9cca6f6c054861b453fcef935572d51d0e71d01f76
+EBUILD sil-abyssinica-1.500.ebuild 697 BLAKE2B 6084478fbc146a483a4b131691ff32daf32124a9b3752589e337189d5bb7d2c8642c6935ebb01b142abad6e7a65a33cca6d46acb37fb4354d489b5a5ea34f741 SHA512 ba8e826f1754e9d4d62f643329320c5236578a815ced240a7beb0e5e3692932f6e1270517ed3132d48e31c8ce87cafb5024f457458e8f7cc8c29b3b04e81a868
MISC metadata.xml 1078 BLAKE2B 77b83a9768d6536a29bb8aa73031b25c456faa20276c5e1e54de18b7fbebb6931e6be6a53b7cee0901f5dbd2ee48f9ca7b62d5e75b472805e76d3baf309684b5 SHA512 77da0918b61ce3649d2b7b25c336443e056f11915f8d757a20cb6527f7fcffd6152b9fbb15796e557d40fa8af65332622f71284000adfd356043d1edcabf64d1
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild
deleted file mode 100644
index 4673b47e820f..000000000000
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_PN="AbyssinicaSIL"
-
-DESCRIPTION="SIL Opentype Unicode fonts for Ethiopic languages"
-HOMEPAGE="https://software.sil.org/abyssinica"
-SRC_URI="mirror://gentoo/${MY_PN}${PV}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-DOCS="FONTLOG.txt OFL-FAQ.txt README.txt"
-FONT_SUFFIX="ttf"
-
-FONT_S="${WORKDIR}/${MY_PN}-${PV}"
-S="${FONT_S}"
-
-src_install() {
- font_src_install
- use doc && dodoc -r "${S}"/documentation
-}
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index 6dcdf8da346d..b951283c6b9b 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE="doc"
DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index ca92ee7aa8f8..38b451711228 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -1,7 +1,4 @@
DIST LateefGR-1.200.zip 727815 BLAKE2B e236126d08c729fedf5ea3fe7abecdbec1c91c1c350465a555ddf72c83b74145734379394647e9b2527558fe408a871afa0dcc6d386adc32ec3bcaed1221be9e SHA512 12c506516987782d3b3e07ba2cd9773a4e057d358250e9a4cc299287d751f82843d4e6969c714f5321531ac7897448b624dd8a2d1cf3bf213c39f90aae2f01a3
-DIST LateefRegOT_1.001.zip 121996 BLAKE2B 49420da7535a3614183bfbad9aa8a34cdb7a81e587e0f05d88eb2fee563522f987d578c28851aa554e6129af504989e3526262acf2739e164e51db2da5da38b9 SHA512 164cdefac8af1c27aba03adf70f6350f0e0787d988bb930b2ed2f285752817ffdd4c7682ae2cf2a3d0d3067254fe71fa905f07f7010eb3471cb80420aed9c04f
DIST Scheherazade-2.100.zip 1114645 BLAKE2B 27743054c58afc93c79765abf6ac0698b394e1480e28fe59006da8a369d61a26fe3e0a2deec2df298fca6ee1f31185d3d0a0429b74803f049ae8e384735920a0 SHA512 53a6b684a9c6a6f136da28cc2f663fca9e22d1951203587394ff979c4769e4beb898ab73a7cabedf5ed6eaa2775d10c7281439f10331b203f0e03bd434aa2fb2
-DIST ScheherazadeRegOT-1.005.zip 125091 BLAKE2B d3eef8f181a7222c26fef1976f1785328e054736a03505828f56825702f41b665aa9a1e61edd45526fd36b28a93ec9589d80c88ff3b12a35d36b11d18122d6a4 SHA512 d225df081b9dfbc21d9e636b70755f532fe06c6ed91e4ab332e213c8739981f382ffd414caeb573853ba6b3178de7d059ac0d9f7b0e7b3ddc119375a65debb0d
-EBUILD sil-arabicfonts-1.005.ebuild 559 BLAKE2B 7d93d71543b3d6a23988c9723aa09ded2a9f6c7559fb068a273a1e80e6f2324787469966d21a7b7ae4ef192c5c20f2e84574bd1567163bb196a8a29246e48a2b SHA512 899e203301762d4b73f6e5be6c06c980725afb1f9d5eb6dd435dff73f4521b4ed5977576037e837344b6530df1f7c22d7c43fc484cb3b066e757b5e2d1554596
-EBUILD sil-arabicfonts-2.100.ebuild 741 BLAKE2B d22205f3f215f00b6302aa53842783d3d2f275bfe3d7fbcc3a8c38f17bb1a3c914048fcbed7fbbd3137b6d1f9d70fb4c4d8c1d0265bd8bba18bee6ee6dbc3e38 SHA512 4896db5607a79507b372238a2cf810fb2b31a1f1526a9e2b81814bc6c99933dfceb0b9f0cbd2968b6bc1dad6daf2914cfe93b2df6bbbafc437ebd96118c11b71
+EBUILD sil-arabicfonts-2.100.ebuild 740 BLAKE2B 8c65d0de99ed841cf8dae5bed90683fd83dd3d0490f89b343f6eefbfc792a29de23af9bf93e4b06d713059c5be2eb61f1c9a37b3d9f5fc0ef185d2b388eab66d SHA512 fda17cee734cbcb8520def2229ce620bd5ff8533bd52f12dfef72ab3d040ef8e78efedd3e62f865b177227c8165a4323579a5f8adcd05ffab57d0b48d640ee85
MISC metadata.xml 1185 BLAKE2B 0632c1af557645a51a58bb7e3859a0897c39f4145c5a65c9f4316e1573811991b18e3e29ec55c38444471a6533d4770a2c80414c8ec2382839359ad5d46afbe1 SHA512 0fa80c2a6452c1da5049fef563358571259f73b0cf8bb65c17710a37760fd0643ee3bab66ea399531c8e7d190c46d7d1ea9a953a3a572c41c342babda2d73eee
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild
deleted file mode 100644
index 5b51f1260342..000000000000
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-DESCRIPTION="SIL Opentype Unicode fonts for Arabic Languages"
-HOMEPAGE="http://scripts.sil.org/ArabicFonts"
-SRC_URI="mirror://gentoo/ScheherazadeRegOT-1.005.zip
- mirror://gentoo/LateefRegOT_1.001.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
-
-DOCS="FONTLOG.txt OFL-FAQ.txt"
-FONT_SUFFIX="ttf"
-S="${WORKDIR}"
-FONT_S="${S}"
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
index 51ee3b1f38f2..b3e2c4b22a28 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
DEPEND="app-arch/unzip"
RDEPEND=""
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 5aa52637ca56..d4f9b65c4afc 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -8,4 +8,4 @@ DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee55
DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
EBUILD source-han-sans-1.001.ebuild 1194 BLAKE2B e72504920779c8f2cebd09239afaf3760dfca9f8feb4efe78228439d882ffa1d5cba1567956710886d8d2a92cb79fe7a5a4b12745e3b917d2543b3f3665a1068 SHA512 3dab3882c976162dcb36748f2ff51b7bc8fda748a47ca1cdae6d485b35518dc9c3df5f5652ebfb7b068da29ef2e1791bd51077f1aa55be64062410b034a0ff54
EBUILD source-han-sans-1.004.ebuild 1443 BLAKE2B 9b839f997b647305eca937123114e90466708cde91e7a6856e31843722e0e617129a36685606b16bdf49bd2754a6f1ba1c99a3d8c577333b26ac0753d18da074 SHA512 ee81670bcd420a71d1a8288f9b10185039f3a86c3040c45954c5902bd517ae8457ad69132b845903df56a4e3a5f757250aef0c96171c857a3d59acd4f0589986
-MISC metadata.xml 575 BLAKE2B 4e46bc582aacf09caf57590ce707ccb64e76db1463bb84c6e82d019d1fa37a5d8e95b2580b2b5a024a4502a9f2b8788c1f4fcc8f74dab3086124c15a5eb6723d SHA512 b5e8f6a84958d00861fa1dd4a7a2bc42bfe91940db4fcc2b2b1c96c8aa00eaec06563e45afe4b03680857f2aa4667a5611c438d631c37c6b16d48ca326bcb420
+MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index 682103924438..a2973be3b850 100644
--- a/media-fonts/source-han-sans/metadata.xml
+++ b/media-fonts/source-han-sans/metadata.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<maintainer type="project">
<email>fonts@gentoo.org</email>
<name>Fonts</name>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bb6ef39c1b3a..3047aff54899 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
new file mode 100644
index 000000000000..ff15c3b41dbe
--- /dev/null
+++ b/media-gfx/ephoto/Manifest
@@ -0,0 +1,3 @@
+DIST ephoto-1.5.tar.xz 324384 BLAKE2B 20e6a8904b2b80c67355b404ae39b10cb00f050f44336d899e63cc8e6d73b9b6d37dd9147479a2b6fa783ec90a07762fd31663d85d92d518e39cebc858489c9d SHA512 a60558230750f0edf7fb28f1d002a905a2c9afaf00f110c08e35f9d44f7d3939167065e0ef3819ac9ef0cfeed4ec260aef5267d631343dcce4628de70e7a5f23
+EBUILD ephoto-1.5.ebuild 533 BLAKE2B 1d5e884b4009853cede8eea909221999880fe2de12a08969b3facd3ede5ef7eb0e85e0d082f8f700a8b755ee2b3aeaf7def9282b711b4ef27bdb49209c892c4a SHA512 ae7b18946f3558c87c3c890b607bda83cfefa2e21477a7c9004d2a11f4a4b8e69fd00a0f0c7aca6eb5a2e1310a65241725f73d970d6feb87f4f21252d1e50f56
+MISC metadata.xml 1203 BLAKE2B 81c54ec20b38cfbaac1af938c254c1b4a7a4f05f930c49221e4a7069dafa072c28dac491f314043b5df20cb459e068e9082ae10f4a8f84371127d842d5033ef1 SHA512 54f5e200874bfe2a33343f147f320960be3cfcffb710ddf20e4721c446f1d3cc67a87185d4347c64ba80ecae1836cff757e2d44bd368d96c7459776b67b411d7
diff --git a/media-gfx/ephoto/ephoto-1.5.ebuild b/media-gfx/ephoto/ephoto-1.5.ebuild
new file mode 100644
index 000000000000..0d9b39d3494e
--- /dev/null
+++ b/media-gfx/ephoto/ephoto-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment image viewer written with EFL"
+HOMEPAGE="https://www.enlightenment.org/about-ephoto"
+SRC_URI="http://www.smhouston.us/stuff/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+ local myconf=(
+ $(use_enable nls)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/media-gfx/ephoto/metadata.xml b/media-gfx/ephoto/metadata.xml
new file mode 100644
index 000000000000..997099762b2c
--- /dev/null
+++ b/media-gfx/ephoto/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>juippis@gmail.com</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Ephoto is an image viewer and editor written using the Enlightenment Foundation
+ Libraries(EFL). It focuses on simplicity and ease of use, while taking advantage of
+ the speed and small footprint the EFL provide.
+
+ Ephoto’s features include:
+ - Browsing the filesystem and displaying images in an easy to use grid view.
+ - Browsing images in a single image view format,
+ - Viewing images in a slideshow,
+ - Editing your image with features such as cropping, auto enhance, blurring,
+ sharpening, brightness/contrast/gamma adjustments, hue/saturation/value
+ adjustments, and color level adjustment,
+ - Applying artistic filters to your image such as black and white and old photo,
+ - Drag And Drop along with file operations to easy maintain your photo directories.
+ </longdescription>
+</pkgmetadata>
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 194f32629b79..24c3c13e61ad 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -4,5 +4,5 @@ AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150
AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89
-EBUILD fontforge-20170731-r4.ebuild 2852 BLAKE2B 6ca3b179543a8e95853c3b77ba7664bc28f4f00c7ae0af7ace7590cadd8f105fc1499598956191d8ed90599767ce8438928b22b254d093b24b439f29792fa315 SHA512 8ffa980ad263e24da8424b0af679d6f4718f96e24180648aeffe1692f1f8734cb3fcdcb17338791a46d4ad6325146cf7009ae1a18eed1781935ee2ea0e4e4cca
+EBUILD fontforge-20170731-r4.ebuild 2850 BLAKE2B 7dd1932e28fde621b6af94f96b42c9ac7a9583b76890076d8eee91803e0ab889dc0a96747c90a682eaf63533fa15659c49b87a4d14f77792ec7978f2aa5b1492 SHA512 43d10231680abca2faf74d3d51bc75c781e9f3d23ebe0406cd2667ae608527f47ba11a00d4078f0a543a0851b6d65e310509d4e4e03d050e04d0a4fdbdd1298c
MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
index f0072048fd04..48ea943d4edf 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 7e4b43044ab1..0cd97cc38316 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -15,5 +15,5 @@ DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26
EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8490e660766b722e216cc956a03ff73f118c24bd8d356925a9a688f093da23b81cf0a9de62d4ca3b209715a3 SHA512 c9c70bc7f093dbe9cad2d9324c0ce2269cb0aaa6c022590cb01538fb14ada2a1885151e4d610596b39ea5fa556abb4872a68a389fa0496c0186ae906c5c22e2c
EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
-EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
+EBUILD gimp-9999.ebuild 5146 BLAKE2B fc245f0f86922ea132cc7839c45e5ecb18cce3f9eb14c29ec74589563e1e5621bcf119d943ae85fd90c960ba0b5a43a94c43404c7920fa4239e447fdb87ba0fa SHA512 57d76bac0516d2273c3cfbc8d7cb1d6598bb82b339e980463061b0b97d32e690988bf4ce03f35bec9e9e4e100c4ad9345f5c09023aa3cc9910a369f97caa952f
MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 2ac820e3f5b1..8d2e5828d246 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -3,8 +3,9 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
-inherit virtualx autotools eutils gnome2 multilib python-single-r1 git-r3
+inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
@@ -15,12 +16,11 @@ SLOT="2"
KEYWORDS=""
LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
-RDEPEND=">=dev-libs/glib-2.40.0:2
+RDEPEND=">=dev-libs/glib-2.54.2:2
>=dev-libs/atk-2.2.0
>=x11-libs/gtk+-2.24.10:2
- dev-util/gtk-update-icon-cache
>=x11-libs/gdk-pixbuf-2.31:2
>=x11-libs/cairo-1.12.2
>=x11-libs/pango-1.29.4
@@ -29,25 +29,27 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
>=media-libs/harfbuzz-0.9.19
>=media-libs/gexiv2-0.10.6
>=media-libs/libmypaint-1.3.0[gegl]
- >=media-libs/fontconfig-2.2.0
+ >=media-gfx/mypaint-brushes-1.3.0
+ >=media-libs/fontconfig-2.12.4
sys-libs/zlib
dev-libs/libxml2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.30
- >=media-libs/gegl-0.3.20:0.3[cairo]
+ >=media-libs/babl-0.1.50
+ >=media-libs/gegl-0.4.2:0.4[cairo]
>=dev-libs/glib-2.43
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
aqua? ( x11-libs/gtk-mac-integration )
gnome? ( gnome-base/gvfs )
virtual/jpeg:0
- jpeg2k? ( media-libs/jasper:= )
- >=media-libs/lcms-2.7:2
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ >=media-libs/lcms-2.8:2
mng? ( media-libs/libmng )
openexr? ( >=media-libs/openexr-1.6.1 )
- pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
- >=media-libs/libpng-1.6.25:0
+ >=app-text/poppler-0.44[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=media-libs/libpng-1.6.25:0=
python? (
${PYTHON_DEPS}
>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
@@ -65,8 +67,9 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
postscript? ( app-text/ghostscript-gpl )
udev? ( virtual/libgudev:= )"
DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
+ >=dev-lang/perl-5.10.0
dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
sys-apps/findutils
virtual/pkgconfig
>=dev-util/intltool-0.40.1
@@ -75,7 +78,7 @@ DEPEND="${RDEPEND}
>=sys-devel/libtool-2.2
>=sys-devel/autoconf-2.54
>=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
+ dev-util/gtk-doc-am"
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
@@ -88,25 +91,10 @@ pkg_setup() {
}
src_prepare() {
- eapply_user
-
sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
- echo '#!/bin/sh' > py-compile
- chmod a+x py-compile || die
- sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
- local myconf
- if ! use doc; then
- myconf="${myconf} --disable-gtk-doc"
- fi
- ./autogen.sh ${myconf} || die
-
- # Fix "libtoolize --force" of autogen.sh (bug #476626)
- rm install-sh ltmain.sh || die
- _elibtoolize --copy --install || die
-
- gnome2_src_prepare
+ gnome2_src_prepare # calls eautoreconf
sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
@@ -114,7 +102,8 @@ src_prepare() {
src_configure() {
local myconf=(
- GEGL=/usr/bin/gegl-0.3
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
--enable-default-binary
--disable-silent-rules
@@ -124,14 +113,15 @@ src_configure() {
$(use_with alsa)
$(use_enable altivec)
--with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
--without-webkit
- $(use_with jpeg2k libjasper)
+ $(use_with jpeg2k jpeg2000)
$(use_with postscript gs)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_with mng libmng)
$(use_with openexr)
$(use_with webp)
- $(use_with pdf poppler)
+ --without-libheif
$(use_enable python)
$(use_enable smp mp)
$(use_enable cpu_flags_x86_sse sse)
@@ -158,7 +148,7 @@ src_compile() {
addwrite /dev/ati/ # bug 589198
addwrite /proc/mtrr # bug 589198
- export XDG_DATA_DIRS=/usr/share # bug 587004
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
gnome2_src_compile
}
@@ -170,7 +160,7 @@ _clean_up_locales() {
einfo "- keeping ${lang}"
continue
}
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+ rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
done
}
@@ -187,12 +177,12 @@ src_install() {
# Workaround for bug #321111 to give GIMP the least
# precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
prune_libtool_files --all
# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
_clean_up_locales
}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index cf37ac2c2a3f..7df3894a2842 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,7 +4,7 @@ AUX graphicsmagick-1.3.27-version.sh-fix.patch 310 BLAKE2B 0a9a0c97c675af8892073
DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
-EBUILD graphicsmagick-1.3.27.ebuild 3325 BLAKE2B 2dc3525d0cd95d103a6f78dbb098c63fb69d50528107306c48ea2cd378ced281b08ec6a006c0ae4216e8f7c15910334efce0f628ba396bad936db04f5dacd047 SHA512 5381ce87435c8e86e1a09de878dea8f71a3aca7aef212f1132b227786abcfa6fc883c4af28b9f603889731cd7ac4931a8f3c6cc9ba0da46027e6a003519accea
+EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498
EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
EBUILD graphicsmagick-1.3.30.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
index 7295e1e63303..ea52ca5e1e59 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
fi
IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 545b6c7641d9..1001c95a0d41 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,6 +3,6 @@ DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4
DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
EBUILD hugin-2016.2.0.ebuild 1948 BLAKE2B 813e60b2a655186d9ee3042e03372e1185e07aa6fdb7a5ecd57889efb9252630d7902b36600995e02ba03677f9c11a6bc4b7fc841f852391e1c3ed168c24b24f SHA512 0fa77072010e24db9fa58b5601040baff38121342a7c187b24b6fd37626becd46b372fde844981bb00da4b840970ebff88bc2f3f2833afc584c2aad6cba8a265
EBUILD hugin-2017.0.ebuild 1924 BLAKE2B 8d618f623ed9d53a49e138acad196d691bcd0b69b4f3318a002b88917bcfc216ce9b10c02a283b540acae345e8878a6ab233022ec1ae44f37b305e11eb592066 SHA512 7921827a90e88f68218e7d2a4b9480ab5ffcb7bcd9aff1f8245d7d9233b55d425f216fcd14c13c064fe30dc2fe65f2882fb8ba8f3a4e8d126db754d6e733737f
-EBUILD hugin-2018.0.0.ebuild 1971 BLAKE2B ce8ccaea602866ecaee5d5890e740d98e940344c3da1d1f0ddec1257e1ef02e2e67962658c47e3ae4f3b1f5edd0705b9df7157e4c6a3ae8e2ff1aff8ff208aff SHA512 0776d6b2b334da1d85763dfa2628b3c0f44adbd6e295b2b36d5cc9b5b75fdcb33cefd5702e0f75f03ea134e1c4b622d975d1693251cff45792d7acb3fc8a3026
+EBUILD hugin-2018.0.0.ebuild 1970 BLAKE2B f756191712f7f71d7b5bbf4b58b8943a6851c231c070d42794b06a0adc04189b757541432027c4f0f1014bfd7f1bde1cbb67f11cfbeeb9e9c4ca589578b1e6d9 SHA512 45f5cf6a1d2532316834a967396b445b2686bc6aa68e6f367d82d65abbb8d986552a56b61465382001616fe1e4bceef605c1f86f9ac17116cca81665c9efcc2b
EBUILD hugin-9999.ebuild 1988 BLAKE2B 0fa525881a25a8141a1fc2fabc176382ec1cd040ad49e3c1f90f9b239570f06c944f44d633d2c43ce304048fa48075f0432c2c89bdb6921b0a6bf476d24b9786 SHA512 40f281844a1fe6562e9c692f6ca6dee905b7dbd7e233da31a7be04940f6b7c831d50180969a6752024a15a7e667459ec5ef835f4879b3789e9c5d156016de133
MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 3a3bee02ade3..3b5e82f438dd 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index dc7d6307538d..bb446ed97bb0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,21 +1,23 @@
-DIST ImageMagick-6.9.10-1.tar.xz 8918684 BLAKE2B 62e77bed14b2a82f2fd2e429142c4200d7b243caa3ed8ff11be672d1c0a9094b7916dcbac11f0876cf46e6aa4753044e0cbe0c25dacafe5966f49d3f586bb747 SHA512 570edd18299982769a471ae37b7458401b13aa7802fd9f6ae8a72a2ece34cbf9b30e42a9f06abe62a6b01cc3573fc16d4c43a732260e0dedc8da54fef82f74a4
+AUX imagemagick-7.0.26-FTBFS-on-i386.patch 1228 BLAKE2B 113d732c49e8341c9f9b7a9722ff561a9d37951a1278f6bc8a11af306016a798518f39d0ebfb5b85800dd211c9da3f60eebca4d7e5cd9f751ddf298d9dcc39db SHA512 f56936b02ed7fd3ce7d886df21980d7c1a6b9a9c92c4e3d46a4a33a7b30ff050c399d063595ba1efe62a56e2d3e5a6b36e901e96d7546b12db60fd18824fd164
DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe
+DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b
DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
-DIST ImageMagick-7.0.8-1.tar.xz 8606196 BLAKE2B fd7bd794793cd9bb063023f2f7f36272efb99a1b75082dd3f71a244b7cb0e28971ff091af5b8a575084f42bd5a4639641b44831dae0cc52ea03d6624a650f01e SHA512 e7f2acb9a7912bb68dced74b7a0381d4909b13aa4fa36e4f3c56479b7b24f8f91ff21c171e542bec63e2873a94adea4673c5351ce1d641f72e8279886eb4b224
DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70
-EBUILD imagemagick-6.9.10.1.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
+DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d
EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
+EBUILD imagemagick-6.9.10.5.ebuild 5190 BLAKE2B 5a149c6283ed909e7536c3b9119e6c347fa12897835101a3fe1d36ebf50016fa5bd4bfb8b3c698de38452948ef6e22993651111c5524d346cb5647bee1b9ab1e SHA512 5207197582de505a66eddc265563d8a1673b93bd1d2429f086f6becaf4a8a72c1adc5393e11c091b07cd75e5597175c5adbcf361f0fd621438168496637ee138
EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
EBUILD imagemagick-6.9.9.47.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
-EBUILD imagemagick-7.0.8.1.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
EBUILD imagemagick-7.0.8.3.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
+EBUILD imagemagick-7.0.8.5.ebuild 5196 BLAKE2B 8773a600b236dc906796ba12160df7f22792ca1b49f27a4fe165d6448099a0de8773090f4a44206ce201218a6d0cb25b012fa62ac0782fcef500ea13bfea5ba1 SHA512 584841bb65fff2dda4095dc32e6fc388306a2f73253d60fac721e0ae15b2b337d44ff7baafe088fcc1df7283bd32d96a6a1137fab4f3979c54a5b6777e566138
+EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee
MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
new file mode 100644
index 000000000000..c568ed345ecd
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
@@ -0,0 +1,36 @@
+Gentoo-Bug: https://bugs.gentoo.org/653752
+Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019
+
+
+From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001
+From: Svante Signell <svante.signell@gmail.com>
+Date: Mon, 25 Jun 2018 16:06:19 +0200
+Subject: Fix FTBFS on i386 any
+
+bug-debian: https://bugs.debian.org/898914
+---
+ Magick++/tests/attributes.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
+index 9ebc67f2d..e969def27 100644
+--- a/Magick++/tests/attributes.cpp
++++ b/Magick++/tests/attributes.cpp
+@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
+ //
+
+ // Test default value.
+- if ( image.backgroundColor() != ColorRGB("white") )
++ if ( image.backgroundColor() != string(ColorRGB("white")) )
+ {
+ ++failures;
+ cout << "Line: " << __LINE__ << ", backgroundColor default ("
+@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv)
+ // pixelColor
+ //
+ // Test default
+- if ( image.pixelColor(40,60) != canvasColor )
++ if ( image.pixelColor(40,60) != string(canvasColor) )
+ {
+ ++failures;
+ cout << "Line: " << __LINE__ << ", pixelColor default ("
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild
deleted file mode 100644
index 52e77059cb1d..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-gfx/ufraw )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- local mesa_cards ati_cards nvidia_cards render_cards
- default
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
- emake check
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
new file mode 100644
index 000000000000..89f3e64c115f
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
+
+MY_P=ImageMagick-$(ver_rs 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ local mesa_cards ati_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild
deleted file mode 100644
index 1db0353011d7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
-
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-gfx/ufraw )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- local ati_cards mesa_cards nvidia_cards render_cards
- default
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
- emake check
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
new file mode 100644
index 000000000000..ec008c8024fa
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
+
+MY_P=ImageMagick-$(ver_rs 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ local ati_cards mesa_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
new file mode 100644
index 000000000000..aa36a8a3e7be
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+ inherit git-r3
+ MY_P="imagemagick-9999"
+else
+ inherit eapi7-ver
+ MY_P=ImageMagick-$(ver_rs 3 '-')
+ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-libs/libraw:= )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ local ati_cards mesa_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with raw)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 69f715c205b9..b81e734ef6e0 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
-EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
-EBUILD krita-4.0.3.ebuild 3027 BLAKE2B 32d9132b221c68d5e22fff6a7e234f1f34099a3aec054fc5d3becc4dc69f7ed205ba2f3468945346fc5890e10ad0f7301da5833d70b1039ac9993d697c0e0a21 SHA512 103fddb1bdbdfb47cd2dd04403c1840e5108d16ef7c43f7e6462bfc26cd33202603df51f0f94ad17b4c006643a386989aa887bd2302ea3a0ece807e9c265ed7a
+EBUILD krita-3.3.3.ebuild 2559 BLAKE2B a8cff6bd75d240ab4f4b63ac7f58d3d329c7c830cd5c62b0846d3b8b9f5ccbc0cb3a4405daad513a4d3ed3db3de9d9c9f81696d204cbc1779721312a171fe6d8 SHA512 43163beb98c83de02b28da41e8172546cf9993280d395387ed471b0c35568a7e6393610cc53da64d55830c0460b00d0fabb5431d14a6a360bba17f8ad54d1f14
+EBUILD krita-4.0.3.ebuild 3033 BLAKE2B 9103366c623967ad717a23cab0be96b8f1214a6c6f3e7958cc6a70c11436093cb3b476521f728b999669f1fb2aef2d82cd63f542c8660b7cd33edfc49b1fbd72 SHA512 7e74f23f97e3053ef4d73b99ff769303824aa81d458d379e43603925aaff9b8567ce664a0cab3d5d62b16bf87b2d0441da8f4405d5708d75ec5bfdc003ce101c
MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
index 24bf800d2a04..b99c804b692b 100644
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ b/media-gfx/krita/krita-3.3.3.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND="
)
pdf? ( app-text/poppler[qt5] )
qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
+ raw? ( <media-libs/libraw-0.19:= )
tiff? ( media-libs/tiff:0 )
"
DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index 432b5ebc2692..ef2f33ef2484 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
dev-python/sip[${PYTHON_USEDEP}]
)
qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
+ raw? ( <media-libs/libraw-0.19:= )
tiff? ( media-libs/tiff:0 )
"
DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 0785ba4f94c1..46534209ee24 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0.ebuild 520 BLAKE2B 74cdd57d777c4c58d69c295a6feb173504e1033a3c966421509aa96f574bf198f2d921045d137b670d82f657312cb00d7a0e57ca92f134805bdb562f17bfafd7 SHA512 d2dcb6d1b44c27a618a88ce3a531d3a50731242bc4fc4818baee207bf7100ee4945737a1b9ba147c1cc604190fce792ad0e785e990ebf461622321da4fb829fb
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 528 BLAKE2B 1e75e64a45364f2bff22dc7bfb298d5c6464036a9094e114ff42fcd7c1d808c3717e354ef47a814ea3745ebf0fc52ee0537e93404f65225efa900fb816f173a9 SHA512 4b1a783a7ae8ef88b15935bf6f7691f4c90d8cb23b34e39f3a355c59a271b34a55521596581d0c88b13599e6662b534d9ef6fdd285aebcd53d9bb044fd735b22
MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..5cf603c4f1d6
--- /dev/null
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Default MyPaint brushes"
+HOMEPAGE="https://github.com/Jehan/mypaint-brushes"
+SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="1.0" # due to pkgconfig name "mypaint-brushes-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( AUTHORS NEWS README.md ) # to exclude README symlink
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
deleted file mode 100644
index 67caf0132e3d..000000000000
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/Jehan/mypaint-brushes"
-SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="1.0" # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( AUTHORS NEWS README ) # to exclude README.md
-
-src_prepare() {
- eapply_user
- eautoreconf
-}
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 89fb34dc12a3..9c532977835e 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,6 +1,3 @@
-AUX openexr_viewers-1.0.1-gcc43.patch 2122 BLAKE2B ad29a9a5972f00d2955fce75a927fc87a2a042a0343a6e6586866b606784c4e8783c53a2ea4caefa4e786bfbfe0c99dec6194757d4f74c829c77e88a1f2e3277 SHA512 1e4c2f7a496b7a48063b6ec163c72620eabc78fa850cd87de8c4d1555bdcf91913941c16fdadcfe076c67d0903c229e677ee3b7c0fe194116864c5cab1bbe4a1
-AUX openexr_viewers-1.0.1-gcc44.patch 1064 BLAKE2B 6142b8195a0ee03e1e8f7c0f711cf7a63dbf59291c95f4a4d6fb6c85f84ada831c1549daf7910e56717ac63f954d1efc870980ad22d9a9ab95521f367b521139 SHA512 3b6c2f02581025a9a9e8963274aca27badc905a1986376860728b24b795008dedbb7a3887b5a4fed04c81b0ea1acff1918fab3ad09881de9f2be899c90443177
-AUX openexr_viewers-1.0.2-nvidia-automagic.patch 472 BLAKE2B 52a9adbbf2c809433009b20e4ca6655eb837dedb368a7eced8d38f52941278355d8385a8c185feecb138a239fcd33373e3b0dd866c85e59f3410b96c26a15980 SHA512 777b8635b4454ea9c8c9bcd1b707012218ba16c523a105e987e897a17b126a2e11d986bc566cfe1a87a1af2df3336ec53e5ff8cc54cdc01ea7752947dac140f4
AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch
deleted file mode 100644
index 3630efc6f7a2..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -up openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43 openexr_viewers-1.0.1/exrdisplay/applyCtl.h
---- openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43 2006-12-09 01:14:07.000000000 +0100
-+++ openexr_viewers-1.0.1/exrdisplay/applyCtl.h 2008-01-10 02:07:14.000000000 +0100
-@@ -49,6 +49,7 @@
- #include <ImfArray.h>
- #include <ImfHeader.h>
- #include <vector>
-+#include <cstdlib>
-
- //
- // Apply a series of CTL transforms to the raw pixel data from an image file
-diff -up openexr_viewers-1.0.1/configure.ac.gcc43 openexr_viewers-1.0.1/configure.ac
---- openexr_viewers-1.0.1/configure.ac.gcc43 2007-10-10 00:20:51.000000000 +0200
-+++ openexr_viewers-1.0.1/configure.ac 2008-01-10 02:07:14.000000000 +0100
-@@ -126,6 +126,7 @@ AM_COMPILELINKRUN(
- #include <ImfFrameBuffer.h>
- #include <ImathBox.h>
- #include <vector>
-+#include <cstdlib>
- using namespace Ctl;
- using namespace Imf;
- using namespace Imath;
-diff -up openexr_viewers-1.0.1/configure.gcc43 openexr_viewers-1.0.1/configure
---- openexr_viewers-1.0.1/configure.gcc43 2007-10-10 00:21:01.000000000 +0200
-+++ openexr_viewers-1.0.1/configure 2008-01-10 02:07:14.000000000 +0100
-@@ -20869,6 +20869,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <ImfFrameBuffer.h>
- #include <ImathBox.h>
- #include <vector>
-+#include <cstdlib>
- using namespace Ctl;
- using namespace Imf;
- using namespace Imath;
-diff -up openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43 openexr_viewers-1.0.1/playexr/ctlToLut.h
---- openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43 2008-01-10 03:09:55.000000000 +0100
-+++ openexr_viewers-1.0.1/playexr/ctlToLut.h 2008-01-10 03:11:18.000000000 +0100
-@@ -88,6 +88,7 @@
- #include <string>
- #include <vector>
- #include <half.h>
-+#include <cstdlib>
-
-
- void
-diff -up openexr_viewers-1.0.1/playexr/main.cpp.gcc43 openexr_viewers-1.0.1/playexr/main.cpp
---- openexr_viewers-1.0.1/playexr/main.cpp.gcc43 2008-01-10 03:05:03.000000000 +0100
-+++ openexr_viewers-1.0.1/playexr/main.cpp 2008-01-10 03:05:48.000000000 +0100
-@@ -48,6 +48,7 @@
- #include <vector>
- #include <string>
- #include <stdlib.h>
-+#include <cstring>
-
- using namespace std;
-
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
deleted file mode 100644
index 4ab58548d71a..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp
---- playexr/ctlToLut.cpp.orig 2009-12-14 09:07:00.863493115 -0800
-+++ playexr/ctlToLut.cpp 2009-12-14 09:08:16.721186947 -0800
-@@ -49,6 +49,7 @@
- #include <ImfFrameBuffer.h>
- #include <cassert>
- #include <iostream>
-+ #include <cstdio>
-
- using namespace std;
- using namespace Ctl;
-@@ -61,6 +62,7 @@
- #include <ImfHeader.h>
- #include <cassert>
- #include <iostream>
-+ #include <cstdio>
-
- using namespace std;
- using namespace Imf;
---- exrdisplay/applyCtl.cpp.orig 2009-12-14 09:11:44.950334079 -0800
-+++ exrdisplay/applyCtl.cpp 2009-12-14 09:11:59.900332294 -0800
-@@ -49,6 +49,7 @@
- #include <ImfFrameBuffer.h>
- #include <cassert>
- #include <iostream>
-+ #include <cstdio>
-
- using namespace std;
- using namespace Ctl;
-@@ -61,6 +62,7 @@
- #include <ImfHeader.h>
- #include <cassert>
- #include <iostream>
-+ #include <cstdio>
-
- using namespace std;
- using namespace Imf;
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch
deleted file mode 100644
index e39a0c1da789..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -188,8 +188,11 @@
-
- dnl
- dnl check for Cg
--dnlCG_LD
--if test "${have_fltk}" = yes; then
-+dnl CG_LD
-+AC_ARG_ENABLE(nvidia, AC_HELP_STRING([--enable-nvidia],
-+ [enable nvidia cg support [[default=check]]]), [want_nvidia="${enableval}"], [want_nvidia=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_nvidia}" != "no"; then
- AM_PATH_CG(have_cg=yes, have_cg=no)
- if test "${have_cg}" = yes; then
- AC_DEFINE(HAVE_FRAGMENT_SHADERS)
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 44ca2495708e..b4c61579c59b 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
EBUILD ristretto-0.8.2_p20170821.ebuild 949 BLAKE2B 118693c9ce2ac41f5dfce5410cf4951c3f05ea5334a84b04c43e4d877d14021eb08b30a99c343270af2ccb1611ee898695f9d20fada95888a28516a6ff1dfa26 SHA512 01e5b950ff9684ade413e33532e0f81b0ea214bd13203cfe68f2cfa7bd278be50d27cb9a1196b0ab69d80a0f48384aa11e0686074d7919e17fcb0cd8d8b40d12
-EBUILD ristretto-0.8.3.ebuild 868 BLAKE2B f2a43df79c91c5bee6d711a8e34a83f46ecfdcd3c2182a8785a63421afcdeb491d8864a3958df1304f6408da21f1910b452c6cc4adf1f3459cf932746aca828e SHA512 ec132996ec3ab06259952db5b26cb15463d5e396ca9fb3a6561d8dd89943dec3456fc74134f1c9b69a3f778502072a1998d8fb82a018c997764fc689a191db87
+EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.3.ebuild b/media-gfx/ristretto/ristretto-0.8.3.ebuild
index b5c45b79a92e..330499742f2c 100644
--- a/media-gfx/ristretto/ristretto-0.8.3.ebuild
+++ b/media-gfx/ristretto/ristretto-0.8.3.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A fast and lightweight picture viewer for Xfce"
HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
new file mode 100644
index 000000000000..83cdf37974ad
--- /dev/null
+++ b/media-gfx/termtosvg/Manifest
@@ -0,0 +1,3 @@
+DIST termtosvg-0.4.0.tar.gz 88543 BLAKE2B a45e15e7d681bb649670d4c73cf09306fa09276b2a34f762db66f4cf2d640d2163f4e98b16dc609e92b4145978e76a00e80950634d1599ee0766c4f08afb15a5 SHA512 c0c90fc9e74c892ebe6b7fcd25ff2757a7a8b9ee4da459fc608c96295d0f9b40bf6c98a0ac56f42c3e2a60cb60e9404a9b50863bdf74335d2b4758b124c04fcb
+EBUILD termtosvg-0.4.0.ebuild 535 BLAKE2B 36a601396f720ded522dacd4754deb2a26adbd9a8cbda06ae0239490038f3faa9d00c66835e41e01ab5007c483acd97a450276e6bde501919085797836007f4f SHA512 ccd3929947cbf35b573e9502d8c5122f2339f55f169d6a98c2edcee5cee28c17d410d029e56d0402ed43a6f1030a3f9648e07c79f48124dc2e2daf160b3d7f20
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/metadata.xml b/media-gfx/termtosvg/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/media-gfx/termtosvg/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/termtosvg/termtosvg-0.4.0.ebuild b/media-gfx/termtosvg/termtosvg-0.4.0.ebuild
new file mode 100644
index 000000000000..a9ab7bed95f3
--- /dev/null
+++ b/media-gfx/termtosvg/termtosvg-0.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Record terminal sessions as SVG animations"
+HOMEPAGE="https://github.com/nbedos/termtosvg"
+SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
+ dev-python/svgwrite[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 89a3620aa600..973924c3fdb6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index e1d2ec189b39..588be6ffac6f 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,6 +1,6 @@
DIST adplug-2.2.1.tar.bz2 810257 BLAKE2B a51c85a10af6a1cc308a7ccfa657daab1e627800a0617f6cf8b874726a115bdef188dc3d82fb6af9fd2aadc2b28b12f0707ea12cb52f6656d2b8654849bad806 SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f
DIST adplug-2.3.1.tar.bz2 1478424 BLAKE2B 8c2b65d11d3b12b4a3337bc9c6ada2920b07279ac0199d4bdf1fa2ceec2f51748a1bb9357456b3e7aba7c906253691066b274e7a7c7578c777d1e2e77f5131f0 SHA512 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3
EBUILD adplug-2.2.1.ebuild 624 BLAKE2B e762d87d6b15d6dc6e6c2367db8e8b1af9c504755e2be3a547129b3a21dc64b672a16ad1b5e7d5726a87a389e831a732f331279b1141c8f195311347b55fc5a6 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090
-EBUILD adplug-2.3.1.ebuild 888 BLAKE2B a01ec48a5f6bba6d6ccf9334165c0f907d73db518b453b2abab2b19f2c09bb31b33818f210a509f74a59aa7ed48149b73fa5d5d47d1cbac2553110465ab77910 SHA512 55fb2fbf046fb2a5a57d97396967660f8f250674f61b9000c56b2dd9772abfeb9550c4ef37cef4a4bb5794ede7652dcb217ab2011833d84d387d4e5d6d05d2cf
+EBUILD adplug-2.3.1.ebuild 887 BLAKE2B a42f5a3b4a2bc21ac2dbcd1284b3059a3955fa8dd88a488d4395b895a6caaed1fe9a1f40c4f4b73c02d4eb706312f77c9e00cb17813a8269b578924a8de40a45 SHA512 6bdb7e93d0a5c35630fece9b0f891633dd5647dc61316ea34db3f631d9e68e15c2572c6fd6759bd9c58fb4e71079a4b31dca6f2354205ddf28e13ebfd70c0b88
EBUILD adplug-9999.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
diff --git a/media-libs/adplug/adplug-2.3.1.ebuild b/media-libs/adplug/adplug-2.3.1.ebuild
index df3d368a1770..b1a8021b9528 100644
--- a/media-libs/adplug/adplug-2.3.1.ebuild
+++ b/media-libs/adplug/adplug-2.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/adplug/adplug.git"
else
SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
fi
LICENSE="LGPL-2.1"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 09158a450a48..b57a8b5605e0 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,3 +1,5 @@
DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
EBUILD codec2-0.7.ebuild 485 BLAKE2B 06f9744dbf2dd9eeb47bebfb09662526253ac62e3d34b47390b9b4df147721b6b7aeb51a67c9a5495474e133a4fc27465736ff50c4a9043e3be8e3ff8c834357 SHA512 39da503a4cfd811cd0de69e775b38cd16a1e41cf97342df493f09597efbd225a06e2f56836e9641367d67c5005da67e4c89bb5ee5052b1605117226b251d8b89
+EBUILD codec2-0.8.1.ebuild 617 BLAKE2B 95cb749714a9f5f90b0e2f8f6bc8b16f071ecf0583d27cfc655e88affdf932aa9af77dc584f791794615975565de4eac268a510111a33564259a2ce94faf24c4 SHA512 73fa97599384d3fc755a0449f793ee920a7e32931ff2444249e674dc9ef9daaa27d5c98ec5b7373538788e416caa447429ed75230b59942f91c3e6ef69cd57b6
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
new file mode 100644
index 000000000000..07c6f859762f
--- /dev/null
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/"
+SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+ local mycmakeargs=( -DUNITTEST=OFF )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ if use examples; then
+ insinto /usr/share/codec2
+ doins -r wav raw
+ fi
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 4ad605c2936e..aaa8f8c07880 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
-EBUILD hamlib-3.2.ebuild 2228 BLAKE2B b30f306ef16f8f9c8998ef1dc019e3a1e2beaa2d21b2a654bf39b9f927b4ae4d0d25921cad2d8fed94a2d3aeb420dfa75e0964c7f5854714b0cf7d8ac58f7e7b SHA512 c34b82e9c7e31387c28d78f1e240c8f1025682ee1e08f6f1cf374b7e62806eb3e3c1c9f9c820e45f94da52724bb29dd7727398afbe74f9c712180cf05b5cb702
+EBUILD hamlib-3.2.ebuild 2227 BLAKE2B 23d7ae9e5987706a88d124a3c6731bb82bcf4c8616380b4f57a79b195d4589164148dc20c4bfdcab2ca76353bee0514fdebd7cece62a9f441e65af762d871855 SHA512 b11c5cdc7952aef7a02b3a245ae7d0e139a2bfec3eb4ca682aaa638d155e7825804debda11595c940c30bf4fdef6d8bb3e68ac36f9bb3be1128005305a1c9e21
MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 5b7abf81949d..82d0cf58c42f 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
LICENSE="LGPL-2 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="doc perl python tcl"
RESTRICT="test"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 946657a7dbfc..a5a26dd81a1d 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,8 +2,10 @@ AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f1
DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
+DIST harfbuzz-1.8.3.tar.bz2 3828043 BLAKE2B 038a714480f10b05b2b31ba46667ce563598b43d122f64ab4adc6f267b2b99ea23ba92a1ae0df173be13f29da8960d55a5c5fdee25aa9fc4541a109c5e76946d SHA512 d3ec8f31ff51315fb35f6b5c69b3fbf29e1dff710fb11158801990fbeb99be5fce691f3c06df1c295a08bfb6c14021c511993b0d22ca96e76d8212ddfda198b6
EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
-EBUILD harfbuzz-1.8.1.ebuild 3212 BLAKE2B ec5c198e5f01625d6fb05fb275a4cd11995300a7135785f1a3213d0646fc73ef4c64a2ce1c09480f21887fdcd34a20d287887db334bcdf0ad42439a2462911f4 SHA512 161bde7c3fa3f28e8faa2cf890c2843251de6c3c67463bd474d41a1e563e37cff1a76ee39f7913883e8341746e7a211bd0cdd47fc9fdc79f8bedcd3ca3701cd1
+EBUILD harfbuzz-1.8.1.ebuild 3210 BLAKE2B 5728ea38556eb2aa0d113bf2f3a4d4632c1dfbe1a05d4531fa4553a17130c2fe56f49bc6db688e5ab00666c27cb655a67c7f4fd16d77f6503bf1cb74264be832 SHA512 83efd6b91b845884a7a43abf4dd8cbe2a0e6e04c2c0701b2dc9974796e0c22b39311eef27987b9db38a10719f4167b47c4f669d96b192ba1244e91bde710b3c0
EBUILD harfbuzz-1.8.2.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.3.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
index f736d69ecd44..92d65fff155f 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
new file mode 100644
index 000000000000..c723137a7e55
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+ graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+ DEPEND+="
+ >=dev-libs/gobject-introspection-common-1.34
+ dev-util/ragel
+ "
+fi
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+ if ! use debug ; then
+ append-cppflags -DHB_NDEBUG
+ fi
+}
+
+src_prepare() {
+ default
+
+ xdg_environment_reset
+
+ if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+ # on Darwin/Solaris we need to link with g++, like automake defaults
+ # to, but overridden by upstream because on Linux this is not
+ # necessary, bug #449126
+ sed -i \
+ -e 's/\<LINK\>/CXXLINK/' \
+ src/Makefile.am || die
+ sed -i \
+ -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+ src/Makefile.in || die
+ sed -i \
+ -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+ test/api/Makefile.in || die
+ fi
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+ elibtoolize # for Solaris
+
+ # bug 618772
+ append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+ # harfbuzz-gobject only used for instrospection, bug #535852
+ local myeconfargs=(
+ --without-coretext
+ --without-uniscribe
+ $(use_enable static-libs static)
+ $(multilib_native_use_with cairo)
+ $(use_with fontconfig)
+ $(use_with glib)
+ $(use_with introspection gobject)
+ $(use_with graphite graphite2)
+ $(use_with icu)
+ $(multilib_native_use_enable introspection)
+ $(use_with truetype freetype)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 3c832cc2b656..9cb6de54c9a7 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,5 +3,5 @@ DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538a
DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
-EBUILD imlib2-1.5.1.ebuild 1969 BLAKE2B a6d7f500fd5432b2d9344ef7ccdf48d7ba8d7c5076611a0b48a3fe0a1228fd6726d37698fb051bd0a549efaad5d53711ac5bd0859c3724f4e4908122f71e502c SHA512 bc4f3e27207996f4feb484512fd3bef8ca81a71e74289f1575ca119a7d5aa2d95b5967e2aa2df234a4dac56e175b1be177635403dc0c070226137ec148c54eb0
+EBUILD imlib2-1.5.1.ebuild 1968 BLAKE2B 51cf776a53f08aa0f55136248c80f980082dd00ce9df5cf549fed7a46e1a97ce2962202267c7874264750e868a8fccca5d8f6866067584808001da1adfb10133 SHA512 7ee47df946294a8ec7b21488c9aa0ecccb325052e87ebca92930899fa2bd4bad8c1f3e0c4653d43f25a75acae85b8f209bb0c879a2fac48c123d6d77bca68e00
MISC metadata.xml 2445 BLAKE2B 58a14b7c6eeb627113a5a2a4e72c3937b4b74b3ac6e363d8e0f735f25775178ac2aa5bae2ccc6881bc291d220268fc7db85cd33c0ec796ada823c7812c40d10a SHA512 7a6940cd007784b50b010af8d01992ba56bb756f6433e26ae4962ccdfe25efc41ca1b020b7d88f15cb784ba2d8cb39caffd89b727db7b7f7149ecb137dcaae6d
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index ad93bd2f5e8e..3810890007b8 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
RDEPEND="
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 2df256ea8b3f..75880545b410 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,6 +5,6 @@ DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484
EBUILD libbluray-0.9.3.ebuild 2186 BLAKE2B 811d0c37422c0a9425084573f25c19be5a272a88654a227338029de63b4217a6ffe644cd88e45410fd66cd810d1931130e973ce839e8721ab3214710890ec1db SHA512 e2fa9e014338231de6f2811439f88bc861a8765eac08e25121c3200307d01dd478a537b368dd4b9a28966d4f3b2fe73f2d451369dacde8ef441400c0add68629
EBUILD libbluray-1.0.0.ebuild 2194 BLAKE2B 16b08e28b74eb2d8635092ab2a02d2225d8d69b0b100346170abef947f2a56cb3a3aba7e8a52307c0781e11b74b35ec13b11e15bf2b2e78f46c3481e7ce57976 SHA512 33d28c33eb451f6360426efcde049a9250bcc8ed63e35132f37517bc1630e9c95d189b40fc69ae642e5444ed19bd9a19f4521a92bdaa2640c62fbad8c0060952
EBUILD libbluray-1.0.1.ebuild 2202 BLAKE2B 486111965f4623e1f9b894f4533276c3e626a1152cbfb4ca0417bab5c4fc11489a7e564b6724123312bb7759e711db945cdbd4f508a0bef77df94ab65ea60353 SHA512 d6666bcc3db0d2c0407b364eccfda76710da9fb66710e93bb71707e4a5ea5941b7bcca4d06a1afa4273d20e1224496f8b60f2106f35ccfe6121efd25d1aae896
-EBUILD libbluray-1.0.2.ebuild 2217 BLAKE2B 3296a880c09aca896d4631be7b2ed7de24720bcfbacf59234ef4f316ec939be4ae59ca881598428438ff35d3bd7efdbb1654583eb62224ec08cb2162ed46a7f4 SHA512 64e47c04e42f184a805572dd3dd6a3330c1e38ae3f53b70dda722c2c117e8cc9991287b598c0473f6454cfdc986e419b69468d111ed6c3eb3a12b13219a8df9d
+EBUILD libbluray-1.0.2.ebuild 2216 BLAKE2B 0ccf81a396903645ca601a72cfb09e1adc8c970a30d8a3498441b5c0535c13d9c8a11edc43479e3409b3235bd46534f0a87cab0dc45062683ef38a394605aa18 SHA512 193b8ef72dfe4e958b1144c77bfcba0a221a1abe1bbb0ea5dd2978295e91b8966d801dfcc9ebcbde5ff1004c139bb15fcc58b55d58bb238513fe75f1c89dd9e9
EBUILD libbluray-9999.ebuild 2201 BLAKE2B 161cdc3be5991a0462a1d4fd90d361032d44e8d6c21ab4166e2db49698803b7a561a1e5f78c5dbcd95708658b46e33a968c78d0f4466387833eeb02afdde8451 SHA512 a3d54041b72299fa25da8c4ec957f77aff6f8b4f1c0be1d775172fdbf6162bcd51c36275e16b71951f1e6f267bd12bc799a99b87f97a723b74aad7522da7b81a
MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild
index 0704851b93fc..1dd1be0ec72a 100644
--- a/media-libs/libbluray/libbluray-1.0.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
else
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
fi
diff --git a/media-libs/libgltf/Manifest b/media-libs/libgltf/Manifest
deleted file mode 100644
index 6cace8cd0995..000000000000
--- a/media-libs/libgltf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libgltf-0.1.0.tar.gz 736163 BLAKE2B d134df92ef246043290fa6a28c2d8a78e9c1d0d90208737d3ef5115d5b37ad942663316a1b54d7385cfa480d7cfd03c522136ad0d63fc733a34723aa20a58b38 SHA512 c4ef222d638a3f691bcce493776ef451830168ef0569c417f0acdd305e5f261500767943f92a3e65d6b00aecf6c02bdae56f52e0943b8d36490ef66474d9252a
-EBUILD libgltf-0.1.0.ebuild 1043 BLAKE2B f0ba4f415a7b1df249fa9b6b6e1b7be9f624282468858c9b361b426ee122666aad743722ca60fd849a2eff835ebf2f9e9d3872a85c6cab3c0f67c4a4e8c7a487 SHA512 7cbd4cb546e24e2b34dd579cd0f286ced4dde7c923ce0669cc6ff288ca1ec9e823f0a3f46e0e79f99b9f1235fa332200ef723a0751211e2abcc747b7b4af2c63
-EBUILD libgltf-9999.ebuild 1045 BLAKE2B 29e412d589785ca95c5a72fc02fdab8cb4e1f47511254fdaa5c8d91386f604a85f4a9ef44c74b95d718c226198a1ef591c356bab88c08ff8b4ea87a886b5925a SHA512 0b6ad4de2a8a8bf219c6cbd27c575d7064a161cb5a591974ca52f357f182f288c580b9fa73bd3a4a8fd496e4930ef9affc16df0d405a5fd04b2e00e564116db1
-MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libgltf/libgltf-0.1.0.ebuild b/media-libs/libgltf/libgltf-0.1.0.ebuild
deleted file mode 100644
index 41afce1e5ba6..000000000000
--- a/media-libs/libgltf/libgltf-0.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
-HOMEPAGE="http://www.libreoffice.org https://gerrit.libreoffice.org/gitweb?p=libgltf.git"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
-IUSE="debug test"
-
-RDEPEND="
- >=media-libs/libepoxy-1.3.1
- virtual/opengl
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
-"
-
-# testsuite not in tarball
-# only in git; unsure
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable debug) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libgltf/libgltf-9999.ebuild b/media-libs/libgltf/libgltf-9999.ebuild
deleted file mode 100644
index 320dc63b2873..000000000000
--- a/media-libs/libgltf/libgltf-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
-HOMEPAGE="http://www.libreoffice.org https://gerrit.libreoffice.org/gitweb?p=libgltf.git"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
- >=media-libs/libepoxy-1.3.1
- virtual/opengl
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
-"
-
-# testsuite not in tarball
-# only in git; unsure
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable debug) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libgltf/metadata.xml b/media-libs/libgltf/metadata.xml
deleted file mode 100644
index 13ce236ee519..000000000000
--- a/media-libs/libgltf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>office@gentoo.org</email>
- <name>Gentoo Office project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 386e522cbcac..da6ee2f6e410 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,5 @@
-DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fbaff5afd9a66c1a1fd85d78dae1b9ed9c057030849fd8fc0acec5f2ad012c0f098323d3596f6c38d5b01a9603a SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77
DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1
DIST libmtp-1.1.15.tar.gz 805983 BLAKE2B f464c58a9844706ecc066a4a744b525ac6e8020ab80e35b01eab2813562ea1452deb5e6fb4477eb243b6631c24f8bc11887ec35279cb6cd89e1a459aca6b36cb SHA512 c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a
-EBUILD libmtp-1.1.13.ebuild 1596 BLAKE2B 34ae4dc534b04f1a010155aa2c20c956e1ff692a57b3b291bd701a1c20f291c79eb4f7dd9263749374c3b3b13796379f0eba1fb2acd65c77882214258a0e71ac SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b
EBUILD libmtp-1.1.14.ebuild 1597 BLAKE2B fb0ff0ba1478dd9c6d8b1e6be56f88d288a0cce2294ff271a1c392881c009dbf41ee457ff8a97282e76faede81a35296fd04507d64c9bd5cdb425e593e50df93 SHA512 ed6d56fa731f121082cc27e7790530ef4c4a02885685a8f0fdaea693c963d0b9a18c6b74bba8772c4965d2d910590131cf4da96fdc1f35568c7135f4da11ccea
EBUILD libmtp-1.1.15.ebuild 1603 BLAKE2B 52649939b562e4af906e7ee5613afa6cb35d3c7834a6593a426553f19a921f87a7a2a0bd763843a7c115e236de9c7919855af60702d88d128c8fbf0648e7d652 SHA512 8de4ae97012b8c8cbe4d7b5408834a048c73d91b8e9371d936c48a93193a8b528d5b3e148d14d31cdbbb669bb995f796c8bdb22cf9e708e60e1c59a74e2885f1
EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
diff --git a/media-libs/libmtp/libmtp-1.1.13.ebuild b/media-libs/libmtp/libmtp-1.1.13.ebuild
deleted file mode 100644
index 515e227cee7d..000000000000
--- a/media-libs/libmtp/libmtp-1.1.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils udev user
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
- inherit autotools git-r3
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="virtual/libusb:1
- crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS README TODO"
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- default
-
- # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
- rm -f ChangeLog
-
- if [[ ${PV} == 9999* ]]; then
- local crpthf=config.rpath
- local crpthd=/usr/share/gettext/${crpthf}
- if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
- cp "${crpthd}" .
- else
- touch ${crpthf} # This is from upstream autogen.sh
- fi
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable doc doxygen) \
- $(use_enable crypt mtpz) \
- --with-udev="$(get_udevdir)" \
- --with-udev-group=plugdev \
- --with-udev-mode=0660
-}
-
-src_install() {
- default
- prune_libtool_files --all
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h,sh}
- fi
-}
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 084f0f72a03e..0d4b76c9c414 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,3 @@
DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34
-EBUILD libqaccessibilityclient-0.2.0.ebuild 676 BLAKE2B 8d9b808bb4f5a3d67f5109b504a17646ee3dacbb76bd37a03a2594b60bd7dda1f7c054c774bfd76079e694e3ff3f10f487408fc975c3643ce6169910754b2ad2 SHA512 a5f306c068318b08b2da0faa5efcf3bfd46d40a3226a17c8cf54baa649d26ca59f3bd51b2a745593c8e355f3ab953afb0410276b6c6880c86eca51acebf1656a
+EBUILD libqaccessibilityclient-0.2.0.ebuild 703 BLAKE2B 6881be7f9673d83581794acdcdeb0b738260f37de0c277d98ddf721d539db16e9048533ca732494860baf84111f379177990857357d6bcc9b56644d4fea3b482 SHA512 6b3435f1ab30c35dfe06a3ee5e0b09931d591f1003a1c0144eaa179fafc1c9942d4f475eafc05fd1b89fa09a46c0e5b18fa2cb3eca58a998c2b7b77f36ee13e3
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
index f01a0f3a3c8c..de1d15f27a17 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+ECM_KDEINSTALLDIRS="false"
KDE_EXAMPLES="true"
inherit kde5
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index d4b09c018ffa..9b64752196d0 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,6 +4,6 @@ AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab
DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452
-EBUILD libsdl2-2.0.8-r1.ebuild 4745 BLAKE2B d9225e03e3099971db730d3b03554ab6be323cd5db8b73e5eed0b9eb476b9e6f355122c0eed8b7a5f1ecc48ece714f9d71f6baf2b22c476456e6beabe71b75a6 SHA512 fe18bb622ff74b93637010304dce886cba44ca43985c505de6c02f443fe6dd7d09c1c2db1a4ee266f9f8a64ed89827ffb25040d408534bf1feebdb330997c4a7
+EBUILD libsdl2-2.0.8-r1.ebuild 4744 BLAKE2B a9a1e0f5a717f8444550a7f64f7b3248f5cd311cfec836b59467bcb56c1d698827189e3294b151e621f20615df14d85a4be88b1273dd91b6bb30e23facdf84af SHA512 f6c79bf3600de8fcfd66dad89b3ecb15ab47c72ecee147c5c2ba60704d1acbb0996d98d5a2a802ddf446a45f7ee65f44c8c5510594ac864a23c89eaa0b8e7013
EBUILD libsdl2-2.0.8-r2.ebuild 5173 BLAKE2B 03b84a9b6888a3fe83e3f689dc8f554eb612f64f1f258c15dfc7f8349ad08d38a4c4cf20a5a3a8aa3592225dfd6690db4724af32cf4d27943a97b336bf05a07d SHA512 7d7c1f59f492c7a856e947284a239d3b3a2d22a0259d80422af01fb77a0a48ddf49221faf965c46c1af9588da9bd4e08d7f24f507c816b228d729bf673bc73ee
MISC metadata.xml 1665 BLAKE2B 7f469ffb0096991ffcd95d5cac92ded15aa0b6d0d60f0d38bcaf966336a8c782b51a4fd61e2984b97bf65896438517868836b251619647f330004c4795acd008 SHA512 dc0fae98711a1a79ccd76371e6747c8cf722dfb84d75d1d414bb90980886d649c53f9bdbee96e627854ace0fc6b30160688dc906aa74cc943e71172737ae659c
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index b263c1db9c1d..670e63c5e1f3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
REQUIRED_USE="
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d010b8d65d0f..b4f908401e6d 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,5 @@
AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
EBUILD lilv-0.24.2-r2.ebuild 1492 BLAKE2B 5a7cbdc6d7dfea55ba9f4ce9ecd82cb2c29735670ade2018c09ab59d07a2ca16fbc344a4bd47b06ae461487acf25734c9c07af17587198ad33e5330edc96ffea SHA512 8d148dbc7d2bb524a6f53a5d49350a6a5d0767b28924cbe3e1a725b15659483e571fc8f1e9ed423d8455c85cf10617d272e347e158e6c929b6b2598b6f05bdd0
+EBUILD lilv-0.24.2-r3.ebuild 1588 BLAKE2B d518f977015f285bbf2631a79f5767f94c064d03e5b1e75494327951a3b523719554b5164ca9514807aafe03384a855448a8721d3c8aa495e64e798836e33c4e SHA512 f115672494c74bb7493a35f7caf7e197fee2b413e549e501828419838a55a6280eb08a4252c808f2d4de2e11da93f24535d68271d2e51ae550808d984c101bea
MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
new file mode 100644
index 000000000000..9b5c50d8fcf3
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+ >=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+ eapply "${FILESDIR}/includedir.patch"
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ waf-utils_src_configure \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --no-bash-completion \
+ $(multilib_native_usex doc --docs "") \
+ $(usex test --test "") \
+ $(usex static-libs --static "") \
+ $(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+ ./waf test || die
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+}
+
+multilib_src_install_all() {
+ newbashcomp utils/lilv.bash_completion ${PN}
+ dodir /etc/env.d
+ echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8c2ed5f31e0e..08ef3a6bc746 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,11 +4,13 @@ DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f657577
DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
DIST mesa-18.1.2.tar.xz 11124408 BLAKE2B 8327f16f41d59e6ec8d4145a8399503cf04799d437e336714760e4bdc563c483583363e32d41affc2365e977b96494156300910b1834bc9957504b6c0cf168fa SHA512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5
DIST mesa-18.1.3.tar.xz 11126236 BLAKE2B 2315cdc95130ef604a86e3886abf9b15e6c7944fab3b3cc020358dd08a76f2b876904516e5c081d549b16240ae4dedd647402dd7bd8de4c91015bb601c0c2923 SHA512 f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887
+DIST mesa-18.1.4.tar.xz 11133392 BLAKE2B b0c205e5baa04bb018333ffd89942f86f19edd3f610cce004db23bad4ebc1a3379ea35e72c85ccc08c34c8bc0991c1f0b595227fae2259e4b76895542d3f25b9 SHA512 04b8e5bbfa640f2303c388ab701fc2aca7f6d5d127ca5a9f9409975556813ba8e94305d27c9cea236a0e6d44a38b97e2877509268a96d9ed2a6762ab385aa3dc
EBUILD mesa-17.3.9.ebuild 14465 BLAKE2B 9fbe7ed8fd4f46d918288fe6f8b944d56cdd470c804d2786a19ef713b65c6b609e7286425c2cdc47aa52fd509af02eb077bea83ba04fa9dc232b2e6e19e59b1f SHA512 2f09d42d19cb4ef714d6b5fc1b6526f630393428522d98d24106d351a135e93eab172a2072e11cd9968e9c9e18da82b3f96cd7f6b0dc81ab316db80d6c542e3a
EBUILD mesa-18.0.5.ebuild 14421 BLAKE2B d1170f83f571b84a1c3906b02aff38190c9586e3a22928b3f85b16c98448c928574faa18975bc01210c524d10221af679a894c975f83e0cdbca0146b553950a1 SHA512 a9d5c7284211a34f8022388838fedf2df792bac3188cc4e12ed4a5f362a978651b39c571402d798e559bc625708a2dd3a0363c19ccc43dfed9de81eda40e22b7
EBUILD mesa-18.1.1-r1.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
EBUILD mesa-18.1.1.ebuild 13086 BLAKE2B 1b16c276e43656dae8281ab4cf73540856b6745ddca81b11ee7ce2cd70ce376c24f370217b22b4756ef4271946806b36032a0a9ef225a37a17c848e70a652568 SHA512 6360affa7be25af6f9f97b4de04a42706bf1fae95dc4453a6480c62135792dd9ef6b3a1c1385fbf9c6dfa7e84243d3f9d09e3be0770b9d1005665ce5a5c9a602
EBUILD mesa-18.1.2.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
EBUILD mesa-18.1.3.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
+EBUILD mesa-18.1.4.ebuild 13432 BLAKE2B 0ecb168929a67a1829e9b1e8ace99091813afb6e7facddae82e22b89c0011abfa0fba0d577649dff24b6ec6569651077ae77069f7ec6ad59d1bfe023ffa3f53c SHA512 19c6d34947e4962014b3df6738d2564bd6c0172be81d6101b051bdef96e8b1f2d901b8566aa4ed9212f42c190251477e70ad16188655c17ce32848703190d02f
EBUILD mesa-9999.ebuild 11964 BLAKE2B 48537a7aae256d79f3a29075bb2e258dfd2876dd0c5f661b01cb3d23519be1505b15c3fe81a08686a0a1d7e9a84090203db58323794df06ba89fd56262d4455d SHA512 09462036738bb8bdce4550754eeb25f902a96a69c5f9743ea6e26f2a2e5253c8db2ea5f11f041e64c7b17454ce20381d006c7565c11445ab188b69048c4b15a2
MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.1.4.ebuild b/media-libs/mesa/mesa-18.1.4.ebuild
new file mode 100644
index 000000000000..fab799310391
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.4.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+ +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+ vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+ d3d9? ( dri3 gallium )
+ llvm? ( gallium )
+ opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
+ openmax? ( gallium )
+ gles1? ( egl )
+ gles2? ( egl )
+ vaapi? ( gallium )
+ vdpau? ( gallium )
+ vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ wayland? ( egl gbm )
+ xa? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_imx? ( gallium video_cards_vivante )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=app-eselect/eselect-opengl-1.3.0
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ opencl? (
+ app-eselect/eselect-opencl
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ openmax? (
+ >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+ x11-misc/xdg-utils
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="6"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:7[${MULTILIB_USEDEP}]
+ sys-devel/llvm:6[${MULTILIB_USEDEP}]
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/gettext
+ virtual/pkgconfig
+ valgrind? ( dev-util/valgrind )
+ x11-base/xorg-proto
+ vulkan? (
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+ )
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+ sys-devel/bison
+ sys-devel/flex
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ !pic? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ )
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply_user
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf
+
+ if use classic; then
+ # Configurable DRI drivers
+ driver_enable swrast
+
+ # Intel code
+ driver_enable video_cards_i915 i915
+ driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ driver_enable video_cards_r100 radeon
+ driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ driver_enable video_cards_radeon radeon r200
+ fi
+ fi
+
+ if use egl; then
+ myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+ fi
+
+ if use gallium; then
+ myconf+="
+ $(use_enable d3d9 nine)
+ $(use_enable llvm)
+ $(use_enable openmax omx-bellagio)
+ $(use_enable vaapi va)
+ $(use_enable vdpau)
+ $(use_enable xa)
+ $(use_enable xvmc)
+ "
+ use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+ gallium_enable swrast
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable video_cards_i915 i915
+ gallium_enable video_cards_imx imx
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ # opencl stuff
+ if use opencl; then
+ myconf+="
+ $(use_enable opencl)
+ --with-clang-libdir="${EPREFIX}/usr/lib"
+ "
+ fi
+
+ gallium_enable video_cards_virgl virgl
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_radeonsi radeon
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ myconf+=" --disable-asm"
+ fi
+
+ if use gallium; then
+ myconf+=" $(use_enable osmesa gallium-osmesa)"
+ else
+ myconf+=" $(use_enable osmesa)"
+ fi
+
+ # build fails with BSD indent, bug #428112
+ use userland_GNU || export INDENT=cat
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-dri \
+ --enable-glx \
+ --enable-shared-glapi \
+ $(use_enable !bindist texture-float) \
+ $(use_enable d3d9 nine) \
+ $(use_enable debug) \
+ $(use_enable dri3) \
+ $(use_enable egl) \
+ $(use_enable gbm) \
+ $(use_enable gles1) \
+ $(use_enable gles2) \
+ $(use_enable nptl glx-tls) \
+ $(use_enable unwind libunwind) \
+ --enable-valgrind=$(usex valgrind auto no) \
+ --enable-llvm-shared-libs \
+ --disable-opencl-icd \
+ --with-dri-drivers=${DRI_DRIVERS} \
+ --with-gallium-drivers=${GALLIUM_DRIVERS} \
+ --with-vulkan-drivers=${VULKAN_DRIVERS} \
+ PYTHON2="${PYTHON}" \
+ ${myconf}
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+
+ if use wayland; then
+ # These files are now provided by >=dev-libs/wayland-1.15.0
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
+ rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
+ rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
+ fi
+
+ if use opencl; then
+ ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+ local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+ dodir ${cl_dir}/{lib,include}
+ if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+ mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+ "${ED}"${cl_dir}
+ fi
+ if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+ mv -f "${ED}"/usr/include/CL \
+ "${ED}"${cl_dir}/include
+ fi
+ eend $?
+ fi
+
+ if use openmax; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+ doenvd "${T}"/99mesaxdgomx
+ keepdir /usr/share/mesa/xdg
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete
+ einstalldocs
+
+ if use !bindist; then
+ dodoc docs/patents.txt
+ fi
+}
+
+multilib_src_test() {
+ if use llvm; then
+ local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+ pushd src/gallium/drivers/llvmpipe >/dev/null || die
+ emake ${llvm_tests}
+ pax-mark m ${llvm_tests}
+ popd >/dev/null || die
+ fi
+ emake check
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+
+ # Switch to mesa opencl
+ if use opencl; then
+ eselect opencl set --use-old ${PN}
+ fi
+
+ # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+ if use openmax; then
+ ebegin "Registering OpenMAX drivers"
+ BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+ OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+ omxregister-bellagio
+ eend $?
+ fi
+
+ # warn about patent encumbered texture-float
+ if use !bindist; then
+ elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+ elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+ elog "explanation."
+ fi
+}
+
+pkg_prerm() {
+ if use openmax; then
+ rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+ fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ DRI_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ DRI_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+gallium_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ GALLIUM_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ GALLIUM_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
+
+vulkan_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ VULKAN_DRIVERS+=",$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ VULKAN_DRIVERS+=",${i}"
+ done
+ fi
+ ;;
+ esac
+}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index ba6f094daf07..401accc6c3d1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,3 @@
-AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc
EBUILD phonon-9999.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
diff --git a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
deleted file mode 100644
index 5f478cac18c1..000000000000
--- a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index 3245e9b..3427c62 100644
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -178,7 +178,7 @@ if (PHONON_BUILD_PHONON4QT5)
- endif (PHONON_BUILD_PHONON4QT5)
- set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
- set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
--set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-+set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt4)")
- if (PHONON_BUILD_PHONON4QT5)
- set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
- endif(PHONON_BUILD_PHONON4QT5)
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index be3dce253787..3080d51106aa 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,3 +1,4 @@
DIST rubberband-1.8.1.tar.bz2 177501 BLAKE2B 57ca56abc7db2f2a25ff7c900daf24f32a892a1ef27099d34ab8ad290344ea8c5884cbace9206bfdf75262ee0c30bec8d736ae5398d5aaf92f73d0d5980e6932 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620
EBUILD rubberband-1.8.1-r1.ebuild 1318 BLAKE2B ef83174727b0932afa5aadd90c0beaf29d099d01dc259cb57803e0c717e1b367ca962034964587fa5743474b057a0a93d32c343c54cdd42d0d637b6071eaad76 SHA512 da3e700e934bec7f7b05382c277c7d6226446052729363503631562b2eedc6a9e88e62595817344f25c153462806c20e77f8d7c2daa13386521192b3d56ba416
+EBUILD rubberband-1.8.1-r2.ebuild 1342 BLAKE2B f8d1f872e092a3d8f7a76ed7626dcab553f4e11e36d474c222ef58dbaeb2661fa6aafb9c491b30cea2bf01f7ef39c79eb755f92800cca555e18e9ed4d52bac50 SHA512 f80a3f0d07ecabb31e299ac044ed064e6df3df631faadc6ec9df85e9f27c86efd46ab5e6c391dc7be9ff6ef1e8d17d07386949c922d50fd36038338b408d690d
MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.1-r2.ebuild b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..754ed4704a40
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}]
+ media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ media-libs/libsndfile
+ media-libs/ladspa-sdk
+ sci-libs/fftw:3.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ if ! use static-libs ; then
+ sed -e '/^all:/s/$(STATIC_TARGET)//' \
+ -e '/^\tcp $(STATIC_TARGET)/d' \
+ -i Makefile.in || die
+ fi
+ multilib_copy_sources
+}
+
+multilib_src_install() {
+ emake INSTALL_BINDIR="${ED}/usr/bin" \
+ INSTALL_INCDIR="${ED}/usr/include/rubberband" \
+ INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
+ INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
+ INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
+ INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
+ INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ install
+}
+
+multilib_src_install_all() {
+ dodoc CHANGELOG README.txt
+}
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 9078e3100dc2..c3bcbbb03aaa 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1,6 +1,7 @@
-AUX sge-030809-build.patch 4020 BLAKE2B f503cd2e76f1cd6845a25816754c254c2873671452495eaa5709926677e12a3634cba33d23bdb38bebfda67169952df0f605484a6900fa70fe8205500d7731d2 SHA512 e6824fcd18226f416289ad96b2774f5f3339fe9feda1a77d797f5d0e229c4bb65b06ed3e92b00db4e12c8343b5c1bb1d7a208b3acfae7ca8001fac7666d9d029
+AUX sge-030809-build.patch 3874 BLAKE2B a01040b011494cdada26c22c163b7f478a59f762bb736370e0ca695ac02248e97ec640b30fb67592a51fd1229d5c8360525a74e9cb3fd8eeac2fcdc466b4cb58 SHA512 d685efed24604339013099deca3846bf1b5547a7518eeecdc36d36cee41a914f9f8d10d0880fbfe7f936ff3538396eff22bded91be553315bf57c6c126cca6a8
AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91775af03e6d37e324b879176c838487b9537fa1aed9582258285ee80921a834a7b911df80b9ee06049cf435 SHA512 adf9018c09c8e2581d1693cee28224b65c605f95a8df333ab9f50fe14668b501d1e3ce39b91b43216f67f1d107c167b77be8aa28a9025b95ec8ea025e9d6a43e
-AUX sge-030809-freetype.patch 621 BLAKE2B 478e6105ccab4e2200d925cf015968181bd7b35bb6a2cb028f3739b90a77be5ea8a1b07a57163decd16102023b55345ad36517ef27c956bb62226f8a764c7816 SHA512 6a0d22209d047f607b4409519798947a06e0baa15ca628134fe1b503c90fa691274a5fa8a23f30a696f97cc74adb3ea0a2f75daa38e97454c579f223119c7e04
+AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
+AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581
DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1209 BLAKE2B cb5e1e660e0c79b48af5415efb1a67fc80375837295a2b6a7ecd6e4d9f888ec5bd1c31a0338ab419fb57de22de26c95b0f9dd4d7bc9bd2452a6d008548f12485 SHA512 5625b1f3ffb06898224a8269822f91a48986f95fc39bc291deb8c99fadeea22fcb0ad04f91ca7bbc60122c376535d295dc4b164da0fe326a49cae2f7c1793b27
+EBUILD sge-030809.ebuild 1325 BLAKE2B a05e59e3d3bbbacaebdd20cf084b17980a78fb26f9a3be18b7c4e2701764040288fde9a0f8e237ec39dbcffa473df3affa6844a89f1ffd1ac236fc665cce2177 SHA512 e956073120c740ffb6f8fc6a0ba82ac7e0f67b883de56d68360c3dee903f9473b91a37108b9f5e7690ef112cccb6fa950ea518fc8d16bc30769717441988c493
MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6
diff --git a/media-libs/sge/files/sge-030809-build.patch b/media-libs/sge/files/sge-030809-build.patch
index 5b277a0a6b08..4ded0888a7f3 100644
--- a/media-libs/sge/files/sge-030809-build.patch
+++ b/media-libs/sge/files/sge-030809-build.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2006-03-29 00:08:39.000000000 -0500
-+++ Makefile 2006-03-29 00:09:36.000000000 -0500
+--- a/Makefile
++++ b/Makefile
@@ -2,7 +2,7 @@
include Makefile.conf
@@ -95,8 +95,8 @@
ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
ln -sf libSGE.so.$(API_VER) libSGE.so
@echo "** Headerfiles installed in $(PREFIX_H)"
---- Makefile.conf.orig 2006-03-29 00:08:39.000000000 -0500
-+++ Makefile.conf 2006-03-29 00:08:39.000000000 -0500
+--- a/Makefile.conf
++++ b/Makefile.conf
@@ -11,6 +11,7 @@
# Compilers (C and C++)
CC=gcc
diff --git a/media-libs/sge/files/sge-030809-freetype.patch b/media-libs/sge/files/sge-030809-freetype.patch
index 7b638e4100f9..f07ce98256a5 100644
--- a/media-libs/sge/files/sge-030809-freetype.patch
+++ b/media-libs/sge/files/sge-030809-freetype.patch
@@ -1,5 +1,5 @@
---- sge_tt_text.cpp
-+++ sge_tt_text.cpp
+--- a/sge_tt_text.cpp
++++ b/sge_tt_text.cpp
@@ -36,10 +36,9 @@
#include "sge_textpp.h"
diff --git a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..ceb478f3d828
--- /dev/null
+++ b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/655798
+
+--- sge030809/Makefile.conf
++++ sge030809/Makefile.conf
+@@ -35,16 +35,16 @@
+ SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+
+
+-# Is freetype-config available?
+-HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
++# Is freetype available?
++HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;)
+ ifeq ($(HAVE_FT),n)
+ USE_FT = n
+ endif
+
+ ifneq ($(USE_FT),n)
+ USE_FT = y
+- SGE_LIBS +=$(shell freetype-config --libs)
+- FT_CFLAGS =$(shell freetype-config --cflags)
++ SGE_LIBS +=$(shell pkg-config --libs freetype2)
++ FT_CFLAGS =$(shell pkg-config --cflags freetype2)
+ endif
+
+
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 6bff1d0d2baf..159379bb02fd 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=6
+inherit multilib toolchain-funcs
MY_P="sge${PV}"
DESCRIPTION="Graphics extensions library for SDL"
@@ -14,17 +14,24 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
IUSE="doc examples image truetype"
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
image? ( media-libs/sdl-image )
truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-freetype.patch
+ "${FILESDIR}"/${P}-cmap.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-freetype.patch \
- "${FILESDIR}"/${P}-cmap.patch
+ default
sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile || die
sed -i \
-e '/^CC=/d' \
@@ -43,10 +50,13 @@ src_compile() {
}
src_install() {
- DOCS="README Todo WhatsNew" \
- default
+ local DOCS=( README Todo WhatsNew )
+ default
- use doc && dohtml docs/*
+ if use doc ; then
+ docinto html
+ dodoc docs/*
+ fi
if use examples ; then
insinto /usr/share/doc/${PF}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 251c8374c7b5..806183ec0ffc 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
+AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae
AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
-AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2
DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
-EBUILD vulkan-layers-1.1.77.0.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
-EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
+EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f
+EBUILD vulkan-layers-9999.ebuild 1589 BLAKE2B 18735830fd91904282c3e7f38d1dcd095f96541fb41b4f504dc4fdc9f6d4d5daf0ec1c7cd207c07d96421dcd9e4d51656c3d847ad1845c1d0b1976a1222edee3 SHA512 b461f270d7cb92a6c9da25e737388899b122fd7b7d603b2da3a44e3e0e609d0e955903b0f3c279b92c7d04a7479c846ed11c3946bbb637ec6dd5aa3f41085b65
MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
new file mode 100644
index 000000000000..d0b48a749c26
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
@@ -0,0 +1,68 @@
+From 4c0da77c705464a259b38944fb53cf747e4c0554 Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+Date: Tue, 3 Jul 2018 10:17:21 -0600
+Subject: [PATCH] layers: Rework include dependencies
+
+This change removes the assumption that vk_layer.h will include
+vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
+in the near future.
+
+Backported-by: Nick Sarnie <Sarnex@gentoo.org>
+
+Change-Id: I082ccc52c3cb8257bf57342404d52dd737009b4b
+---
+ layers/parameter_validation_utils.cpp | 1 +
+ layers/vk_layer_logging.h | 1 +
+ layers/vk_layer_table.h | 1 +
+ scripts/dispatch_table_helper_generator.py | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
+index 17f95bb8..c65a4970 100644
+--- a/layers/parameter_validation_utils.cpp
++++ b/layers/parameter_validation_utils.cpp
+@@ -46,6 +46,7 @@
+ #include "vk_layer_logging.h"
+ #include "vk_layer_extension_utils.h"
+ #include "vk_layer_utils.h"
++#include "vk_layer_dispatch_table.h"
+
+ #include "parameter_name.h"
+ #include "parameter_validation.h"
+diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
+index f111cc5d..f67a3f55 100644
+--- a/layers/vk_layer_logging.h
++++ b/layers/vk_layer_logging.h
+@@ -31,6 +31,7 @@
+ #include "vulkan/vk_layer.h"
+ #include "vk_object_types.h"
+ #include "vk_validation_error_messages.h"
++#include "vk_layer_dispatch_table.h"
+ #include <signal.h>
+ #include <cinttypes>
+ #include <stdarg.h>
+diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
+index 45b8f6e1..23990a12 100644
+--- a/layers/vk_layer_table.h
++++ b/layers/vk_layer_table.h
+@@ -19,6 +19,7 @@
+
+ #pragma once
+
++#include "vk_layer_dispatch_table.h"
+ #include "vulkan/vk_layer.h"
+ #include "vulkan/vulkan.h"
+ #include <unordered_map>
+diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
+index fba25e55..1e2412c0 100644
+--- a/scripts/dispatch_table_helper_generator.py
++++ b/scripts/dispatch_table_helper_generator.py
+@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator):
+ preamble += '#include <vulkan/vulkan.h>\n'
+ preamble += '#include <vulkan/vk_layer.h>\n'
+ preamble += '#include <string.h>\n'
++ preamble += '#include "vk_layer_dispatch_table.h"\n'
+
+ write(copyright, file=self.outFile)
+ write(preamble, file=self.outFile)
+--
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 0d5cb22f74d2..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 157e9e714c64f3148f09053454d15a25af550a28 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sat, 2 Jun 2018 07:01:28 -0400
-Subject: [PATCH] Use usr for vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt | 2 +-
- layers/CMakeLists.txt | 5 +++--
- scripts/lvl_genvk.py | 2 +-
- scripts/object_tracker_generator.py | 1 +
- scripts/parameter_validation_generator.py | 1 +
- scripts/spec.py | 2 +-
- 6 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa2e87ed..85c3cc21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- find_package(PythonInterp 3 REQUIRED)
-
- # TODO: Add option to override this with env var, or even to use SDK
--set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-+set(VULKAN_HEADERS_LOCATION "/usr")
-
- # Output warning if vulkan headers submodule contents are not present
- if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h")
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index d67e8d79..35485e35 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
- # Define macro used for building vkxml generated files
- macro(run_vk_xml_generate dependency output)
- add_custom_command(OUTPUT ${output}
-- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output}
-- DEPENDS ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${VULKAN_HEADERS_LOCATION}/registry/reg.py
-+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${output}
-+ DEPENDS ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py
-+${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/reg.py
- )
- endmacro()
-
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 4dac9ca2..170bc0f5 100644
---- a/scripts/lvl_genvk.py
-+++ b/scripts/lvl_genvk.py
-@@ -16,7 +16,7 @@
-
- import argparse, cProfile, pdb, string, sys, time, os
- scripts_directory_path = os.path.dirname(os.path.abspath(__file__))
--registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry')
-+registry_headers_path = os.path.join(scripts_directory_path, '/usr/share/vulkan/registry')
- sys.path.insert(0, registry_headers_path)
-
- from reg import *
-diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
-index 8d4b68af..ac3020c1 100644
---- a/scripts/object_tracker_generator.py
-+++ b/scripts/object_tracker_generator.py
-@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator):
- previous_dir = os.getcwd()
- os.chdir(os.path.dirname(sys.argv[0]))
- vuid_filename_locations = [
-+ '/usr/share/vulkan/registry/validusage.json',
- './Vulkan-Headers/registry/validusage.json',
- '../Vulkan-Headers/registry/validusage.json',
- '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
-index 66ede40d..9eae6fed 100644
---- a/scripts/parameter_validation_generator.py
-+++ b/scripts/parameter_validation_generator.py
-@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator):
- previous_dir = os.getcwd()
- os.chdir(os.path.dirname(sys.argv[0]))
- vuid_filename_locations = [
-+ '/usr/share/vulkan/registry/validusage.json',
- './Vulkan-Headers/registry/validusage.json',
- '../Vulkan-Headers/registry/validusage.json',
- '../../Vulkan-Headers/registry/validusage.json',
-diff --git a/scripts/spec.py b/scripts/spec.py
-index 4eeb46aa..212b0c57 100644
---- a/scripts/spec.py
-+++ b/scripts/spec.py
-@@ -28,7 +28,7 @@ import re
-
- out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option
- db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option
--json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option
-+json_filename = "/usr/share/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option
- gen_db = False # set to True when '-gendb <filename>' option provided
- json_compare = False # compare existing DB to json file input
- # This is the root spec link that is used in error messages to point users to spec sections
---
-2.17.1
-
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
index 436c46fc5259..cbe189ea63ce 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
DEPEND="${PYTHON_DEPS}
dev-util/glslang:=[${MULTILIB_USEDEP}]
>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
- dev-util/vulkan-headers
+ >=dev-util/vulkan-headers-1.1.77.0-r1
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -38,6 +38,7 @@ DEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+ "${FILESDIR}/${PN}-1.1.77.0-layers-Rework-include-dependencies.patch"
)
multilib_src_configure() {
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 436c46fc5259..b2e238baddb1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
DEPEND="${PYTHON_DEPS}
dev-util/glslang:=[${MULTILIB_USEDEP}]
>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
- dev-util/vulkan-headers
+ >=dev-util/vulkan-headers-1.1.77.0-r1
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 9ca81c798a52..519e56f451d6 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,9 +1,10 @@
AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
+AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0
-EBUILD vulkan-loader-1.1.77.0.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
-EBUILD vulkan-loader-9999.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
+EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78
+EBUILD vulkan-loader-9999.ebuild 1582 BLAKE2B 66c19b3c7d53aeb752606921a61504a4298d6d714c36b27d809aadda683552fd19ab7640578b0a62466dc50651e4f0fea205587d81bfb99e2d0e5e5f3ad13624 SHA512 ac1ee088a9887eb45b8d26106b0e55cf84d14260dc251ba84e1f05be22320745207b2ae1cf32107e99a9d9d2ea86a324a4b636af5e9a28b0190429c56705bf30
MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
new file mode 100644
index 000000000000..21fe853ce4e1
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
@@ -0,0 +1,54 @@
+From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+Date: Mon, 25 Jun 2018 14:09:51 -0600
+Subject: [PATCH] loader: Rework include dependencies
+
+This change removes the assumption that vk_layer.h will include
+vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
+in the near future.
+
+Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c
+---
+ CMakeLists.txt | 2 --
+ loader/loader.h | 1 +
+ scripts/dispatch_table_helper_generator.py | 1 +
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b942bd47c..64f498945 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -201,8 +201,6 @@ if(NOT WIN32)
+ endif()
+ endif()
+
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
+-
+ # uninstall target
+ if(NOT TARGET uninstall)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+diff --git a/loader/loader.h b/loader/loader.h
+index 0af2abf27..c39c5385e 100644
+--- a/loader/loader.h
++++ b/loader/loader.h
+@@ -34,6 +34,7 @@
+ #include <vulkan/vk_layer.h>
+ #include <vulkan/vk_icd.h>
+ #include <assert.h>
++#include "vk_layer_dispatch_table.h"
+ #include "vk_loader_extensions.h"
+
+ #if defined(__GNUC__) && __GNUC__ >= 4
+diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
+index fba25e55e..1e2412c0c 100644
+--- a/scripts/dispatch_table_helper_generator.py
++++ b/scripts/dispatch_table_helper_generator.py
+@@ -113,6 +113,7 @@ def beginFile(self, genOpts):
+ preamble += '#include <vulkan/vulkan.h>\n'
+ preamble += '#include <vulkan/vk_layer.h>\n'
+ preamble += '#include <string.h>\n'
++ preamble += '#include "vk_layer_dispatch_table.h"\n'
+
+ write(copyright, file=self.outFile)
+ write(preamble, file=self.outFile)
+
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
index 4f7ccd73988b..28a5a5566365 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
@@ -26,13 +26,15 @@ IUSE="layers wayland X"
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
DEPEND="${PYTHON_DEPS}
- dev-util/vulkan-headers
+ >=dev-util/vulkan-headers-1.1.77.0-r1
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
)"
+PATCHES=( "${FILESDIR}"/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch )
+
multilib_src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=True
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 4f7ccd73988b..0331bbbe2b69 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
DEPEND="${PYTHON_DEPS}
- dev-util/vulkan-headers
+ >=dev-util/vulkan-headers-1.1.77.0-r1
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 80b59032e7be..b5961779df79 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,4 @@
-AUX ffmpeg29.patch 1861 BLAKE2B c4045b93f352ecec5668fce239a04108f273307d3221b0c2a48cac64ebc6d556b8bd5efdc7e12bbcd3b1783b28492a72c969fd257192064dc0e6a808eb74ad87 SHA512 3697cb1ab8801a1d091aead3e50837946e6d8f6c6329341ced40039ebb6ac68b6e186ff2bd2f2ec5d517e5ed45bfb61d0cd21921f255e1ad768c186faf75beca
AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
-AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d06662659d59c8f15e0b378518117ba55b7ee5a5fd55cc8fb7c896e2cbc80d297fd1b89e8437c6278d7e442453779e5f933f930 SHA512 c3415c9a0f65ec35dcb59b6880905ae525c6cfc38a42578d96ac713a4426b642069613e4234903e46e852e8f33b4eeab3ffce3864ca672efe8170ae987121783
-AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0
DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
EBUILD xine-lib-1.2.9-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60
EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34
diff --git a/media-libs/xine-lib/files/ffmpeg29.patch b/media-libs/xine-lib/files/ffmpeg29.patch
deleted file mode 100644
index a220483218c0..000000000000
--- a/media-libs/xine-lib/files/ffmpeg29.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
- int got_frame;
- float gain = this->class->gain;
- if (!this->av_frame)
-- this->av_frame = avcodec_alloc_frame ();
-+ this->av_frame = av_frame_alloc ();
-
- consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
- if ((consumed >= 0) && got_frame) {
-@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
- /* try to reset the wma decoder */
- if( this->decoder_ok ) {
- #if AVAUDIO > 3
-- avcodec_free_frame (&this->av_frame);
-+ av_frame_free (&this->av_frame);
- #endif
- pthread_mutex_lock (&ffmpeg_lock);
- avcodec_close (this->context);
-@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
-
- if( this->context && this->decoder_ok ) {
- #if AVAUDIO > 3
-- avcodec_free_frame (&this->av_frame);
-+ av_frame_free (&this->av_frame);
- #endif
- pthread_mutex_lock (&ffmpeg_lock);
- avcodec_close (this->context);
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
- this->stream = stream;
- this->class = (ff_video_class_t *) class_gen;
-
-- this->av_frame = avcodec_alloc_frame();
-+ this->av_frame = av_frame_alloc();
- this->context = avcodec_alloc_context();
- this->context->opaque = this;
- #if AVPALETTE == 1
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
deleted file mode 100644
index cc17643d9c56..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.xine-project.org/show_bug.cgi?id=572
-https://bugs.gentoo.org/584640
-
---- xine-lib-1.2.6/m4/video_out.m4
-+++ xine-lib-1.2.6/m4/video_out.m4
-@@ -305,7 +305,7 @@
- dnl xcb
- XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
- if test x"$with_xcb" != x"no"; then
-- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
-+ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
- if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then
- AC_MSG_ERROR([XCB support requested, but XCB not found])
- elif test x"$have_xcb" = x"yes"; then
---- xine-lib-1.2.6/src/video_out/Makefile.am
-+++ xine-lib-1.2.6/src/video_out/Makefile.am
-@@ -147,7 +147,7 @@
- xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
-
- xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
--xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
-+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
- xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
-
- xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
deleted file mode 100644
index a7168d5b4506..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix build w/newer glibc due to major/minor includes being dropped from sys/types.h
-
-https://bugs.gentoo.org/580012
-https://bugs.xine-project.org/show_bug.cgi?id=574
-
---- a/src/xine-utils/xine_check.c
-+++ b/src/xine-utils/xine_check.c
-@@ -55,6 +55,7 @@
- #include <dlfcn.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <sys/utsname.h>
- #include <linux/major.h>
- #include <linux/hdreg.h>
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 35aa4b42872f..c37a7d583849 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
Binary files differ
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 9f4d0c929de1..bd8f24ce97c1 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -2,6 +2,7 @@ AUX calf-0.0.60-cpp14.patch 3259 BLAKE2B 1a76d9170088bc6adf466c06d026f7e9adc11c3
DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
EBUILD calf-0.0.60-r1.ebuild 1114 BLAKE2B f1e5f69121e7bb9c8c32a7fbd425b0d54884f4ab7bf99a51e705490a008426833470404866fba6d62fb5b60d5f5fdd4492ff6c8cceb9ebc3005c1332303cc867 SHA512 5dc27ad36ca4677882cfde392e8b89a09d7cb86ea8f804f4259ef8802f174612cd011f6644e14d2e5d15269e8a276d627ff37b803d8409d64dbbfdca7f6aac58
+EBUILD calf-0.90.0-r1.ebuild 1253 BLAKE2B 5a215266efeacbb08fa6562eff8de48b310dd4cba37abab08cd9c086d8eee955b9d1c584c83314e3c509661b033d8c03118e2e4be60ef02633ea09088d5a20a5 SHA512 0889a1bf91c00eddd1f700c9b9e0b5c7862bf041a386ba55b3bcf60a6c1667b718817acaed689e3a5e53f953389f1609ae222601512f1f8b1bc31828e9c2b574
EBUILD calf-0.90.0.ebuild 1211 BLAKE2B 914852fa62e92132c497116c238b99512d343dcd954315870df35c9e6b66ec25da18f5c2a78160b2f5cccd553f7a449bbd48c73405167c3143309d01e2185f5d SHA512 600d8b739ab04d1a74d750684fc904ff33d8477925559c77475cca0e9f92ca573105db81df585b808cc79a5e9cdb4f792ee2c52a57a482f31d8f66e0f9d69a89
-EBUILD calf-9999.ebuild 1213 BLAKE2B 1f7b88003301390c66fcd5fd29760eef2a4141e519e2b4da5e2c70579176e72d31211d6ad797adc1f02db0b4c8ab1ade7aa3bdc7ae20a8e1e31c03283372f856 SHA512 e6c7089af65b89dbed425afddda78da85152d4e5ed91f7eb840049ef4223a19adfb6b08e4c5bfe09b349b59532bccc603e586175b0270275b3a56e63831fff9f
+EBUILD calf-9999.ebuild 1253 BLAKE2B 5a215266efeacbb08fa6562eff8de48b310dd4cba37abab08cd9c086d8eee955b9d1c584c83314e3c509661b033d8c03118e2e4be60ef02633ea09088d5a20a5 SHA512 0889a1bf91c00eddd1f700c9b9e0b5c7862bf041a386ba55b3bcf60a6c1667b718817acaed689e3a5e53f953389f1609ae222601512f1f8b1bc31828e9c2b574
MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
diff --git a/media-plugins/calf/calf-0.90.0-r1.ebuild b/media-plugins/calf/calf-0.90.0-r1.ebuild
new file mode 100644
index 000000000000..a065b446eb2b
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf-studio-gear.org/"
+
+if [[ "${PV}" = "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+ SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
+
+RDEPEND="dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ media-sound/fluidsynth
+ jack? ( virtual/jack )
+ gtk? (
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+ )
+ lash? ( media-sound/lash )
+ lv2? ( media-libs/lv2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # automagic...
+ #$(use_with gtk gui)
+ #$(use_with jack)
+ econf \
+ --prefix="${EPREFIX}"/usr \
+ $(use_with lash) \
+ $(use_with lv2 lv2) \
+ $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
+ $(use_enable static-libs static) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable experimental)
+}
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 2187ab626fd5..a065b446eb2b 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -45,9 +45,10 @@ src_configure() {
#$(use_with gtk gui)
#$(use_with jack)
econf \
+ --prefix="${EPREFIX}"/usr \
$(use_with lash) \
$(use_with lv2 lv2) \
- $(usex lv2 "--with-lv2-dir=/usr/$(get_libdir)/lv2" "") \
+ $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
$(use_enable static-libs static) \
$(use_enable cpu_flags_x86_sse sse) \
$(use_enable experimental)
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 20edcff0e364..2dc4b6c1eaf2 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -2,6 +2,6 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
EBUILD gst-plugins-lv2-1.12.3.ebuild 366 BLAKE2B 840552f35904c3373eec39caa40356faed9e3ff8772423dc8e39f14bb01285d256543a62b71020e6857fbded6a9226557de54340d4a55141a8ef3146bf524207 SHA512 952dbe13418e0e84f057968f1b72ced57a70883009c4572a0c6ad5d66bcd4d3af2c48d27e8d3a1ea22c96d746f1a211f16223af3817b861f269785940fd53997
-EBUILD gst-plugins-lv2-1.12.4.ebuild 367 BLAKE2B 5e5e847b5dea6bff42f097812041cb70d5f3caf4865349df7662aad0808cf1bc4eec51920a6e2f592b2724f57e4e2426e43406d7ea0b4e319aee122776ef80ad SHA512 062c4dc8149f50a9cd715f9f2a92c4b4ed7ac1057996852124a8205732334a0b5d36cf4c0f724990de66dafd39c8510293693bfe6e476817dcb905442c80f590
+EBUILD gst-plugins-lv2-1.12.4.ebuild 366 BLAKE2B 840552f35904c3373eec39caa40356faed9e3ff8772423dc8e39f14bb01285d256543a62b71020e6857fbded6a9226557de54340d4a55141a8ef3146bf524207 SHA512 952dbe13418e0e84f057968f1b72ced57a70883009c4572a0c6ad5d66bcd4d3af2c48d27e8d3a1ea22c96d746f1a211f16223af3817b861f269785940fd53997
EBUILD gst-plugins-lv2-1.14.1.ebuild 368 BLAKE2B 2eeb95cb2c226077b910d9917387d2d8045d6363353039710b9dd6551cc2e0eb1045463eac5ca7313183c8faa9f8dccb3533a6d9b88079935e6f93d56fcf1a15 SHA512 ce68ef36e8668c75bf759b237a2034b65b8b3af5b13427fb6dc51b19b1fae80d6c9f3e41a779b9c500e9726922d1a66bed7a6da7247afef7cc384e60473ab288
MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild
index db0c398b70de..301141d646fe 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index 3ecddf4ed38c..e1e33e9b2b0c 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,7 +1,3 @@
-DIST imlib2_loaders-1.4.7.tar.gz 384739 BLAKE2B 125200707c6bb9bb8f0c4ded56a3f8c0073843819e11d7ded6a363e1bef1a8c95227c4d010a3101c8a4714f9df8593cb2b58fd9e8b8f6da514a4be06ca1af10a SHA512 c7be31b9a7b50ea5a44cadf0ec7f056f5080498ec53fcd32d82a0a6da163b59397e8470c7bbe536d2cabf88c7694d18b450ad85cc6693e8862aeb7d4ee0f4835
-DIST imlib2_loaders-1.4.8.tar.gz 384862 BLAKE2B 53ac4d0dec5fccf2cb442883dbf9a0a31dab26c3ef206ef07b1bacf59ab74d9318dd6836eb0371183863e43b68db7f209efe92a1f8ecc18a1c2cfe038992f631 SHA512 5acf6568000d98571f0a4b7e63c3e5c534a7d12139654cdc64eaa3a551b7952f3752ad78e4ced595945adf03454367cc9c3dff7766bd35c2f7ee6baffdbb0a1a
DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
-EBUILD imlib2_loaders-1.4.7.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
-EBUILD imlib2_loaders-1.4.8.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
-EBUILD imlib2_loaders-1.5.1.ebuild 694 BLAKE2B 611aa5e81944b34a4b78447fe0c9395dee5673c71ca71a1d9fb5363f5937960bcea9c1cb0c34202585fcff1ae8d5f1c5efa3e610dfaf29815fac34c40f86f8f6 SHA512 1192edfec21029550f3daeaedf1ff7d505a479b2a98f57119cd2e6f5444d735dc6c89603ebe90942584ee944ff8bff3cceb29ea9b749c366a31c5e06ccc4851c
+EBUILD imlib2_loaders-1.5.1.ebuild 819 BLAKE2B 825cddbc8441e509dc0401be4a005c7bb448bd29f301ae6cdac11499ad457d7a844b5948100995ba5061c8eb59fe0ad451e0617146ba1f8d0817ccf75c3edd1b SHA512 d21e088f2f59033c12a16ee767c3a35d1e692cf491e6d088b3774c6ca05f29a9edccbe025554d5180832e77516f19e08efb5ae8105558a2f51c1efa308f44921
MISC metadata.xml 922 BLAKE2B 6f1e856106a42159a968188e7638f70f8a5b0570f452c0fec6f917f50fa86e1be0ab9b3688dd1917c4db62968cecaa1c658bb403c7a55a08223566fb403d1468 SHA512 18ff6fed6da1e8e9657eca8b04c05b509c2f968f4798a2f5a54d54d6827c4a11f22ee4efdb174c5008816b9fad8b496a3cf2e6561efd8c55e23b9031de2becbe
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
deleted file mode 100644
index 4217329e4f22..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="legacy"
- EGIT_URI_APPEND=${PN}
-else
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="image loader plugins for Imlib 2"
-HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="eet xcf"
-
-RDEPEND=">=media-libs/imlib2-${PV}
- eet? ( dev-libs/efl )"
-
-src_configure() {
- E_ECONF=(
- $(use_enable eet)
- $(use_enable xcf)
- )
-
- enlightenment_src_configure
-}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild
deleted file mode 100644
index 4217329e4f22..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="legacy"
- EGIT_URI_APPEND=${PN}
-else
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="image loader plugins for Imlib 2"
-HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="eet xcf"
-
-RDEPEND=">=media-libs/imlib2-${PV}
- eet? ( dev-libs/efl )"
-
-src_configure() {
- E_ECONF=(
- $(use_enable eet)
- $(use_enable xcf)
- )
-
- enlightenment_src_configure
-}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
index 44ed51cae4d5..2ad59ea05cb5 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="eet xcf"
RDEPEND="
diff --git a/media-plugins/vdr-bgprocess/Manifest b/media-plugins/vdr-bgprocess/Manifest
index 7e7e05f9c897..e4685fa85536 100644
--- a/media-plugins/vdr-bgprocess/Manifest
+++ b/media-plugins/vdr-bgprocess/Manifest
@@ -1,4 +1,4 @@
AUX vdr-bgprocess-0.1.0-fix-i18n.diff 427 BLAKE2B e7d2ff38a01d65cc53046ab4d86fcb2104abe8e69e3a9e531dc841cfd3a05e476eb7b66e4bcaa820e3f9cdf756e0a71400644edf458e7bd5a24ded07133c85dc SHA512 45cf83b099ac8625db7d89ce26b5d62cf31dc8cb06d07cba8abbe48865727cb4ce2c51d5968c60ff08ee81a7070cdeabef47b14f518e7440c8843cf056129e74
DIST vdr-bgprocess-0.1.0.tgz 16454 BLAKE2B ed6c49efd4b015d32f07d1e014f35cdf6dcd1f0fad2b7c2e002b58378ccdcb236871b8d8c7142ea9a85fb4ebb69462e1cb5b799d26af7e262aa0ee4349454ae6 SHA512 35e37ddd6a32cef3d2c89ddbe6dd9342ea8d18083b9bcd4d5e9f7557e956415fb75508d2a177265c663e834d3d64adcefd87f3e17dc473d1db74bcdafbc951d9
-EBUILD vdr-bgprocess-0.1.0.ebuild 487 BLAKE2B 4b71700d99c5d6e49a3d1f0a92398cbf2e0ab98ed9b3ee957414a1134b471648586eca676727769dcf2663cd0f8bbe382e11dc6d7790d4fcbfe320406c88d326 SHA512 0b39d4682e0ccc4b8b1adca7bb53ab324cf5c0ef08166a3ffb6090d413181b445cc9b90fe382d88ba9b02a49566906cd9e9a3da4bfe5408810ee006e70192fa2
+EBUILD vdr-bgprocess-0.1.0.ebuild 486 BLAKE2B 31bea6f2f960f20dcceeecb991dcafb5da0e062f475edfea3431337ba151886d1dcdf44399ede314b2ce77a4f6b05db62689c8f87e5ecf9b9852950fed2bb00d SHA512 38f81517c2b8e8b435038d239074e13dd105c25a7a43f79722a04617baca04d619659eb04559747a6fc049d1bf216a69b6258adff0e546f514610fc1fe1e69d1
MISC metadata.xml 255 BLAKE2B 62a6eb83a2d389a72a813ba8a0f41d77447b32e302a2c9540469a76b76cb1dd9b5166aec3f46f2ac72c9491ce4758b850328f07eab44beceac621f672822fb9c SHA512 25c24a1d1548c9bc74c9d391ff42b076acccbf9c4240e9778f7fb24fe12176b06d8292604698b4d2289d4906c7b658764b2b4fb5298f6815bd2dfe9ceec043d8
diff --git a/media-plugins/vdr-bgprocess/vdr-bgprocess-0.1.0.ebuild b/media-plugins/vdr-bgprocess/vdr-bgprocess-0.1.0.ebuild
index 212df240ead1..4bd3cff27886 100644
--- a/media-plugins/vdr-bgprocess/vdr-bgprocess-0.1.0.ebuild
+++ b/media-plugins/vdr-bgprocess/vdr-bgprocess-0.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
inherit vdr-plugin-2
DESCRIPTION="VDR plugin: Collect information about background process status"
-HOMEPAGE="http://linuxtv.org/pipermail/vdr/2008-July/017245.html"
+HOMEPAGE="https://linuxtv.org/pipermail/vdr/2008-July/017245.html"
SRC_URI="http://www.reelbox.org/software/vdr/${P}.tgz"
LICENSE="GPL-2"
diff --git a/media-plugins/vdr-chanman/Manifest b/media-plugins/vdr-chanman/Manifest
index b967d9d2e631..b3724147b4e6 100644
--- a/media-plugins/vdr-chanman/Manifest
+++ b/media-plugins/vdr-chanman/Manifest
@@ -1,3 +1,3 @@
DIST vdr-chanman-0.0.9.tar.gz 31748 BLAKE2B 859bd95037f5dbc99d4d16aefae29a214cb6687545939aaa2b475b4984ef35f1220fa529b87e7e0122fa57c8952755e0cd0a702742b15051b6047967c344d833 SHA512 3167f1f4e9f31930a130d2efc05f5195f20769077b6ddb9a0fbc92523b7180391c0043ae3fe340b6978fa07898fdc32bb305654da8fa868976b2815d49cb839a
-EBUILD vdr-chanman-0.0.9.ebuild 484 BLAKE2B ab623f7c835ae6c2d222d5a0e6d00a73dc00ee41d16aaaf912e271ee461946b02e1e3011f58406f77d2ad81e3a840587303df3876776779fa14d3c73c28721aa SHA512 3f05e7798ab897135e6ad8573e57316a43d66d40ddb2add5db69a3a436d37e71af9fb033bc79f3eb030be5e27e347d3a71fcc1e843a69f2005af42d43e6b0e6b
+EBUILD vdr-chanman-0.0.9.ebuild 483 BLAKE2B 18e8183f0b03001503a381f303ddf6dd6c469534489a26011346a7608558d3d4b8ef8dba9935b3c3959c02b400e4acc65f3f5f1780045d18bae4fc1443aabea5 SHA512 43c5a77df5f70e32716699697feb9b26264a0b9af003949f0c2f44e94f5ca56d1c954eacffecc6d3bf736f51ad47c34abf7722dc667cb47746b7f83e3a1eab5f
MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-chanman/vdr-chanman-0.0.9.ebuild b/media-plugins/vdr-chanman/vdr-chanman-0.0.9.ebuild
index 0da47abb4867..aa22d3670f35 100644
--- a/media-plugins/vdr-chanman/vdr-chanman-0.0.9.ebuild
+++ b/media-plugins/vdr-chanman/vdr-chanman-0.0.9.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
inherit vdr-plugin-2
VERSION="993" # every bump, new version
DESCRIPTION="VDR plugin: change channel with a multi level choice"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-chanman"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-chanman"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
SLOT="0"
diff --git a/media-plugins/vdr-ffnetdev/Manifest b/media-plugins/vdr-ffnetdev/Manifest
index 2e37d2772e3e..5dba46beaf0c 100644
--- a/media-plugins/vdr-ffnetdev/Manifest
+++ b/media-plugins/vdr-ffnetdev/Manifest
@@ -2,5 +2,5 @@ AUX confd 762 BLAKE2B 15fd4bdf5d90cb20e5f24e43f277f0417fc983e51728178537bd55ad28
AUX rc-addon.sh 347 BLAKE2B a2116fc8cf5add305a1f0187539d435a8860ff2294efdd7044fe96f9869331b9485113176d8240512577ab6c107a0726054898ffd246e9b93c49ff06eb232bb2 SHA512 2d95b774f5caffb784634d5a5ba413523e5fa2756ee9b57b7dd8426bec547acc850c82781d0e1c38d206199f25d40a466cccf599d11e7ef2b945cc3ab1cdf12d
AUX vdr-ffnetdev-0.1.2_gettext.diff 3946 BLAKE2B d9814db7b63583c862d6d8a33e75ba33b3148abee8c2070e823c9113ec821dd851449b10ebca77527b01c15953b4380a03ff9a663545777712b3d1e7ea75f585 SHA512 48f8dea661340f8fe23bd291008e0b005fc43298aa2fd8eb5220ad667d511b296cf1d37005cc894868e66c5019718552b303dc6690cf378e858df296653fe929
DIST vdr-ffnetdev-0.1.2.tar.bz2 56059 BLAKE2B 09995e26dcc193be26ea82b061ea638f026129bb778fc250fed51596a5cb0e9776bf2590fc98fe31f229ecc05a1c67550a1619a9015cb63d585eb29e7f5420b8 SHA512 5583a0c1ea7a421a745704a4440f25c9b35ed72686baeacaa67324e0c1a51f7a4a2d0ff4840ffb0b7086b4d310f48141cd001889692a1c1987a246d999c9afd6
-EBUILD vdr-ffnetdev-0.1.2.ebuild 624 BLAKE2B f968bb0eca475d699d330e02afc84e8c0303db33430139d7464a2de8fbf0fd965262bceded34a008e17f5155ae3309656eb3b92cffd4d1ba45c90499dbe9533a SHA512 1cb82e5c7d301c807efc448b803797a41fc8f0b6b441e5a466c7de6baba8bec6a02084bdd5505aa7d177ce89e58baa0750a2d9d06f41aff21cfef5f3108d3a2e
+EBUILD vdr-ffnetdev-0.1.2.ebuild 623 BLAKE2B 6b68cf6466acff7e4b729e58cbfd1692df361d965383f763b35689be0059713fdc30b6a46b226584878c2c7ba25faf7b3e129711d3735221c7beb838373829df SHA512 be297aba02b940a7fbcb00bd3565d4f8722bc521b839659c7985a3528de8beff65b95db380697fe2080dd5ffc51ab4a313fff9cf8e6226756c845e3f04ed2763
MISC metadata.xml 342 BLAKE2B 7d00d806a09b695fe5c28c7797b3cb4533be9d546f97071df24da62ecaec5a18b256ebd1285f7e9749a31fe288465ea4adc5e2e9340603a3a56e88b87c43e781 SHA512 08daa834bad599cbf6a73558855fb928a30e411baafb8f82f7021a3be2953d615827e402912d72c0811e06959f0c33b30f37e05e99be94746d10732f9602fc98
diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.2.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.2.ebuild
index bea1daf8d78a..cd48d5623782 100644
--- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.2.ebuild
+++ b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
inherit vdr-plugin-2
VERSION="837" # every bump, new version
DESCRIPTION="VDR Plugin: Output device which offers OSD via VNC and Video as raw mpeg over network"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-ffnetdev"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ffnetdev"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.bz2"
SLOT="0"
diff --git a/media-plugins/vdr-lcdproc/Manifest b/media-plugins/vdr-lcdproc/Manifest
index 05401b3807f4..f8b55cfdaf5f 100644
--- a/media-plugins/vdr-lcdproc/Manifest
+++ b/media-plugins/vdr-lcdproc/Manifest
@@ -1,3 +1,3 @@
DIST vdr-lcdproc-0.0.10.9.tgz 40465 BLAKE2B c812c9efe57f5015450ebc7c91ba6ff107486b566fd46ccf60fe3251eac483d119d8c1caa41868536a6051d5f094a7b89f985609f60c13bb4fcbb31bdc8d631c SHA512 237726e6c7a3436e416596e2b85411edb5945a3feef809d2e86c3952673b2531077ab70f9bddbfc1bc12fa0b2f416f153bf1a12f91288ecbdee23553474e044a
-EBUILD vdr-lcdproc-0.0.10.9.ebuild 610 BLAKE2B caf2ae96530f87a7874a68fbd422cac6b1468088f4be8e162afdcb4f555db7d5e147a97d045ee75ef9b83c9278301b8bcd150236007644908a56993f11e1e34a SHA512 1f3788a6dcd5b0a95f0a025806008288b33c451f29822fd9f04d8bb40d00578e7b73be187bda048f8e15acd0a776428ce1fc1d9235eff38628d161adc4af6425
+EBUILD vdr-lcdproc-0.0.10.9.ebuild 609 BLAKE2B 5adff9076ce955334d084f9f5b538f5fa14cbab87e499ae6262ded70027e4c29fdf1f90d3e49301eeef09de537d7fe128ab521c0b9cc7686a22f9c129a2edbc1 SHA512 0f6222df2d49795f6265ea0ac24d764ad7b013a8e27bbc5c6c979ce515e03cf737a402c6679924485d9dd4c7f061de97d67b19d700a77532dd57c4731db62ef6
MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
index 89d03a3e7912..207b8e2c1334 100644
--- a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
+++ b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
inherit vdr-plugin-2 versionator
@@ -10,7 +10,7 @@ VERSION="932" # every bump, new version
MY_P=${PN}-$(replace_version_separator 3 -jw ${PV})
DESCRIPTION="VDR plugin: use LCD device for additional output"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-lcdproc"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-lcdproc"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${MY_P}.tgz -> ${P}.tgz"
KEYWORDS="~amd64 ~x86"
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index d81cd944b7a0..1da1d44054de 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -12,5 +12,5 @@ DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefe
DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2480 BLAKE2B 7504d6a210309b38f1f14b941481d45004c89723118c1b153e69191b36ccf1c6c4d987e9e6be7ec43bed00e62e58a96d4814e082e06c60339ae9ea17a8efde80 SHA512 07a8f8181755db85a08a79e5f57da1cd01c6f49116d22ae0e530a09d17dc6f4070d5749e8da551ca60da58c48ad294b4ab2871a891be85765ea71fdcda9559e7
EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2498 BLAKE2B b79b61c5bfc8bfbe7f5269a550e15d2df2de79b6a91597813867a2f9a54b573eac46381d19c8d6133a3a304ff85bb4d30f3e43b82dbff699206824a4015830fb SHA512 ede04c06de104f5a001a1b4bf9be572bcd7d2fceec885defb4c8b6168342398c4a35806f85bf92fae9fefa1efaad3effc197bfa097d95af33e0ce77c56dc2b13
-EBUILD vdr-live-2.3.1.ebuild 2330 BLAKE2B a981a8c33de178923e1e5f68edb02fac21f4196ad4e3e0ec4c3e8982926ed234eaf1cf3d64482e545c49cd7a7c9c66cf9dca0d3d52a20cf1eea07e3c7a508fa9 SHA512 9d2012405c461aef5f3047bcec1b247eb5896d838f7548681cf2581be179afb9f8a743bc2b585fd3daf9227ec2fd68d542a9be60f492fea6c4f5057fb31c4f50
+EBUILD vdr-live-2.3.1.ebuild 2353 BLAKE2B cb071f68da71a9818c49e8a5176e7de1d99f5584c323a62e4e63defa4ab01a0cf00f3556d478148ffb6f30d808113374d4eceb18a1cf2549494ea2d5417e211f SHA512 11ba877b3fe716208878f6272113e40d2443b5b6fe0142454bb07520659411737300888da92950ade92d5fe5e7a671230a3937a8d408c5f17792a6c7d8429cde
MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
index ef19ad4ee495..f46cff93c6de 100644
--- a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
@@ -27,6 +27,8 @@ S="${WORKDIR}/${MY_P}"
VDR_CONFD_FILE="${FILESDIR}/confd-2.3"
VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh"
+KEEP_I18NOBJECT="yes"
+
make_live_cert() {
# TODO: still true?
# ssl-cert eclass creates a "invalid" cert, create our own one
diff --git a/media-plugins/vdr-pvr350/Manifest b/media-plugins/vdr-pvr350/Manifest
index 44112614be8a..c02ab5439a85 100644
--- a/media-plugins/vdr-pvr350/Manifest
+++ b/media-plugins/vdr-pvr350/Manifest
@@ -1,7 +1,3 @@
-DIST vdr-pvr350-1.7.3.tgz 54099 BLAKE2B fe8ee1c8051f5886bdfd36f60c996785c0aaf83ec49daea2d40811ba3ba019515b2415bb66a689d8c657a36fa71ee8ac66f47bfcb0c180060ab9a5dcd0f0be28 SHA512 0febce619ac86e3a20e28b661c18c452b09a3ab5376f52542cce608f55a352f320c5a45c9e1c2589f81416900ce42b3893d6c000f1e4e87b4064d552efdec45d
-DIST vdr-pvr350-1.7.4.tgz 52592 BLAKE2B 2dac443c489ead557aa00914aade9be8131be91134e428b1aae6897d30aef356d586603e3d5154fb86dff63c9449a685d4aa0bda1b809676317b49247561e5d5 SHA512 52831e7c83c601a8e7ce68064505715cf87250268b27fc5392808688293cb0e763b3157384260419c2e39151ef3f4d16e388ebb24767374a49126b05d5f91e59
DIST vdr-pvr350-1.7.5.tgz 48676 BLAKE2B 42af0c22704aaf1ac51ed3b5b8af76e8850ae63d09d110db140a2c8eaa29448800da291642d753bec894c345e58e1095453db4b902eab51e6188efe5be3e94e6 SHA512 dd29836afe4e56b6ec083210920964645568c2680c170d435b379593f7f8fc1a5420e10af53126cfb82be4764aee47d2233b8fca3efece0ccb221c1a94445d05
-EBUILD vdr-pvr350-1.7.3.ebuild 734 BLAKE2B 3b56da13935166f1217799051946b9710d73f014f2d1f47b488b39649bfa5e6d4c14afd6973c8e45f71061bc4646022b09f4b72cf9d069434599b0676995b068 SHA512 2e6fa7bfa0534016299b37326624b5c81c7c62f0c4e2424ddb23329a2e13ee1c5038191f3495abe45e0c83db96ce498baead4d832e085c778101d0e00ed640e5
-EBUILD vdr-pvr350-1.7.4.ebuild 734 BLAKE2B fe45535f7bcad3fcbe516fba6e201306bb74873c7b42bf8f319876b935a29704aa030a4a6d17d1e089ce27f8a6ea905c957eac5b0e2a671ecbe433acdeb6aba8 SHA512 aa789fe79e119a903eb6a1073450b5661b9a31cdf85291e76b38e6ae809cf9e816ad4bdbbde72a99601457ffbd828c3f64b8a0490a7c6aae293175ae2b26f6b6
-EBUILD vdr-pvr350-1.7.5.ebuild 961 BLAKE2B d17ef6b14c8fe033f83e6c918aad1492dc0837662fb174d4a58a273978236e9acc60a7bb9c13317fa33ad91fbe2a2b82c26bdeb4d05a7489835e92c9213d89d2 SHA512 cfe53678ecd333ae029cc0b0f056435c7f429acf51c948f673bdd27406698b8b7d330ac011a67893cdb865de14245a373acb6844477d02f5ba7dd268c02856f6
+EBUILD vdr-pvr350-1.7.5.ebuild 962 BLAKE2B b02b4dbda2a19e20ba8ec9f38e3af970f5790aaa8385d94511e68ff23b9dada5187315bcd3e5fb95386e5e2d2c4b6ea42f92a61d2663e6177dda5b5795422275 SHA512 2806e4cb7bb9a26c47279cd48df7b112ed03e1a26f25b14f78070267c806b7ca0104a1b87861554ba7f1b213f678d46fa5b659115b5dbe2cd76795fa40d40a48
MISC metadata.xml 341 BLAKE2B a946e7442d32f3b1f55648ab99947151557fa0ba9fbf756ce65aaec998b49c88d8e7c2c0ae1595cae3137e4713c93ab77916893fe081da27070abdfa59558711 SHA512 7da125b264c38aadbac1c973c7212db2fe04d6c91687f76dedc95c5060a38258ef426101a9d52024da974e98fbc35a3b61df8dba30a5f40ee9b89c4dbe1ca803
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild
deleted file mode 100644
index 9a5ece34c15f..000000000000
--- a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-VERSION="995"
-
-DESCRIPTION="VDR plugin: use a PVR350 as output device"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-pvr350"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="yaepg"
-
-DEPEND=">=media-video/vdr-1.6.0
- media-sound/mpg123
- media-sound/twolame
- media-libs/a52dec
- yaepg? ( >=media-video/vdr-1.6.0[yaepg] )"
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
- || ( >=sys-kernel/linux-headers-2.6.38 )"
-
-S="${WORKDIR}/${P#vdr-}"
-
-pkg_setup() {
- vdr-plugin-2_pkg_setup
-
- if use yaepg; then
- BUILD_PARAMS="SET_VIDEO_WINDOW=1"
- fi
-}
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild
deleted file mode 100644
index 472cab1bd4b9..000000000000
--- a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-VERSION="996"
-
-DESCRIPTION="VDR plugin: use a PVR350 as output device"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-pvr350"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="yaepg"
-
-DEPEND=">=media-video/vdr-1.6.0
- media-sound/mpg123
- media-sound/twolame
- media-libs/a52dec
- yaepg? ( >=media-video/vdr-1.6.0[yaepg] )"
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
- || ( >=sys-kernel/linux-headers-2.6.38 )"
-
-S="${WORKDIR}/${P#vdr-}"
-
-pkg_setup() {
- vdr-plugin-2_pkg_setup
-
- if use yaepg; then
- BUILD_PARAMS="SET_VIDEO_WINDOW=1"
- fi
-}
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
index 0713fc3fb6a1..18b1dc989e9d 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit vdr-plugin-2
VERSION="1657" # every bump, new version
DESCRIPTION="VDR plugin: use a PVR350 as output device"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-pvr350"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-pvr350"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
LICENSE="GPL-2"
diff --git a/media-plugins/vdr-vcd/Manifest b/media-plugins/vdr-vcd/Manifest
index 0ccaa0b386ce..d6164cb3657d 100644
--- a/media-plugins/vdr-vcd/Manifest
+++ b/media-plugins/vdr-vcd/Manifest
@@ -5,7 +5,6 @@ AUX vdr-vcd-0.9_gcc-6.patch 681 BLAKE2B a3b1c5b26056c5dc77384ce1e4475273ec432d7e
AUX vdr-vcd-0.9_vdr-1.7.2.diff 504 BLAKE2B 0a64d3ad808bbfbd643c55204fafff9a96504c9ec48430cb98689c3fef752099babad005d31f9155f8124d958a9115df93a1dd7b9b9e658b52382457834f5564 SHA512 51dffde0b098db7bdc5f0cfa8f7a77c37add76075968c9c02553d3214055495041afabadc8754479678648bd968aa4928cb35a3735f34fa0f006f37d82b344ab
AUX vdr-vcd-0.9_xgettext.diff 7167 BLAKE2B b861b3cdd4f87dc27b7f9dcb155714752b3990ee2c2deb5dacc85566dbf950dd60981988326dff962eb453d6c172316ccf0930a2f6d22831134c3416c843729f SHA512 7e54813e5a685cd95bb9f274946e155f00dc5e9f1b1c6c317d10a3ab796bca1a505cd67eedbbf635477b83ba7066c980be66e2e8cb10e49a5fd802e7fd82b548
DIST vdr-vcd-0.9.tgz 33687 BLAKE2B e3631e9556fa16351fe336fc71da0b7ed385b39ecef722a92a98648ffd8a0f0767531b92af8888ef408dc1d56860d17860fa24c7c18cfc62b91cb2de60977a01 SHA512 d1d58a5395877da38ee16f6b338e957781a4369497b9a3f92b80ce8b3577eb4a2387108d1da8889c3195b49c3b0f0e6baebc9c1868a35d7727de0c2b6e81469b
-EBUILD vdr-vcd-0.9-r1.ebuild 667 BLAKE2B 28d1e8bd0c80da1b586cfa2880f03ceec5003060b8519991ddc970f6be4211ccb2f1aab18e523ac3203787a339e4be29d81563ea8e70a24e6dff7c3f74f1a5e9 SHA512 96f9ac3fda69c368ecd50052b3fb8465c61ae2c61ab303aabce73915e5a06ece384908b282a0adbba1451b4a3ad999c5164a6418f6ed224aaaed15ef61bb314d
-EBUILD vdr-vcd-0.9-r2.ebuild 710 BLAKE2B 912be5d1502601d0b8c28a4b24328e3b80b59cfbc85c64afa38e3410cd9f62caa8a776f8cb04bec8e2983df120b95b27e1bcdd6230e660948cbfaaf053be973a SHA512 18b15b53b93921136f0c5433a92adb447c87d23a0f5956d0dcce19682f63b65264e34e3f432caebc5cba340b9d89c44f36b013476f2ed23cb20fb1e0144a0701
-EBUILD vdr-vcd-0.9-r3.ebuild 742 BLAKE2B e711d6213c0aef46e40db58b325863ba8d2ab7d9fac02855e6b8c8bee7d332fc4f965c0a05a845da42b1e28877e60d47b9badbfb43b661258582fa390ddb77d5 SHA512 ce05b1db012743515bb96b4a4eb8b7706fdccac3e39f150e6d1dfa03ca5a4179bbffe0a4e7b557ca19a975bba1a8efa9c04cc9669edb293543e63627c66ee021
+EBUILD vdr-vcd-0.9-r3.ebuild 743 BLAKE2B 2728cdb7877b089941eb262ea3488f96a35cf7738d23d8951001089fa2d5ef3d64dfd408e3afaf7220ead74a54129eadd8ca40fd1b3409afc0025df0f6bb6c5c SHA512 9ebff5bd269ec28054317418b8fbf6d2d7f1441e656b71de42bdbb8d36c88e4aa4bdd990563d103b33368fb71f1a567fc4b10ec9476f9672e90b135164aff854
+EBUILD vdr-vcd-0.9-r4.ebuild 750 BLAKE2B 4b38e8b4c6ce66be0e877cf92230dd26b6448aab618bd6cf2f2e4df262a668d14a62868735013839a1d902c7dff5f66a6b94f7f1babc6d6312382096599c5117 SHA512 ffd5ca1c8b7d00fb75686a8887fff543afa15f6fd643dee4afcea5ae48d813e5e0319f857bed29e6ae22d0e49ea70367ee3b08ab1b82aa96d5b4741c96d703dd
MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
deleted file mode 100644
index d31f5da54e0f..000000000000
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: play video cds"
-
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.5.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
- "${FILESDIR}/${P}_vdr-1.7.2.diff" )
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- # Patch Makefile, as VDRDIR is no well known variable name
- # to stop spare -I in gcc cmdline
- sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
-}
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
deleted file mode 100644
index 09c9d99f4319..000000000000
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: play video cds"
-
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.5.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
- "${FILESDIR}/${P}_vdr-1.7.2.diff"
- "${FILESDIR}/${P}_devicetrickspeed.patch" )
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- # Patch Makefile, as VDRDIR is no well known variable name
- # to stop spare -I in gcc cmdline
- sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
-}
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
index 64dfed857f61..9d42ec0aedf1 100644
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,8 +7,8 @@ inherit vdr-plugin-2
DESCRIPTION="VDR plugin: play video cds"
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
+HOMEPAGE="https://www.heiligenmann.de/"
+SRC_URI=" http://www.vdr.heiligenmann.de/download/${P}.tgz"
SLOT="0"
LICENSE="GPL-2"
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
new file mode 100644
index 000000000000..fc35fd6c45a3
--- /dev/null
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: play video cds"
+
+HOMEPAGE="https://www.heiligenmann.de/"
+SRC_URI="http://www.vdr.heiligenmann.de/download/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.5.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
+ "${FILESDIR}/${P}_vdr-1.7.2.diff"
+ "${FILESDIR}/${P}_devicetrickspeed.patch"
+ "${FILESDIR}/${P}_gcc-6.patch" )
+
+src_prepare() {
+ vdr-plugin-2_src_prepare
+
+ # Patch Makefile, as VDRDIR is no well known variable name
+ # to stop spare -I in gcc cmdline
+ sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile || die
+}
diff --git a/media-plugins/vdr-vdrmanager/Manifest b/media-plugins/vdr-vdrmanager/Manifest
index 510391be2d1a..cbc456b6a45c 100644
--- a/media-plugins/vdr-vdrmanager/Manifest
+++ b/media-plugins/vdr-vdrmanager/Manifest
@@ -2,8 +2,6 @@ AUX confd 600 BLAKE2B 823d55620653b8f61dcaa98924e38e236800d1d5cc1d90c6f7ec9a14b5
AUX confd-0.12 1156 BLAKE2B 1d34b1f59c91016a9594235bfde19bebe56ea02dc8df1a8167eaaf5f247f8ccdf74e29b05f7f3c4cba10bc18c8069fc523e7659bba849920f92bbbf156727540 SHA512 a2c213ad9cc5955a7b341d710507b609c4c22db28716df4775f809c5d0c95e55f6497b122a018be395eb7fc3631c2ad4b4ebae779d912f14b7d2d9ba836c7154
AUX rc-addon-0.12.sh 686 BLAKE2B d0cea279707ac69d8c7a02963d97d3b33ac319304d20d8008ac81e13588c02e69ee0066ce2910e7a223a2f5b2cabc602663d251aab65b926d557409cc7e77a0c SHA512 7fa21512024fa57024d37a88dc2ede422ac206e08f143c40ef13cd8692e0d9ec626cf02fb80adbf569c2edde69f147367dd9c8aeb8fb9d27ae9193c43406c2d3
AUX rc-addon.sh 422 BLAKE2B e609e1c36cec36b678b5163f9efd4c201e6a55cbf9ecf62b0d3b9f4e7632b833c54c6477ce3d5c041cb3cb36fcdc227eea4ae1b4a276fb212abf61a02704f661 SHA512 8baddd977f0806aeb8a5c9aa9c043b22bd556aab135820afc33b98de461cbd9d1f99fdb6bedaa73476f8d2b7c61ecd4d877345fd66e708c9c7fda6018446bc48
-DIST vdr-vdrmanager-0.12.tar.gz 34404 BLAKE2B 7148a9b40a558220f9e236ca7c8c5ba110fa9d5a59ae4e80231acea0b8c14526fceafd1077716654f5a2d89667de00bf7ae6412bcb2253884f9b8d9fe85797f9 SHA512 a5b962c53c636c899f2ce62a4f20bc123fb5d4603d506c51b6450fde86348bc5192697876e03bf22952197846f7cf828d743727de0c9903420a05c0c07172265
DIST vdr-vdrmanager-0.14.tgz 30543 BLAKE2B d2ccfbd13b811681daa67d9df841d5add7d0068a1a3f49d901c75d35c7462b50d86faeb8c710069249dd6ae2104508b5be7860bfef56162359c340b052933b1c SHA512 6b8604a5311b64fad82e3934f38524cc0f122968c707989606a5e06755a9c817ab3e7144afa4f561d8aaef8b239b758fe886ee3265410de25491243a8ef18fc3
-EBUILD vdr-vdrmanager-0.12.ebuild 2205 BLAKE2B 59c8f95259b3c49a19d2e272a05c9a5f8a2b4bec9f447f692520d35e8dabafe9270b338a3952b62d26ec06eeb3c8d9bd19458cd500668e782cba8b4e5c7e337c SHA512 eb0ad8f51de7e9b0286d9c430683701fec7a4be9d6c21e3aadfc746a5f63ea134c83157bfe83c5a18a95cd7f1eb07dc5909fa2ca4a5f4421c48596526ad678e1
-EBUILD vdr-vdrmanager-0.14.ebuild 2202 BLAKE2B 1af9c089596201108682e4f1268bdb3337045212d6aa53e9119e83d857f2d530073ff9e07b46a94e8f43eb89d0644cf323e0602dd59f1ced423446ab3d53d574 SHA512 49a108adfdfd699fe397caecd34d43cd7c9a7f2a4168bc0aaba05e0fbbf9512de09623fa5be68a3d76e3c1d716687eadca17df339b3c97bb3aadb62d3b7a6e6a
+EBUILD vdr-vdrmanager-0.14.ebuild 2203 BLAKE2B 0c93ebe00b01337c08a97ca2d734143ffc5ad2f22c75e5c53619aa9fed0fd85fbf7f6244a0f9df70a38af12ef01584bf740b51970ea9f582f6bbe617fa3a1a1b SHA512 4307791e7ca568fad6179537945fcb8c2b4e9e8ebb07fccb879f4db60d481ced7d49e0641b8b5adf2be1bab3dfd52322311fe8f193d4d2e07f5bcb2142fecf2a
MISC metadata.xml 343 BLAKE2B 9096d9d6e70cf4fba780ebcb20a71a2e48baa8b0e119ee77a1c42f1a3b770388f69489459f8b35e5d4c929423e13e1f537f174ff25e2c94709b46fc0b0823220 SHA512 3045d1a4c69d44d576143ee396fd3f8908e4c5a6aa9f9f949b3e0a65d3120e7da9720d58ec82307ace2375c6867ae86be01eca8b83f5d7677bd6c86102a06880
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
deleted file mode 100644
index 0427b6c21a46..000000000000
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2 ssl-cert
-
-VERSION="1747" # every bump, new version
-
-DESCRIPTION="VDR Plugin: remote programming VDR using VDR-Manager running on Android devices"
-HOMEPAGE="http://projects.vdr-developer.org/projects/vdr-manager/wiki"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gzip +ssl -stream zlib"
-
-DEPEND=">=media-video/vdr-2
- ssl? ( dev-libs/openssl )"
-RDEPEND="stream? ( media-plugins/vdr-streamdev[server] )
- zlib? ( sys-libs/zlib )"
-
-S="${WORKDIR}/${P}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.12.sh"
-VDR_CONFD_FILE="${FILESDIR}/confd-0.12"
-
-VDRMANAGER_SSL_KEY_DIR="/etc/vdr/plugins/vdrmanager"
-VDRMANAGER_SSL_KEY_FILE="${VDRMANAGER_SSL_KEY_DIR}/vdrmanager"
-
-make_vdrmanager_cert() {
- SSL_COUNTRY="${SSL_COUNTRY:-}"
- SSL_STATE="${SSL_STATE:-Unknown}"
- SSL_LOCALITY="${VDRMANAGER_SSL_LOCALITY:-Unkown}"
- SSL_ORGANIZATION="${VDRMNAGER_SSL_ORGANIZATION:-VDR-Manager Plugin}"
- SSL_UNIT="${VDRMANAGER_SSL_UNIT:-VDR Server}"
- SSL_COMMONNAME="${VDRMANAGER_SSL_COMMONNAME:-`hostname -f`}"
- SSL_EMAIL="${VDRMANAGER_SSL_EMAIL:-Unknown}"
- SSL_BITS="${VDRMANAGER_SSL_BITS:-1024}"
- SSL_DAYS="${VDRMANAGER_SSL_DAYS:-720}"
-
- rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.*
-
- install_cert ${VDRMANAGER_SSL_KEY_FILE}
-
- rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.{crt,csr,key}
- chown vdr:vdr "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
- chmod 0400 "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
-}
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- BUILD_PARAMS+=" VDRMANAGER_USE_GZIP=$(usex gzip 1 0)"
- BUILD_PARAMS+=" VDRMANAGER_USE_SSL=$(usex ssl 1 0)"
- BUILD_PARAMS+=" VDRMANAGER_USE_ZLIB=$(usex zlib 1 0)"
-}
-
-pkg_postinst() {
- vdr-plugin-2_pkg_postinst
-
- einfo "Add a password to /etc/conf.d/vdr.vdrmanager"
-
- if use ssl ; then
- if path_exists -a "${ROOT}${VDRMANAGER_SSL_KEY_FILE}.pem"; then
- einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
- einfo "emerge --config ${PN}"
- else
- einfo "No SSL cert found, creating a default one now"
- make_vdrmanager_cert
- fi
- fi
-}
-
-pkg_config() {
- make_vdrmanager_cert
-}
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
index 80757050530c..8639a6df48d1 100644
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
+++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit vdr-plugin-2 ssl-cert
VERSION="1971" # every bump, new version
DESCRIPTION="VDR Plugin: remote programming VDR using VDR-Manager running on Android devices"
-HOMEPAGE="http://projects.vdr-developer.org/projects/vdr-manager/wiki"
+HOMEPAGE="https://projects.vdr-developer.org/projects/vdr-manager/wiki"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
KEYWORDS="~x86 ~amd64"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index eda987cf62d0..f47fe205fc8b 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
Binary files differ
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 559fd2e9b3c1..b7e546901c42 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,4 +1,7 @@
AUX 2.1.0-makefile.patch 523 BLAKE2B 8a0143b80422ee19a0bdf8637de065d3af6b4aded30e3437b8ff3b05b5704426e9f890d915ba5e50429ebba9f4f77da9b15865d6a3b8e8233976c0b165e8dd09 SHA512 26da9c578cab7f2fadebf6818f323967e28383fe3e2429d3ef614c43bcd50155bdf1607f353beedd91c27b45045dff1787ee9d2844ffa800f7da53e04b045de8
+AUX 2.3.0-makefile.patch 531 BLAKE2B 8860b129afa97fc9c1d444e0356950afa554c25a2cab8bc508a319e5bb85d57df411ec5cf9e813de4b0991f79694b47070b6933e649c4bd32f44d2de4c4400b8 SHA512 a8c724ea250518d701bf0b458114caaee410463fbc954288d8127a743955cff133fb0064561b1a2fb7b077c66f667a1398cb053210b0b21cda3185638baafa7c
DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
+DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b8902a7cf959b72ab9a667cbaea1f8a829bfb6b3abfb2a9112f4aeed2adcbed825b1f347ceba640f1ad3903b0c246 SHA512 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000
EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d
+EBUILD cqrlog-2.3.0.ebuild 951 BLAKE2B 1bd1f5a05104c7d05ede2175c289a478d5bcb71369c8593476899c592d23057865b19a9063324f2b13c11640a45ead03a3133321536d8fcf06d10604aae9c84b SHA512 f21a6559f3ac0dd2ee9c16fde8f34e768171d35cdf19b9aa86053aa97577784cffc3f1cfe0be433d36c1a1c287c1f15a59b979396dd88aa3ff3f896a39c1f78c
MISC metadata.xml 213 BLAKE2B 968a2200bc028093589608429f0d0696f40ab32aa15b97320ea16e0a3769843a69537c5be4c96d6d95f83d49f75a133ef1d1be1419e1e88b86780aa7be036f58 SHA512 82ed61dc8b730a64e8265a7f341fe601880959c39efbd20fb923e980ca88bb07e8e5ed57d8ef677dfd519417fc2b2f5a9a72f91b32eecae6ca15a1a44f0c101c
diff --git a/media-radio/cqrlog/cqrlog-2.3.0.ebuild b/media-radio/cqrlog/cqrlog-2.3.0.ebuild
new file mode 100644
index 000000000000..3b72a623578a
--- /dev/null
+++ b/media-radio/cqrlog/cqrlog-2.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
+HOMEPAGE="https://www.cqrlog.com/"
+SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+#RESTRICT="strip"
+
+DEPEND=">=dev-lang/lazarus-1.8.0
+ >=dev-lang/fpc-3.0.2"
+
+RDEPEND="${DEPEND}
+ virtual/mysql[server]
+ dev-libs/atk
+ dev-libs/glib
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+
+ x11-libs/libX11
+ x11-libs/pango"
+
+#S=${WORKDIR}/${P}
+
+LazarusDir=/usr/share/lazarus/
+
+src_prepare() {
+# add --lazarusdir=/usr/share/lazarus to command line
+# fix tmpdir
+# remove strip call
+ eapply_user
+ epatch "${FILESDIR}/${PV}-makefile.patch"
+}
+
+pkg_postist() {
+ elog "This package optionally supports media-libs/hablib"
+ elog "for monitoring radio settings."
+}
diff --git a/media-radio/cqrlog/files/2.3.0-makefile.patch b/media-radio/cqrlog/files/2.3.0-makefile.patch
new file mode 100644
index 000000000000..da6ac782c488
--- /dev/null
+++ b/media-radio/cqrlog/files/2.3.0-makefile.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.orig b/Makefile
+index 0b1d1ef..8d6eb2f 100644
+--- a/Makefile.orig
++++ b/Makefile
+@@ -3,11 +3,10 @@ ST=strip
+ datadir = $(DESTDIR)/usr/share/cqrlog
+ bindir = $(DESTDIR)/usr/bin
+ sharedir = $(DESTDIR)/usr/share
+-tmpdir = /tmp
++tmpdir := $(shell mktemp -d)
+
+ cqrlog: src/cqrlog.lpi
+- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+- $(ST) src/cqrlog
++ $(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
+
+ clean:
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index d2f415bcad35..1b51377ceee3 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -9,6 +9,6 @@ EBUILD fldigi-4.0.12.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8
EBUILD fldigi-4.0.13.ebuild 965 BLAKE2B 249c84924b752a7f34b17713d9bcba9496ecea87d19c3ca45706f1f8a6ed8bed649e1d47e168637046974730ffbaecab1800d8bcfd3638dab1698b4318c7d415 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0
EBUILD fldigi-4.0.14.ebuild 965 BLAKE2B a93061981be1aa6c653b0bdba3c93c202b5d0b97df5f065ac634244e400621ac2404b911cea9fd886ffe78e636e3d056df51b64dd3e38653289f7d49e72d755c SHA512 2be335257d9954b6a4ab61b7f22a4ca25f19c1b5c3d0a7593bec0cd2880382a18b52053d3d24547c0c882dca15eb84d05a6d75acc6de6a57f9406022b181852e
EBUILD fldigi-4.0.15.ebuild 965 BLAKE2B a93061981be1aa6c653b0bdba3c93c202b5d0b97df5f065ac634244e400621ac2404b911cea9fd886ffe78e636e3d056df51b64dd3e38653289f7d49e72d755c SHA512 2be335257d9954b6a4ab61b7f22a4ca25f19c1b5c3d0a7593bec0cd2880382a18b52053d3d24547c0c882dca15eb84d05a6d75acc6de6a57f9406022b181852e
-EBUILD fldigi-4.0.16.ebuild 964 BLAKE2B 1b96e2b2b76a80140d21a59a302ea6b7fb8ffe7ca3a0eba547b35dfedc3a31e04b39d30ecc9bbffe3608bc58e3b0ef1154b337e50f32eb787c04a3fdae31887d SHA512 e4b8c603b6f486d40570a957fccb10150e9d8d6682944a58d8665e9896dd2c0cd4d3d4e9309a97767539c1ad9c5f8e24120306f0b31b1dae27915774d1a52adb
+EBUILD fldigi-4.0.16.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8f7c5f5d53c71a11677242f51f109efb51ebedb86dbc36592e11b694398f0537a49d52f2aa49f55de0509f918 SHA512 cd049738e4d063b4a23121e0a7890875b5dc19dc70bc183dcd748063717e03ab143a6c588a7c1383f0a1425517bb8b7b35e9af517567cfde82078456c367cc9d
EBUILD fldigi-4.0.17.ebuild 935 BLAKE2B 63d149e300ed20cf7ab2eee1d7d4b54d844c0e117366c01667692634b662c6315f52a6736cdcefb2d328d17269399c410e7566f7cb29dbf0f3d8a17c5103e5ce SHA512 df9c80bd2ef8402b32352c25d26f59059475905eef8de5cc05d7528dbd0162e2c84a78324801dd76efce3520a31e4ad359ad5ad78f8fe348fd2e2367bd9a5fa7
MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.0.16.ebuild b/media-radio/fldigi/fldigi-4.0.16.ebuild
index cfa5be442f1a..5f82ae983153 100644
--- a/media-radio/fldigi/fldigi-4.0.16.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="hamlib nls pulseaudio"
RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ded0a89862c9..fe40136cd32d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,10 +1,6 @@
AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
-DIST flrig-1.3.36.tar.gz 692799 BLAKE2B 5fbe2a38a5b76f850c3ac7760481e2ae0b11e9115b239caf9c6a3fd8a39495baf7e00b615ce340fd60739aba36f3c2bb7fc25a6034f1d73add7c964b5db5a6b9 SHA512 8d8797ed09d9314eb4fa2100056b2f9f84cdb104a516a30b36c6341c05d09c5868cd3b9b256c967bed5514ac3362be28b46aca8f9af871f9261904bc12d6401e
-DIST flrig-1.3.37.tar.gz 700906 BLAKE2B f37e858b23476b9b2cdcc3a07f011889b33118030b3b8a9d8e46c53ee57426554ff8db2a9a9e458eed6ffa2c84193b3aba7a8c5e6db994f5ad291f4e645d9da7 SHA512 a8d611cae7bf23c92689e75b75b8de72bf4ea56a5039e54c97dcfeca186afcdebb13782dffafb507047e1d5574e2af1fb6f88bc8a01452ac8921bfa6295c0c90
-DIST flrig-1.3.38.tar.gz 706694 BLAKE2B bc69731fb1cc386ddafe476743aae3747b9dd0fd27610defc53dd9a21dee222c30d101668aa8a040feecde3baf87f3d76a2b758575c6428e4c644fe5bfcecbcb SHA512 905c32923820cfb11da4b94f69df780c5d62bc1fde1c6d569feca7a6aa3a30665953aeb349823dfa5331c527dc4d494dc126a70929f28da561a621533578ab01
DIST flrig-1.3.39.tar.gz 711661 BLAKE2B d0db385b04b91648a900e08a76e4e8a7715df72d78b379e14852cc47ea86b550016c655414412cc3bad4a5935039b6e50ca2e63ed2b8fcc4a0b2c552fb8be806 SHA512 8e77aff8d1a16d45e510606edb15623248cc41a979c324bece719acb1fddb6a29c05ef99d5dbe8a8a1247f4a5f6353a240556dcfd51ab7180cdc8b68ce5cc4ee
-EBUILD flrig-1.3.36.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
-EBUILD flrig-1.3.37.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
-EBUILD flrig-1.3.38.ebuild 626 BLAKE2B 0b0869afd239a791eb95c904bbccfa11dd332cd06b51873ad1e2449a514600bb83fe7958703758243234ce3e4e8b43956d4c4bc89191fd3d68b3f184c98dfe91 SHA512 c74380b192490fb007d231e5b5b547ae822bdd6e5bcee3e443f232429c7eabdb152cde450dc7015a79b1ba7194092aaaa61a8d16085fa132a03453629a39b34e
-EBUILD flrig-1.3.39.ebuild 625 BLAKE2B e134ec9cd30f2a78a6072139656d0cb00aea42eb28070f550f2789b782a505b245b7008d72516948887d9f56ae72fa7f892d159a9c4558d4ff84f6d40e4fe83a SHA512 3fe335abf499aea713e746af0a0a9c07ca347539b5cdd3c5f79f1e115c152b1d77a7edd0503ea0d57451743ce9d856f2208976f53fa8d5a4bf573cf02654d62f
+DIST flrig-1.3.40.tar.gz 745925 BLAKE2B ef9e3295c7afed5ec14aeeb6c056afb31ad1f9719f2a49091b397e1809b34550cb667914b78f370da1722184a8db6253bf7a377db960deeb50a4833d9beb99d6 SHA512 28ed895a1b87ddcbab152b29c17d14b03ea29c9ae427bfc6eb594f270dc85c0044dc566991be8680d09f19dc46839e0672b250f3c765fb0f76da1624840ae216
+EBUILD flrig-1.3.39.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
+EBUILD flrig-1.3.40.ebuild 584 BLAKE2B 9c7b89a5702ab9c72b1bd727d6147902f216c803c7594ccf626760c48dcf0cc2f804bb582dde3666796f217de635e3695cd8a962e7d980022ff0fbc1c8018d2f SHA512 778128e835cadeb59882f5b4352036399cc4ee47f84b9ebdfe79edc24111eb8f8a9b807bdeafdc39eadd6ad4012636860a8d4124ac664561271469b82b16ac1f
MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.36.ebuild b/media-radio/flrig/flrig-1.3.36.ebuild
deleted file mode 100644
index 8b0982ab2c0d..000000000000
--- a/media-radio/flrig/flrig-1.3.36.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.37.ebuild b/media-radio/flrig/flrig-1.3.37.ebuild
deleted file mode 100644
index 55065b05abc0..000000000000
--- a/media-radio/flrig/flrig-1.3.37.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.38.ebuild b/media-radio/flrig/flrig-1.3.38.ebuild
deleted file mode 100644
index 19d88bf2c029..000000000000
--- a/media-radio/flrig/flrig-1.3.38.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.39.ebuild b/media-radio/flrig/flrig-1.3.39.ebuild
index c4cebbc77a77..8b0982ab2c0d 100644
--- a/media-radio/flrig/flrig-1.3.39.ebuild
+++ b/media-radio/flrig/flrig-1.3.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
RDEPEND="x11-libs/libX11
diff --git a/media-radio/flrig/flrig-1.3.40.ebuild b/media-radio/flrig/flrig-1.3.40.ebuild
new file mode 100644
index 000000000000..3aa457624c82
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.40.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+ x11-libs/fltk:1
+ x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_prepare() {
+ eapply_user
+ eapply "${FILESDIR}"/fix-bashism.patch
+ eautoreconf
+}
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index 134358da517f..5b2d74ac9a1c 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,6 +1,6 @@
AUX gpredict-2.0-doc.patch 563 BLAKE2B 7c95bb3261774799e7316eaa57b30ad72a9cadb2562103a581339699d7293fa9378aa6e8b224e75930665ec60570a5a60a0367c9a470ec8135c230547f260262 SHA512 04cc303d3bdcd8d312ec9ff99dd7e2f921feef5c50c7d4cd6e20199f7a9caefb5023b6dfdb1cb410ed3693a60f016a6545446e02eff4f678dd2897dc275ecb3e
DIST gpredict-2.2.1.tar.bz2 4647342 BLAKE2B 989b80fd0f0029551854c18c1e00bd5d223bffe4aa20004b828bec87ab56dd488edf4d62289d394225e2a6b0c89ca1c9962cf63afe076a355757371127712ea7 SHA512 590a218bc95a465ca9772f892b77763b92a6c41c7d9f3b48279f28916cef8a5bfe616e6cdda1002e7dda082f37f37a98af8c8180895c572fec9c96aa76888f5d
DIST gpredict-2.2.tar.bz2 4646331 BLAKE2B 5f07484814cbc3973617e2f161eed4fdc9ead11b9369cd2f6ffacbf60a5a73651e8081c2110ecc7e83a8214d4278a0d7ba9d5b313a9c1bbda7ca3e5c5a6730a9 SHA512 4884459922da4fcbe221252c002e76ac06926bda4745e3eaa480c93c9fdbed9da7a78c7d11a6e7fb5777d8e11cc1f0859c18461fb19f249d924882bfe7ace32c
-EBUILD gpredict-2.2.1.ebuild 674 BLAKE2B d9b15e90a9a4ad7ab5d7b755f167afc4d226ac09825260ea984bede9d64b4911451be32f6889a74973f19c042119eb1e74f5d9233d5e4812814c138fe513fbe7 SHA512 056bf73c3243e14374104656892b28ff7476c4a987c9b5c910091b8707151a47528559c9a27a6149c8e4936dbc2825478ceef669ec0861e535b237b4af86b2bb
+EBUILD gpredict-2.2.1.ebuild 673 BLAKE2B a29c4df80eed560c2ea8cee5728777c5a5c11fba55de631fc65e7d27fb20db4d36db101557253532fa92064acf51ec821d1d82e2ba8d3303c374d811f563ddb8 SHA512 89ad3c414051ab016e72523b9e0d3f2e3bb8b4124b81a3012fe01c20a864331cb436a243fa3a9745506bcd9a434cc937fc9ca5d887d2bca49de02e5bc723aced
EBUILD gpredict-2.2.ebuild 673 BLAKE2B a29c4df80eed560c2ea8cee5728777c5a5c11fba55de631fc65e7d27fb20db4d36db101557253532fa92064acf51ec821d1d82e2ba8d3303c374d811f563ddb8 SHA512 89ad3c414051ab016e72523b9e0d3f2e3bb8b4124b81a3012fe01c20a864331cb436a243fa3a9745506bcd9a434cc937fc9ca5d887d2bca49de02e5bc723aced
MISC metadata.xml 327 BLAKE2B 337b6c3aaf2d60785241601818dcaa4c831b122e339826560343f32712bda042b0f5140f321e9de6f2fc680e66702b39b0148aea2aaac52aa3b3faa7ef5292d4 SHA512 8e461ba4d187a96f1e15e1fab90da3755ec7ad6b24f1182b65eeacffa996375bd0bd905907c329bb53a92b94c22b08283ea936956acc58e5153634e464d9a147
diff --git a/media-radio/gpredict/gpredict-2.2.1.ebuild b/media-radio/gpredict/gpredict-2.2.1.ebuild
index 3effbee5363c..b6f1c87b1200 100644
--- a/media-radio/gpredict/gpredict-2.2.1.ebuild
+++ b/media-radio/gpredict/gpredict-2.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="dev-libs/glib:2
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 16099686893c..2475657eebf8 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -7,5 +7,5 @@ AUX svxlink.service 690 BLAKE2B 7f62518556c7c0fd0a4e759031520181f5a9a61a4d5ebcf8
DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f977367069658bdf4af7d91726e558c9e1ab084423b0238ae1f5fdcafd8e88480b818491e5f91d176d07d81fced5a3 SHA512 90bd74420fcd78d974d12ee13ac792f2a0ecd7cb483ec36ef1085e905f9d6c62af707cb65d04079ec66d7df6da615080a2058a0a559c82171b4882a4b20289f9
DIST svxlink-17.12.2.tar.gz 1622039 BLAKE2B f67e74605d371f37bddc06f2092d7c9c355a549df2dcfcda3e48e3238dd38d57e195f2fe7edf390e3d48324ef8ab4accf18975ead9216259e484d96597275937 SHA512 cace3894da3b94ae8bd41c47c76c9c6203cb7eaaca6d2c847509b733ed4a6a1dc9ca8c4c16c060dfb0d9ee2982f2a0a2746aa06a5507640d5ed9c9b4fdf90f7e
EBUILD svxlink-17.12.1.ebuild 1672 BLAKE2B a78139f14e1a4d8d8351a7367230df9f5522d3c92124f5c21e4e3f19b181c42ce28d0f52f99398e7ba4a851d7068faa1c54627cb7f4987e258b4329b0b614950 SHA512 bdd8c8ce8841d96fc1ed63287d0f9bf0e8c07b0918449a231bb87debbe1820c890fc64864c41fb0cf07b15393e5cb5034b0e655f4200fb93144f08f4237ee1a3
-EBUILD svxlink-17.12.2.ebuild 1796 BLAKE2B 6d448e1592fb02ffde696704e58393b1e26629d674234a84096859d6901484468f1a0c699a37b4b070dc290b57cd22505551c59626b2c44c20d2e5afaf2ff32a SHA512 fe4d33fdd0de7c1123d9224e5731257f664f51c394a548ce08a4331b9840864ec0720a4e7020a8094a64173f14dfac5e3c9973570f6ab9ab130bcb67011844dd
+EBUILD svxlink-17.12.2.ebuild 1795 BLAKE2B b46352f97710784cf73ecd7e4abbfc0f6087b503bd7c23d5cd295a83579b155048b7e15d62e8632b8dc09d9f81ba3897a38c035cf85082b7b23103c72400dd1c SHA512 4bca680ce3c89d77f0491f31f43f2436fe40e17e433735b71493c70ff299671eec036393f90c0f45ceb0979906d3e5c92598cdc7405dfa777af631a2596d6f67
MISC metadata.xml 696 BLAKE2B 51be8858bc950793e0044d7d8dfa695f3f4c1fa0f373be8908d00c0fdc73ee0fbbe06b118a28da147978ad204d63f2eb02183c961123d71c078fcaa9cc8306f0 SHA512 8e514fc2f15af5d7520a371ab802aa2a024276514d184f31b00b96c09b06e7b7c69904a0ea256f17fbe9e97f8da4cd908a91072284b274ba6488982e92182bc5
diff --git a/media-radio/svxlink/svxlink-17.12.2.ebuild b/media-radio/svxlink/svxlink-17.12.2.ebuild
index 2c36f3f80d70..f7eca1b5cdf9 100644
--- a/media-radio/svxlink/svxlink-17.12.2.ebuild
+++ b/media-radio/svxlink/svxlink-17.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-lang/tcl:0
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 08404060f4cb..946f913361fd 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,7 @@
DIST tucnak-4.11.tar.gz 3517554 BLAKE2B 70f704f1251a9a8411ffceaff56b445160affe523e3aa665e7a6a54a2b3c8bfa5e934143b8a342d02240b929a9219287ca2eed74de1d2a906905162fcc2ad74b SHA512 510c13b181f2417e7fddfd13d808288624bfbf3c0e26cab712a7401d24e53432ad4a270a43f8224a75359a2a31ea3f4d7992583bee8188292ed7d8bc5ad8e8a0
DIST tucnak-4.13.tar.gz 3516237 BLAKE2B 81d2f11ff2cc619ff22072355b08341115f4fcf33af9e9348a73980ba09e61282027d0b0f838682a2143b5d7d06db38b6b8ee502f16dfcded4e63eddb757afdb SHA512 5d5ca272240442cf2727a1285e560f04df6de96f88d990171a53320fb436b46ead7da1701ec4192fc18fab5f97b7a0b50a1025675e78653390301ee3b739d0d3
+DIST tucnak-4.14.tar.gz 3514740 BLAKE2B f147eff8ef5a001309261b463c4334bdb82aedf5b262309336069592bff6473f93403c26b03470adc049cd337fac04eb5eed1f1eaf43414d023606d8bcbc0848 SHA512 f37895b08d302b71c345dc58df5590c3909edc8182047bd8b1a67218cc8159c9ab25b267adc6a05bd625d44dda3f21a45296611c91ce1cd974f95c6776552a49
EBUILD tucnak-4.11.ebuild 1991 BLAKE2B d80af2ffb0945095946c4b90c61e692383b9f1772b166dd6857ed58ebb87c9c6ad2b414f7ab201ec5e2aa4b20aad60e19cdb1516db56e000d6674f834fce2d50 SHA512 55dae58cad12669dbecef391299c7daa8dd73c9c97545cc602154088ef5303a93a5fbdee8d080a4a170a07fe4984beeb7306822be9dc437b49e209027eadd17d
EBUILD tucnak-4.13.ebuild 1971 BLAKE2B 8b7643d235bd8196d2c4c54abc02d8618983cd232d2f260569661682ee9748d7819b91fe26c536e43b42f3c4a233f59f1d239805630718831cedb7b770b9872c SHA512 fe60f6cd25e3a1dd77abf6dedb28415e8ec2a4eb9aa6fdb5374898ab346e0b5ff04aaacbd44df5eb6725f82bba971902fc85d6d64cb1aa525079a4ec3c898001
+EBUILD tucnak-4.14.ebuild 1971 BLAKE2B 8b7643d235bd8196d2c4c54abc02d8618983cd232d2f260569661682ee9748d7819b91fe26c536e43b42f3c4a233f59f1d239805630718831cedb7b770b9872c SHA512 fe60f6cd25e3a1dd77abf6dedb28415e8ec2a4eb9aa6fdb5374898ab346e0b5ff04aaacbd44df5eb6725f82bba971902fc85d6d64cb1aa525079a4ec3c898001
MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.14.ebuild b/media-radio/tucnak/tucnak-4.14.ebuild
new file mode 100644
index 000000000000..911cc5d37830
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/libzia
+ media-libs/libsndfile
+ >=media-libs/libsdl-1.2
+ alsa? ( media-libs/alsa-lib )
+ fftw? ( sci-libs/fftw:3.0 )
+ gpm? ( sys-libs/gpm )
+ hamlib? ( media-libs/hamlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+ # fix destop file
+ sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+ # fix doc install path
+ sed -i -e "s/docsdir/# docsdir/" \
+ -e "s/docs_DATA =/# docs_DATA/" \
+ -e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ append-ldflags -L/usr/$(get_libdir)/hamlib
+ econf $(use_with alsa) \
+ $(use_with gpm) $(use_with hamlib) \
+ $(use_with fftw fftw3)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+ if use suid ; then
+ fperms 4711 /usr/bin/soundwrapper
+ fi
+}
+
+pkg_postinst() {
+ elog "In order to use sound with tucnak add yourself to the 'audio' group"
+ elog "and to key your rig via the parport add yourself to the 'lp' group"
+ elog ""
+ elog "tucnak can be used with the following additional packages:"
+ elog " media-radio/cwdaemon : Morse output via code cwdaemon"
+ elog " (No need to recompile)"
+ if use suid ; then
+ ewarn "You have choosen to install the little helper program 'soundwrapper'"
+ ewarn "setuid by setting USE=suid. That helper is only needed if you"
+ ewarn "want to use morse sidetone output via the PC speaker."
+ ewarn ""
+ ewarn "While the helper should be safe by design be aware that setting"
+ ewarn "any program setuid is a security risk."
+ fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f8f9d29a35fe..4b99c84c30c9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 1c602990c7b5..6d48096bacb2 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52465d3c473de309f48ac196c2d40885acf08fe84669ccfd5c107d7e45e45069c1757fbc2b550cdb8eaa90e01475 SHA512 37b8ed7c7eed46e594807866d29c3bd37cba8d880c68e714168ae373a8d0dbc58cf837dbd704f95ddbe2544880470fb1f176ab6a67643a4a45b048eabb87e4c2
DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-EBUILD asunder-2.9.2-r1.ebuild 1077 BLAKE2B f66d32dfbb906f4d8972b198837d90068c9e2f072dc1ac83e3068954691bfa8a2bfd909be8abdac7d72887ecfa35ad1d4656fc0ab09dc11e327d4a854a0f6433 SHA512 3cf5a77110d76e29d8a0fe648b09249db74d3983ce60ded19602aeb48da1ae53c316a5d4637bcc196781af9e1756efc4b37e3b16878df6e21bb783e51750b58d
-EBUILD asunder-2.9.3.ebuild 1079 BLAKE2B 24f91d1007a50bbc781c158dadea898140208d4f69d7936219f7e65ee63acf7c9a79ba32dd30c486e0e2909d0b4032814164942d9e3529b65558e698a71664e8 SHA512 8db7e0724a4917a1debde92c73ae7e4d4e2169e8deec95f783ec1c4d045bb8478b6f4529e978c80e2882c62f50bca4bd9ec2e753c8dcb56378e3a83ec93f4ad1
+EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
+EBUILD asunder-2.9.3-r1.ebuild 1045 BLAKE2B ca487c6e9b44f7ffe47d6245e555a0d66875da1abd3b999d79c315f60d304ecc9e4c56da2603eac25c704e3a9bfa0bf48ad5e730dd4a8a4f69ac6a2fc051651f SHA512 c9b4828e8e907fe02467fc2b10f1d4ec074e10d8b238a73987278f4001177905a1db8127c1dc3f23e01f5260507e9f05fb7085f9463a21b1c9c0896bd4ece2f3
MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
diff --git a/media-sound/asunder/asunder-2.9.2-r1.ebuild b/media-sound/asunder/asunder-2.9.2-r1.ebuild
deleted file mode 100644
index 02687a60142d..000000000000
--- a/media-sound/asunder/asunder-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
-
-COMMON_DEPEND=">=media-libs/libcddb-0.9.5
- media-sound/cdparanoia
- x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
- aac? ( media-sound/neroaac )
- flac? ( media-libs/flac )
- mac? ( media-sound/mac )
- mp3? ( media-sound/lame )
- musepack? ( media-sound/musepack-tools )
- opus? ( media-sound/opus-tools )
- vorbis? ( media-sound/vorbis-tools )
- wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
- default
- sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-sound/asunder/asunder-2.9.2-r2.ebuild b/media-sound/asunder/asunder-2.9.2-r2.ebuild
new file mode 100644
index 000000000000..ed513c27d336
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.2-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+ media-sound/cdparanoia
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+ flac? ( media-libs/flac )
+ mac? ( media-sound/mac )
+ mp3? ( media-sound/lame )
+ musepack? ( media-sound/musepack-tools )
+ opus? ( media-sound/opus-tools )
+ vorbis? ( media-sound/vorbis-tools )
+ wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+ default
+ sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
new file mode 100644
index 000000000000..34f0aaa1ed75
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+ media-sound/cdparanoia
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+ flac? ( media-libs/flac )
+ mac? ( media-sound/mac )
+ mp3? ( media-sound/lame )
+ musepack? ( media-sound/musepack-tools )
+ opus? ( media-sound/opus-tools )
+ vorbis? ( media-sound/vorbis-tools )
+ wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+ default
+ sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-sound/asunder/asunder-2.9.3.ebuild b/media-sound/asunder/asunder-2.9.3.ebuild
deleted file mode 100644
index 1dee31d021e3..000000000000
--- a/media-sound/asunder/asunder-2.9.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
-
-COMMON_DEPEND=">=media-libs/libcddb-0.9.5
- media-sound/cdparanoia
- x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
- aac? ( media-sound/neroaac )
- flac? ( media-libs/flac )
- mac? ( media-sound/mac )
- mp3? ( media-sound/lame )
- musepack? ( media-sound/musepack-tools )
- opus? ( media-sound/opus-tools )
- vorbis? ( media-sound/vorbis-tools )
- wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
- default
- sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index ca4761ed2385..44d3d1c71ec8 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-0.1.1.tar.xz 1461960 BLAKE2B da194b982f676b536d893bc9f419cbe6f47e73426abc19f454b706514e6a9150397e4bdc7917457d8cc442ab644fa9a51976c7211bad64473c6a039baa0f3c2f SHA512 892e38b2d23af4c65727377c7b4fa08b10c2a2e96adea490222c6f47c44a8131dde01ed0f6e07a58a383b210303a7b9795e80c1025200343770a95aa12e0d5da
-EBUILD elisa-0.1.1.ebuild 1382 BLAKE2B ec2396cfb1a680f095a9a8acfb28935f995397bad8f8a7157345477b81650c0bc84d30e7a6ea916070781cb3389a6515e5be99655447cf503b8fad1be4081da5 SHA512 091f97afcdaf8aa7f078eb0acff327c4b41edd055066052afa9096e7b4f53c8f19f68a36d3cb6e426710c58dd62419f390793ed55d3244a5c0cf50cf65345cd0
+DIST elisa-0.2.1.tar.xz 1488948 BLAKE2B 91c885f0c95cff634570ce283be31ab3ae71119561d5cd309ddb663df050eb0117a7b6a59adb0e334b39d408485762665a07ea0cf316aca7ff30b9278b76a20c SHA512 39701f5c840ed4539e9b4093cccce9c27f728500ef0c7687585a17fabfb9498dda2649664e9613961ef8d514ef2257858bf0c815c0f05b593eb0b42f87ef4e25
+EBUILD elisa-0.2.1-r1.ebuild 1463 BLAKE2B 62feace67b61c37c0bc3dddf647094d86194d5a45512c3ecee3be46e64762fd75dab55f85df0a8b8730239d86815c40d94e86d88e8b6ac137f4cb023362fdc4d SHA512 8a4cc2f63dc34359d85b13668e268951b231b7ca9d3508e0341727b4ff150cdb74eaf747da1011515e49816c64237475fa4c45cff0bfa8ede545ed415b306cbd
MISC metadata.xml 313 BLAKE2B 76e574d16964ee300bbfd452a53738f99626f7e572847cc923e8b1688dd3e55843a7f4aa5511525eed8e6a9513bc687f131b2a50d173901b54ce94d080d4103f SHA512 17fba6644e9931a1bda042c4ae7e9ad414276c0b159418630c6d20013f4d4b68cd62f150c5076f99e3c719d93f0103fba824fcbbfeebab1478aeddb19181c2f6
diff --git a/media-sound/elisa/elisa-0.1.1.ebuild b/media-sound/elisa/elisa-0.1.1.ebuild
deleted file mode 100644
index 59f7d8a72c82..000000000000
--- a/media-sound/elisa/elisa-0.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
-LICENSE="LGPL-3+"
-IUSE="mpris semantic-desktop"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kfilemetadata)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtmultimedia 'gstreamer')
- $(add_qt_dep qtsql)
- $(add_qt_dep qtwidgets)
- mpris? (
- $(add_frameworks_dep kdbusaddons)
- $(add_qt_dep qtdbus)
- )
- semantic-desktop? (
- $(add_frameworks_dep baloo)
- )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_qt_dep qtgraphicaleffects)
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtquickcontrols2)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package mpris KF5DBusAddons)
- $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
- )
-
- kde5_src_configure
-}
diff --git a/media-sound/elisa/elisa-0.2.1-r1.ebuild b/media-sound/elisa/elisa-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..15da92ebbfac
--- /dev/null
+++ b/media-sound/elisa/elisa-0.2.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+KDE_HANDBOOK="optional"
+QT_MINIMAL="5.11.1"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://community.kde.org/Elisa"
+LICENSE="LGPL-3+"
+IUSE="mpris semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kfilemetadata)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtmultimedia 'gstreamer')
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ mpris? (
+ $(add_frameworks_dep kdbusaddons)
+ $(add_qt_dep qtdbus)
+ )
+ semantic-desktop? (
+ $(add_frameworks_dep baloo)
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtquickcontrols)
+ $(add_qt_dep qtquickcontrols2)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package mpris KF5DBusAddons)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index d3126c3a11a7..2642ab17aa96 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,9 +1,5 @@
AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
-DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
-DIST kid3-3.6.0.tar.gz 1425297 BLAKE2B ff1c8dd8aed2b24c27c458e2215e304587bf658495ad8c8f7ceecd6f9960b010600c25be4ca0c512cf4c5335d48fea7b6267baae0ce2eef2db4dc271442f128c SHA512 ceba8175260d2ef6fad441c7ee5c9b2870b85988515229c09acfccd1a108998b07040dde26ca426de466599b9171fac37f001237991ae977f59742bbbb0cd4f0
DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
-EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
-EBUILD kid3-3.6.0.ebuild 2014 BLAKE2B a955dea1b861316afdf42b3936da65d875baf24165640b9e8f9958fca12788bdc68fb190116f90baf462b3d595de1b62ff7b63a5be9020a488a532f14683068b SHA512 acab344e781bc386e84d9e3dafe518b6b7982b243511ee6c6c28645076b5c4b65c53aac9fb737b3953ee7a7c0c8d2440a0b00254fdd9b94da80c582f47aadfad
-EBUILD kid3-3.6.1.ebuild 2013 BLAKE2B 9c5014553b565a1e82ad8a996dc4e1084018c76c423e02337d37e423a462cadc756fca60ecd72bcd4c65aeaec8252beef47a9b61e3d3d2a4f349130228d31e38 SHA512 2a744c187d0596fef714b14d7cd70e166935d1a1c5dc7dae95c583e79cd72eb3b1f1a0b8ac12537f411fd67e61e90abae4ab3986c6696f60536b47408c37544b
+EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb
MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.5.1.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
deleted file mode 100644
index a2e641496a1d..000000000000
--- a/media-sound/kid3/kid3-3.5.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtmultimedia)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- sys-libs/readline:0=
- acoustid? (
- media-libs/chromaprint
- virtual/ffmpeg
- )
- flac? (
- media-libs/flac[cxx]
- media-libs/libvorbis
- )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- )
- mp3? ( media-libs/id3lib )
- mp4? ( media-libs/libmp4v2:0 )
- taglib? ( >=media-libs/taglib-1.9.1 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.2-libdir.patch"
- "${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
- # overengineered upstream build system
- # kde5 eclass src_prepare leads to compile failure
-
- # only enable handbook when required
- if ! use_if_iuse handbook ; then
- cmake_comment_add_subdirectory ${KDE_DOC_DIR}
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_PHONON=OFF
- -DWITH_QT4=OFF
- -DWITH_QT5=ON
- -DWITH_CHROMAPRINT=$(usex acoustid)
- -DWITH_FLAC=$(usex flac)
- -DWITH_ID3LIB=$(usex mp3)
- -DWITH_MP4V2=$(usex mp4)
- -DWITH_TAGLIB=$(usex taglib)
- -DWITH_VORBIS=$(usex vorbis)
- )
-
- if use kde ; then
- mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
- else
- mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
- fi
-
- kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.6.0.ebuild b/media-sound/kid3/kid3-3.6.0.ebuild
deleted file mode 100644
index 17db2bbd586f..000000000000
--- a/media-sound/kid3/kid3-3.6.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtmultimedia)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- sys-libs/readline:0=
- acoustid? (
- media-libs/chromaprint
- virtual/ffmpeg
- )
- flac? (
- media-libs/flac[cxx]
- media-libs/libvorbis
- )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- )
- mp3? ( media-libs/id3lib )
- mp4? ( media-libs/libmp4v2:0 )
- taglib? ( >=media-libs/taglib-1.9.1 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.2-libdir.patch"
- "${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
- # overengineered upstream build system
- # kde5 eclass src_prepare leads to compile failure
-
- # only enable handbook when required
- if ! use_if_iuse handbook ; then
- cmake_comment_add_subdirectory ${KDE_DOC_DIR}
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_PHONON=OFF
- -DWITH_QT4=OFF
- -DWITH_QT5=ON
- -DWITH_CHROMAPRINT=$(usex acoustid)
- -DWITH_FLAC=$(usex flac)
- -DWITH_ID3LIB=$(usex mp3)
- -DWITH_MP4V2=$(usex mp4)
- -DWITH_TAGLIB=$(usex taglib)
- -DWITH_VORBIS=$(usex vorbis)
- )
-
- if use kde ; then
- mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
- else
- mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
- fi
-
- kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
index 0315d043942a..a187a6615d05 100644
--- a/media-sound/kid3/kid3-3.6.1.ebuild
+++ b/media-sound/kid3/kid3-3.6.1.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+ECM_KDEINSTALLDIRS="false"
KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
inherit kde5
@@ -12,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index df206bf51abb..71251e426e58 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,5 +1,5 @@
AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
EBUILD mumble-1.2.19.ebuild 3048 BLAKE2B e925f6df26dd6a0da4241f90d2ced7d095029a292484028fedf332008d7e9a7ac755f14a72cd8a358ec7b2bc527c82eae59da6746d38879fa2827afd6bcccbd7 SHA512 9b5a99ae4ca3ccddc03e50044289fefae4cc41baa0db018316df809f56f893d8e676ee5e6c35d8e783c621fec848c54fa0be5471567909ebd1e0486924fffdbc
-EBUILD mumble-9999.ebuild 2889 BLAKE2B 8d8904682b7f11236a25474167b97ffad1196d7d36dfca6a41bf975cc94e21d0c6d49f4c3c90a64485b3439fbe487a5eb367d4fa158f0ca45129cb63475343e0 SHA512 ce9d09dd4a9d16a968e0f8b6db8bf84076ccdea0989df3a5c2e5e8dd48e290f1b3a650afc322aadfbd2dbcf3fb8e219a27a597ece65c2637615bf52224f3837b
-MISC metadata.xml 751 BLAKE2B 17b72569ef8313fa654bd444572521c482b1b2c4d14bc73b41be5f6ddf8e9c8e9064fa1a87b4589f7a18a5ceae835fb60718226059f5b96d4dfa6e2b26256630 SHA512 78d4d18e60dfbcbab8b1ae64f214c2f6aa0ae7ea01323590f3847b1ed50fc90a29acbb5a44c65e82747237e60d5d4a24c9b2808d4e4a90a996ab90952340c18b
+EBUILD mumble-9999.ebuild 2938 BLAKE2B 7dd09916803c64271aefdea74382bfc8a3a700fce6eb07bc00f08d4cc337dede346bd836380f71f690e20493e3d98bc594eace985df6fae572d8827aefc3ff61 SHA512 c434b208665e4a74cd19c326727ad02fddb90ac26353eabce996a9c90df22d8e8011e74c4470e3e4150d15b0909d1c5e2df9cd467ce154d8ccdc89bf47e50626
+MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 59327713616d..146871bb68ac 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -11,6 +11,7 @@ Mumble is an open source, low-latency, high quality voice chat software primaril
<use>
<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg>.</flag>
+ <flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
<flag name="speech">Enable text-to-speech support in Mumble.</flag>
</use>
<upstream>
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 1d787139f196..6caa7e0e0b35 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
if [[ "${PV}" = 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
- EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble )
+ EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
else
MY_P="${PN}-${PV/_/~}"
SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
@@ -20,7 +20,7 @@ fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio speech zeroconf"
+IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
RDEPEND="
dev-qt/qtcore:5
@@ -74,6 +74,7 @@ src_configure() {
$(myuse opus)
$(myuse oss)
$(myuse portaudio)
+ $(myuse rnnoise)
$(usex speech '' no-speechd)
$(usex zeroconf '' no-bonjour)
)
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
deleted file mode 100644
index d088a66db611..000000000000
--- a/media-sound/puddletag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST puddletag-1.2.0.tar.gz 1231226 BLAKE2B 3555bb8fe06acf95106a0dc59dd617d9fba7075dbe97c2fba18a24a663cb9d9ae010718fc07d57823acccdb528c078a8edbb9d38829468582b8791d5debdae42 SHA512 4fd57f3e89c01e2914c3cf2e08760752ab5454c15c66c97fb1b42165fd27893d240762ac3591bc5165a31d03ef7fbf8d411c4cd989e07dcc69f43f5e87e89611
-EBUILD puddletag-1.2.0.ebuild 1004 BLAKE2B 8871cec12d6ad3fcc87aa2d7d8bde1e1d024b01938c502e00f241947077960e3015aae704b84baf12e94b2408f0885b950d3cb3f8bf11db311c2bb422f2f5334 SHA512 f453158eeb6acaf99bb5b63a9afafb5b11b470a11cbf29a9034d7eaf575f544496cdd9d01a9fffa55d55352db1679e2c73fff817269a536d13815c5446eda041
-MISC metadata.xml 778 BLAKE2B 55eb2ed831d91ca2c042c329c91fab1d672c6ff581a6908f0ee3e895def40ed65ea885cf7a3aa50901810794faf43fa3d6f8761de35df8206492e2d1589cb8fe SHA512 3d8d7e8b38b916809424a16b9e306f301c07906fed200f8694b3496dd58259faee37c3e1964e914bdf11db2123dd68bbd5436555edddcf72d377fa5581645867
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
deleted file mode 100644
index dd26272a674e..000000000000
--- a/media-sound/puddletag/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>billie@gentoo.org</email>
- <name>Daniel Pielmeier</name>
- </maintainer>
- <use>
- <flag name="cover"> Enables editing of FLAC cover art</flag>
- <flag name="musicbrainz"> Enables support for musicbrainz, needs <pkg>dev-python/python-musicbrainz</pkg></flag>
- <flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
- <flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">puddletag</remote-id>
- <remote-id type="github">keithgg/puddletag</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.2.0.ebuild b/media-sound/puddletag/puddletag-1.2.0.ebuild
deleted file mode 100644
index 263adc18efad..000000000000
--- a/media-sound/puddletag/puddletag-1.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 fdo-mime
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://docs.puddletag.net/"
-SRC_URI="https://github.com/keithgg/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid cover musicbrainz quodlibet"
-
-DEPEND=""
-RDEPEND=">=dev-python/PyQt4-4.9.6-r2[${PYTHON_USEDEP},svg]
- >=dev-python/pyparsing-1.5.1[${PYTHON_USEDEP}]
- >=media-libs/mutagen-1.21[${PYTHON_USEDEP}]
- >=dev-python/configobj-4.7.2-r1[${PYTHON_USEDEP}]
- acoustid? ( >=media-libs/chromaprint-0.6 )
- musicbrainz? ( >=dev-python/python-musicbrainz-0.7.4-r1[${PYTHON_USEDEP}] )
- cover? ( dev-python/pillow[${PYTHON_USEDEP}] )
- quodlibet? ( >=media-sound/quodlibet-2.5[${PYTHON_USEDEP}] )
- >=dev-python/sip-4.14.2-r1:0[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
-
-DOCS=(changelog HACKING NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 6120095e4ea3..f3c3868dd090 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,7 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
DIST pulseaudio-11.99.1.tar.xz 1655948 BLAKE2B 33d774bbcb2cf4a1d457e2cecfae007a75acc5c8ba188c5f2fbce773cf3fb67c9c345538584014898f42b3ff7c6e680c9660ff07f7d74630f711f85d9c514d2c SHA512 f9340f836bd12756ddb30e27bb04f8470a97ec372f5d9a2703da3ac348436b7b3efe074635c5a994cc6cd77c7f18aa2d74811c7e12bc52c0578fd15f8dffaab8
DIST pulseaudio-12.0.tar.xz 1657212 BLAKE2B b38bdeec21c336d7435b1ae895eb50b164d513f4b15d5c6b559df457722da02484072d3beb8874c3690efd1ddff1e13966ab5501d1e9418683461ca977b2c6fb SHA512 e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c
-EBUILD pulseaudio-11.1-r1.ebuild 10991 BLAKE2B 5f5eb2a5a941307d9144f06a0d3452b040fa873f04abb48ed5e51e861841a0ef677201be07edfb96c54d9f6dda8d77e6306331c706884ffb954a921a56301dd0 SHA512 0389700cdbbcad351e7bea818ffd57ca244b2a41bd901eb5511d4af9bbf980fdca3a346ff0854abc280b938b2aaf52fb11f0c8f21342413dc70218806e12f853
+EBUILD pulseaudio-11.1-r1.ebuild 10990 BLAKE2B 7c5d064fa0b728ef39a0c9e6aa538427bceb66e19cef41e19167185793c6021c9365584fc22f9b4417a510c90253216a1515339954cc3ae26c352e2e987b29ac SHA512 4c076242f0a7f3bee1bece13a1ef5563b848a5be3856180fa69bc3b62892a9a9cf33df368d875c9382ee51e761689588b6f0fdc864a6b746d591103f12839323
EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
EBUILD pulseaudio-11.99.1-r1.ebuild 10990 BLAKE2B fbf57d791769744ef97fd49390bcb9d30a5a02450650f8b81a3b27575fc1188e7da5797939b01a6c308ba61a4b448377c5a5602ec0e7e585de98ece239b9da6e SHA512 a290149a12739dd09707d18f192f45532e36ab9473a211de4c3da0d37abe142ba710813ceb9019116953e96a451d8f4b7a9636710ea84000b584543073c8846f
EBUILD pulseaudio-12.0-r1.ebuild 10661 BLAKE2B d411bcf361f9affe99c93f954b122bafc843b327e7e2668b3a01a18b0def83615aeced03d21aadae9fd993535ee44802ae3aed4b8b6a689627c2eaeaf3b575c1 SHA512 fbe96ce05c0b7aff771481d93d7d5567c08c7edfcfbc920e056dbd18cff7c488f86cfe9d5966e8eb71f0919e7af32194bc92f0c0a8997104e23c0385752a794b
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
index e2673e617622..ee526c96d715 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 9a2bcd9995b8..29ed3acbe5ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,10 @@
DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
+DIST pulseeffects-4.1.3.tar.gz 721527 BLAKE2B 616e341375aa71a209e8d5e3043b3013da037609ddbec595eec1f655c9a725e17f1c9359535aa4c6bf441af2e7943bef435340ecccbbd92c5022230697609a40 SHA512 416111e77a09adad9af501d4ef24482969277ac52da5d1df730995ab650e6eca46b96ec6277bada8ee8ed5bb14a09592e566d419ea19f6a87840cecdf1a79bdd
+DIST pulseeffects-4.1.6.tar.gz 750083 BLAKE2B 36d0b61a578b40fc6a14ed56ca66260f1ddaba5bd8c3b2c7f234d081716c2f8437a4b8410a0f4a3db935ab4780a763cd2a0d58d793865f5306e6db13c144afbb SHA512 6bca6d6ef393f4844840e975d86f835c44b36ca339ab3817d051663cd6a14531aabbc5ed98c39e85fbd4440522c9ba48b53e451d955434d508b8aa175caf46d7
EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-9999.ebuild 1517 BLAKE2B 61c46ec631b877ca88ad25ddb887467895a924d5112d54d7fe239609f85c0b213811277dd26d77aaa3bd35f5e9582e28f218d3a4795044fccde38b15684f74c3 SHA512 6d22aadcdc20b568fad4a094e3d01c613d9b7c7be3151d7da40597270133e76ccf7424a28c4e4abe9f87b2f60baac830f2dbd58251ca107444895c14c41de007
-MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
+EBUILD pulseeffects-4.1.3.ebuild 1417 BLAKE2B 889d988ed05c491f366e78aaa88a8455d431ed47490edba05575ae705fb7dce2d796baea85f1a48d3eef9b2b80fd1476a6a45754a895ab1f6a29af490969bd71 SHA512 73375cff820247f19cda0ab51eba32fab8629721ceb34f73fe1050c5b6a2346eb54f9a05244550e8742958fb5590e5af1b5e1fbdd45be1644de42ce83f4b2343
+EBUILD pulseeffects-4.1.6.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+EBUILD pulseeffects-9999.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c9003b7aa9b2..4f7f3990a2bb 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -10,6 +10,12 @@
<name>Jorge Pizarro Callejas</name>
<description>Jorgicio Gentoo Overlay</description>
</maintainer>
+ <use>
+ <flag name="bs2b">Enable use of media-libs/libbs2b</flag>
+ <flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
+ <flag name="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
+ <flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+ </use>
<longdescription lang="en">
Audio effects for Pulseaudio applications
</longdescription>
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
new file mode 100644
index 000000000000..edfa01b18d19
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="${HOMEPAGE}"
+else
+ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+DEPEND="
+ >=dev-libs/boost-1.41
+ >=dev-cpp/glibmm-2.56.0
+ >=dev-cpp/gtkmm-3.20:3.0
+ >=dev-libs/glib-2.56:2
+ >=dev-libs/libsigc++-2.10:2
+ >=x11-libs/gtk+-3.18:3
+ >=media-libs/lilv-0.24.2-r1
+ >=media-libs/gstreamer-1.12.0:1.0
+ >=media-libs/gst-plugins-good-1.12.0:1.0
+ >=media-libs/gst-plugins-bad-1.12.0:1.0
+ bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+ >=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+ >=media-plugins/gst-plugins-lv2-1.12.0:1.0
+ >=media-plugins/gst-plugins-pulse-1.12.0:1.0
+ calf? ( >=media-plugins/calf-0.90.0[lv2] )
+ mda-lv2? ( media-plugins/mda-lv2 )
+ rubberband? ( media-libs/rubberband )
+"
+RDEPEND="${DEPEND}
+ media-sound/pulseaudio
+"
+
+pkg_preinst(){
+ gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+ gnome2_gconf_install
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+ gnome2_gconf_uninstall
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild
new file mode 100644
index 000000000000..fde99f8f82b8
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="${HOMEPAGE}"
+else
+ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+DEPEND="
+ >=dev-libs/boost-1.41
+ >=dev-cpp/glibmm-2.56.0
+ >=dev-cpp/gtkmm-3.20:3.0
+ >=dev-libs/glib-2.56:2
+ >=dev-libs/libsigc++-2.10:2
+ >=x11-libs/gtk+-3.18:3
+ >=media-libs/lilv-0.24.2-r1
+ >=media-libs/gstreamer-1.12.0:1.0
+ >=media-libs/gst-plugins-good-1.12.0:1.0
+ >=media-libs/gst-plugins-bad-1.12.0:1.0
+ bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+ >=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+ >=media-plugins/gst-plugins-lv2-1.12.0:1.0
+ >=media-plugins/gst-plugins-pulse-1.12.0:1.0
+ calf? ( >=media-plugins/calf-0.90.0[lv2] )
+ mda-lv2? ( media-plugins/mda-lv2 )
+ rubberband? ( media-libs/rubberband )
+ >=media-libs/zita-convolver-3.0.0
+"
+RDEPEND="${DEPEND}
+ media-sound/pulseaudio
+"
+
+pkg_preinst(){
+ gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+ gnome2_gconf_install
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+ gnome2_gconf_uninstall
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 94b01c50ed02..fde99f8f82b8 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -3,9 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
+inherit gnome2-utils meson
DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
HOMEPAGE="https://github.com/wwmm/pulseeffects"
@@ -21,31 +19,31 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
+IUSE="bs2b calf mda-lv2 rubberband"
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
DEPEND="
- ${PYTHON_DEPS}
- python_targets_python3_4? ( dev-python/configparser )
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- >=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+ >=dev-libs/boost-1.41
+ >=dev-cpp/glibmm-2.56.0
+ >=dev-cpp/gtkmm-3.20:3.0
+ >=dev-libs/glib-2.56:2
+ >=dev-libs/libsigc++-2.10:2
>=x11-libs/gtk+-3.18:3
- dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
>=media-libs/lilv-0.24.2-r1
- >=media-plugins/calf-0.90.0[lv2]
>=media-libs/gstreamer-1.12.0:1.0
>=media-libs/gst-plugins-good-1.12.0:1.0
>=media-libs/gst-plugins-bad-1.12.0:1.0
- >=media-plugins/gst-plugins-bs2b-1.12.0:1.0
+ bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
>=media-plugins/gst-plugins-lv2-1.12.0:1.0
>=media-plugins/gst-plugins-pulse-1.12.0:1.0
- media-libs/rubberband
+ calf? ( >=media-plugins/calf-0.90.0[lv2] )
+ mda-lv2? ( media-plugins/mda-lv2 )
+ rubberband? ( media-libs/rubberband )
+ >=media-libs/zita-convolver-3.0.0
"
RDEPEND="${DEPEND}
- media-sound/pulseaudio[equalizer]
+ media-sound/pulseaudio
"
pkg_preinst(){
@@ -55,9 +53,11 @@ pkg_preinst(){
pkg_postinst(){
gnome2_gconf_install
gnome2_schemas_update
+ gnome2_icon_cache_update
}
pkg_postrm(){
gnome2_gconf_uninstall
gnome2_schemas_update
+ gnome2_icon_cache_update
}
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 22f734fe173f..c64297366034 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,4 +1,5 @@
+AUX qtscrobbler-0.11_pre20130123-qt5.11.patch 697 BLAKE2B d60d5da77ab0a30d9ad89d24a10882ce91c85bf9959e5be6019c69b0db95c60d2e6d1c2cbf5a1fdd5494236ce5d78d9b5a5a05b9bea264db750c0f570cda85d0 SHA512 2edf71e6397dfdbb1aaeb38bca5b6a3b2a097b1a25038f62d1052cb5258cf94b12c26181fea76c64506ed60bfdeaa4968429836eb47e874aec273cdb480689ce
AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1251 BLAKE2B 094405e5dcd19615efde5fc392f5f42a0087e75e25f028ff3f45b5682afd50d1708cdb37bdcba8d48bdc20a93fccefe67d8fbc8fda5f640525109e0b84939985 SHA512 37b3d7419fb6dd0505f7cd2a64b42ae0b29503cb47ab0afbf54ffe9c5450b45c4a168b8d506d7ce1a3b563455a49d687dd12b4104f2748db676aff6a6b8b1ded
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1285 BLAKE2B d6ea8043f5932cc68231731d0ead450f99faed2a5d0e9871c103eedf648004b445320f0c5744c85e26b9ecf6489e84b1dac51dd71f49de58e812693ecde14958 SHA512 e16d66960de5faa44f4426bc38000a1f50bc86ec0807b2f4e088a6d3513b57388d274206b33e06eaa33218fa269e68ffe5e44b74b4ffc150fe005bb0960f6bf7
MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
new file mode 100644
index 000000000000..33781a4ee82f
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
@@ -0,0 +1,24 @@
+From 11d70c80a634aaf1606a435688dddbc3db36b7ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 14 Jul 2018 15:35:25 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ src/qt/src/qtscrob.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qt/src/qtscrob.cpp b/src/qt/src/qtscrob.cpp
+index 5b7a561..c6084e3 100644
+--- a/src/qt/src/qtscrob.cpp
++++ b/src/qt/src/qtscrob.cpp
+@@ -17,6 +17,7 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
++#include <QHeaderView>
+ #include <QtGui>
+ #include <QTime>
+ #include "qtscrob.h"
+--
+2.18.0
+
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index dc4f5ac6824a..3dc54d6064d0 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-qt5.patch
+ "${FILESDIR}"/${P}-qt5.11.patch
+)
src_configure() {
pushd src >/dev/null
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ef6784e9bf41..ed63092d3c6c 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,6 +9,6 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2623 BLAKE2B 88d031c8627f1a22fd70a7a6bc5eddedbec612f26c6151ce9e1f9eff5ea32e082b0a1a9c2734c60d0a50724600ef39c42122b5239936f02da1bee83459a2c63f SHA512 6a9e00525989efc807dbffdb863e218cd030285122f76e752055e1585ae79e78f3f899aafe4e61abaf873614a8456725774fd277db92e7d58e6199afa2f4244f
+EBUILD sox-14.4.2-r1.ebuild 2622 BLAKE2B 63710ce09d8eea6117f7851b709bf98a304535ef827df23cad86a9402e141f4d1de1292601c5344705ab40d9b17a2d5b45c93c33d970aff90b31017fbec9cc9a SHA512 980f2a62047118431b1c0452cec7c36cccd5b0d5ee9cf6b1203235fa6a06f28abd685af961e44f62bff663c51b20382d91c029646c5722c3ce1ae10d3f3bacf9
EBUILD sox-14.4.2.ebuild 2162 BLAKE2B acf1642bd7003f6d19bc454196f4b6cf6fe9e7088363b3c3b530a973d874a3261faca50c26fc6d4e076064ebf10a87d39a5d647e4feccacc49d8c4cc052a1d62 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825
MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 233339ff404d..8f7f7227ebc1 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
RDEPEND="
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index e6ea21ccd3b1..0277005ee19f 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,11 +1,6 @@
-AUX supercollider-3.8.0-desktop.patch 373 BLAKE2B a754375ae87cc47b62a4262b151f16800a9799f932669a095e1df0cbce693597fb35821a7c8d99a1816c7e7c432e25a2f7d19cb4af0dd3840f2f87a6ae7de9fd SHA512 be8a72fbf53cdcc7bccc073602457aa1f7d6c779077276dae0252f0379f62d923a588ba18d32cac4b1d48d46cd0a1799d95ccd0f9c8c1f73ed3f5188829ede93
-AUX supercollider-3.8.0-gcc-7.patch 2083 BLAKE2B 4e47c81c954136f6b8ba47f749755ccd8b61710ffa4442e93229dedbb4ae8f7b8d3d9559dbc1e253e34d9f550347940f8b437c68f27c3174069d79adf3ec16b6 SHA512 816f26d27fe98e716fae749bb1248d3b7022dcfa12e8de7450f40f2a6b9d7d89642ffe70b75b3340a93d34a2c8bafb0de9a3d7330d87f97027bc2ed534d73b99
-AUX supercollider-3.8.0-multilib.patch 3495 BLAKE2B 5c2ae8010c243966d01dfac3a38f5e73e1b8a5e4d4f12f11ffff1d8a701bb09fd278aba7126548219319ee65ff6814260f98cdc4194d7077d02b5c22bd476576 SHA512 9b6d7e878e71954d75fbb21c7a205a054187fb15b9e20d60bc5817281a926ffee702b6954701d1cdaab668201ad42674d7b17815b4c822a3b97ab2e799aac356
AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2
AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
-DIST SuperCollider-3.8.1-Source-linux.tar.bz2 8913640 BLAKE2B 998b64b7e3530f6dc2e5d329bf387bb62aa694ec65d9a8464ae2b3bc1816f6a6fb26f351465df58170034ba35d7afc5df545a9bd614e96e6434155c70715d0ce SHA512 50d9e65e8b610e86decc98ecfa5bef2088af6dc2436e5059e5aa66e8ce9b4f2dab23dd1c5231c08430d1c50b211c876e7860c0e2078d0500bf8de4fbb9554eb7
DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
-EBUILD supercollider-3.8.1.ebuild 2935 BLAKE2B 52699086a017a4f86b5aa0cd0a1aa624f149f6d3e81c2724c5878560c2c9d7c06f2a3d651fd20d303ab8aff4ec47d2c0dc890e1c93ede245b5de2e07ccadcd46 SHA512 8ddcca74f44990e3b0f65b345019500a80505004462980287cb4026f458a538f9e94ac3adddd5e359b842093d1d93bfd75563d5cf62640065c7e550a50a1c1d6
-EBUILD supercollider-3.9.3.ebuild 2813 BLAKE2B 4e458fd33e51fb320fa2c58a49abce501ef1fbe2157a5c3b3edcac030e260126e5fadcbe57e9402ec55cddaad08ca30635da9c9568cb023860c64d84a4522105 SHA512 c26560c21dfa079e937a1d798bdaf294222ddbea0184350311e0eda10a84e972065d496020b9f10e5a317ecdd5ea2eeb7c08c1a2645cf5b3ee71c16b4bc13809
+EBUILD supercollider-3.9.3-r1.ebuild 2830 BLAKE2B 0dff8c6d9b3cb9fc53f06c1b99cea728d7eee0aa4f6e2650a6551522199e65a6f207db87ea1d31d1165af9acd915eda1b3fca37953ef6e16e8473f6994fec187 SHA512 604f01e53eeefd9b70ab4582221cb66076d1c033bf74c04a44efddb01c9d28c4a38dfab43399a96347f4cfcb2232e66f2b1498a1367bcc693b8256bd646bb2c6
MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
deleted file mode 100644
index 2cf759881d05..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/editors/sc-ide/SuperColliderIDE.desktop 2016-08-22 11:12:21.000000000 +0300
-+++ b/editors/sc-ide/SuperColliderIDE.desktop 2017-10-31 18:26:58.520164204 +0300
-@@ -5,6 +5,5 @@
- Icon=sc_ide
- Type=Application
- Terminal=false
--Patterns=*.scd;*.sc;*.schelp
--Categories=Application;Multimedia;Audio;AudioVideo
-+Categories=X-Multimedia;Audio;AudioVideo
- MimeType=text/x-sc;
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch b/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
deleted file mode 100644
index 5f0269845b31..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1eaa3fb3afbbf4708695a25361527a70e2d7a02d Mon Sep 17 00:00:00 2001
-From: Brian Heim <brianlheim@gmail.com>
-Date: Tue, 4 Jul 2017 13:26:00 -0400
-Subject: [PATCH] DiskIO_UGens: include <functional>
-
-std::bind is in <functional> according to the C++ ISO standard, and
-gcc7.1 enforces this.
----
- server/plugins/DiskIO_UGens.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
-index 47c91a139..d4bb1c51c 100644
---- a/server/plugins/DiskIO_UGens.cpp
-+++ b/server/plugins/DiskIO_UGens.cpp
-@@ -28,6 +28,7 @@
-
- #include <atomic>
- #include <new>
-+#include <functional>
- #include <SC_Lock.h>
-
- #include <boost/lockfree/queue.hpp>
---
-2.15.1
-
-From a891e7d5be4c4944970973cc8467485e8a4c0571 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 7 Sep 2017 19:38:46 -0300
-Subject: [PATCH] PyrSched.cpp: #include <functional> to fix FTBFS
-
-Bug-Debian: https://bugs.debian.org/853671
----
- lang/LangPrimSource/PyrSched.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
-index 02f0c6264..63487a58e 100644
---- a/lang/LangPrimSource/PyrSched.cpp
-+++ b/lang/LangPrimSource/PyrSched.cpp
-@@ -37,6 +37,7 @@
- #include <string.h>
- #include <math.h>
- #include <limits>
-+#include <functional>
-
- #if defined(__APPLE__) || defined(__linux__)
- # include <pthread.h>
---
-2.15.1
-
-From c058e16ff215b0b318abb3aa9ab4d47c0eeac877 Mon Sep 17 00:00:00 2001
-From: hlolli <hlolli@gmail.com>
-Date: Mon, 10 Jul 2017 18:32:22 +0200
-Subject: [PATCH] adding functional header in PyrSerialPrim.cpp
-
----
- lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
-index 3099598fe..5e2b40372 100644
---- a/lang/LangPrimSource/PyrSerialPrim.cpp
-+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
-@@ -36,6 +36,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <boost/atomic.hpp>
-+#include <functional>
-
- #include <stdexcept>
- #include <sstream>
---
-2.15.1
-
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
deleted file mode 100644
index 982e44a15a95..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 547a18c14dd45a22361f2ab495d14625862499e5 Mon Sep 17 00:00:00 2001
-From: Ferdinand Thiessen <rpm@fthiessen.de>
-Date: Sun, 5 Mar 2017 16:16:19 +0100
-Subject: [PATCH] cmake / linux: Allow setting LIB_SUFFIX to install libraries
- into lib64 etc.
-
----
- editors/sced/CMakeLists.txt | 6 +++---
- server/plugins/CMakeLists.txt | 2 +-
- server/scsynth/CMakeLists.txt | 4 ++--
- server/supernova/server/main.cpp | 1 +
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/editors/sced/CMakeLists.txt b/editors/sced/CMakeLists.txt
-index 286d625fb..b304d4c07 100644
---- a/editors/sced/CMakeLists.txt
-+++ b/editors/sced/CMakeLists.txt
-@@ -14,10 +14,10 @@ if(NOT WIN32 AND SC_ED EQUAL 2)
- DESTINATION share/gtksourceview-2.0/language-specs)
-
- install(FILES data/sced.gedit-plugin
-- DESTINATION lib/gedit-2/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
-
- install(DIRECTORY sced
-- DESTINATION lib/gedit-2/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
-
- elseif(NOT WIN32 AND SC_ED EQUAL 3)
-
-@@ -29,7 +29,7 @@ elseif(NOT WIN32 AND SC_ED EQUAL 3)
- DESTINATION share/gtksourceview-3.0/language-specs)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
-- DESTINATION lib/gedit/plugins)
-+ DESTINATION lib${LIB_SUFFIX}/gedit/plugins)
-
- elseif(WIN32)
-
-diff --git a/server/plugins/CMakeLists.txt b/server/plugins/CMakeLists.txt
-index 52accc332..570f2e50b 100644
---- a/server/plugins/CMakeLists.txt
-+++ b/server/plugins/CMakeLists.txt
-@@ -301,7 +301,7 @@ elseif(APPLE)
-
- else()
- install(TARGETS ${plugins} ${supernova_plugins}
-- DESTINATION "lib/SuperCollider/plugins"
-+ DESTINATION "lib${LIB_SUFFIX}/SuperCollider/plugins"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index 1d99cad80..dbb92749b 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -150,7 +150,7 @@ elseif(NOT NO_LIBSNDFILE)
- endif(SNDFILE_FOUND)
-
- if(UNIX AND NOT APPLE)
-- target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins\"")
-+ target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/SuperCollider/plugins\"")
- endif()
-
-
-@@ -284,7 +284,7 @@ elseif(WIN32)
- else()
- install(TARGETS ${INSTALL_TARGETS}
- RUNTIME DESTINATION "bin"
-- LIBRARY DESTINATION "lib"
-+ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
-diff --git a/server/supernova/server/main.cpp b/server/supernova/server/main.cpp
-index c0f603471..453355523 100644
---- a/server/supernova/server/main.cpp
-+++ b/server/supernova/server/main.cpp
-@@ -245,6 +245,7 @@ void set_plugin_paths(server_arguments const & args, nova::sc_ugen_factory * fac
- const path home = resolve_home();
- std::vector<path> folders = { "/usr/local/lib/SuperCollider/plugins",
- "/usr/lib/SuperCollider/plugins",
-+ "/usr/lib64/SuperCollider/plugins",
- home / "/.local/share/SuperCollider/Extensions",
- home / "share/SuperCollider/plugins" };
-
---
-2.15.1
-
diff --git a/media-sound/supercollider/supercollider-3.8.1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
deleted file mode 100644
index 07406d0c4346..000000000000
--- a/media-sound/supercollider/supercollider-3.8.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
- media-libs/alsa-lib
- sys-libs/readline:0=
- x11-libs/libX11
- x11-libs/libXt
- avahi? ( net-dns/avahi )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- gedit? ( app-editors/gedit )
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qtdeclarative:5
- dev-qt/qtconcurrent:5
- )
- vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
- "${FILESDIR}"/${PN}-3.8.0-multilib.patch
- "${FILESDIR}"/${PN}-3.8.0-gcc-7.patch
- "${FILESDIR}"/${PN}-3.8.0-desktop.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=OFF
- -DSYSTEM_YAMLCPP=OFF
- -DNO_AVAHI=$(usex !avahi)
- -DFFT_GREEN=$(usex !fftw)
- -DNO_GPL3=$(usex !gpl3)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_IDE=$(usex qt5)
- -DSC_ED=$(usex gedit)
- -DSC_VIM=$(usex vim)
- -DSC_EL=$(usex emacs)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- use vim && newdoc editors/scvim/README.md README.vim
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
- einfo
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
- einfo
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
new file mode 100644
index 000000000000..af5984979652
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
+RESTRICT="mirror"
+
+RDEPEND="
+ media-libs/alsa-lib
+ sys-libs/readline:0=
+ x11-libs/libX11
+ x11-libs/libXt
+ avahi? ( net-dns/avahi )
+ fftw? ( sci-libs/fftw:3.0= )
+ jack? ( virtual/jack )
+ !jack? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ server? ( !app-admin/supernova )
+ sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}
+ dev-libs/icu
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ gedit? ( app-editors/gedit )
+ qt5? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtconcurrent:5
+ )
+ vim? ( app-editors/vim )
+"
+
+S="${WORKDIR}/SuperCollider-Source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DAUDIOAPI=$(usex jack jack portaudio)
+ -DINSTALL_HELP=ON
+ -DSYSTEM_BOOST=OFF
+ -DSYSTEM_YAMLCPP=OFF
+ -DNO_AVAHI=$(usex !avahi)
+ -DFFT_GREEN=$(usex !fftw)
+ -DNO_GPL3=$(usex !gpl3)
+ -DNO_LIBSNDFILE=$(usex !sndfile)
+ -DSC_QT=$(usex qt5)
+ -DSCLANG_SERVER=$(usex server)
+ -DSUPERNOVA=$(usex server)
+ -DLIBSCSYNTH=$(usex !static-libs)
+ -DSSE=$(usex cpu_flags_x86_sse)
+ -DSSE2=$(usex cpu_flags_x86_sse2)
+ -DSC_IDE=$(usex qt5)
+ -DSC_ED=$(usex gedit)
+ -DSC_VIM=$(usex vim)
+ -DSC_EL=$(usex emacs)
+ )
+
+ use debug && mycmakeargs+=(
+ -DSC_MEMORY_DEBUGGING=ON
+ -DSN_MEMORY_DEBUGGING=ON
+ -DGC_SANITYCHECK=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ use vim && newdoc editors/scvim/README.md README.vim
+ use emacs && newdoc editors/scel/README.md README.emacs
+ use gedit && newdoc editors/sced/README.md README.gedit
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Notice: SuperCollider is not very intuitive to get up and running."
+ einfo "The best course of action to make sure that the installation was"
+ einfo "successful and get you started with using SuperCollider is to take"
+ einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
+ einfo
+
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3.ebuild
deleted file mode 100644
index 5ea861d111ba..000000000000
--- a/media-sound/supercollider/supercollider-3.9.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
- media-libs/alsa-lib
- sys-libs/readline:0=
- x11-libs/libX11
- x11-libs/libXt
- avahi? ( net-dns/avahi )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- !jack? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- )
- server? ( !app-admin/supernova )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- dev-libs/icu
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- gedit? ( app-editors/gedit )
- qt5? (
- dev-qt/linguist-tools:5
- dev-qt/qtdeclarative:5
- dev-qt/qtconcurrent:5
- )
- vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
- "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DAUDIOAPI=$(usex jack jack portaudio)
- -DINSTALL_HELP=ON
- -DSYSTEM_BOOST=OFF
- -DSYSTEM_YAMLCPP=OFF
- -DNO_AVAHI=$(usex !avahi)
- -DFFT_GREEN=$(usex !fftw)
- -DNO_GPL3=$(usex !gpl3)
- -DNO_LIBSNDFILE=$(usex !sndfile)
- -DSC_QT=$(usex qt5)
- -DSCLANG_SERVER=$(usex server)
- -DSUPERNOVA=$(usex server)
- -DLIBSCSYNTH=$(usex !static-libs)
- -DSSE=$(usex cpu_flags_x86_sse)
- -DSSE2=$(usex cpu_flags_x86_sse2)
- -DSC_IDE=$(usex qt5)
- -DSC_ED=$(usex gedit)
- -DSC_VIM=$(usex vim)
- -DSC_EL=$(usex emacs)
- )
-
- use debug && mycmakeargs+=(
- -DSC_MEMORY_DEBUGGING=ON
- -DSN_MEMORY_DEBUGGING=ON
- -DGC_SANITYCHECK=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- use vim && newdoc editors/scvim/README.md README.vim
- use emacs && newdoc editors/scel/README.md README.emacs
- use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
- einfo
- einfo "Notice: SuperCollider is not very intuitive to get up and running."
- einfo "The best course of action to make sure that the installation was"
- einfo "successful and get you started with using SuperCollider is to take"
- einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
- einfo
-
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 3211a8f0241f..41d0176c8422 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -6,5 +6,5 @@ AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743af
AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
EBUILD vorbis-tools-1.4.0-r3.ebuild 1174 BLAKE2B 3369ef56b23523dbb981341bc6e1bc745be8cc405604b9c633a8cc636356075ea2eea4e849718e29428688d877adad0eb8a91e64c4b482a4446fbb9884209f25 SHA512 e0868673ea0b1af427118f502d54bf4b25be9148fcb06e5f47a9fd5415505db2d94f98cff4736ff496119382354a0de8390956c596bdfbd56e172802ad9c2f51
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1210 BLAKE2B 2bb0bdd6f0334377a31e9ea8050f26e187f3d5fb63b79634a4ef0bc2f77eb045d0963cfd572c8b5060ddd41e7912eb902cda44bb190e6bbf7bd22b71eb81880c SHA512 ad4808b45f8c35e58cf73729b4c8aa1f72dcf369569a1d161e804a1830770b0ac6bd025289fe603c38846f99a1f6d7aab516bf86a162c1a46cb606b22caa29b3
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1209 BLAKE2B 534f416e532934aeb7d3e206a37b858b92ae18042154f1b31e60c67c4dca684b39a2bf8e5bc692d2833cc18e521cc0159bc2b5e978d2c2cd394da27979ed94f2 SHA512 938ea8ca7496a0f2e85b1cedc73f7f9745909bbf919c218468717fe590346469f991397226dff0f58fca6d2b6d885fc7399ec38d4612c3fbfbdf238abf85e536
MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
index c44d174861f9..7587affb5980 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac kate nls +ogg123 speex"
RDEPEND="
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 15fc2e1e3f40..42f62688c818 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,3 +1,3 @@
DIST xfmpc-0.2.3.tar.bz2 414680 BLAKE2B 167af8e53d7ddf2a629d585e8ca9f15507e54ee92ceae0f48d3462fc1667b07570d2489cc5058c0521aae2f0b1493a1101655ae702e48b3c4d0c6be493a4ec57 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be
-EBUILD xfmpc-0.2.3-r1.ebuild 763 BLAKE2B fc955996e53129533110994c9a36134bf56c6c8204b5caea7671741a47585dea562bb087f5c2acd4436e0b853b9d6476cfb24598e9b40b64d5e1304ddb0f454a SHA512 64e9a9454b6b4f0457167debff549a10e4a82f31cc9c3a60d6d33c5c4bb0b2a8d4da6f6fe7d11408e976870ea6c7ad96328f708ecf08ab60f41d51f1cbfe71d2
+EBUILD xfmpc-0.2.3-r1.ebuild 774 BLAKE2B ecfffb22006c3452b3d0cf54bcdb9d993fb274b3adee1b72164beddfd4eb3a786863fd8278c02afb8052e89fc748ae90699ebada619436d0fccafbf3d9c004db SHA512 5b1272722cac67bc3b6c5492a64f63d85e22014dda9f45eaf8e523df5e56ddcef562a57db71093721674f82db0665933522b66922fca16d64cd9757d69f7cca8
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
index 1f2802f64c8e..6d1b25a9d567 100644
--- a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xdg-utils
DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/0.2/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f1a5a0555c07..73946bc0ab8b 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 81be684a7e0c..2ea5f269064b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,6 +9,7 @@ DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecf
DIST ffmpeg-3.3.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a
DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
DIST ffmpeg-3.4.2.tar.bz2 10179184 BLAKE2B a9116fd42b62683d904159b4317df7216df556268d5ac05f48c2204b7269d353746ecd709ad194cab542627047b991528bcfe7c302439753f96ddc5617ab236b SHA512 7d14865316d514b8fee19431b45c5f456422447bd7c68a746e06c6f7450a49aff1ec1d9f88b642c9072e846163d1f7bbe41d1cf73a1ad580f5162f58c8b30fb4
+DIST ffmpeg-3.4.3.tar.bz2 10183483 BLAKE2B 144811663ab32db05577e262e2fcf9087528544b2f27fb6c551317d4916d399ee2d6e70f6f5ce6351ba78f6f51609b2455eef6170b3e339699c9f2486a459194 SHA512 924838d334d905de23c950634ad905bc55ae4435e135afdea93639a598ad522c020165f4528c66560448c136c28770c3fd3311328c2307bb232bc1d0914af964
DIST ffmpeg-4.0.1.tar.bz2 10425808 BLAKE2B 22afbd0f0a4e4708078e0ce606c4bd461df53aa9855ff029fa18423b2dc48966c12b6f4b2646eb11a949249cdabd42c201ef2833d1ef5e08d789ce663f3235d2 SHA512 4e94cd9c8ebfc18f83d211a09e0015825a07451604a7eb6a328123db5a28bcb205e6729d83859af0740be7312e9a025009013f418d5993bda848fb043f0abaa1
DIST ffmpeg-4.0.tar.bz2 10423830 BLAKE2B be020731e2ab3567c326b41fdbca7ff9bd35bfff5c4c8c466b73e2dfb1c6ffb59bfbd82c366e40893732fcf0664ab4862db4cff3950a8350aa6c55d25d296417 SHA512 73224e0f29ce39280a7d67fe9f7ad4a2a7cdb079f1b65916cbac5c0754b995d27d85fee3eb9621b6cba4fbd7a07dcf7b94414a8e5bb9b74738d24af18311d0f2
EBUILD ffmpeg-3.2.6.ebuild 14927 BLAKE2B 8a9e1cda51c5bcd2631b02ec80c8e725ed3974ce795eaafbc62d8b98cbad90c4b33840237f89214a51f78ba2c029a1e983d4722c2f07326239d3b521c981ca76 SHA512 69b076b981f63f9d0e427f0554bc53630dce0fa866a4202426c242ea2e58d75e2edd0198702191c9ae7b9a85e5f7acdfcf666bab954c1c5008e18b19b3474190
@@ -18,6 +19,7 @@ EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f5
EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8
+EBUILD ffmpeg-3.4.3.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
EBUILD ffmpeg-4.0.1.ebuild 16478 BLAKE2B 86bde33dbe714c6ee01923cc6a641d76154bf9c4ec0e15fcf4903293ce9874d8f4c4c91e4ed5da2d0ba8b1d0a9a91141b3c7ffdc7cb3ab3e7ff9d7ecee45c6c4 SHA512 0b3035478c18bc4b9557daaf17f958eef8139af6dbad51b229ba3025eec1099384de6f09c4d37cbdaa0ac977ed32c542d72ff79245803490c409eb8e15fd774c
EBUILD ffmpeg-4.0.ebuild 16478 BLAKE2B 86bde33dbe714c6ee01923cc6a641d76154bf9c4ec0e15fcf4903293ce9874d8f4c4c91e4ed5da2d0ba8b1d0a9a91141b3c7ffdc7cb3ab3e7ff9d7ecee45c6c4 SHA512 0b3035478c18bc4b9557daaf17f958eef8139af6dbad51b229ba3025eec1099384de6f09c4d37cbdaa0ac977ed32c542d72ff79245803490c409eb8e15fd774c
EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 388f7d528159be1ebbba172ec58f0e2b02a509f000ab33a757579311b24b8a169bb1183960694f13bd6796f4f41f117ad0ba514a44e9d29de7a3bb386929566f SHA512 4d0d216c765c6645e9b5d8fc30dd61ab7cafe9663cbc42066793607ebb7c486ecbbee5c08ef9aa81da14ca4aff946e7db306f2f1b197681d6237e447f21777da
diff --git a/media-video/ffmpeg/ffmpeg-3.4.3.ebuild b/media-video/ffmpeg/ffmpeg-3.4.3.ebuild
new file mode 100644
index 000000000000..aa8b226963bb
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.4.3.ebuild
@@ -0,0 +1,488 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+ SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+ !gpl? ( LGPL-2.1 )
+ gpl? ( GPL-2 )
+ amr? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ gmp? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ encode? (
+ amrenc? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ )
+ samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+ +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+ +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
+ samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+ xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+ # libavdevice options
+ cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+ opengl
+ # indevs
+ libv4l:libv4l2 pulseaudio:libpulse libdrm
+ # decoders
+ amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+ jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+ mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+ speex:libspeex svg:librsvg vorbis:libvorbis
+ vpx:libvpx zvbi:libzvbi
+ # libavfilter options
+ appkit
+ bs2b:libbs2b chromaprint flite:libflite frei0r
+ fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+ rubberband:librubberband zeromq:libzmq zimg:libzimg
+ # libswresample options
+ libsoxr
+ # Threads; we only support pthread for now but ffmpeg supports more
+ +threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+ amrenc:libvo-amrwbenc mp3:libmp3lame
+ kvazaar:libkvazaar nvenc:nvenc
+ openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+ wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+ alsa chromium doc +encode jack oss pic static-libs test v4l
+ ${FFMPEG_FLAG_MAP[@]%:*}
+ ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_thumb:armv5te
+ cpu_flags_arm_v6:armv6
+ cpu_flags_arm_thumb2:armv6t2
+ cpu_flags_arm_neon:neon
+ cpu_flags_arm_vfp:vfp
+ cpu_flags_arm_vfpv3:vfpv3
+ cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+ arm64? ( cpu_flags_arm_v8 )
+ cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+ cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+ cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+ cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+ cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+ cpu_flags_x86_xop? ( cpu_flags_x86_avx )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+ cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
+ cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
+ cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${MIPS_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+ ${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+ ${ARM_CPU_REQUIRED_USE}
+ ${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+ bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+ bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+ celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+ chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+ encode? (
+ amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+ kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+ nvenc? ( media-video/nvidia_video_sdk )
+ openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+ snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+ theora? (
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ )
+ twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+ wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+ webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+ x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+ x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+ xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+ )
+ fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+ flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+ fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ frei0r? ( media-plugins/frei0r-plugins )
+ fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+ gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+ gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+ gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ iec61883? (
+ >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ )
+ jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+ jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+ libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+ libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+ libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+ libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ mmal? ( media-libs/raspberrypi-userland )
+ modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+ openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+ speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+ svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+ vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+ vorbis? (
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ )
+ vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ )
+ xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+ zeromq? ( >=net-libs/zeromq-4.1.6 )
+ zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+ !media-video/qt-faststart
+ postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+ >=sys-devel/make-3.81
+ doc? ( sys-apps/texinfo )
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+ cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+ test? ( net-misc/wget sys-devel/bc )
+ v4l? ( sys-kernel/linux-headers )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+ postproc? ( gpl )
+ frei0r? ( gpl )
+ cdio? ( gpl )
+ samba? ( gpl )
+ encode? (
+ x264? ( gpl )
+ x265? ( gpl )
+ xvid? ( gpl )
+ X? ( !xcb? ( gpl ) )
+ )
+"
+REQUIRED_USE="
+ libv4l? ( v4l )
+ fftools_cws2fws? ( zlib )
+ test? ( encode )
+ ${GPL_REQUIRED_USE}
+ ${CPU_REQUIRED_USE}"
+RESTRICT="
+ gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+ "${FILESDIR}"/chromium.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+ if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+ export revision=git-N-${FFMPEG_REVISION}
+ fi
+ default
+ echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+ local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+ local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+ use openssl && use gpl && myconf+=( --enable-nonfree )
+ use samba && myconf+=( --enable-version3 )
+
+ # Encoders
+ if use encode ; then
+ ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+ # Licensing.
+ if use amrenc ; then
+ myconf+=( --enable-version3 )
+ fi
+ else
+ myconf+=( --disable-encoders )
+ fi
+
+ # Indevs
+ use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+ for i in alsa oss jack ; do
+ use ${i} || myconf+=( --disable-indev=${i} )
+ done
+
+ # Outdevs
+ for i in alsa oss sdl ; do
+ use ${i} || myconf+=( --disable-outdev=${i} )
+ done
+
+ # Decoders
+ use amr && myconf+=( --enable-version3 )
+ use gmp && myconf+=( --enable-version3 )
+ use fdk && use gpl && myconf+=( --enable-nonfree )
+
+ for i in "${ffuse[@]#+}" ; do
+ myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+ done
+
+ # (temporarily) disable non-multilib deps
+ if ! multilib_is_native_abi; then
+ for i in frei0r libzmq ; do
+ myconf+=( --disable-${i} )
+ done
+ fi
+
+ # CPU features
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ use ${i%:*} || myconf+=( --disable-${i#*:} )
+ done
+
+ if use pic ; then
+ myconf+=( --enable-pic )
+ # disable asm code if PIC is required
+ # as the provided asm decidedly is not PIC for x86.
+ [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+ fi
+ [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+ # Try to get cpu type based on CFLAGS.
+ # Bug #172723
+ # We need to do this so that features of that CPU will be better used
+ # If they contain an unknown CPU it will not hurt since ffmpeg's configure
+ # will just ignore it.
+ for i in $(get-flag mcpu) $(get-flag march) ; do
+ [[ ${i} = native ]] && i="host" # bug #273421
+ myconf+=( --cpu=${i} )
+ break
+ done
+
+ # LTO support, bug #566282
+ is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+ # Mandatory configuration
+ myconf=(
+ --enable-avfilter
+ --enable-avresample
+ --disable-stripping
+ "${myconf[@]}"
+ )
+
+ # cross compile support
+ if tc-is-cross-compiler ; then
+ myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+ case ${CHOST} in
+ *freebsd*)
+ myconf+=( --target-os=freebsd )
+ ;;
+ *mingw32*)
+ myconf+=( --target-os=mingw32 )
+ ;;
+ *linux*)
+ myconf+=( --target-os=linux )
+ ;;
+ esac
+ fi
+
+ # doc
+ myconf+=(
+ $(multilib_native_use_enable doc)
+ $(multilib_native_use_enable doc htmlpages)
+ $(multilib_native_enable manpages)
+ )
+
+ set -- "${S}/configure" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --enable-shared \
+ --cc="$(tc-getCC)" \
+ --cxx="$(tc-getCXX)" \
+ --ar="$(tc-getAR)" \
+ --optflags="${CFLAGS}" \
+ $(use_enable static-libs static) \
+ "${myconf[@]}"
+ echo "${@}"
+ "${@}" || die
+
+ if multilib_is_native_abi && use chromium; then
+ einfo "Configuring for Chromium"
+ mkdir -p ../chromium || die
+ pushd ../chromium >/dev/null || die
+ set -- "${@}" \
+ --disable-shared \
+ --enable-static \
+ --enable-pic \
+ --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+ echo "${@}"
+ "${@}" || die
+ popd >/dev/null || die
+ fi
+}
+
+multilib_src_compile() {
+ emake V=1
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ emake V=1 tools/${i}$(get_exeext)
+ fi
+ done
+
+ if use chromium; then
+ einfo "Compiling for Chromium"
+ pushd ../chromium >/dev/null || die
+ emake V=1 libffmpeg
+ popd >/dev/null || die
+ fi
+ fi
+}
+
+multilib_src_install() {
+ emake V=1 DESTDIR="${D}" install install-doc
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ dobin tools/${i}$(get_exeext)
+ fi
+ done
+
+ if use chromium; then
+ einfo "Installing for Chromium"
+ pushd ../chromium >/dev/null || die
+ emake V=1 DESTDIR="${D}" install-libffmpeg
+ popd >/dev/null || die
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+ [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+ emake V=1 fate
+}
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 79fbfcfd823c..0314242e032c 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,5 +1,5 @@
-DIST gaupol-0.91.tar.gz 518493 BLAKE2B 76a01579c12084e5b7b25f9582126c33070a1df1ce230adfdea66d698830888065c8ea160da70e39550f02dc28f61d8c529aa50c2e75768ed7a2ff3e6165919f SHA512 92459ec0a7d77c8e4a34f44489ae8fc01feeb2d34f6fd152c8bfeaf72b8235c680155698c55e7f9d46ce82bee8274b14313b6a43167f65f784511e583d4858fb
+DIST gaupol-1.4.1.tar.gz 524816 BLAKE2B 677f1ee0e3b523f97d4b0f6491547d07a658c41c3c2c0f76732589592b542176761df28e13735af58371594043ef234f7987988deacd4d8f73554a87f555d001 SHA512 464e71390ba13f1da11bd40ecb4683d146acb6e547204231a2e78c24719b4ad9ba188210d1bf2108924bcfa0df89c0296f428cba693d3b6d4366e98950cb072a
DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
-EBUILD gaupol-0.91.ebuild 1404 BLAKE2B 89e6c685d46631436a9a2a6f1e1aef068e2e4773f26ca7c814e14e9d22ce2298a6b65514c7c7ffc2e0711a010c0831ca78581203d60ef46df1ae4e4e9427e101 SHA512 55203e2267c64cdeefb265ca1bd9e41f4695e2fb6939096b901a2a2f0d749cbdcc032100fb264233417a8f3aae466b448355c6d0999ac0c50be55660c5f58644
-EBUILD gaupol-1.4.ebuild 1425 BLAKE2B 8b44b0c6f882867da70f604a9b1c48623996529b951b009f76988a2fd054fc1e52d7574d9dc1c7a8c57300b7f2f57c86bc5176f4bf2852f284471fa8c7be1f68 SHA512 6b81cf714e8302423bcd2e55229f9bb17e65976d13f5034aa6a29df211242e90aa01e9e065c639d47ce598cab5957fc981227282d4bed65556655e16b1f60af3
+EBUILD gaupol-1.4.1.ebuild 1384 BLAKE2B f2a4eb63b65b6c855650faa7da6af5ced3d0c504f604b31927056d9e8661d64e262a8b44aeda1077a59eff16296d79f2fcec28fc100f632f7717315b5110058a SHA512 49096af25b97bdeec8d3c7f913f5f473de8183e91a4f895a7234d02d419fde062c50ae2cd0cdc83f8f85c49fd3647a74633778df56b86baddf197265624394e5
+EBUILD gaupol-1.4.ebuild 1424 BLAKE2B 95b4045fa111616491df258bee5542338e04209b7083fae27901b50255eaefe75be5c94cbe7d976e2b57365ed5f6d6a9287da586bd9971155a0d4cb88d73761f SHA512 1a74311606a5dfe5c8b827fa8ac01d258fbbdc2d9b635433c90a088ceb10994cfc3bdc229073fa5e47200ba3bb1726a4c6bcb385ac0366f93d4ab23452b54dcc
MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-0.91.ebuild b/media-video/gaupol/gaupol-0.91.ebuild
deleted file mode 100644
index 0c1fd6b43f72..000000000000
--- a/media-video/gaupol/gaupol-0.91.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="spell test"
-
-RDEPEND="
- app-text/iso-codes
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- spell? (
- >=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
- app-text/gtkspell:3
- )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Previewing support needs MPV, MPlayer or VLC."
-
- if use spell; then
- elog "Additionally, spell-checking requires a dictionary, any of"
- elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
- fi
- fi
-}
-
-python_test() {
- virtx py.test
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.4.1.ebuild b/media-video/gaupol/gaupol-1.4.1.ebuild
new file mode 100644
index 000000000000..25d3dea5fb47
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="https://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell test"
+
+RDEPEND="
+ app-text/iso-codes
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ spell? (
+ app-text/gtkspell:3
+ >=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="
+ sys-devel/gettext
+ test? (
+ ${RDEPEND}
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+python_test() {
+ virtx py.test
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Previewing support needs MPV, MPlayer or VLC."
+
+ if use spell; then
+ elog "Additionally, spell-checking requires a dictionary, any of"
+ elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+ fi
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-video/gaupol/gaupol-1.4.ebuild b/media-video/gaupol/gaupol-1.4.ebuild
index f1239186beb2..30ff66358092 100644
--- a/media-video/gaupol/gaupol-1.4.ebuild
+++ b/media-video/gaupol/gaupol-1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="spell test"
RDEPEND="app-text/iso-codes
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f892ae287bef..d093fa122ecb 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,6 +1,4 @@
AUX kaffeine-2.0.15-qt-5.11.patch 40573 BLAKE2B 2e782013fcdc06e3ba19170da714e7565c27f467ec9f2ba7d4c3a352d4b1f0ed8dfe9e562ca4bae6a0f8ed424783f6d2f52f40aaacbf40a7574ad460fc10a963 SHA512 3cdeea289406493b668bf6ff1f48f9fde1efa39fdc92b0eda90942fa79620b2c9b65321c03d63d7e593b1ceaf17b5f03f04d7da572ead71f602c04c8da97c13b
-DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
-EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
-EBUILD kaffeine-2.0.15.ebuild 1386 BLAKE2B a4c397e6f0c68ecc941c8fd8515a2646a4b358f03914877b03cca82b0475ba4b108a6e9dc82d170aadbdad04c939fb4004d953a7c2555e55fbf66378b4e131fd SHA512 a4df9b4afd9cc3aea7683b03381c3eda2cfe44a4107683fd17df722228a1e2eed401771d5ee3bb4eb7048b50824d1095f54cb6ea6a3cee445a2c5d4f400e3aaa
+EBUILD kaffeine-2.0.15.ebuild 1385 BLAKE2B 1b1824ace75e0878cab888e50b3bec8fec65e21f4666aa07914435f9299429189871780237806ece7f6a6a27caa259e68d37d3808a3e7dc66698ef5f8e9ab400 SHA512 c20977403fa0b1d57b4231283b301ccc692aab5b6214e2bc47185254d3438887932fe7499da289f712ba5cda29edcfbbeb9c25adc0b8485374d2c011da83173b
MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.14.ebuild b/media-video/kaffeine/kaffeine-2.0.14.ebuild
deleted file mode 100644
index 77757018422d..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.14.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="amd64 x86"
-IUSE="dvb"
-
-CDEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtsql 'sqlite')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- media-video/vlc[X]
- x11-libs/libXScrnSaver
- dvb? ( media-libs/libv4l )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
- !media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_prepare() {
- if has_version '<kde-frameworks/kdoctools-5.40.0-r1'; then
- rm -r po/pt_BR/docs || die "failed to remove pt-BR handbook"
- fi
- kde5_src_prepare
-}
-
-src_configure() {
- # tools working on $HOME directory for a local git checkout
- local mycmakeargs=(
- -DBUILD_TOOLS=OFF
- $(cmake-utils_use_find_package dvb Libdvbv5)
- )
-
- kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
index 1213b25aa2b8..56f1d1f4177e 100644
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.15.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
inherit kde5
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
fi
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index d25c3dd41b55..20698ce80f6f 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -10,8 +10,10 @@ AUX pre-shutdown-15-noad.sh 771 BLAKE2B ce0053c6fb813c28d0c653ba0ba68819f03532c8
AUX reccmds.noad.conf 61 BLAKE2B 4600a5a2fc948b0695c487e87013b1207873b2f1f70e30604cb20288bbf7f107b2fbdb9a63d7f7eb2a8612569bb4975756109c804eb351635582f87e68eda8e5 SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb
AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9f8186a6567d01f656adb4b5385bb29bf8ce3a68a747a973f9bb00f64a65b21e1c7d43b7f60e2f54c55a SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9
DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66
+DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
-EBUILD noad-0.7.3-r1.ebuild 2209 BLAKE2B 5400bb77666a06ca3a7f7a671352395e937bff06fbb02cc2fe2e9e0b2e68dfa342fe9fa62c5c2e1e7cead517b56594d27616148b88dba03d503c500c0b559ce9 SHA512 b065e6d6681dab66d5397613a9a35499513b5de40016f10f686d51441e452c6aa4ed5d475da52c86942ae95b1be9ff6f56676d61a5c1ede766bc23eb1e6e7e2b
-EBUILD noad-0.8.6-r1.ebuild 1890 BLAKE2B 74b42f53c86ddddb01360b122d59ba8128bed60cacb6d5d3731800073c397ecfefb2605604e3e8a85fd559f3122ebc460f47695b3f68d0b019435429acf10606 SHA512 36123fab1ead711ec002e1f031839bf82e0d10eea73916cc0306ee49f4fd93e860661aa43f71d85f1170d931ffca9aa6b40aa502ada898119d87cdd6e8cc5704
-EBUILD noad-0.8.6-r2.ebuild 2038 BLAKE2B a08a1a5e1f60b835cba003a107e423299fe42b0b8065d0650ad96418b00e4b19aaa074585edeeb15a592b94a7db71a96e4b17990973a74ad6b0510b8dad567b4 SHA512 ec02b138a507039e175d6456ee9e4f66f624a0cc0f484c18245be25802b477fb506435a2faab24a332a75ac79167fb0e17f0066eda1a711efa4c39459886be63
-MISC metadata.xml 535 BLAKE2B 47f0762d4493359fa23a6fed7bb8a3e92aa16b1af614c6f66b572c4aff5aaf5723e61d68356d29c72cdfb11ba0a4b84134c2c3ed03c4d2821a2e4b674979f55b SHA512 fc9fa7cd96b12452c50e75602da047582e3e8a10377555ea363db1662278199c62f4ed3844ba9d1eef3979a896e1953fbf0efa73123a9f16d88cabb2114c82eb
+EBUILD noad-0.7.3-r1.ebuild 2209 BLAKE2B d4cd9e1024360b1f1d6740b501d304d051bbb0327fc3b7e4ca3721d31da18b08c5557f8d000506c8f46aabf6ef39f8c13cc63236e2f1c1a1672bbe48f0a5ba48 SHA512 bee6253e1cedad70e2ebbe256e0d3cce3ba45b0123320f813c3fee4cc0aaddf097958d2aeeacaa2b1e741222281cfff9736bc89249a5774d1103257b8452f442
+EBUILD noad-0.8.6-r1.ebuild 1890 BLAKE2B 005750b00b334559f25087b925e2c9fc7f4da035252879c9ea50fd6cfbfdbf437618b8a5b26337494e5c0b6fcbb19323d6c24372c2de9c1f74b3f9b866c590c9 SHA512 8d6ef2f5688ffca4e97fc34baca05a6f1d658f38390d129c7e396b984115f25c5ce6333e90d38bcbc4410699f536f8369e00a6f3c7a7e7a0213b163c41c88b6f
+EBUILD noad-0.8.6-r2.ebuild 2038 BLAKE2B d8b952ef694693a0911e127f8421ffc85897147f1d816da9eb442a0be71e6ee29976e2afe1edd51737a38e2e5e1b9d3a1310d3a0a068d57fd933959070ac1329 SHA512 3f1dcce94f84a82cb62232fefe5fbbf0979c5d2a1f9f52fbb092b6759e05dd2f258e9b6b75da7f259b365ded17f59b3196ef10c8057ff5d4e164c892d3c72a50
+EBUILD noad-0.8.6-r3.ebuild 1862 BLAKE2B 97cd24f13d1c9f1d5876ff7810300ff438a7eb5839c975f5776fa472b8d9558d1f013ead6cb73d9d8d70dc1742e6e3f747d50a3ee37e8f1cdeb2b7fb5119ca2e SHA512 4d5f4359c228ba202fd7d36bf0fc10651b524c47422262b51756fcd66468d01a39986720e94a39095b246a0db6571824a57be3452862e7b534978fb5cbcf73ca
+MISC metadata.xml 580 BLAKE2B ff89aebf4857547381931544cba6740e7775ac238d26a64fc982e516738155318fe6740e4655a5280814d9ec9ce1f90fbee56b3610bdc20a9d3a4578eb69dcc2 SHA512 ca567b06bad92795d337a7ef814d5b45e959403142d9589edf1361a48e66daaa64f28a7c0a67c188dd2a449aafb5e0f2ca597097ee104c0a3a88c85194db1902
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
index b76754b18b74..8251361a1e12 100644
--- a/media-video/noad/metadata.xml
+++ b/media-video/noad/metadata.xml
@@ -10,7 +10,7 @@
<name>Gentoo Video project</name>
</maintainer>
<use>
- <flag name="libmpeg2">Support for libmpeg2 library</flag>
+ <flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg</flag>
</use>
<longdescription lang="en">
Mark commercial Breaks in VDR records.
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild
index 2a433cde6db5..3835c9d4b831 100644
--- a/media-video/noad/noad-0.7.3-r1.ebuild
+++ b/media-video/noad/noad-0.7.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools eutils toolchain-funcs
DESCRIPTION="Mark commercial Breaks in VDR records"
diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild
index ae96bfd4fd50..60d75aed517f 100644
--- a/media-video/noad/noad-0.8.6-r1.ebuild
+++ b/media-video/noad/noad-0.8.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools eutils toolchain-funcs
DESCRIPTION="Mark commercial breaks in VDR recordings"
@@ -27,7 +27,7 @@ src_prepare() {
sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
# tested libav-9, ffmepg-2.2.9
- epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+ eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
eautoreconf
diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild
index cd819660440a..d9c62f84e4be 100644
--- a/media-video/noad/noad-0.8.6-r2.ebuild
+++ b/media-video/noad/noad-0.8.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools eutils toolchain-funcs
DESCRIPTION="Mark commercial breaks in VDR recordings"
@@ -31,7 +31,7 @@ src_prepare() {
sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp
# tested libav-9, ffmepg-2.2.9
- epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+ eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
eautoreconf
diff --git a/media-video/noad/noad-0.8.6-r3.ebuild b/media-video/noad/noad-0.8.6-r3.ebuild
new file mode 100644
index 000000000000..ab6a5dbf53c8
--- /dev/null
+++ b/media-video/noad/noad-0.8.6-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mark commercial breaks in VDR recordings"
+HOMEPAGE="http://noad.net23.net/"
+SRC_URI="http://noad.net23.net/${P}.tar.bz2
+ http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ffmpeg imagemagick libmpeg2"
+
+RDEPEND="
+ libmpeg2? ( media-libs/libmpeg2:= )
+ ffmpeg? ( virtual/ffmpeg )
+ imagemagick? ( media-gfx/imagemagick )
+ !media-plugins/vdr-markad"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
+
+src_prepare() {
+ default
+
+ #compile tested libav-13, ffmepg-3.4
+ eapply "${WORKDIR}/${P}-ffmpeg3.4.diff"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(usex imagemagick '--with-magick') \
+ $(usex ffmpeg '' '--without-ffmpeg') \
+ $(usex libmpeg2 '' '--without-libmpeg2') \
+ --with-tools
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" # see bug #469810
+}
+
+src_install() {
+ dobin noad showindex checkMarks
+ use imagemagick && dobin markpics
+
+ dodoc README INSTALL
+ # example scripts are installed as dokumentation
+ dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
+
+ newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+ insinto /usr/share/vdr/record
+ doins "${FILESDIR}"/record-50-noad.sh
+
+ insinto /usr/share/vdr/shutdown
+ doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+ insinto /etc/vdr/reccmds
+ doins "${FILESDIR}"/reccmds.noad.conf
+
+ exeinto /usr/share/vdr/bin
+ doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+ elog
+ elog "To integrate noad in VDR you should do this:"
+ elog
+ elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+ elog
+ elog "Note: You can use here all parameters for noad,"
+ elog "please look in the documentation of noad."
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 3ba4f5305b55..c45f64c1df9c 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,8 @@
-DIST obs-studio-20.1.0.tar.gz 5637636 BLAKE2B 11f42c894af9d8b58ef71eda4c669b557b1b69d8df48d2414ae6d4eda1b8ecb70bb15814a302b87c5b49a43323f772a92ee5dc4a6a58302723b6b1ebf1e35123 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962
-DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 8956e0ae444c05bc452284a730ba4cba7be9209d82f8b63f9cd0455ed73411eadc61825773c6ca5fe20435082399c72d3aaf8671c3830454d9237cc92ca4450f SHA512 9d7c6892fe8940df6c1f1686f07722ea554b5996e72b702758d670a75f1220de59295c0a7b8b6445825a86623521061f64b7672bbe7526aefc9a12bab902ed74
+AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a
+AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
-EBUILD obs-studio-20.1.0.ebuild 2692 BLAKE2B 9d13fc4dd911875bc65e15afd8456fb2f4976501806e543d81b10dfd9d9461be6d000cf61a88e7c90835bbe7c7dcadc5132d25fb90f2e099209c91ea4ef1f7ee SHA512 0bcac3a178efabe8c624aea855018ba24965fba71dde5ee3ee79b3601896850e488daf2d84665d398c23cb1fef0d3fffd727a073268f16271e2292061f4ed0ea
-EBUILD obs-studio-20.1.3.ebuild 2592 BLAKE2B b86a8844f978bda0ecbe155e690bbc866880284634f9074da462451a7a8566e4be5f3b7f1b6234f1b7af44f899aa0da33129089d2d10718bbbbe8bc2bb69e368 SHA512 267f6408a44bf81d41c887b2cfbe225edba24d50ad88e6b3aef32b6e3e2f82a8af5f5fc82738c2012dfffaa31b40b3d76d1463a448f08076d4c5bd99c19d3eb8
-EBUILD obs-studio-21.0.2.ebuild 2638 BLAKE2B 8cc9aae34f58c24abc03e40f7fab8d6baa1d41c61d94114c6f297067fecf7e990c716c6798511e9f8c04b7926623c1b5248acd265fa846445fba2f9300bbd0cf SHA512 00605409f48ebeb8425a1f2c3cb2578774808cc6a9e1209957da5cd274436b5bd1d6e2dedb594feb13a4753f01e47d63fa3aefcb96fde720c251496dc46906a5
-EBUILD obs-studio-9999.ebuild 2561 BLAKE2B db86d0ee2d707beeb1944bd90d5897b79ea116174cf5cca35ce5806b9a4036565df1524c748a36c91209ff17b86bf45e9e6dd789d9cfef82231c0f3fccbf8850 SHA512 936dca63cdb45c8fe29174f1240c451f2c0d5799bc7c56a065fd5ea72aa872e4a8515faa8c50fa2888d8b8648b9adc410a408270372c7066c907421e75ee3a64
-MISC metadata.xml 861 BLAKE2B 42089cc2bf8ac8af65906efa8ebaa2c3254c972f4a60ca72b3420a8e4ff502ca1e17cdc2dd226fd077b918c4616b641274b941c229aa054b6da4ea3bd2caf37b SHA512 c06b0accbc7daa4b0e242b4b41689f77844d15f0c004ca9ca60e81fa03cc8b4c8b3feda309e00f09731e74b85934651437f3e982a361f58038b1d7909b12fae0
+DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
+EBUILD obs-studio-21.0.2.ebuild 2698 BLAKE2B 6383b7f1bb453a355a70b7c010f78afbf9f88d51f8e14f5c11717474d944f8023ec5240935e9ce842f3ac11a620a31eb4e3feb7608608b5cb8e5bbf723cb18a4 SHA512 75f5cec89258c5862a3dcfce606edb994c5e72ef750eefcf533c59702fa9270c8ed1700436fa8efe0b8535bda965b0aae91dc741067c289dabcf62e3f96413b0
+EBUILD obs-studio-21.1.2.ebuild 3034 BLAKE2B 28f24d09d1522e5c8ae1d53a12cc542bf89caa3eb8155ccd0a0ac30d7be66db578832e4a7417a06b29ce57956f0514ecac2174ced0d60de35478da1bad85bad2 SHA512 aeab926019077d31a2ff5a38f0f16bc5d25237bce923a292b8b2677cbc3c1e19e84206aba01d730f503337b250661b427f98284e4641968d6dc67eaa2458bb9c
+EBUILD obs-studio-9999.ebuild 2954 BLAKE2B 71c8b8798e707e87624bbbfc35f8dbde6de6fdc5921307932a84eff6bda423b91f71721e2ca959bfd6fa1de7fbe9ffea2f2a89e08a718d2d004aac33740e5f26 SHA512 eb50971179f1790c66a1258af7dc86d74e5f4ab1d442f675eff48733b7f2f0d57f085b614347e04a35b14a1552b5893462536089223570d2474f6dafec36fe74
+MISC metadata.xml 1125 BLAKE2B cbdc7581bf9c0ae676245bfe24e6bba5914286747c338a8fe56842bc65e6d8ac7b7413f429d8c30ef7d05fecefedc1cffdf60a37433510b79819625f30b0d744 SHA512 f64f485a39668d40e5bd0edcc5f19c57954acd96e1631bb3615e472d566091a70b9ee55548e0dca4e435c017ded350d7be5d1d07ad0ec9cefe94b196d8dcd3d4
diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
new file mode 100644
index 000000000000..6eb7f7c3ca8d
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
@@ -0,0 +1,28 @@
+From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Sat, 17 Mar 2018 18:16:39 +0200
+Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt
+ 5.11
+
+Some headers are no longer unconditionally included, leading to
+build failures.
+
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
+---
+ UI/frontend-plugins/frontend-tools/scripts.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp
+index d923dcf610..364757e48b 100644
+--- a/UI/frontend-plugins/frontend-tools/scripts.cpp
++++ b/UI/frontend-plugins/frontend-tools/scripts.cpp
+@@ -12,6 +12,7 @@
+ #include <QFont>
+ #include <QDialogButtonBox>
+ #include <QResizeEvent>
++#include <QAction>
+
+ #include <obs.hpp>
+ #include <obs-module.h>
diff --git a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
new file mode 100644
index 000000000000..2c28c8e080d5
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
@@ -0,0 +1,167 @@
+From eee6541153cfb6788ee088181781793de100e54c Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 9 Jul 2018 02:20:10 +0300
+Subject: [PATCH 1/2] deps/obs-scripting: Use less automagic for Lua/Python
+ detection
+
+This adds build-time options for disabling the Lua and/or Python
+scripting support in cases where users do not wish to build
+it, but have the required libraries installed.
+---
+ deps/obs-scripting/CMakeLists.txt | 73 +++++++++++++++++++------------
+ 1 file changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
+index 835c1b30..46412779 100644
+--- a/deps/obs-scripting/CMakeLists.txt
++++ b/deps/obs-scripting/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 2.8)
+
+ if(NOT ENABLE_SCRIPTING)
++ message(STATUS "Scripting plugin disabled")
+ return()
+ endif()
+
+@@ -11,44 +12,60 @@ if(MSVC)
+ w32-pthreads)
+ endif()
+
+-find_package(Luajit QUIET)
+-find_package(PythonDeps QUIET)
+-find_package(SwigDeps QUIET 2)
++option(DISABLE_LUA "Disable Lua scripting support" OFF)
++option(DISABLE_PYTHON "Disable Python scripting support" OFF)
+
+ set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
+ set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
+
+-if(NOT SWIG_FOUND)
+- message(STATUS "Scripting: SWIG not found; scripting disabled")
+- return()
+-endif()
++if(NOT DISABLE_LUA)
++ find_package(Luajit QUIET)
+
+-if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
+- message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+- return()
+-endif()
+-
+-if(NOT LUAJIT_FOUND)
+- message(STATUS "Scripting: Luajit not found; Luajit support disabled")
++ if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
++ message(STATUS "Luajit support not found.")
++ set(LUAJIT_FOUND FALSE)
++ else()
++ message(STATUS "Scripting: Luajit supported")
++ set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++ endif()
+ else()
+- message(STATUS "Scripting: Luajit supported")
+- set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++ message(STATUS "Scripting: Luajit support disabled")
++ set(LUAJIT_FOUND FALSE)
+ endif()
+
+-if(NOT PYTHONLIBS_FOUND)
+- message(STATUS "Scripting: Python 3 not found; Python support disabled")
++if(NOT DISABLE_PYTHON)
++ find_package(PythonDeps QUIET)
++
++ if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
++ message(STATUS "Python support not found.")
++ set(PYTHON_FOUND FALSE)
++ set(PYTHONLIBS_FOUND FALSE)
++ else()
++ message(STATUS "Scripting: Python 3 supported")
++ set(PYTHON_FOUND TRUE)
++ set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
++
++ get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
++ string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
++
++ if(WIN32)
++ string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
++ endif()
++ endif()
++else()
++ message(STATUS "Scripting: Python 3 support disabled")
+ set(PYTHON_FOUND FALSE)
+ set(PYTHONLIBS_FOUND FALSE)
+-else()
+- message(STATUS "Scripting: Python 3 supported")
+- set(PYTHON_FOUND TRUE)
+- set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
+-
+- get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
+- string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
+- if(WIN32)
+- string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
+- endif()
++endif()
++
++find_package(SwigDeps QUIET 2)
++
++if(NOT SWIG_FOUND)
++ message(STATUS "Scripting: SWIG not found; scripting disabled")
++endif()
++
++if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
++ message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+ endif()
+
+ set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
+--
+2.18.0
+
+From 79006adaf2b93ed4ddc07ff236a9ed1fcd09e47f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 11 Jul 2018 02:08:51 +0300
+Subject: [PATCH 2/2] obs-filters: Use less automagic for SpeexDSP detection
+
+This adds a build-time option for disabling the SpeexDSP-based
+Noise Suppression filter support in cases where users do not
+wish to build it, but have the required library installed.
+---
+ plugins/obs-filters/CMakeLists.txt | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt
+index ec4289cc..4d862b0a 100644
+--- a/plugins/obs-filters/CMakeLists.txt
++++ b/plugins/obs-filters/CMakeLists.txt
+@@ -1,13 +1,23 @@
+ project(obs-filters)
+
+-find_package(Libspeexdsp QUIET)
+-if(LIBSPEEXDSP_FOUND)
+- set(obs-filters_LIBSPEEXDSP_SOURCES
+- noise-suppress-filter.c)
+- set(obs-filters_LIBSPEEXDSP_LIBRARIES
+- ${LIBSPEEXDSP_LIBRARIES})
++option(DISABLE_SPEEXDSP "Disable building of the SpeexDSP-based Noise Suppression filter" OFF)
++
++if(DISABLE_SPEEXDSP)
++ message(STATUS "SpeexDSP support disabled")
++ set(LIBSPEEXDSP_FOUND FALSE)
+ else()
+- message(STATUS "Speexdsp library not found, speexdsp filters disabled")
++ find_package(Libspeexdsp QUIET)
++
++ if(NOT LIBSPEEXDSP_FOUND)
++ message(STATUS "SpeexDSP support not found")
++ set(LIBSPEEXDSP_FOUND FALSE)
++ else()
++ message(STATUS "SpeexDSP supported")
++ set(obs-filters_LIBSPEEXDSP_SOURCES
++ noise-suppress-filter.c)
++ set(obs-filters_LIBSPEEXDSP_LIBRARIES
++ ${LIBSPEEXDSP_LIBRARIES})
++ endif()
+ endif()
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/obs-filters-config.h.in"
+--
+2.18.0
+
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 27ed2bccb4cb..74a7f582c048 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -14,9 +14,13 @@
<use>
<flag name="fdk">Enable libfdk support for AAC encoding.</flag>
<flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
- <flag name="nvenc">Enable NVENC encoding for nVidia video cards</flag>
+ <flag name="luajit">Build support for scripting via Luajit.</flag>
+ <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
+ <flag name="python">Build support for scripting via Python 3.</flag>
+ <flag name="speexdsp">Enable noise suppression filter support via
+ <pkg>media-libs/speexdsp</pkg>.</flag>
</use>
<upstream>
- <remote-id type="github">jp9000/obs-studio</remote-id>
+ <remote-id type="github">obsproject/obs-studio</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-video/obs-studio/obs-studio-20.1.0.ebuild b/media-video/obs-studio/obs-studio-20.1.0.ebuild
deleted file mode 100644
index 727eac660202..000000000000
--- a/media-video/obs-studio/obs-studio-20.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-COMMON_DEPEND="
- >=dev-libs/jansson-2.5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-video/ffmpeg:=[x264]
- net-misc/curl
- x11-libs/libXcomposite
- x11-libs/libXinerama
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- fdk? ( media-libs/fdk-aac:= )
- imagemagick? ( media-gfx/imagemagick:= )
- jack? ( virtual/jack )
- pulseaudio? ( media-sound/pulseaudio )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
- imagemagick? (
- || (
- <media-gfx/imagemagick-7
- (
- >=media-gfx/imagemagick-7
- >=dev-util/cmake-3.9
- )
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DDISABLE_ALSA=$(usex !alsa)
- -DDISABLE_FREETYPE=$(usex !truetype)
- -DDISABLE_JACK=$(usex !jack)
- -DDISABLE_LIBFDK=$(usex !fdk)
- -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- -DDISABLE_V4L2=$(usex !v4l)
- -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
- -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
- -DOBS_VERSION_OVERRIDE=${PV}
- -DUNIX_STRUCTURE=1
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- if ! use alsa && ! use pulseaudio; then
- elog
- elog "For the audio capture features to be available,"
- elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
- elog "be enabled."
- elog
- fi
-
- if ! has_version "sys-apps/dbus"; then
- elog
- elog "The 'sys-apps/dbus' package is not installed, but"
- elog "could be used for disabling hibernating, screensaving,"
- elog "and sleeping. Where it is not installed,"
- elog "'xdg-screensaver reset' is used instead"
- elog "(if 'x11-misc/xdg-utils' is installed)."
- elog
- fi
-
- if ! has_version "media-libs/speexdsp"; then
- elog
- elog "For the speexdsp-based noise suppression filter"
- elog "to be available, the 'media-libs/speexdsp' package needs"
- elog "to be installed."
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-20.1.3.ebuild b/media-video/obs-studio/obs-studio-20.1.3.ebuild
deleted file mode 100644
index 5faf60232c12..000000000000
--- a/media-video/obs-studio/obs-studio-20.1.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MIN_VERSION=3.9.6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-COMMON_DEPEND="
- >=dev-libs/jansson-2.5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-video/ffmpeg:=[x264]
- net-misc/curl
- x11-libs/libXcomposite
- x11-libs/libXinerama
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- fdk? ( media-libs/fdk-aac:= )
- imagemagick? ( media-gfx/imagemagick:= )
- jack? ( virtual/jack )
- pulseaudio? ( media-sound/pulseaudio )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DDISABLE_ALSA=$(usex !alsa)
- -DDISABLE_FREETYPE=$(usex !truetype)
- -DDISABLE_JACK=$(usex !jack)
- -DDISABLE_LIBFDK=$(usex !fdk)
- -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- -DDISABLE_V4L2=$(usex !v4l)
- -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
- -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
- -DOBS_VERSION_OVERRIDE=${PV}
- -DUNIX_STRUCTURE=1
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- if ! use alsa && ! use pulseaudio; then
- elog
- elog "For the audio capture features to be available,"
- elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
- elog "be enabled."
- elog
- fi
-
- if ! has_version "sys-apps/dbus"; then
- elog
- elog "The 'sys-apps/dbus' package is not installed, but"
- elog "could be used for disabling hibernating, screensaving,"
- elog "and sleeping. Where it is not installed,"
- elog "'xdg-screensaver reset' is used instead"
- elog "(if 'x11-misc/xdg-utils' is installed)."
- elog
- fi
-
- if ! has_version "media-libs/speexdsp"; then
- elog
- elog "For the speexdsp-based noise suppression filter"
- elog "to be available, the 'media-libs/speexdsp' package needs"
- elog "to be installed."
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild
index db4647c07d16..208ad0004506 100644
--- a/media-video/obs-studio/obs-studio-21.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.0.2.ebuild
@@ -9,10 +9,10 @@ inherit cmake-utils gnome2-utils
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+ EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
EGIT_SUBMODULES=()
else
- SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -55,6 +55,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
+PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+
CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
src_configure() {
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
new file mode 100644
index 000000000000..062b0f414089
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+CMAKE_MIN_VERSION=3.9.6
+
+inherit cmake-utils gnome2-utils python-any-r1
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+ EGIT_SUBMODULES=()
+else
+ SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+
+COMMON_DEPEND="
+ >=dev-libs/jansson-2.5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtsql:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-video/ffmpeg:=[x264]
+ net-misc/curl
+ x11-libs/libXcomposite
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ alsa? ( media-libs/alsa-lib )
+ fdk? ( media-libs/fdk-aac:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ jack? ( virtual/jack )
+ luajit? ( dev-lang/luajit:2 )
+ nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ python? ( ${PYTHON_DEPS} )
+ speexdsp? ( media-libs/speexdsp )
+ truetype? (
+ media-libs/fontconfig
+ media-libs/freetype
+ )
+ v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+ luajit? ( dev-lang/swig )
+ python? ( dev-lang/swig )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+ "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+)
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DDISABLE_ALSA=$(usex !alsa)
+ -DDISABLE_FREETYPE=$(usex !truetype)
+ -DDISABLE_JACK=$(usex !jack)
+ -DDISABLE_LIBFDK=$(usex !fdk)
+ -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+ -DDISABLE_SPEEXDSP=$(usex !speexdsp)
+ -DDISABLE_V4L2=$(usex !v4l)
+ -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+ -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+ -DOBS_VERSION_OVERRIDE=${PV}
+ -DUNIX_STRUCTURE=1
+ )
+
+ if use luajit || use python; then
+ mycmakeargs+=(
+ -DDISABLE_LUA=$(usex !luajit)
+ -DDISABLE_PYTHON=$(usex !python)
+ -DENABLE_SCRIPTING=yes
+ )
+ else
+ mycmakeargs+=( -DENABLE_SCRIPTING=no )
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+
+ if ! use alsa && ! use pulseaudio; then
+ elog
+ elog "For the audio capture features to be available,"
+ elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+ elog "be enabled."
+ elog
+ fi
+
+ if ! has_version "sys-apps/dbus"; then
+ elog
+ elog "The 'sys-apps/dbus' package is not installed, but"
+ elog "could be used for disabling hibernating, screensaving,"
+ elog "and sleeping. Where it is not installed,"
+ elog "'xdg-screensaver reset' is used instead"
+ elog "(if 'x11-misc/xdg-utils' is installed)."
+ elog
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index e030ae7b1d73..4558c2f4e954 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,16 +3,17 @@
EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
CMAKE_MIN_VERSION=3.9.6
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils python-any-r1
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+ EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
EGIT_SUBMODULES=()
else
- SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
COMMON_DEPEND="
>=dev-libs/jansson-2.5
@@ -44,16 +45,25 @@ COMMON_DEPEND="
fdk? ( media-libs/fdk-aac:= )
imagemagick? ( media-gfx/imagemagick:= )
jack? ( virtual/jack )
+ luajit? ( dev-lang/luajit:2 )
+ nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
pulseaudio? ( media-sound/pulseaudio )
+ python? ( ${PYTHON_DEPS} )
+ speexdsp? ( media-libs/speexdsp )
truetype? (
media-libs/fontconfig
media-libs/freetype
)
v4l? ( media-libs/libv4l )
"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ luajit? ( dev-lang/swig )
+ python? ( dev-lang/swig )
+"
RDEPEND="${COMMON_DEPEND}"
+PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+
CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
src_configure() {
@@ -64,11 +74,23 @@ src_configure() {
-DDISABLE_JACK=$(usex !jack)
-DDISABLE_LIBFDK=$(usex !fdk)
-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+ -DDISABLE_SPEEXDSP=$(usex !speexdsp)
-DDISABLE_V4L2=$(usex !v4l)
-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-DUNIX_STRUCTURE=1
)
+
+ if use luajit || use python; then
+ mycmakeargs+=(
+ -DDISABLE_LUA=$(usex !luajit)
+ -DDISABLE_PYTHON=$(usex !python)
+ -DENABLE_SCRIPTING=yes
+ )
+ else
+ mycmakeargs+=( -DENABLE_SCRIPTING=no )
+ fi
+
cmake-utils_src_configure
}
@@ -92,14 +114,6 @@ pkg_postinst() {
elog "(if 'x11-misc/xdg-utils' is installed)."
elog
fi
-
- if ! has_version "media-libs/speexdsp"; then
- elog
- elog "For the speexdsp-based noise suppression filter"
- elog "to be available, the 'media-libs/speexdsp' package needs"
- elog "to be installed."
- elog
- fi
}
pkg_postrm() {
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index a625722d709c..a172063ca8da 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,7 +1,7 @@
DIST parole-0.8.1.tar.bz2 814827 BLAKE2B 54c6753da5f9e6e6eef70bfbe13dd6496687fb35905ac8222a8ab96d3a46bc2f718a5d87dc44abec2c15cfde503f839960b0bcb51c8a58b5c978df830eec5207 SHA512 73c27022331828adb7b5805245ce97f03f4848c569125529436e82651da61e28f4d4a834468d6e4c165754f2fd9664eded9a7e15fc86f067d9b2c7c54afff3ee
DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a3e02b1ef15b6ff742687efc70a3e3f0ae8124ed2226a1cf00022c7ef0650c8e1c1b6e3279b111891e8c3e651e SHA512 0581fed93d2a09a3d9ec9cf1bb68a298ccd47676b22d0824495136ee9d785290b8465af8c12b5ecd34a46936f7433bf96dd559e6252a8f1af46c0e2f9256c864
DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
-EBUILD parole-0.8.1.ebuild 1273 BLAKE2B b405ca010d41afc12e9919f539ef16fc3e8ba9596b50a35ca6f31ebffcd1f7650df01dfd3f4b6d66d977c598605af9dd73056ec247378d043bff7ef1f92ee0ee SHA512 65f9b29682d111a579898978c00bc26e90fa871f78684def66167e4de763b433112b3b3c4a0fc4b458992cb9686b39d2706331ae1029992122d3017b34c77e86
-EBUILD parole-1.0.0.ebuild 1478 BLAKE2B e13f84ffacfa44fedb5eb2280458779d0dedb6b55a952f8a6608ef2bdb67829c9c64a756406c503d5f8769527d9aadff199954fed023a74fbbe3ececd772770c SHA512 edfa428ce1859d92502117576902cd940783c7f59dd307b279a3e56f2f4caf06387b64c9482e8de5252896b3ab5f967165bcce22230f8cd33cb7e03f5d23c1d5
-EBUILD parole-1.0.1.ebuild 1480 BLAKE2B 3ab039d3a89b7d08e983a19265e7fe931bf52af47260835f02d077bc6d3252819dd863245a13f0acdf725fe512369be9f65673df7e953b9ee12f15eab36263af SHA512 91ab5856526563dd3bfa957eeeefc883dfe788a98d677c81d38ae16c7770cbe08497b8665a570eb45c65fedf42d3375e594eb17c1da68b4496d1851b60271906
+EBUILD parole-0.8.1.ebuild 1284 BLAKE2B add340579bde9e74dad8d327f0a47d72d0275eac9a69f43b034b71b80f6e4f754999f937e6585c8e7494f35172fcfc55258f5eb8d6ed4d095a44efd3d2bef741 SHA512 d315e12d36f1d0c8bbf8a5e2bb4a34e3c9f67e4cfc06fa03ac862a7ac8df349957bb43f15fc75589e9523dda4785142e849f8ababd3cd18ed050f222627fcae2
+EBUILD parole-1.0.0.ebuild 1489 BLAKE2B b609b1903f400a0465ee0b3c425eaceab269b9d39c5bba04ef27da757719057ab8e0befd12664c4b486fa9d12a8c46b6ef2f79a8da0d9984e7ff7599bf123bf0 SHA512 303f44537374389aa315b7e0d4b70ba35c97df9d35f49e425fdba012d857a5258e95a9b01f27b419d3c0ca859596aa1415d16c52ee90fac0b5279f5c9ba758ba
+EBUILD parole-1.0.1.ebuild 1491 BLAKE2B 7ec1947bf6ad7865889343c6f81d331762eff7885eb129461e9fdc1250a04df1873c9df31d4aeaef847ad421e599db6362f45064b6b4177dace84100feabd1f3 SHA512 eabdea181b48d8535f3ad3e20567289ad4873654535c5cf16718082ea3e12ff25178c248f5c49780bfe7011adc19f4f6b95dc0e84b2b61813c880bb7fd3f8652
MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e
diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild
index dda831291c0d..880299d5fad0 100644
--- a/media-video/parole/parole-0.8.1.ebuild
+++ b/media-video/parole/parole-0.8.1.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-video/parole/parole-1.0.0.ebuild b/media-video/parole/parole-1.0.0.ebuild
index ba3fa0b882ea..19fa3b98c738 100644
--- a/media-video/parole/parole-1.0.0.ebuild
+++ b/media-video/parole/parole-1.0.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A simple Xfce4 media player using GStreamer"
HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
index c67039828941..6bc14f9e8690 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A simple Xfce4 media player using GStreamer"
HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 268e1a845ca6..0b6c2d0fb57d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,11 +14,9 @@ AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681f
AUX vlc-3.0.3-fix-disable-vlm.patch 1366 BLAKE2B a0ebb75f8b171063dfc4490ed8abfcad515cac85a618bcd0e157fda71a6673023d45682a5c5507ffbc1412e15f1edb3cd0e3f1e5095d9d5ce5dfb0ae51488e36 SHA512 544c3f57112e7c37c1fc3a853e45b6ca3c186ee70734cd755365b233cbd481257ec0a7be8e8213c55ee6c6110a2ee8c0d4bce50eab67cdd57cb4e74a9edab862
AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b
DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
-DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
-EBUILD vlc-3.0.2-r1.ebuild 13436 BLAKE2B 7ac65a355a8d490ee6d4b2b10367f7e07010f5b3875d7fa02852186d1076ba565c5c9326b75b71635629a1f040f305dbed86817fe746f9bbb7c10cdc079b090a SHA512 fd565e3519b7b2b223aacff1ba77238463704eb96d59cf0fcd6ac5bc32786e616395c25a51375b7e708a30691e2d42de3823445d92915c3a77b30717ddc29c9d
-EBUILD vlc-3.0.3-r1.ebuild 13312 BLAKE2B e512693ba782e22c0ac4ffa239c545d78625ce5cf6b135ff63ef2e3690603bcc8efd510517d4c1f2bda5c63c3540fc75a66eb618622098b9da9f87b43c5f02c5 SHA512 d337ce9dd8d84a9cbba1d55099cd21ba6f98517fffe9221d46c934d966c7e2db3d1d00e649186f658c56cf88327afb386c34c51b7e755386575276099b032101
-EBUILD vlc-3.0.9999.ebuild 13267 BLAKE2B 47729197d456de777c9385362f92d655717c1080f2fca5164bacdb3881000454b7438bcd6048e0a14e828c03dc79a3edf205f7058136508cb493ea9c573ff2f6 SHA512 3438988f6876e98515de816e599c65c2992d122a6b0efbeab346224236ee78d4be0470f9c8accdb61252fa19a72bc20daab9c7a7f361364aa6c32007d5b9717f
-EBUILD vlc-9999.ebuild 13191 BLAKE2B b9daef991ad07aa1dce5ebc83a1b257e5b3e8b203bd8bd3fdd79d73d00fe3f2c3810dce16348d5d76e1ff200674d7720239d0da09aa38675d118fc5991d4b178 SHA512 7dba561df7714da8d8b82d390b418a5f2659346209ce9df51533360fea7a3daa962e16d7306f7268de7d16572ae58802dc60ede2d2252957ae2a7704db73424f
-MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc
+EBUILD vlc-3.0.3-r1.ebuild 13311 BLAKE2B c491f0e6e2420ec7a38b54381c7aa1d47fa6363bd64dd9b09ceefc6c25af00e97ea98ce29db28a104ccdb203b2353a9d6978249f4a1f96feb87237b5770d9754 SHA512 57eaee066838353db635819b76fdbe6ec191b728ad5540e4b72668184551b9c866cd000a0c939cba96d1ea160ca11bf171c46f6b904f332eac9e93b71e71fb14
+EBUILD vlc-3.0.9999.ebuild 13258 BLAKE2B a854c15e9d55053045a0579adb86b09e2e9666d90418c3e8de2bf93d005fba065b65896ff9a7ed5b5db5b1a2400a82ab62809a7eb99b07047daa9939dedc729d SHA512 86781b905ced59d14c9d6955d57ed4f9e076f2d2f5ca95d13cfd1171c285ef6cd7d1bbee11ea427bfd4250db3511fdfdb9782f1a7e6e78aa5e6163c428d3aa97
+EBUILD vlc-9999.ebuild 13182 BLAKE2B 7fe08b02b5cc03fa81a439c36a23725052047704bdf9d7cf38c05467108a5a539d3b87af99beb795094a2581558b20be8a281c3417ea717b4d6b420d28017c15 SHA512 9e7b21a95098c4a853efff043f3f00474b0a3e14c1ef17cac0ce579555bc5de4562561a5a0bbba3024030607b8fd94549ac917d684f4853e157a4961a478dcda
+MISC metadata.xml 6544 BLAKE2B 206a3f6f2f0f7b081db92625b722460814fb2ac71a579c3e32cffbbe2cdb4a49c89b25eb151052999ba9c56c82b0cf61da6c2e05eb01518e0d97a5371e14e29e SHA512 b9bc5b98d1ea0ee567d7b552afe9af9110ab8cacb5194cfa90800ae9fb021200eb3e983f45459649029e852584dee20c8ec844c1f158e514005b99d3d9f965e7
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 89c1c887a183..da0fee395798 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -41,7 +41,6 @@
<flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag>
<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag>
<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
- <flag name="microdns">Enable Chromecast auto-detection using <pkg>net-libs/libmicrodns</pkg></flag>
<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
<flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag>
diff --git a/media-video/vlc/vlc-3.0.2-r1.ebuild b/media-video/vlc/vlc-3.0.2-r1.ebuild
deleted file mode 100644
index 27977bca29e3..000000000000
--- a/media-video/vlc/vlc-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
- if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
- fi
- SCM="git-r3"
-else
- if [[ ${MY_P} = ${P} ]] ; then
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
- else
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
- fi
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
- debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
- +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
- libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
- omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
- run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
- taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
- wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
- chromecast? ( encode )
- directx? ( ffmpeg )
- fontconfig? ( truetype )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- postproc? ( ffmpeg )
- skins? ( qt5 truetype X xml )
- ssl? ( gcrypt )
- vaapi? ( ffmpeg X )
- vdpau? ( ffmpeg X )
-"
-RDEPEND="
- net-dns/libidn:=
- sys-libs/zlib:0[minizip]
- virtual/libintl:0
- virtual/opengl
- a52? ( media-libs/a52dec:0 )
- alsa? ( media-libs/alsa-lib:0 )
- aom? ( media-libs/libaom:= )
- archive? ( app-arch/libarchive:= )
- bidi? (
- dev-libs/fribidi:0
- media-libs/freetype:2[harfbuzz]
- media-libs/harfbuzz
- virtual/ttf-fonts:0
- )
- bluray? ( media-libs/libbluray:0= )
- cddb? ( media-libs/libcddb:0 )
- chromaprint? ( media-libs/chromaprint:0= )
- chromecast? ( >=dev-libs/protobuf-2.5.0:= )
- dbus? ( sys-apps/dbus:0 )
- dc1394? (
- media-libs/libdc1394:2
- sys-libs/libraw1394:0
- )
- dts? ( media-libs/libdca:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
- dvd? (
- >=media-libs/libdvdnav-4.9:0
- >=media-libs/libdvdread-4.9:0
- )
- faad? ( media-libs/faad2:0 )
- fdk? ( media-libs/fdk-aac:0= )
- ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
- )
- flac? (
- media-libs/flac:0
- media-libs/libogg:0
- )
- fluidsynth? ( media-sound/fluidsynth:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? (
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error:0
- )
- gme? ( media-libs/game-music-emu:0 )
- gnome-keyring? ( app-crypt/libsecret )
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
- ieee1394? (
- sys-libs/libavc1394:0
- sys-libs/libraw1394:0
- )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- kate? ( media-libs/libkate:0 )
- libass? (
- media-libs/fontconfig:1.0
- media-libs/libass:0=
- )
- libcaca? ( media-libs/libcaca:0 )
- libnotify? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify:0
- )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( dev-libs/libtar:0 )
- libtiger? ( media-libs/libtiger:0 )
- linsys? ( media-libs/zvbi )
- lirc? ( app-misc/lirc:0 )
- live? ( media-plugins/live:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? (
- dev-libs/libebml:0=
- media-libs/libmatroska:0=
- )
- microdns? ( >=net-libs/libmicrodns-0.0.9:= )
- modplug? ( media-libs/libmodplug:0 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( media-libs/libmpeg2:0 )
- mtp? ( media-libs/libmtp:0= )
- musepack? ( media-sound/musepack-tools:0 )
- ncurses? ( sys-libs/ncurses:0=[unicode] )
- nfs? ( >=net-fs/libnfs-0.10.0:= )
- ogg? ( media-libs/libogg:0 )
- opencv? ( media-libs/opencv:0= )
- opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= )
- postproc? ( libav? ( media-libs/libpostproc:0= ) )
- projectm? (
- media-fonts/dejavu:0
- media-libs/libprojectm:0
- )
- pulseaudio? ( media-sound/pulseaudio:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
- samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl-image? ( media-libs/sdl-image:0 )
- sftp? ( net-libs/libssh2:0 )
- shout? ( media-libs/libshout:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? (
- x11-libs/libXext:0
- x11-libs/libXinerama:0
- x11-libs/libXpm:0
- )
- soxr? ( media-libs/soxr )
- speex? (
- >=media-libs/speex-1.2.0:0
- media-libs/speexdsp:0
- )
- srt? ( net-libs/srt )
- ssl? ( net-libs/gnutls:0 )
- svg? (
- gnome-base/librsvg:2
- x11-libs/cairo:0
- )
- taglib? ( >=media-libs/taglib-1.9:0 )
- theora? ( media-libs/libtheora:0 )
- tremor? ( media-libs/tremor:0 )
- truetype? (
- media-libs/freetype:2
- virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 )
- )
- twolame? ( media-sound/twolame:0 )
- udev? ( virtual/udev:0 )
- upnp? ( net-libs/libupnp:= )
- v4l? ( media-libs/libv4l:0 )
- vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
- vdpau? ( x11-libs/libvdpau:0 )
- vnc? ( net-libs/libvncserver:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0= )
- wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
- )
- X? (
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/xcb-util
- x11-libs/xcb-util-keysyms
- )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xml? ( dev-libs/libxml2:2 )
- zeroconf? ( net-dns/avahi:0[dbus] )
- zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
- amd64? ( dev-lang/yasm:* )
- x86? ( dev-lang/yasm:* )
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
- "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
- "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/647668
- if use chromecast && ! use microdns; then
- einfo "USE=microdns is required for Chromecast autodetection support"
- fi
-}
-
-src_prepare() {
- default
-
- has_version '>=net-libs/libupnp-1.8.0' && \
- eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
- # Bootstrap when we are on a git checkout.
- if [[ ${PV} = *9999 ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- # Disable running of vlc-cache-gen, we do that in pkg_postinst
- sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
- -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-aa
- --disable-dependency-tracking
- --disable-optimizations
- --disable-update-check
- --enable-fast-install
- --enable-screen
- --enable-vcd
- --enable-vlc
- $(use_enable a52)
- $(use_enable alsa)
- $(use_enable altivec)
- $(use_enable aom)
- $(use_enable archive)
- $(use_enable bidi fribidi)
- $(use_enable bidi harfbuzz)
- $(use_enable bluray)
- $(use_enable cddb libcddb)
- $(use_enable chromaprint)
- $(use_enable chromecast)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable dbus)
- $(use_enable dbus kwallet)
- $(use_enable dc1394)
- $(use_enable debug)
- $(use_enable directx)
- $(use_enable directx d3d11va)
- $(use_enable directx dxva2)
- $(use_enable dts dca)
- $(use_enable dvbpsi)
- $(use_enable dvd dvdnav)
- $(use_enable dvd dvdread)
- $(use_enable encode sout)
- $(use_enable encode vlm)
- $(use_enable faad)
- $(use_enable fdk fdkaac)
- $(use_enable ffmpeg avcodec)
- $(use_enable ffmpeg avformat)
- $(use_enable ffmpeg swscale)
- $(use_enable flac)
- $(use_enable fluidsynth)
- $(use_enable fontconfig)
- $(use_enable gcrypt libgcrypt)
- $(use_enable gme)
- $(use_enable gnome-keyring secret)
- $(use_enable gstreamer gst-decode)
- $(use_enable ieee1394 dv1394)
- $(use_enable jack)
- $(use_enable jpeg)
- $(use_enable kate)
- $(use_enable libass)
- $(use_enable libcaca caca)
- $(use_enable libnotify notify)
- $(use_enable libsamplerate samplerate)
- $(use_enable libtar)
- $(use_enable libtiger tiger)
- $(use_enable linsys)
- $(use_enable lirc)
- $(use_enable live live555)
- $(use_enable lua)
- $(use_enable macosx-notifications osx-notifications)
- $(use_enable macosx-qtkit)
- $(use_enable matroska)
- $(use_enable microdns)
- $(use_enable modplug mod)
- $(use_enable mp3 mad)
- $(use_enable mpeg libmpeg2)
- $(use_enable mtp)
- $(use_enable musepack mpc)
- $(use_enable ncurses)
- $(use_enable neon)
- $(use_enable ogg)
- $(use_enable omxil)
- $(use_enable omxil omxil-vout)
- $(use_enable opencv)
- $(use_enable optimisememory optimize-memory)
- $(use_enable opus)
- $(use_enable png)
- $(use_enable postproc)
- $(use_enable projectm)
- $(use_enable pulseaudio pulse)
- $(use_enable qt5 qt)
- $(use_enable rdp freerdp)
- $(use_enable rtsp realrtsp)
- $(use_enable run-as-root)
- $(use_enable samba smbclient)
- $(use_enable schroedinger)
- $(use_enable sdl-image)
- $(use_enable sftp)
- $(use_enable shout)
- $(use_enable sid)
- $(use_enable skins skins2)
- $(use_enable soxr)
- $(use_enable speex)
- $(use_enable srt)
- $(use_enable ssl gnutls)
- $(use_enable svg)
- $(use_enable svg svgdec)
- $(use_enable taglib)
- $(use_enable theora)
- $(use_enable tremor)
- $(use_enable twolame)
- $(use_enable udev)
- $(use_enable upnp)
- $(use_enable v4l v4l2)
- $(use_enable vaapi libva)
- $(use_enable vdpau)
- $(use_enable vnc)
- $(use_enable vorbis)
- $(use_enable vpx)
- $(use_enable wayland)
- $(use_enable wma-fixed)
- $(use_with X x)
- $(use_enable X xcb)
- $(use_enable X xvideo)
- $(use_enable x264)
- $(use_enable x265)
- $(use_enable xml libxml2)
- $(use_enable zeroconf avahi)
- $(use_enable zvbi)
- $(use_enable !zvbi telx)
- --disable-asdcp
- --disable-coverage
- --disable-cprof
- --disable-crystalhd
- --disable-decklink
- --disable-gles2
- --disable-goom
- --disable-kai
- --disable-kva
- --disable-libplacebo
- --disable-maintainer-mode
- --disable-merge-ffmpeg
- --disable-mfx
- --disable-mmal
- --disable-opensles
- --disable-oss
- --disable-rpi-omxil
- --disable-shine
- --disable-sndio
- --disable-spatialaudio
- --disable-vsxu
- --disable-wasapi
- )
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- if use x86; then
- # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
- append-cflags $(test-flags-CC -fno-stack-check)
- # Bug 569774
- replace-flags -Os -O2
- fi
-
- # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
- append-cxxflags -std=c++11
-
- # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- xdg_environment_reset # bug 608256
-
- if use truetype || use bidi; then
- myeconfargs+=( --enable-freetype )
- else
- myeconfargs+=( --disable-freetype )
- fi
-
- if use truetype || use projectm; then
- local dejavu="/usr/share/fonts/dejavu/"
- myeconfargs+=(
- --with-default-font=${dejavu}/DejaVuSans.ttf
- --with-default-font-family=Sans
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace
- )
- fi
-
- econf ${myeconfargs[@]}
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values may break the build (bug 523144), so definition should not be removed.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
- sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
- einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
- rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index 6aa05a391aed..a93e6174bb38 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -19,7 +19,7 @@ else
else
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
fi
inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 4952663cc4be..efc70e7337f3 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 59118d7bf74a..857714b2e491 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1ea425fd5586..fdaf5e9a011b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 72a9a15e4ae3..b4f3dd2cfcbc 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -2,7 +2,7 @@ DIST fail2ban-0.10.2.tar.gz 474675 BLAKE2B 569599eec3c7b786933af332507ca148f49d3
DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
DIST fail2ban-0.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e
EBUILD fail2ban-0.10.2.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
-EBUILD fail2ban-0.10.3.1.ebuild 3344 BLAKE2B b2851fe55c59ce815ec89b137fa656279e5e984f3cd6a82e3e395439252b43e5f33cc9bb66491f0b2cfed4dfe118c9b97b123d3cfd49280acb936e51aa8d14d3 SHA512 01dcac4c1ec75a0c82db304fdccd6d71326fce56fb54a5b92a69a00f31420b25c2e7f4181cd5877a71ae365bd4c81cb761278d344e430b2d9a34cc2dfd8c5c81
+EBUILD fail2ban-0.10.3.1.ebuild 3341 BLAKE2B 0b0f7d1f4ca20d23ef9d787c04bc984e9859900f9e3fec4c691338d6638a32e6e9fa4948ce31895821a7cc4787806051059687864c2cde8fce7f13f26ef0e084 SHA512 63c23a53745ce27797eeb686fb896d3dfaf86b7a1c4a7cfddaf1f2438fef6c44dead638719f884d4ed46fe19d40edd204dad20a0d05121d1646d51a5b4a40e60
EBUILD fail2ban-0.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0
EBUILD fail2ban-99999999.ebuild 3190 BLAKE2B dac84d04dc01c20b5af2a34c07be78ce7db25c79d00a5cfc7e6c58b4077e884b71e8fdb83b34e9abe7326c68836b3963d6ebd373bb618e74db4f13cb7464e086 SHA512 8b2a59c16a2a9bc712c7d905a30df88d72ebf47e5f89e227bd1371ae35aa7d44c6056c1aef7c9952ae166b0bab806e8a21ee584eff36652df43d0cc668f237e5
MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
index 1ccf82b68cd5..3dda24f6f476 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="selinux systemd"
# TODO support ipfw and ipfilter
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 2614ee46d858..c54ed0abde9b 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,7 +1,5 @@
AUX logrotate.d-munin.3 647 BLAKE2B 3f0272b95bc2a926807b3c66aecf91e3f62d492b4aa32efb0672525952d3f0332ec4a8543eb1d05c346a145e41b1e06a312519fa12707229be6a55f068e83efe SHA512 14ec0363b561695ae58db95e8d6fc68d7161805cfa0002001ec60566d0b22cc6103ae949de12715dc646131d692e023735895007c04807940c6d1a22de342302
AUX munin-1.3.2-plugins.conf 1760 BLAKE2B 97d853698470c35dd4bc305a559be6b1160a6877e557f6146eeddaf7d91f72c7ade36e1f5571c5ad742560a2f5f400fc51b481ee7ce305db9546af6b211046ac SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f
-AUX munin-2.0.33-nogitversion.patch 327 BLAKE2B 7368d2f44bd6d6c2ebb842d8a516b8ee238c49e3492ea91467ffe5b85c6db9c36e236d853e0d3e6e5a8e3bd96a39c365c3fba137a84d7ad6f79f8ed2b0085f78 SHA512 61dfdae1f224860ee33def50d3d074e1d1ae431fcba2007d7cd4d8b0b602b302b782a06626e6e795436cd65362a752e6aa97107575b46bcfa547a72ec27d8cf0
-AUX munin-2.0.33-perl526.patch 849 BLAKE2B 4f38dedbe74e601dd67f44339dc1e64754f30284e368e4768db4f593749060a32923030a55811beb6ab2ed1e7b7fb1d817761656c0fff89adee3c518fb5e88ad SHA512 b20e6b7de057ea88cfe5420fe79520d1fbb23cfdf961096c355c6bd48384b6d78a74b7545e8ded47374eeb5b884f54b39556abf950577e025d8221f69ef43789
AUX munin-async.service 201 BLAKE2B 2de35c4577d097525b75fb812042627702e846daf908b8deeaf9980c76b31135d5ea906b0932dfe3b4d589e3c635e37e8198cf2b6e9d60cdc305eb499815266f SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a
AUX munin-asyncd.init.2 452 BLAKE2B 3f368195aa6896a726068b9db0ce0d1fc5750fee69a4ca5b60bfc2897486625cb83dab1ceec5cd6c1cf4d4aa0fc517eb0e41548004254abc8ad25657b0bfd422 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26
AUX munin-graph.service 208 BLAKE2B 0234016852b69c645ee7184fb373dd5435a111f52e44b2c0e0c716a39e8356717042ffde25d9292c396b410f563af5894f8a78bd1baafb43e25c2d5257c9bcdc SHA512 3c0ea1cbcaacca02d2e36dbe0dbf02a553ce899db253510a17cbdd1a21275556101117f5d2701bd5519a8813c9ae022465c7fe89fa6000c857ca09c6aed6989c
@@ -18,7 +16,10 @@ DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9
DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
DIST munin-2.0.37-gentoo-1.tar.xz 5572 BLAKE2B 5f6371b2fd7e4933e3f19435e74773d2f74d6d909d65aac1f26e334239af2de4f7f78f81ae58c763024a30a15c9eaf9324c5a3a4ccc5b086951c1a49ddf8a2c9 SHA512 9ab47db4c98bc68a32e63aaf44fad83661efa316ff8f19967a886e3c5e268288d7b25503639c89e851edd57a50d215d8dd46b8e9b985feac9d367d56eb21610b
DIST munin-2.0.37.tar.gz 2249145 BLAKE2B 430a89e6ec5920885abdd09779e61df1365ba132527ac156803a2b71d1a10d716658135a34820083b55ed843f8c6bd502c0f078493ab995df39b0afe4ee5d86e SHA512 22a87fe17a3674464e0cb242c27db57eb97a2b23e5f1fc7044de1b1b8187fbdb2ee5dbab51df42c87dfd8640194fbde23332998bff707368997421c61098d07f
+DIST munin-2.0.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eba6f024c6ac430356cff725c35cfdd84240f5df57d87a0c5bcd71fa5c1dc0482c6a91f7a46d75aeca68f745a74264243 SHA512 a725f978710f328b0a14aa96b5ba499eead358668431c2d53483847846a447bc6f5be855d12c0c13e7dadf821e1c8aee1352ba90f380db389c6d720a0704785f
+DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b033a190cfa1d3a5def7455daf7c6cae741b08f3389b4508220eb2bda6b6afd7eddf620dbb745eecd9cbc3e7b08 SHA512 1139cd2ca765ba85fcf7cf37986fb0dd5423d976ae2943373ee4706f376a6f299f0c626912db318eb49e541054017c604725e6f9b0c1e9198530375a2db6eb05
EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
EBUILD munin-2.0.37.ebuild 12383 BLAKE2B 3da162ea89c907034b757ffed960bf651e04a7268e98d6830868b44b1b45ab00daf77675cc0e16b0e4aea40edeeb9ad66994506d30f17e97a9ac20cbb6900902 SHA512 8ff80be8cd3d11976ddbf9d9748c8a4156a2c0005852ab8f490ea5dc96a37e36d54866b367e0a6b10a1fca77fde3bcb0b6703da2a74b3dc301674164796bd690
+EBUILD munin-2.0.38.ebuild 12297 BLAKE2B 012b21a48257d59999ec27e985825c99512854d305a5becf9ad390d380655e2b679b85f6758fdbef6a6a3f43b4a5646af865ee5753d92cb1cec2b862f50521c6 SHA512 8e09ad8e1e8844c30c8d9ac73f182053899365b986ffcb3be2947f484dcdecf459a0b0a58df717490740bb87019fee83880858216a6a3d2c7eb91bcba4a323d7
EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch b/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch
deleted file mode 100644
index 6cf33538bdec..000000000000
--- a/net-analyzer/munin/files/munin-2.0.33-nogitversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- munin-2.0.33/getversion
-+++ munin-2.0.33/getversion
-@@ -54,8 +54,6 @@
-
- if [ -s "RELEASE" ]; then
- cat RELEASE
--elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
-- generate_version_string
- elif [ ! -z "$(generate_version_string_from_dir)" ]; then
- generate_version_string_from_dir
- else
diff --git a/net-analyzer/munin/files/munin-2.0.33-perl526.patch b/net-analyzer/munin/files/munin-2.0.33-perl526.patch
deleted file mode 100644
index d3cabb9906c3..000000000000
--- a/net-analyzer/munin/files/munin-2.0.33-perl526.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL
---- munin-2.0.33.orig/master/Build.PL 2017-03-03 00:02:39.000000000 -0000
-+++ munin-2.0.33/master/Build.PL 2017-08-05 15:06:55.799816839 -0000
-@@ -1,3 +1,4 @@
-+use lib q[.];
- use MasterBuilder;
-
- use warnings;
-diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL
---- munin-2.0.33.orig/node/Build.PL 2017-03-03 00:02:39.000000000 -0000
-+++ munin-2.0.33/node/Build.PL 2017-08-05 15:11:07.689824612 -0000
-@@ -1,3 +1,4 @@
-+use lib q[.];
- use NodeBuilder;
-
- use warnings;
-diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL
---- munin-2.0.33.orig/plugins/Build.PL 2017-03-03 00:02:39.000000000 -0000
-+++ munin-2.0.33/plugins/Build.PL 2017-08-05 15:13:57.056168401 -0000
-@@ -1,3 +1,4 @@
-+use lib q[.];
- use PluginsBuilder;
-
- use warnings;
diff --git a/net-analyzer/munin/munin-2.0.38.ebuild b/net-analyzer/munin/munin-2.0.38.ebuild
new file mode 100644
index 000000000000..1659f7a892a5
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.38.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+ https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+ dev-lang/perl:=[berkdb]
+ dev-perl/DBI
+ dev-perl/Date-Manip
+ dev-perl/File-Copy-Recursive
+ dev-perl/List-MoreUtils
+ dev-perl/Log-Log4perl
+ dev-perl/Net-CIDR
+ dev-perl/Net-DNS
+ dev-perl/Net-Netmask
+ dev-perl/Net-SNMP
+ dev-perl/Net-Server[ipv6(-)?]
+ virtual/perl-Digest-MD5
+ virtual/perl-Getopt-Long
+ virtual/perl-MIME-Base64
+ virtual/perl-Storable
+ virtual/perl-Text-Balanced
+ virtual/perl-Time-HiRes
+ apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+ asterisk? ( dev-perl/Net-Telnet )
+ cgi? (
+ dev-perl/FCGI
+ dev-perl/CGI-Fast
+ )
+ dhcpd? (
+ >=net-misc/dhcp-3[server]
+ dev-perl/Net-IP
+ dev-perl/HTTP-Date
+ )
+ doc? ( dev-python/sphinx )
+ http? ( dev-perl/libwww-perl )
+ irc? ( dev-perl/Net-IRC )
+ ldap? ( dev-perl/perl-ldap )
+ kernel_linux? ( sys-process/procps )
+ memcached? ( dev-perl/Cache-Memcached )
+ mysql? (
+ virtual/mysql
+ dev-perl/Cache-Cache
+ dev-perl/DBD-mysql
+ )
+ postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+ ssl? ( dev-perl/Net-SSLeay )
+ syslog? ( virtual/perl-Sys-Syslog )
+ !minimal? (
+ dev-perl/HTML-Template
+ dev-perl/IO-Socket-INET6
+ dev-perl/URI
+ >=net-analyzer/rrdtool-1.3[graph,perl]
+ virtual/ssh
+ )
+ "
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+ dev-perl/Module-Build
+ java? ( >=virtual/jdk-1.5 )
+ test? (
+ dev-perl/Test-Deep
+ dev-perl/Test-LongString
+ dev-perl/Test-Differences
+ dev-perl/Test-MockModule
+ dev-perl/Test-MockObject
+ dev-perl/File-Slurp
+ dev-perl/IO-stringy
+ dev-perl/IO-Socket-INET6
+ )"
+RDEPEND="${DEPEND_COM}
+ virtual/awk
+ ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+ java? (
+ >=virtual/jre-1.5
+ || ( net-analyzer/netcat6 net-analyzer/netcat )
+ )
+ !minimal? (
+ virtual/cron
+ media-fonts/dejavu
+ )
+ selinux? ( sec-policy/selinux-munin )
+ !<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup munin
+ enewuser munin 177 -1 /var/lib/munin munin
+ enewuser munin-async -1 /bin/sh /var/spool/munin-async
+ esethome munin-async /var/spool/munin-async
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ echo ${PV} > RELEASE || die
+
+ eapply "${WORKDIR}"/patches/*.patch
+
+ sed -i -e '/hp-ux/ s/done/fi/' Makefile || die
+
+ eapply_user
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+ use cgi || cgidir="${T}/useless/cgi-bin"
+
+ local cgiuser=$(usex apache2 apache munin)
+
+ cat >> "${S}"/Makefile.config <<- EOF
+ PREFIX=\$(DESTDIR)/usr
+ CONFDIR=\$(DESTDIR)/etc/munin
+ DOCDIR=${T}/useless/doc
+ MANDIR=\$(PREFIX)/share/man
+ LIBDIR=\$(PREFIX)/libexec/munin
+ HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+ CGIDIR=${cgidir}
+ CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+ CGIUSER=${cgiuser}
+ DBDIR=\$(DESTDIR)/var/lib/munin
+ DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+ SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+ LOGDIR=\$(DESTDIR)/var/log/munin
+ PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+ JCVALID=$(usex java yes no)
+ STATEDIR=\$(DESTDIR)/run/munin
+ EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+ emake -j1
+ use doc && emake -C doc html
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ eerror "You cannot run tests as root."
+ eerror "Please enable FEATURES=userpriv before proceeding."
+ return 1
+ fi
+
+ local testtargets="test-common test-node test-plugins"
+ use minimal || testtargets+=" test-master"
+
+ LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+ local dirs="
+ /var/log/munin
+ /var/lib/munin/plugin-state
+ /etc/munin/plugin-conf.d
+ /etc/munin/plugins"
+ use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+ keepdir ${dirs}
+ fowners munin:munin ${dirs}
+
+ # parallel install doesn't work and it's also pointless to have this
+ # run in parallel for now (because it uses internal loops).
+ emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+ # we remove /run from the install, as it's not the package's to deal
+ # with.
+ rm -rf "${D}"/run || die
+
+ # remove the plugins for non-Gentoo package managers; use -f so that
+ # it doesn't fail when installing on non-Linux platforms.
+ rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+ insinto /etc/munin/plugin-conf.d/
+ newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+ newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+ newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+ newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+ dodir /usr/lib/tmpfiles.d
+ cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+ d /run/munin 0700 munin munin - -
+ EOF
+
+ systemd_dounit "${FILESDIR}"/munin-async.service
+ systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+ systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+ systemd_dounit "${FILESDIR}"/munin-node.service
+
+ cat >> "${T}"/munin.env <<- EOF
+ CONFIG_PROTECT=/var/spool/munin-async/.ssh
+ EOF
+ newenvd "${T}"/munin.env 50munin
+
+ dodoc README ChangeLog INSTALL
+ if use doc; then
+ cd "${S}"/doc/_build/html || die
+ docinto html
+ dodoc -r *
+ cd "${S}" || die
+ fi
+
+ dodir /etc/logrotate.d/
+ sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+ "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+ dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+ if use syslog; then
+ sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+ "${D}"/etc/munin/munin-node.conf || die
+ fi
+
+ # Use a simpler pid file to avoid trouble with /run in tmpfs. The
+ # munin-node service is ran as user root, and only later drops
+ # privileges.
+ sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+ "${D}"/etc/munin/munin-node.conf || die
+
+ keepdir /var/spool/munin-async/.ssh
+ touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+ fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+ fperms 0750 /var/spool/munin-async{,/.ssh}
+ fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+ if use minimal; then
+ # This requires the presence of munin-update, which is part of
+ # the non-minimal install...
+ rm "${D}"/usr/libexec/munin/plugins/munin_stats
+ else
+ # remove font files so that we don't have to keep them around
+ rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+ if use cgi; then
+ sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+ keepdir /var/cache/munin-cgi
+ touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+ fowners $(usex apache2 apache munin) \
+ /var/cache/munin-cgi \
+ /var/log/munin/munin-cgi-{graph,html}.log
+
+ if use apache2; then
+ insinto /etc/apache2/vhosts.d
+ newins "${FILESDIR}"/munin.apache.include munin.include
+ newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+ fi
+ else
+ sed \
+ -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+ -i "${D}"/etc/munin/munin.conf || die
+ fi
+
+ keepdir /var/lib/munin/.ssh
+ cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+ IdentityFile /var/lib/munin/.ssh/id_ecdsa
+ IdentityFile /var/lib/munin/.ssh/id_rsa
+ EOF
+
+ fowners munin:munin /var/lib/munin/.ssh/{,config}
+ fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+ dodir /usr/share/${PN}
+ cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+ # Force the shell to bash
+ SHELL=/bin/bash
+ # Mail reports to root@, not munin@
+ MAILTO=root
+
+ # This runs the munin task every 5 minutes.
+ */5 * * * * /usr/bin/munin-cron
+
+ # Alternatively, this route works differently
+ # Update once a minute (for busy sites)
+ #*/1 * * * * /usr/libexec/munin/munin-update
+ ## Check for limit excess every 2 minutes
+ #*/2 * * * * /usr/libexec/munin/munin-limits
+ ## Update graphs every 5 minutes
+ #*/5 * * * * nice /usr/libexec/munin/munin-graph
+ ## Update HTML pages every 15 minutes
+ #*/15 * * * * nice /usr/libexec/munin/munin-html
+ EOF
+
+ cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+ # Mail reports to root@, not munin@, only execute one at a time
+ !mailto(root),serial(true)
+
+ # This runs the munin task every 5 minutes.
+ @ 5 /usr/bin/munin-cron
+
+ # Alternatively, this route works differently
+ # Update once a minute (for busy sites)
+ #@ 1 /usr/libexec/munin/munin-update
+ ## Check for limit excess every 2 minutes
+ #@ 2 /usr/libexec/munin/munin-limits
+ ## Update graphs every 5 minutes
+ #@ 5 nice /usr/libexec/munin/munin-graph
+ ## Update HTML pages every 15 minutes
+ #@ 15 nice /usr/libexec/munin/munin-html
+ EOF
+
+ # remove .htaccess file
+ find "${D}" -name .htaccess -delete || die
+ fi
+}
+
+pkg_config() {
+ if use minimal; then
+ einfo "Nothing to do."
+ return 0
+ fi
+
+ einfo "Press enter to install the default crontab for the munin master"
+ einfo "installation from /usr/share/${PN}/f?crontab"
+ einfo "If you have a large site, you may wish to customize it."
+ read
+
+ ebegin "Setting up cron ..."
+ if has_version sys-process/fcron; then
+ fcrontab - -u munin < /usr/share/${PN}/fcrontab
+ else
+ # dcron is very fussy about syntax
+ # the following is the only form that works in BOTH dcron and vixie-cron
+ crontab - -u munin < /usr/share/${PN}/crontab
+ fi
+ eend $?
+
+ einfo "Press enter to set up the SSH keys used for SSH transport"
+ read
+
+ # generate one rsa (for legacy) and one ecdsa (for new systems)
+ ssh-keygen -t rsa \
+ -f /var/lib/munin/.ssh/id_rsa -N '' \
+ -C "created by portage for ${CATEGORY}/${PN}" || die
+ ssh-keygen -t ecdsa \
+ -f /var/lib/munin/.ssh/id_ecdsa -N '' \
+ -C "created by portage for ${CATEGORY}/${PN}" || die
+ chown -R munin:munin /var/lib/munin/.ssh || die
+ chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+ einfo "Your public keys are available in "
+ einfo " /var/lib/munin/.ssh/id_rsa.pub"
+ einfo " /var/lib/munin/.ssh/id_ecdsa.pub"
+ einfo "and follows for convenience"
+ echo
+ cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+ elog "Please follow the munin documentation to set up the plugins you"
+ elog "need, afterwards start munin-node."
+ elog ""
+ elog "To make use of munin-async, make sure to set up the corresponding"
+ elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+ elog ""
+ if ! use minimal; then
+ elog "Please run"
+ elog " emerge --config net-analyzer/munin"
+ elog "to automatically configure munin's cronjobs as well as generate"
+ elog "passwordless SSH keys to be used with munin-async."
+ fi
+ elog ""
+ elog "Further information about setting up Munin in Gentoo can be found"
+ elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+ if use cgi; then
+ chown $(usex apache2 apache munin) \
+ "${ROOT}"/var/cache/munin-cgi \
+ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+ if use apache2; then
+ elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+ elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+ elog "host you want it to be served."
+ elog "If you want to enable CGI-based HTML as well, you have to add to"
+ elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+ else
+ elog "Effective CGI support has just been added in 2.0.7-r6."
+ elog "Documentation on how to use it is still sparse."
+ fi
+ fi
+
+ # we create this here as we don't want Portage to check /run
+ # symlinks but we still need this to be present before the reboot.
+ if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+ mkdir "${ROOT}"/run/munin
+ chown munin:munin "${ROOT}"/run/munin
+ chmod 0700 "${ROOT}"/run/munin
+ fi
+}
diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
index 576c3ab79809..c02d33005fc3 100644
--- a/net-analyzer/nagios-check_linux_bonding/Manifest
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -1,3 +1,3 @@
DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81
-EBUILD nagios-check_linux_bonding-1.4.ebuild 714 BLAKE2B 6162389d0b67476e4a19e81dfb658ba85586bf8b37c86aa9f6b0b493f8fcb829aa4e953c5613d235a782a3cb2b51f8810f38ede8ee95598399bad3a0707e0e23 SHA512 07e745ee927c0ad7146dd249df97399e51b20c660724a1ebfe8934287e48d17df4a771b7b325c3e01e841975ea3cc40a7ace694a6445acca4772f6697d366944
+EBUILD nagios-check_linux_bonding-1.4.ebuild 713 BLAKE2B 6abd0a186a51daaa22173147c5fdcbcbaa55cc7d78e582779f6d94d6d83123e2f86aee250fbae1ab914e820f8a0e136ce5985f4e65d848ed57b7e6a97d2f7952 SHA512 6e787e6b2ac2cae19094712b7680a7eb6323c67159e18ed73aedb279feb856d91c05c35a1efa367d0e7074cc179e4f1482f6e7ba2276a275eb1f719c026f98e3
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
index 6cb284ba95a4..f5b6af3adc6b 100644
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 0a8ba8a0021d..fabb97b152e8 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -5,6 +5,6 @@ DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d
DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
-EBUILD nagios-core-4.3.4.ebuild 6643 BLAKE2B 5ba2d8ba564d053abacf30df936e8301ef465a42b3ac540a97d1416e939319e5bacec7ea482c9383dd088d90c8b3ab6a4bf07665f557a35a876dba44dfa4f94e SHA512 a0e4a8d19f9675e0f2694f34e244873b8cc0f926794fba11b848a232f5933213a636e77ddd6ee8ed4573138f19ea8a2c347b05acd86dcfe65c09353adf914b49
+EBUILD nagios-core-4.3.4.ebuild 6642 BLAKE2B c0791a70440fc8cacdd1c84a5d7e2789316554344d6b26654d8595664fdf67a67e2e278c690c666632995f3abcbca920ff612ca34862fe7a34ca69c35c8dfe1d SHA512 8309de23dfa46bb1a31e70c0f28b2d7c2e6719d8d1e0ce2660298d530d1123978814612dfdb9a56103d1209bea9477b4fb81df3c623f6bf8d07a7419a28d4ae3
EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104
MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index ee472ba7a10c..9ee27cd6da9c 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE="apache2 classicui lighttpd perl +web vim-syntax"
# In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 12697f8bee9d..184b4a29c849 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -3,5 +3,5 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882
DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6
DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f
EBUILD nagstamon-2.0.1.ebuild 1193 BLAKE2B 9364c8ec44986d3352e29ba9a543cb417f812c114746e5743bf5993463d34adff33c75967c8bb3fae6783cda1a5653601afcdcf03d4c6d86c3eb1d4f79fb6f68 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1
-EBUILD nagstamon-3.0.2.ebuild 1379 BLAKE2B b55ad28645ce8723bb0e732385dc698641fbd3aae1513cfebd076118fe51d5b98a18c5543a5b175e64c95ae292f9f62d23f64f9e883e56fa8b37da3f511da7f5 SHA512 9b0f15f63c4a6ede8f885a1ca5dd234ef8b9a93e0856e7e5c5e5654a46ed5c0953fd480e7ee3ce40ac3d179a200ce368b691a38481ee1cd4ec8c9ee820086ba4
+EBUILD nagstamon-3.0.2-r1.ebuild 1383 BLAKE2B 19c84d6faa5a09290a73da7252060e5a23fa52f0c040e8fad80154269595f291933c8150e6b714cd4882e3164696e0f35aed75144f6b5cec8fe3e37e101f1596 SHA512 42ed49a6983b713c208e7cf59214fbd25056cfb014d73ead0039d1a127238d59718218e2ff9731ea6a9eedbe959a234360d703f162d947fb3c424c80de4f3e36
MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..508d1a24e804
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+ default_src_prepare
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
deleted file mode 100644
index 992274b0ce37..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils python-r1 distutils-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="status monitor for the desktop"
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.ifw-dresden.de"
-SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/secretstorage[${PYTHON_USEDEP}]
- >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
- dev-python/requests-kerberos[${PYTHON_USEDEP}]
- dev-python/typing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
-
-src_prepare() {
- default_src_prepare
-
- mv ${PN}.py ${PN} || die
-
- rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
-}
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index b857dc318630..cad0a4ca48ad 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -7,5 +7,5 @@ AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f7
AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f
-EBUILD netperf-2.7.0-r2.ebuild 1921 BLAKE2B c2bbe4ed891f75bbae93b535705802e505843ce4fb9ce1e119f08b9a1ea112d803b5fbd4af272360eeaeb70512d5bb524949df663ced9139dec74f4293407d3a SHA512 6e4a2b2779fbe8d551e886c42e9e977efe143ab3d7e504bb287c47fed2e17dbfe6943aecee4c4b4bcd7aa1d485bd5466aefd47118d5e589a32866a013aafed7d
+EBUILD netperf-2.7.0-r2.ebuild 1920 BLAKE2B 786d469ad8be710d5e1df43469e9a9a3e0dcc4b82295d1cad84fed00ca40a16ab6535e410d38ccbeb9d01d1bac72a4a11a01d14aeed37e3fcfc390cfb4963d7c SHA512 0dfc5521c78b597ea0f2f481ff198c1c735fd15a3b49f07bf9df6f1232ce2627bb1e99adcd68f844b0fbf25638c4002a92aba6f7aa747b0c6fc9ddbe22e50627
MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index a0d87cf67300..435bed3f65b2 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic user
DESCRIPTION="Network performance benchmark"
SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha ~amd64 arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm64 ~hppa ia64 ppc ppc64 sparc x86"
HOMEPAGE="http://www.netperf.org/"
LICENSE="netperf"
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 82cf7b0177fd..deab42521460 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,13 +1,6 @@
-AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618
AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
-AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6
AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7
-AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68
-AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae
-DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d
DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
-EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2
-EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182
-EBUILD sarg-2.3.11-r1.ebuild 850 BLAKE2B 5eaf073ba0951e283a2418a23c45d72bf2be1fb0a4dbec7e926f2931586c74489170e702d7ada29066543865521972ddd9b07a1a0ab17d43232cbfa4acf22d33 SHA512 e7dc21b45f3bd8227cc039b2a3b8e7a328073b26bd698d742fefde1ab309d6746f328fd831e5b8bb23e3ed5b7f0a5daf9c28f5f37b6015a8e00a7295c4c0c005
+EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
deleted file mode 100644
index 188b6dd3732b..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util.c
-+++ b/util.c
-@@ -2088,7 +2088,7 @@
- int pad_len;
- bool bracket=false;
- bool port=false;
-- bool port_num=0;
-+ int port_num=0;
-
- // skip leading spaces and tabs
- while (*buf && (*buf==' ' || *buf=='\t')) buf++;
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
deleted file mode 100644
index 926fdc8c6725..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-format.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/report.c
-+++ b/report.c
-@@ -54,7 +54,7 @@
- char accsmart[MAXLEN];
- char crc2[MAXLEN/2 -1];
- char siteind[MAX_TRUNCATED_URL];
-- char arqtt[256];
-+ char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
- char *oldurltt=NULL;
- char oldaccdiatt[11],oldacchoratt[9];
- char tmp3[MAXLEN];
---- a/util.c
-+++ b/util.c
-@@ -671,10 +671,10 @@
- char *buildtime(long long int elap)
- {
- int num = elap / 1000;
-- int hor = 0;
-- int min = 0;
-- int sec = 0;
-- static char buf[12];
-+ short int hor = 0;
-+ short int min = 0;
-+ short int sec = 0;
-+ static char buf[15];
-
- buf[0]='\0';
-
-@@ -1236,10 +1236,10 @@
- char *fixtime(long long int elap)
- {
- int num = elap / 1000;
-- int hor = 0;
-- int min = 0;
-- int sec = 0;
-- static char buf[12];
-+ short int hor = 0;
-+ short int min = 0;
-+ short int sec = 0;
-+ static char buf[15];
-
- hor=num / 3600;
- min=(num % 3600) / 60;
-@@ -1248,7 +1248,7 @@
- if(hor==0 && min==0 && sec==0)
- strcpy(buf,"0");
- else
-- sprintf(buf,"%d:%02d:%02d",hor,min,sec);
-+ sprintf(buf,"%02d:%02d:%02d",hor,min,sec);
-
- return buf;
- }
---- a/index.c
-+++ b/index.c
-@@ -89,9 +89,9 @@
- char monthdir[MAXLEN];
- char monthname1[9], monthname2[9];
- char nmonth[30];
-- char monthnum[10];
-+ char monthnum[15];
- char dayindex[MAXLEN];
-- char daynum[10];
-+ char daynum[15];
- char title[80];
- int yearsort[150];
- int nyears;
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -67,7 +67,7 @@
- int skip;
- int flen;
- int count, clen;
-- char cstr[9];
-+ char cstr[10];
-
- last=NULL;
- for (group=first_user_group ; group ; group=group->next) {
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
deleted file mode 100644
index ddc0ca8ec4eb..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -41,7 +41,7 @@
- CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"])
- AC_MSG_RESULT($have_extra_warnings)
--if test "$have_extra_warnings" == "no" ; then
-+if test "$have_extra_warnings" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
-@@ -50,7 +50,7 @@
- CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
- AC_MSG_RESULT($have_implicit_function_declaration)
--if test "$have_implicit_function_declaration" == "no" ; then
-+if test "$have_implicit_function_declaration" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
-@@ -59,7 +59,7 @@
- CFLAGS="${CFLAGS} -Werror=format"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
- AC_MSG_RESULT($have_error_format)
--if test "$have_error_format" == "no" ; then
-+if test "$have_error_format" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
-@@ -93,7 +93,7 @@
- [],[with_gd=check])
- if ( test "x$with_gd" != "xno" ) ; then
- AC_CHECK_HEADERS(gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h)
-- if ( test "x$ac_cv_header_gd_h" == "xyes" ) ; then
-+ if ( test "x$ac_cv_header_gd_h" = "xyes" ) ; then
- AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD_LIB="yes", HAVE_GD_LIB="")
- if ( test "x$HAVE_GD_LIB" != "xyes" ) ; then
- AC_MSG_ERROR([ligbd is required to compile sarg with gd])
-@@ -137,7 +137,7 @@
- [],[with_pcre=check])
- if ( test "x$with_pcre" != "xno" ) ; then
- AC_CHECK_HEADERS(pcre.h)
-- if ( test "x$ac_cv_header_pcre_h" == "xyes" ) ; then
-+ if ( test "x$ac_cv_header_pcre_h" = "xyes" ) ; then
- LIBS="$LIBS $(pcre-config --libs)"
- CFLAGS="$CFLAGS $(pcre-config --cflags)"
- else
-@@ -243,7 +243,7 @@
- fi
- ],[FONTDIR="${datarootdir}/sarg/fonts"])
- if test "$FONTDIR" ; then
-- if test "x$prefix" == "xNONE" ; then
-+ if test "x$prefix" = "xNONE" ; then
- tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"`
- else
- tempfullpath=`eval "echo $FONTDIR"`
-@@ -261,7 +261,7 @@
- IMAGEDIR=$enableval
- fi
- ],[IMAGEDIR="${datarootdir}/sarg/images"])
--if test "x$prefix" == "xNONE" ; then
-+if test "x$prefix" = "xNONE" ; then
- tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"`
- else
- tempfullpath=`eval "echo $IMAGEDIR"`
-@@ -286,7 +286,7 @@
- CFLAGS="${CFLAGS} -Wformat -Werror=format-security"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_format_security="yes"],[have_format_security="no"])
- AC_MSG_RESULT($have_format_security)
-- if test "$have_format_security" == "no" ; then
-+ if test "$have_format_security" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
-@@ -295,7 +295,7 @@
- CFLAGS="${CFLAGS} -Wempty-body"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_empty_body="yes"],[have_empty_body="no"])
- AC_MSG_RESULT($have_empty_body)
-- if test "$have_empty_body" == "no" ; then
-+ if test "$have_empty_body" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
- fi
-@@ -367,14 +367,14 @@
- AC_CONFIG_FILES([Makefile po/Makefile.in])
- AC_OUTPUT
-
--if ( test "x$gd_status" == "xdisabled" ) ; then
-+if ( test "x$gd_status" = "xdisabled" ) ; then
- AC_MSG_NOTICE([Not building with gd as requested on the configuration command line])
--elif ( test "x$gd_status" == "xnot found" ) ; then
-+elif ( test "x$gd_status" = "xnot found" ) ; then
- AC_MSG_NOTICE([gd.h was not found so the graphs won't be available in the report])
- fi
-
--if ( test "x$pcre_status" == "xdisabled" ) ; then
-+if ( test "x$pcre_status" = "xdisabled" ) ; then
- AC_MSG_NOTICE([Not building with pcre as requested on the configuration command line])
--elif ( test "x$pcre_status" == "xnot found" ) ; then
-+elif ( test "x$pcre_status" = "xnot found" ) ; then
- AC_MSG_NOTICE([pcre.h was not found so the regexp won't be available in the hostalias])
- fi
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
deleted file mode 100644
index 630e944f7534..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -2,6 +2,7 @@
- AC_INIT([sarg],[2.3.9])
- AC_CONFIG_SRCDIR([log.c])
- AC_CONFIG_AUX_DIR(cfgaux)
-+AC_CONFIG_MACRO_DIR(m4)
-
- AC_CANONICAL_HOST
-
-@@ -26,6 +27,11 @@
- dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
- AC_PROG_CC_C99
-
-+dnl mkdir_p / MKDIR_P
-+AC_PROG_MKDIR_P
-+mkdir_p="$MKDIR_P"
-+AC_SUBST(mkdir_p)
-+
- # Report more warnings to improve code quality.
- CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
-
-@@ -60,7 +66,7 @@
-
- case "$host" in
- *-solaris*)
-- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-+ LIBS="${LIBS} -lsocket -lnsl"
- CFLAGS="-DSOLARIS ${CFLAGS}"
- ;;
- esac
diff --git a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
deleted file mode 100644
index 72e6e4dbb97f..000000000000
--- a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
- gd? ( media-libs/gd[png,truetype] )
- ldap? ( net-nds/openldap )
- pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.9-configure.patch
- "${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
- "${FILESDIR}"/${PN}-2.3.10-format.patch
- "${FILESDIR}"/${PN}-2.3.10-bool.patch
- "${FILESDIR}"/${PN}-2.3.10-config.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with gd) \
- $(use_with ldap) \
- $(use_with pcre) \
- --sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
deleted file mode 100644
index 870baa2e64d8..000000000000
--- a/net-analyzer/sarg/sarg-2.3.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
- gd? ( media-libs/gd[png,truetype] )
- ldap? ( net-nds/openldap )
- pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.3.9-configure.patch \
- "${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
-
- sed -i \
- -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
- -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
- -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
- -e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
- sarg.conf || die
-
- sed -i \
- -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
- log.c || die #43132
-
- sed -i \
- -e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
- htaccess || die
-
- sed -i \
- -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
- -e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
- user_limit_block || die
-
- sed -i \
- -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
- sarg-php/sarg-block-it.php || die
-
- sed -i \
- -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
- -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
- sarg.1 sarg-php/sarg-squidguard-block.php || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with gd) \
- $(use_with ldap) \
- $(use_with pcre) \
- --sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 10cc09c45d5e..88f7c507e91e 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE="+gd ldap pcre"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c536f810ffe7..2b03fcf0bcae 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
Binary files differ
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index cc39b6cb10d3..9be7e29e2914 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -7,5 +7,5 @@ DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c
DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
EBUILD ppp-2.4.7-r3.ebuild 6802 BLAKE2B 499a46c7792023bcc00bf4c1fa8a750092765de7738d4875eb350eaed6e9d2ef5c409eb323e60af7603a27dafb089a2f97e9339709caa47d3ce6001cf116283b SHA512 371aac305e679b5297d99971c48ad8c4384a8368b760896d23f3016f4219001cfc618c11a0f9cb876e577ceb1d36488efa06a51d75685982030c26701c066647
EBUILD ppp-2.4.7-r5.ebuild 6843 BLAKE2B a774f4c699de7661e5b344f3647be23ca16f18e26d95e4d9663b68da978351cfd885251fa47374a0d7ea31e0d799da1fc6ea4e66e8c9274f4c4383e5d0e4971f SHA512 13803f3071272f6b0385e95740fe0b25045cfa88a09efab75634ff9e324b0dcbf7962dd291b6cf7d714769c19bfbc351b1fbd65f7faceaa6a659594657bc2efc
-EBUILD ppp-2.4.7-r6.ebuild 7086 BLAKE2B a85a915222d88915baa5467dd8df641d95535e7880ab8ee6b2a0497214d258b5a02d6d5d32e713b81de01e1fd8c0197f41832166f11a8e91803979bf4321e689 SHA512 e536cb227565356c47dae369901694ac8f4b47126dc7318207b93e45d32b078d7d5c906ad1afff10cf24fa1825d03345040251da7bd3ece767081ab1ca02f142
+EBUILD ppp-2.4.7-r6.ebuild 7085 BLAKE2B ad27b9938e956bfae9c3909a16f1206545e9055d2a7de39d23a7bdeba27991c96b22aedca92eb9279cdb2db1c72534f04432b0849bc6856e64c5cd7c1528cd0e SHA512 c8c379211edec2a8172820c5ee2d73d989a9bd69005ab99ea477ae1df4dd90ec4b3be8d99644a16eb2b8adf7b4b530f81d76b52304613ec7a6f1a36694500842
MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
index 206abd0dd04d..f8547e791e9e 100644
--- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="activefilter? ( net-libs/libpcap )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c9ba03e5954c..3d323b1f6012 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
Binary files differ
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 01ff499d107e..3944ab9ed142 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,10 +1,11 @@
AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
-AUX dnscrypt-proxy.initd 646 BLAKE2B 3ede3fd925b6fad6f42ce4b52184ebdaa9c9cc881886e2b18d45f10476a7957ea09037ba2faf8d9ff12f4a0352e982f5d267410a9f3531f1d0ad8f5558d6576d SHA512 faa119b18765eb59ddacad1340752f1bbd9d10acf59f6b79bc4c31fcbe9f0e5f08bf6cd214ce2a5bdafe13c5d1a116aacea2e09a181699f8f06f3ec34fb9dcaa
-AUX dnscrypt-proxy.service 1204 BLAKE2B 879571cc00eab424b10f6ed79d9d52ba1ee835fd3ad7ef295d113b21afed075b3670066cf5dbdf0647c02853bb242c6d037f6ad962e0e6a7225b86fe88a3c9ab SHA512 3ae8f2dbe93169a6ddf71db85103a297210287006a63c71e9837ddfb62cecf6de28dd3ead6028e2f239edc4dab5a16d27c3c84fd2fcc23e41ba71b7b8fbf8b1f
+AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072
+AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
-DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613
DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9
-EBUILD dnscrypt-proxy-2.0.14.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6
-EBUILD dnscrypt-proxy-2.0.15.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6
+DIST dnscrypt-proxy-2.0.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f
+EBUILD dnscrypt-proxy-2.0.15.ebuild 2880 BLAKE2B bf0fc37008d0d54f8aeec9b294175e1eefdfedd1ebda02de0f40ca6678a1070fdbc1702359fa0b8474f62b6a94ff6c68ac166eeac0302909d502c31f4298c2cd SHA512 d148bb289b66526eb0600c1817d54acdd702177571215da2a66a88a4ce5ae419b92ff8e8a0ef0a7b9988704e4571fae89b3f29cbe25e2808d168cf4db05ebe74
+EBUILD dnscrypt-proxy-2.0.16.ebuild 2878 BLAKE2B 42284fc77e8809e196a00cf6b24e0f379c6ac3e8f5da17fdd8387788a19e583914ea8ade40e82d039234632eda4e19e501e8f14e4cee7c4c7a9dd18546bdfc45 SHA512 a83ced12c49aceba4452c1db9173f72972aa105aa9344983f96b06b87da7255ba601970dec2546299921af71e20b1ccc3188a99dbb6b1c930cc0b84a5cc1c947
+EBUILD dnscrypt-proxy-9999.ebuild 2973 BLAKE2B ff38c4e6b05d8743d6d91e10569f89cd78e8d29a0ba05e252dd087fa076c922f3711c38bd3109ce69cec721807902e0f070bc1e664b9dc50fec0c6767a85827f SHA512 5510605f1c0b6aa5087a848f2662d93b890d868c2b81ddf6fe714f50eae7b681d90643f458aa8a51938e8dfa4e3aeb7b054ae81555bace5819f6b9c73e1f60ba
MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
deleted file mode 100644
index 5b04253b9c9b..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jedisct1/${PN}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
-
-pkg_setup() {
- enewgroup dnscrypt-proxy
- enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
-}
-
-src_prepare() {
- default
- # Create directory structure suitable for building
- mkdir -p "src/${EGO_PN%/*}" || die
- mv "${PN}" "src/${EGO_PN}" || die
- mv "vendor" "src/" || die
-}
-
-src_install() {
- dobin dnscrypt-proxy
-
- insinto /etc/dnscrypt-proxy
- newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
- doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
- doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
- insinto "/usr/share/dnscrypt-proxy"
- doins -r "utils/generate-domains-blacklists/."
-
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
- newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
- einstalldocs
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- if ! use filecaps; then
- ewarn "'filecaps' USE flag is disabled"
- ewarn "${PN} will fail to listen on port 53"
- ewarn "please do one the following:"
- ewarn "1) re-enable 'filecaps'"
- ewarn "2) change port to > 1024"
- ewarn "3) configure to run ${PN} as root (not recommended)"
- ewarn
- fi
-
- local v
- for v in ${REPLACING_VERSIONS}; do
- if [[ ${v} == 1.* ]] ; then
- elog "Version 2 is a complete rewrite of ${PN}"
- elog "please clean up old config/log files"
- elog
- fi
- if [[ ${v} == 2.* ]] ; then
- elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
- elog "you can remove obsolete 'dnscrypt' accounts from the system"
- elog
- fi
- done
-
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "Using systemd socket activation may cause issues with speed"
- elog "latency and reliability of ${PN} and is discouraged by upstream"
- elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
- elog "It is disabled by default for new installations"
- elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
- elog
-
- fi
-
- elog "After starting the service you will need to update your"
- elog "/etc/resolv.conf and replace your current set of resolvers"
- elog "with:"
- elog
- elog "nameserver 127.0.0.1"
- elog
- elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
index 5b04253b9c9b..48aca6233183 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild
new file mode 100644
index 000000000000..778e3aa9cecb
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+ enewgroup dnscrypt-proxy
+ enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+ default
+ # Create directory structure suitable for building
+ mkdir -p "src/${EGO_PN%/*}" || die
+ mv "${PN}" "src/${EGO_PN}" || die
+ mv "vendor" "src/" || die
+}
+
+src_install() {
+ dobin dnscrypt-proxy
+
+ insinto /etc/dnscrypt-proxy
+ newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+ doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+ doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+ insinto /usr/share/dnscrypt-proxy
+ doins -r "utils/generate-domains-blacklists/."
+
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+ newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+ systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+ systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if ! use filecaps; then
+ ewarn "'filecaps' USE flag is disabled"
+ ewarn "${PN} will fail to listen on port 53"
+ ewarn "please do one the following:"
+ ewarn "1) re-enable 'filecaps'"
+ ewarn "2) change port to > 1024"
+ ewarn "3) configure to run ${PN} as root (not recommended)"
+ ewarn
+ fi
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [[ ${v} == 1.* ]] ; then
+ elog "Version 2 is a complete rewrite of ${PN}"
+ elog "please clean up old config/log files"
+ elog
+ fi
+ if [[ ${v} == 2.* ]] ; then
+ elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+ elog "you can remove obsolete 'dnscrypt' accounts from the system"
+ elog
+ fi
+ done
+
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "Using systemd socket activation may cause issues with speed"
+ elog "latency and reliability of ${PN} and is discouraged by upstream"
+ elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+ elog "It is disabled by default for new installations"
+ elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+ elog
+
+ fi
+
+ elog "After starting the service you will need to update your"
+ elog "/etc/resolv.conf and replace your current set of resolvers"
+ elog "with:"
+ elog
+ elog "nameserver 127.0.0.1"
+ elog
+ elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
new file mode 100644
index 000000000000..98ba6f98e2c6
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="test"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+ enewgroup dnscrypt-proxy
+ enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+ default
+ # Create directory structure suitable for building
+ mkdir -p "src/${EGO_PN%/*}" || die
+ mv "${PN}" "src/${EGO_PN}" || die
+ mv "vendor" "src/" || die
+}
+
+src_install() {
+ dobin dnscrypt-proxy
+
+ insinto /etc/dnscrypt-proxy
+ newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+ doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+ doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+ insinto /usr/share/dnscrypt-proxy
+ doins -r "utils/generate-domains-blacklists/."
+
+ newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+ newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+ systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+ systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if ! use filecaps; then
+ ewarn "'filecaps' USE flag is disabled"
+ ewarn "${PN} will fail to listen on port 53"
+ ewarn "please do one the following:"
+ ewarn "1) re-enable 'filecaps'"
+ ewarn "2) change port to > 1024"
+ ewarn "3) configure to run ${PN} as root (not recommended)"
+ ewarn
+ fi
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [[ ${v} == 1.* ]] ; then
+ elog "Version 2 is a complete rewrite of ${PN}"
+ elog "please clean up old config/log files"
+ elog
+ fi
+ if [[ ${v} == 2.* ]] ; then
+ elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+ elog "you can remove obsolete 'dnscrypt' accounts from the system"
+ elog
+ fi
+ done
+
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "Using systemd socket activation may cause issues with speed"
+ elog "latency and reliability of ${PN} and is discouraged by upstream"
+ elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+ elog "It is disabled by default for new installations"
+ elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+ elog
+
+ fi
+
+ elog "After starting the service you will need to update your"
+ elog "/etc/resolv.conf and replace your current set of resolvers"
+ elog "with:"
+ elog
+ elog "nameserver 127.0.0.1"
+ elog
+ elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 4a46acdc4bb3..d81a36fc8f85 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -9,11 +9,11 @@ pidfile="/run/${RC_SVCNAME}.pid"
start_stop_daemon_args="--background --make-pidfile"
depend() {
- use net logger
+ use logger net
provide dns
}
start_pre() {
- checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
- checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
+ checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+ checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index ed02955621ba..a0c7a1408c85 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
@@ -7,12 +7,11 @@ Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
## If you enable this, the `listen_addresses` list in the main configuration file can be empty.
## Or, at least, the addresses it contains should not overlap with the systemd socket addresses.
-# Requires=dnscrypt-proxy.socket
-
-After=network.target
-Wants=network.target
+#Requires=dnscrypt-proxy.socket
Before=nss-lookup.target
-Wants=nss-lookup.target
+After=network.target
+Wants=network.target nss-lookup.target
+
[Service]
ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -35,5 +34,5 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
AmbientCapabilities=CAP_NET_BIND_SERVICE
[Install]
-Also=dnscrypt-proxy.socket
+#Also=dnscrypt-proxy.socket
WantedBy=multi-user.target
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 1b4a44f3702b..9729a94923ad 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,6 +1,7 @@
+AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
DIST getdns-1.4.2.tar.gz 1059122 BLAKE2B 79399bb70e58bf449e99052c9f32ebb9d4e6ac26c753d99963d591661ee04ccfaf58e4f35589187a9a89fd9bccc0bff9d319c8b11da9522fbb17a915612ce9bd SHA512 fbbbe80df0f66e295c590c1751c11fcfc66efa200203ce1fdc11a471130fbaa837fa6bade076e17e1dac03d71c3522a67a660f2bdb4766aead19119da355bdd4
-EBUILD getdns-1.4.2.ebuild 1884 BLAKE2B 18700c0594d4a5110b821ec97a38bb33130af3b0d7dca311a4fa18442cc88feec11775f7781878d56b6462566c35a0691dca117a056a99cfdcc18a63a2ea61e0 SHA512 89bf649f84c0774189048cdc2608504aeffdf34759e6914c0b75a13b2abd8a5f8ca9c5321f6e06dd872a1acbb58e4f657a80d608c602d4bb5dd713a6abcce4f2
+EBUILD getdns-1.4.2-r1.ebuild 1946 BLAKE2B 2df36495ee4e8f41f92f1aa052f620000bb0300652cbf176049b3b56079c7097b3161a0dacf333ed97246b6a6ea3c25cd61b6158b549ffcf84bcca2bee7c5775 SHA512 fea036ed04e79948e86dc1f8d669faed7d8cff5332958080407e60ac8a32f2fb60a29c79855c9ce3a683854b168e428fa0cfa9166e1cd1dc39a2e3749aaf989e
MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
new file mode 100644
index 000000000000..2bb7546fcfa5
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
@@ -0,0 +1,16 @@
+diff -ur a/stubby/systemd/stubby.service b/stubby/systemd/stubby.service
+--- a/stubby/systemd/stubby.service 2018-05-11 13:25:22.000000000 +0200
++++ b/stubby/systemd/stubby.service 2018-06-20 15:40:23.650164668 +0200
+@@ -3,9 +3,11 @@
+
+ [Service]
+ User=stubby
+-DynamicUser=yes
++DynamicUser=no
+ CacheDirectory=stubby
+ WorkingDirectory=/var/cache/stubby
++ExecStartPre=/bin/mkdir -p /var/cache/stubby
++ExecStartPre=/bin/chown stubby:stubby /var/cache/stubby
+ ExecStart=/usr/bin/stubby
+ AmbientCapabilities=CAP_NET_BIND_SERVICE
+ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
diff --git a/net-dns/getdns/getdns-1.4.2-r1.ebuild b/net-dns/getdns/getdns-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..28d7a6c9c3c9
--- /dev/null
+++ b/net-dns/getdns/getdns-1.4.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user fcaps systemd
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs"
+
+DEPEND="
+ dev-libs/libbsd:=
+ dev-libs/libyaml:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ idn? ( net-dns/libidn2:= )
+ unbound? ( >=net-dns/unbound-1.4.16:= )
+ libevent? ( dev-libs/libevent:= )
+ libev? ( dev-libs/libev:= )
+ libuv? ( dev-libs/libuv:= )
+"
+RDEPEND="
+ ${DEPEND}
+ stubby? ( sys-libs/libcap:= )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
+src_configure() {
+ econf \
+ --runstatedir=/var/run \
+ --with-piddir=/var/run/stubby \
+ $(use_with stubby) \
+ $(use_with getdns_query) \
+ $(use_with getdns_server_mon) \
+ $(use_with idn libidn2) \
+ --without-libidn \
+ $(use_with unbound libunbound) \
+ $(use_with libevent) \
+ $(use_with libev) \
+ $(use_with libuv) \
+ $(use_with threads libpthread) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ if use stubby; then
+ newinitd "${FILESDIR}"/stubby.initd-r1 stubby
+ newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/stubby.logrotate stubby
+ systemd_dounit "${S}"/stubby/systemd/stubby.service
+ systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
+ fi
+}
+
+pkg_postinst() {
+ if use stubby; then
+ enewgroup stubby
+ enewuser stubby -1 -1 -1 stubby
+ fcaps cap_net_bind_service=ei /usr/bin/stubby
+ fi
+
+ if has_version <dev-libs/libressl-2.7.0; then
+ ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
+ if use stubby; then
+ ewarn "You will NOT be able to use strict profile in Stubby."
+ fi
+ fi
+}
diff --git a/net-dns/getdns/getdns-1.4.2.ebuild b/net-dns/getdns/getdns-1.4.2.ebuild
deleted file mode 100644
index c0978a76f061..000000000000
--- a/net-dns/getdns/getdns-1.4.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user fcaps systemd
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs"
-
-DEPEND="
- dev-libs/libbsd:=
- dev-libs/libyaml:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- idn? ( net-dns/libidn2:= )
- unbound? ( >=net-dns/unbound-1.4.16:= )
- libevent? ( dev-libs/libevent:= )
- libev? ( dev-libs/libev:= )
- libuv? ( dev-libs/libuv:= )
-"
-RDEPEND="
- ${DEPEND}
- stubby? ( sys-libs/libcap:= )
-"
-
-src_configure() {
- econf \
- --runstatedir=/var/run \
- --with-piddir=/var/run/stubby \
- $(use_with stubby) \
- $(use_with getdns_query) \
- $(use_with getdns_server_mon) \
- $(use_with idn libidn2) \
- --without-libidn \
- $(use_with unbound libunbound) \
- $(use_with libevent) \
- $(use_with libev) \
- $(use_with libuv) \
- $(use_with threads libpthread)
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- if use stubby; then
- newinitd "${FILESDIR}"/stubby.initd-r1 stubby
- newconfd "${FILESDIR}"/stubby.confd-r1 stubby
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/stubby.logrotate stubby
- systemd_dounit "${S}"/stubby/systemd/stubby.service
- systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
- fi
-}
-
-pkg_postinst() {
- if use stubby; then
- enewgroup stubby
- enewuser stubby -1 -1 -1 stubby
- fcaps cap_net_bind_service=ei /usr/bin/stubby
- fi
-
- if has_version <dev-libs/libressl-2.7.0; then
- ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
- if use stubby; then
- ewarn "You will NOT be able to use strict profile in Stubby."
- fi
- fi
-}
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index c895124c4746..34c698165927 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,8 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
-DIST knot-2.6.7.tar.xz 1121120 BLAKE2B c3000a08a8d873efc5a120d0f0154bcd16be0162ce3c21d74041181183c5f6f1600eeab3546737591ccd1522c8119202dc1f7dd576b70d4c006c0619b904f54a SHA512 021810b396e9aaca140c6df858c8dcb9a4be6ac8d64a413195b88d8073d39e1de0604058343bff7534d39f32de27b0e0bc2271a0e545bb9f809adfe1bfaec9a9
+DIST knot-2.6.8.tar.xz 1121740 BLAKE2B 2da7e20630fec53952c6892ee4002afeee0c36ef5cb271346caf1760389abaacac7f11dd0b24950ff5eedca40564ccf70c25b5c8548564bdd61c78a1bd9cf93e SHA512 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967
EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
EBUILD knot-2.6.6.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
-EBUILD knot-2.6.7.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
+EBUILD knot-2.6.8.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
diff --git a/net-dns/knot/knot-2.6.7.ebuild b/net-dns/knot/knot-2.6.8.ebuild
index 2c624d4be58a..2c624d4be58a 100644
--- a/net-dns/knot/knot-2.6.7.ebuild
+++ b/net-dns/knot/knot-2.6.8.ebuild
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 72e44b084db2..65de999fa010 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
Binary files differ
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 2979180c2aec..f3110f47ae9a 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -3,6 +3,8 @@ AUX iptables-1.4.13-r1.init 2766 BLAKE2B 1941ba5383055bfedd57b8eb6a390cab5fc3438
AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70
AUX iptables-1.4.21-configure.patch 1066 BLAKE2B 59bf725aeaae131b57e04b556957dd3316f2282ea5a1d9e931f63865dd48484831c9f7674085b7134e2ef4c2dcddbc3b06c8f8e85a45840746a25e386c390f86 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176
AUX iptables-1.4.21-static-connlabel-config.patch 2195 BLAKE2B 237c59c2fd3312efa26181f363c2ad4dfe19b0cb494f90048e50ff464ed8abbb8ec46d406df51b9f3ba75f717a045ebb4fa38cc0ca5741f5efbfc3322171e04f SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1
+AUX iptables-1.8.0-fix-building-without-nft-backend.patch 1324 BLAKE2B 3393141e30d41250b7dc89c8e7c353bade835ce718156873f78d05036bae573a881d0a3c883a2437302498716613bc278c608f3ce9dfa57236467ab91b9a8203 SHA512 77382aedac7829654fa6af0537cb1e7fdffe5cc0609b8255b42de5eb077ac915b48db9e99e99b834ab3c2a3e96f38b36fd862fa27af522a82f719c8eca1bd839
+AUX iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch 1792 BLAKE2B ab5e961f279e1fadcd5f892f869ec1a0f5499c54cc79c21b85e01ad6617753dc51ba001df36e5cb1d5074b062af664c80e751d0010d8dc5951e11d2c11542bdf SHA512 1722b4a49ec8c397df9de5a3748fd5b90053dcee2121b4fd40e0f9f2efe5b27dc09e0321ca6855cf6158bbe400372d119ed825bde7a0b4e6c597f7630ac83c93
AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db
AUX systemd/ip6tables-restore.service 404 BLAKE2B 35cdf804e787aa5cc382cc638de523735ab47b878168c41d8eef85eb592e5bebd9319e75a10db28f0eba6618efae355c90f03ac0798239edeb80d01108e98a47 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee
AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a1a48c681b77b6e3e1b2fa6f2ada7204f23df0f0894218599e95c2ccea71024e86cda7c82b6ff5a55d016d04d71cb1487 SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10
@@ -13,9 +15,10 @@ AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f
DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b
DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8
DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0
+DIST iptables-1.8.0.tar.bz2 677980 BLAKE2B ce874572d736087f46ea5a6e393cf9b32bf7328efda0fd9faee94dfa11428fc0e124d5ed81329484032ac4ebe89b2604b26dbb135e152c0e0f4c74d88db52d00 SHA512 5f3fe4c15f02e29a2e6ee2905a242f450f8a3b51553618e0cdc59301c35b8bb663e8f2ea70dfcaed8d4e53192c01519906b60ff649385c693e0602622742890f
EBUILD iptables-1.4.21-r1.ebuild 2442 BLAKE2B caa1b23d35ccb9a8e5631f932fe4a6816358782ea620d71ad1d64498df64b18015b3610f48b345a13caafaca51bb504d364ed4167804383c03d70439ca4154c2 SHA512 b0d5b1de2c24dbe4aa3eec29e3adefac12f72529fa850fbe5b956d1835fc5ea25ceed8172d8b5bc2d5c1bff63a609cae04c3da923c783ccdfeed126ef2bde831
EBUILD iptables-1.4.21-r5.ebuild 2975 BLAKE2B f9fdeaf8c242b1553b59586346e81735dae31100a435a9cf2d0817c69a8fb6a0652b76944f5261eca8b5c5be60f38db50fb22a3940573e493c3326ec068396e0 SHA512 dab27d6601b69dae4c0be6b48f0cbc7daf7b93066ad398d962f81ec625628d6d2ce9e0188810941364e1cbc7d9c6b4511f3ab832ee736d69d8b977f80d52657d
EBUILD iptables-1.6.1-r3.ebuild 3258 BLAKE2B 069cae36e3e4cbb04865f6f7d6c5b3f17cffd8868adc3fe3360519bc7eedd8b5f10bcd866bd1d03047a98a3675eb0bfc06b8ed882ff02596e56a5167778935dc SHA512 6ccc44b38eba7b0cc8d9195af7cc8e19214d5c8944f3c16ba75dbfe3856f84c5a5b922b435b63598ca9f074f0e4eb17798cb692037e8d8819e52f4d8096cebed
-EBUILD iptables-1.6.2-r1.ebuild 3289 BLAKE2B 313dae5931d2e12a4bedb4650f7057704e7e1203a32de405e6fe45221aac84085b106973acec1e47e8499f7dbafcf41856173ed0495adaf378b0548989d486cf SHA512 30be32e28aae346cd108969613abef7d948c266a203c5968cef1f3e160172a0698487fb25683f35116477e1991559eb4c47466c18a821030081b7a3254037284
EBUILD iptables-1.6.2-r2.ebuild 3327 BLAKE2B c4d683d81f4d3be5efb9d043d63b8ee7b20f4b735cce0d7e31c85e159d2693568b83b28fe1e517ba658ee240dfd063b7810590cbf94029975992b0e5aeab479e SHA512 dc12b299d205f5404bd6486b36a933b611d567be45e00f8f02dd010036c701510824184a3d3d0d52798c89e5b57bfbe402e79bbfbeb50e4f0d26de1627b387d3
+EBUILD iptables-1.8.0-r1.ebuild 3657 BLAKE2B 4ba94eef2bf4cf41b4d102932cec1e913f1b0296115e665feedc8f1f719b4185e3c79bc4482e201a8ef419227b56722f8c40737182ad82fb9265ffb0b9d7a7dc SHA512 0701b7c7400b189a14f74e9c56b446bb52e75f7a9b8d7522354254371af8fb1f24eadad0655d6d68b103287f6d6ccc1a1c38e8945a28092d3034363fba9b87b0
MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch b/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch
new file mode 100644
index 000000000000..6b19c87678b1
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch
@@ -0,0 +1,26 @@
+extensions: don't bother to build libebt/libarp extensions if nft backend was disabled
+
+Bug: https://bugs.gentoo.org/660790
+Reported-by: Thomas Deutschmann <whissi@gentoo.org>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+ extensions/GNUmakefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index bee666e80e45..c0d73cd28c03 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -40,8 +40,8 @@ endif
+ # Wildcard module list
+ #
+ pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
+-pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c)))
+-pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c)))
++@ENABLE_NFTABLES_TRUE@ pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c)))
++@ENABLE_NFTABLES_TRUE@ pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c)))
+ pfx_symlinks := NOTRACK state
+ @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
+ @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
+--
+2.17.1
diff --git a/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch b/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch
new file mode 100644
index 000000000000..1053c0a338ed
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch
@@ -0,0 +1,44 @@
+Backport of
+
+https://git.netfilter.org/iptables/commit/?id=565a22395c4c620bf26a002515d9016db0c35824
+
+Bug: https://bugs.gentoo.org/660886
+--- a/iptables/Makefile.am
++++ b/iptables/Makefile.am
+@@ -80,7 +80,9 @@ x_sbin_links = iptables-nft iptables-nft-restore iptables-nft-save \
+ ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \
+ iptables-translate ip6tables-translate \
+ iptables-restore-translate ip6tables-restore-translate \
+- arptables ebtables xtables-monitor
++ arptables-nft arptables \
++ ebtables-nft ebtables \
++ xtables-monitor
+ endif
+
+ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
+--- a/iptables/Makefile.in
++++ b/iptables/Makefile.in
+@@ -526,7 +526,9 @@ vx_bin_links = iptables-xml
+ @ENABLE_NFTABLES_TRUE@ ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \
+ @ENABLE_NFTABLES_TRUE@ iptables-translate ip6tables-translate \
+ @ENABLE_NFTABLES_TRUE@ iptables-restore-translate ip6tables-restore-translate \
+-@ENABLE_NFTABLES_TRUE@ arptables ebtables xtables-monitor
++@ENABLE_NFTABLES_TRUE@ arptables-nft arptables \
++@ENABLE_NFTABLES_TRUE@ ebtables-nft ebtables \
++@ENABLE_NFTABLES_TRUE@ xtables-monitor
+
+ pkgconfig_DATA = xtables.pc
+ all: $(BUILT_SOURCES)
+--- a/iptables/xtables-nft-multi.c
++++ b/iptables/xtables-nft-multi.c
+@@ -31,8 +31,10 @@ static const struct subcommand multi_subcommands[] = {
+ {"iptables-restore-translate", xtables_ip4_xlate_restore_main},
+ {"ip6tables-restore-translate", xtables_ip6_xlate_restore_main},
+ {"arptables", xtables_arp_main},
++ {"arptables-nft", xtables_arp_main},
+ {"ebtables-translate", xtables_eb_xlate_main},
+ {"ebtables", xtables_eb_main},
++ {"ebtables-nft", xtables_eb_main},
+ {"xtables-monitor", xtables_monitor_main},
+ {NULL},
+ };
diff --git a/net-firewall/iptables/iptables-1.6.2-r1.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
deleted file mode 100644
index 6c819b048e5a..000000000000
--- a/net-firewall/iptables/iptables-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit ltprune multilib systemd toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Subslot tracks libxtables as that's the one other packages generally link
-# against and iptables changes. Will have to revisit if other sonames change.
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-
-COMMON_DEPEND="
- conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
- netlink? ( net-libs/libnfnetlink )
- nftables? (
- >=net-libs/libmnl-1.0:0=
- >=net-libs/libnftnl-1.0.5:0=
- )
- pcap? ( net-libs/libpcap )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/os-headers
- >=sys-kernel/linux-headers-4.4:0
- virtual/pkgconfig
- nftables? (
- sys-devel/flex
- virtual/yacc
- )
-"
-RDEPEND="${COMMON_DEPEND}
- nftables? (
- !<net-firewall/ebtables-2.0.10.4-r2
- !net-misc/ethertypes
- )
-"
-
-src_prepare() {
- # use the saner headers from the kernel
- rm -f include/linux/{kernel,types}.h
-
- # Only run autotools if user patched something
- eapply_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
- # Some libs use $(AR) rather than libtool to build #444282
- tc-export AR
-
- # Hack around struct mismatches between userland & kernel for some ABIs. #472388
- use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
- sed -i \
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
- -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
- configure || die
-
- local myeconfargs=(
- --sbindir="${EPREFIX}/sbin"
- --libexecdir="${EPREFIX}/$(get_libdir)"
- --enable-devel
- --enable-shared
- $(use_enable nftables)
- $(use_enable pcap bpf-compiler)
- $(use_enable pcap nfsynproxy)
- $(use_enable static-libs static)
- $(use_enable ipv6)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Deal with parallel build errors.
- use nftables && emake -C iptables xtables-config-parser.h
- emake V=1
-}
-
-src_install() {
- default
- dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
- # all the iptables binaries are in /sbin, so might as well
- # put these small files in with them
- into /
- dosbin iptables/iptables-apply
- dosym iptables-apply /sbin/ip6tables-apply
- doman iptables/iptables-apply.8
-
- insinto /usr/include
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
- insinto /usr/include/iptables
- doins include/iptables/internal.h
-
- keepdir /var/lib/iptables
- newinitd "${FILESDIR}"/${PN}.init iptables
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
- if use ipv6 ; then
- keepdir /var/lib/ip6tables
- newinitd "${FILESDIR}"/iptables.init ip6tables
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
- fi
-
- systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
- if use ipv6 ; then
- systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
- fi
-
- # Move important libs to /lib #332175
- gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
- prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.8.0-r1.ebuild b/net-firewall/iptables/iptables-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..cbef20783c21
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.8.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit multilib systemd toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://www.netfilter.org/projects/iptables/"
+SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+# Subslot tracks libxtables as that's the one other packages generally link
+# against and iptables changes. Will have to revisit if other sonames change.
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="conntrack ipv6 netlink nftables pcap static-libs"
+
+COMMON_DEPEND="
+ conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+ netlink? ( net-libs/libnfnetlink )
+ nftables? (
+ >=net-libs/libmnl-1.0:0=
+ >=net-libs/libnftnl-1.1.1:0=
+ )
+ pcap? ( net-libs/libpcap )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers
+ >=sys-kernel/linux-headers-4.4:0
+ virtual/pkgconfig
+ nftables? (
+ sys-devel/flex
+ virtual/yacc
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ nftables? ( net-misc/ethertypes )
+"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-fix-building-without-nft-backend.patch
+ touch -r configure extensions/GNUmakefile.in || die
+
+ eapply "${FILESDIR}"/${P}-support-nft-suffix-for-arptables-and-ebtables.patch
+ touch -r configure iptables/Makefile.{am,in} || die
+
+ # use the saner headers from the kernel
+ rm -f include/linux/{kernel,types}.h
+
+ # Only run autotools if user patched something
+ eapply_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+ # Some libs use $(AR) rather than libtool to build #444282
+ tc-export AR
+
+ # Hack around struct mismatches between userland & kernel for some ABIs. #472388
+ use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
+
+ sed -i \
+ -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+ -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
+ configure || die
+
+ local myeconfargs=(
+ --sbindir="${EPREFIX}/sbin"
+ --libexecdir="${EPREFIX}/$(get_libdir)"
+ --enable-devel
+ --enable-shared
+ $(use_enable nftables)
+ $(use_enable pcap bpf-compiler)
+ $(use_enable pcap nfsynproxy)
+ $(use_enable static-libs static)
+ $(use_enable ipv6)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Deal with parallel build errors.
+ use nftables && emake -C iptables xtables-config-parser.h
+ emake V=1
+}
+
+src_install() {
+ default
+ dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+ # all the iptables binaries are in /sbin, so might as well
+ # put these small files in with them
+ into /
+ dosbin iptables/iptables-apply
+ dosym iptables-apply /sbin/ip6tables-apply
+ doman iptables/iptables-apply.8
+
+ insinto /usr/include
+ doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+ insinto /usr/include/iptables
+ doins include/iptables/internal.h
+
+ keepdir /var/lib/iptables
+ newinitd "${FILESDIR}"/${PN}.init iptables
+ newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
+ if use ipv6 ; then
+ keepdir /var/lib/ip6tables
+ newinitd "${FILESDIR}"/iptables.init ip6tables
+ newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
+ fi
+
+ if use nftables; then
+ # Bug 647458
+ rm "${ED%/}"/etc/ethertypes || die
+
+ # Bug 660886
+ rm "${ED%/}"/sbin/{arptables,ebtables} || die
+ fi
+
+ systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+ if use ipv6 ; then
+ systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+ fi
+
+ # Move important libs to /lib #332175
+ gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 229e82a183cb..cb9577e4c172 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
Binary files differ
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 28c33a5dfea1..750f03a5e1ef 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -5,5 +5,5 @@ DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bd
EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af
EBUILD libnfs-2.0.0.ebuild 1110 BLAKE2B fb8098132e10496fd160092eb5b0eaa207b9fce499a97d19ed9f2c0562ec138d6237f49f5061c0eaec3d0b5c2224462f91c2858b5269cd402fcd48aded422d85 SHA512 31fe7ef50c243c033501d310e0d7bf995ff4c84895403caf94251a9793ec9e1404b1e1ca4d19dbfdb3dc48ff86fc49b0013e81242b541e81aac6a3a600454425
EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
-EBUILD libnfs-9999.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
+EBUILD libnfs-9999.ebuild 1210 BLAKE2B 24f63a66d483c1ce06aa120a33e7b19e93c3600861a771b3e050d6802637dc5912cd8ac18a15a85fdd1dbb05baec6927da3ca5ccaa405b6ed72b0e7ac40f5ec6 SHA512 07ce95ae4b64c0dc86b51d6e22d991fe82cf7fc6fc676a29fb682ce88652f7ec522ece3c963849b44baa8933f1fce27160a36c42e2bef368a2fdc25b0e2c5a41
MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 96606a99d49c..d8c9dd244267 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -24,10 +24,6 @@ RDEPEND=""
DEPEND="${RDEPEND}
virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-utils.patch"
-)
-
src_prepare() {
default
eautoreconf
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 3303dc816693..1932e357ba66 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -24,13 +24,13 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c
DIST samba-4.6.15.tar.gz 21175479 BLAKE2B 40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb SHA512 7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986
DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad
-DIST samba-4.8.2.tar.gz 17675145 BLAKE2B 3ae5c33c85d7f0e4cf7fe45fbef55cd0d5aec2e77355297be31c4a32de41ff40338f58843a3e31942ca2c2a086829ed4f339485a7dd39693f1e433526eb23af1 SHA512 061b968c81c2272b5e353444ef53372ae5caa66f5af0b28b422e7d33a32ed0d321900c13636729c0e21a4d8dedcaff7ca7a5f6fe682b71c292f9a66a497a2766
DIST samba-4.8.3.tar.gz 17680660 BLAKE2B ee2c37eb935b3545eec8975d2427e55cf0dcdc8f9725e7549ffd42f8069e2b1ee65178895c173cd694442aac0a888d661837edeb8990e948b021a69e3078106f SHA512 0dd035f5f2cfc5f47f2e9b9e295548ecce73014f01e9539d9cc639f27b00e1e71a57acb018da70e70d3761281246933b6935be151df1bd35e539d6d338686217
+DIST samba-4.9.0rc1.tar.gz 17960031 BLAKE2B d430b56fcb314a3c6a5da0cbd9b55434c02580b19991827ccd6bf65a056bd7a920b7f37eb0bdfb85e0251e6fc4ec1f28f4a1fd81ab66ee98eb58149efd1e2f5a SHA512 9984a5589e49a575b95eb584560acbd14265f5ed6f1f057254f357e63e6293bc9642a458d7623b7245e29a68f6a1f869f50a72ba67fab59715e17ba7739660c8
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
-EBUILD samba-4.2.14.ebuild 7128 BLAKE2B ec7d757f67ed562b5376c317bb6a0a03b66cac9941400a65829c8e2608164d7a78d0c0704289101d7f38a1b43527518c47b2c44f9836c57294719fef1226b7bc SHA512 2c9139f97a5dbe76d78ed82b85ba1fbae7d37e2da48939942f69f546bd0b2a9403e2167cc1cb4ad998e680c524684615e5c87c92f424a767b038d7b911e5b217
+EBUILD samba-4.2.14.ebuild 7140 BLAKE2B c09f771cb1db8d7be599084d4ad9956a41afefeeb9e2b229a9f215b24494348641a95c9f1da7048e18485f14f10dd7d2e0ba745b0c59930b0dbdf810ccd7119e SHA512 70ee5c801744693da54a8c0d944f41e80b60b1ce4a44b51bc36d0433ddbfe3ac98f704094f734faed3b425f08cd2c7543a9bfd4329ee450862a57475af1ac840
EBUILD samba-4.5.16.ebuild 8167 BLAKE2B d979c6b102cfcb3a77a18decad488ba40604fc9ac8d8889e114f09cef489897727197a09eed2c2d057a04aaf2367b3e4f53db260a2edc792db8cd2091113312b SHA512 db32b221d811e09f0a07c5d5fde3f528425c4a7375e8fa45fc9cca96d3b1e64f165f19836926efc8198f05bdb8ddc43f718854d82ad034a97d11f0423e36f2d6
EBUILD samba-4.6.15.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc
EBUILD samba-4.7.7.ebuild 8728 BLAKE2B 2ce8c1eeb3251f446af6844642bf449a7a0fa53ded5dc4202aee6f109cf76145c9fe201be37e371804d147d3c1870d97e554d1d7dbbf996c131ef7f0d40479c0 SHA512 390a7b3fa453a36061237e8f78e94d061e2f130c9fc7197ae21b14f296592868a775228042194cc36b0f6ce0bf2244c2d9314a38234316d5bf80b15fce33871c
-EBUILD samba-4.8.2.ebuild 8361 BLAKE2B ceb9c6330f7ca6b6cff8d24902cee18b5bd2df7974c629fb47c3e9acd02acbc213ddef36ee10ee4af11c601c5c44511fb130239f6049f08fac0c27d8ba8eb1e8 SHA512 b59727776cb37ca5476fb3f0a8993942059f7939503021b226f7b07c81f2ab6cf4065a083545dbdfca3a718434b4a1b5c0c07adf4b4412efa2e326f95df1de5e
EBUILD samba-4.8.3.ebuild 8308 BLAKE2B 44920ec9e0594446ffc441ef6b5a3843351b3ca0ab98516e5f3951e728e5ea1a99b30ae62ae9d890e65e95b11e7eeee05b19272c95c25ac6805baca39a4761c4 SHA512 c2f58f7f1f381241a97982cb760bbbe7f03f6203989ca59f9e7c290c23f6c5a19c46e1f1dba94a5ec84d925a8ccc0fdaf78602ec856877507e42b8ec5fc01e8b
-MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
+EBUILD samba-4.9.0_rc1.ebuild 8392 BLAKE2B ee657d46873bb03311b2e18b2b89c2d196461dc34aff8931f4ec35bcb6e49a18a4147b899522646bda06f56410b3b557b05d280904096cf246aa8bcc902b5c23 SHA512 a389ed4223c5f3ab81a4b7048ac3efee94669b70c03ce960b53f8d0f0ca186831944bcf3645fae29d7afff74fc719a5d91d3c32d4843825ccce5c01249457827
+MISC metadata.xml 1730 BLAKE2B d42bec763cdfdbee859606d1b39474dd9977bfb70ac597d2bbfb66bf5f77ca318b7064aa7f02eaf3ace85462fe19dd0f5da919f4a5c1d900d6a4dc57fc21688d SHA512 b10a146ac000f15e75701e49dbb672081b6704aa1f57c8d5bdac7a2983b5d8846c9b34634c81eec961ba683141202ce1197c980882d438b42beec25d9cfeece6
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 2a3bd677e0d2..743e5e2960d8 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -18,6 +18,7 @@
<flag name="cluster">Enable support for clustering</flag>
<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
+ <flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
<flag name="iprint">Enabling iPrint technology by Novell</flag>
<flag name="quota">Enables support for user quotas</flag>
<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 290889c069a1..393fd23ce924 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -5,7 +5,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd versionator eutils
MY_PV="${PV/_rc/rc}"
MY_P="${PN}-${MY_PV}"
diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild
deleted file mode 100644
index eb9a466868e3..000000000000
--- a/net-fs/samba/samba-4.8.2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/libaio[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/iniparser:0
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-apps/attr[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-1.3.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/libcap
- sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( virtual/pam )
- acl? ( virtual/acl )
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[${PYTHON_USEDEP}]
- )
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gnutls? (
- dev-libs/libgcrypt:0
- >=net-libs/gnutls-1.4.0
- )
- gpg? ( app-crypt/gpgme )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- <sys-libs/glibc-2.26[rpc(+)]
- )
- test? (
- !system-mitkrb5? (
- >=sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.7
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
- !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
- addc? ( python gnutls winbind )
- addns? ( python )
- ads? ( acl gnutls ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
- "${FILESDIR}/${PN}-4.8-without_ads_build_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
- # ugly hackaround for bug #592502
- cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 '--with-system-mitkrb5' '')
- $(use_enable gnutls)
- $(use_with debug lttng)
- $(use_with ldap)
- )
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- systemd_dotmpfilesd "${FILESDIR}"/samba.conf
- systemd_dounit "${FILESDIR}"/nmbd.service
- systemd_dounit "${FILESDIR}"/smbd.{service,socket}
- systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
- systemd_dounit "${FILESDIR}"/winbindd.service
- systemd_dounit "${FILESDIR}"/samba.service
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware the this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.0_rc1.ebuild b/net-fs/samba/samba-4.9.0_rc1.ebuild
new file mode 100644
index 000000000000..f69471635919
--- /dev/null
+++ b/net-fs/samba/samba-4.9.0_rc1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/samba-4.0/policy.h
+ /usr/include/samba-4.0/dcerpc_server.h
+ /usr/include/samba-4.0/ctdb.h
+ /usr/include/samba-4.0/ctdb_client.h
+ /usr/include/samba-4.0/ctdb_protocol.h
+ /usr/include/samba-4.0/ctdb_private.h
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h
+ /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+ dev-lang/perl:=
+ dev-libs/libaio[${MULTILIB_USEDEP}]
+ dev-libs/libbsd[${MULTILIB_USEDEP}]
+ dev-libs/iniparser:0
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ net-libs/libnsl:=[${MULTILIB_USEDEP}]
+ sys-apps/attr[${MULTILIB_USEDEP}]
+ >=sys-libs/ldb-1.4.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/libcap
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0=
+ >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/libiconv
+ pam? ( virtual/pam )
+ acl? ( virtual/acl )
+ addns? (
+ net-dns/bind-tools[gssapi]
+ dev-python/dnspython:=[${PYTHON_USEDEP}]
+ )
+ ceph? ( sys-cluster/ceph )
+ cluster? (
+ net-libs/rpcsvc-proto
+ !dev-db/ctdb
+ )
+ cups? ( net-print/cups )
+ debug? ( dev-util/lttng-ust )
+ dmapi? ( sys-apps/dmapi )
+ fam? ( virtual/fam )
+ gnutls? (
+ dev-libs/libgcrypt:0
+ >=net-libs/gnutls-1.4.0
+ )
+ gpg? ( app-crypt/gpgme )
+ json? ( dev-libs/jansson )
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+ system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ net-libs/libtirpc[${MULTILIB_USEDEP}]
+ virtual/pkgconfig
+ || (
+ net-libs/rpcsvc-proto
+ <sys-libs/glibc-2.26[rpc(+)]
+ )
+ test? (
+ !system-mitkrb5? (
+ >=sys-libs/nss_wrapper-1.1.3
+ >=net-dns/resolv_wrapper-1.1.4
+ >=net-libs/socket_wrapper-1.1.7
+ >=sys-libs/uid_wrapper-1.2.1
+ )
+ )"
+RDEPEND="${CDEPEND}
+ python? ( ${PYTHON_DEPS} )
+ client? ( net-fs/cifs-utils[ads?] )
+ selinux? ( sec-policy/selinux-samba )
+ !dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+ addc? ( python gnutls json winbind )
+ addns? ( python )
+ ads? ( acl gnutls ldap winbind )
+ cluster? ( ads )
+ gpg? ( addc )
+ test? ( python )
+ ?? ( system-heimdal system-mitkrb5 )
+ ${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.0-pam.patch"
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ if use cluster ; then
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+ elif use ads ; then
+ SHAREDMODS="idmap_ad"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # un-bundle dnspython
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+ # unbundle iso8601 unless tests are enabled
+ use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+ # ugly hackaround for bug #592502
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \
+ || die
+
+ # Friggin' WAF shit
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # when specifying libs for samba build you must append NONE to the end to
+ # stop it automatically including things
+ local bundled_libs="NONE"
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+ fi
+
+ local myconf=(
+ --enable-fhs
+ --sysconfdir="${EPREFIX}/etc"
+ --localstatedir="${EPREFIX}/var"
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+ --with-piddir="${EPREFIX}/run/${PN}"
+ --bundled-libraries="${bundled_libs}"
+ --builtin-libraries=NONE
+ --disable-rpath
+ --disable-rpath-install
+ --nopyc
+ --nopyo
+ $(multilib_native_use_with acl acl-support)
+ $(multilib_native_usex addc '' '--without-ad-dc')
+ $(multilib_native_use_with addns dnsupdate)
+ $(multilib_native_use_with ads)
+ $(multilib_native_use_enable ceph cephfs)
+ $(multilib_native_use_with cluster cluster-support)
+ $(multilib_native_use_enable cups)
+ $(multilib_native_use_with dmapi)
+ $(multilib_native_use_with fam)
+ $(multilib_native_use_with gpg gpgme)
+ $(multilib_native_use_with json json-audit)
+ $(multilib_native_use_enable iprint)
+ $(multilib_native_use_with pam)
+ $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+ $(multilib_native_use_with quota quotas)
+ $(multilib_native_use_with syslog)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with winbind)
+ $(multilib_native_usex python '' '--disable-python')
+ $(multilib_native_use_enable zeroconf avahi)
+ $(multilib_native_usex test '--enable-selftest' '')
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '')
+ $(use_enable gnutls)
+ $(use_with debug lttng)
+ $(use_with ldap)
+ )
+ multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # Make all .so files executable
+ find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+ if multilib_is_native_abi ; then
+ # install ldap schema for server (bug #491002)
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins examples/LDAP/samba.schema
+ fi
+
+ # create symlink for cups (bug #552310)
+ if use cups ; then
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+ fi
+
+ # install example config file
+ insinto /etc/samba
+ doins examples/smb.conf.default
+
+ # Fix paths in example file (#603964)
+ sed \
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+ -i "${ED%/}"/etc/samba/smb.conf.default || die
+
+ # Install init script and conf.d file
+ newinitd "${CONFDIR}/samba4.initd-r1" samba
+ newconfd "${CONFDIR}/samba4.confd" samba
+
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+ systemd_dounit "${FILESDIR}"/nmbd.service
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+ systemd_dounit "${FILESDIR}"/winbindd.service
+ systemd_dounit "${FILESDIR}"/samba.service
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ "${WAF_BINARY}" test || die "test failed"
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Be aware the this release contains the best of all of Samba's"
+ ewarn "technology parts, both a file server (that you can reasonably expect"
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+ ewarn "controller work previously known as 'samba4'."
+
+ elog "For further information and migration steps make sure to read "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 83d92529b3ef..2fef14b51940 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index dd5c0c342e09..3a42a23c716b 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,6 +1,8 @@
DIST uftpd-2.4.tar.xz 173132 BLAKE2B 5bb1d90a2353e34d1a2346fa09c9843e598827875cc2c09beabf3916e34693dca17bc0d1f00773ce823cb79685204a20fa16d7abc8d4c88085dd1bdafc7e5acc SHA512 1ed9ed4429a3e7a08ac902ebac95610e58164f3528a8fc00a745c0545aae4e13d3bcbf597bcae6ba045b24ee9ba3c39ec0617068920bcc4bbc3f5ef246d4c404
DIST uftpd-2.5.tar.xz 178652 BLAKE2B 888f6a6be9752d36470de0aa0dd3ec5ffeca335099897fb9a03a0573752257b88d5662f53cfb8c078f2b8efe3dd384b12833def2bea38c5440915b60b3832e78 SHA512 7f7f80f0a291cf57d68570de62c663804af0fa0fa4f0e5e199280c97d0d662881a05d1e0cc908f33e85cc8e07d825813e63271a94a69cd2e6bb974820566ccac
+DIST uftpd-2.6.tar.xz 93532 BLAKE2B 472b6dec74d5df50a93c27f85cff1ceff9bac8bcf3343d7ca7842e2bd51813ba8c0b5b679062eba5dccca0d5ec586302ad7889dd69273b4e08fe6330d70b7dbd SHA512 56e893cda1e807b01021130a763d6409a0e480f7dfb03e3ac9378d76d459a38c9c602d7fac523c3cf353fe972a61e2f8c131003e7dd0c07e5588f3a18b3e3c4d
EBUILD uftpd-2.4-r1.ebuild 457 BLAKE2B 33c4de8d31cbf9d7c14efd8173fda8136afc8c3fa4f43d964220c9c7c05cd6ac95d1dfe2556b1887e6a3545b05dc4c45be537ce034f423cab6fab714406c061f SHA512 f0451976a5643cc09a4e185c4c01b8a3ffdb7ade01609f68b849af1697db1cfe45b1ed2709b18934e847f02bce3b061cddb221788184a5b57a202398f84bfedc
EBUILD uftpd-2.4.ebuild 428 BLAKE2B b047cc73d1822a2f401074c34aaf804b3fbf7a3b87b3d7e217c96f8f7f000f7dbfbb0fd695b8e69021910d23e49c388ea39c404c4f514e1bf19bb14f663d57b1 SHA512 94172f2592ca4164e8eaecbae9fcc12d972b4ab2703968cc80eee7a034f557d60840db8ee2c4546956a200c3b98d48b8efdbd02b8c852fd6ec89da4f7be40634
EBUILD uftpd-2.5.ebuild 511 BLAKE2B b3a02f0678a9dc91cec8ecaa10ed8836b0d59ea616705195afe880490c960ff48bdbffe6b70f35c66b075bc5ac6cb9188bbc163eaeb37c7ba7d5bd9ca9337e9a SHA512 99fde323bbaf3da57bc17f65e55556f8a87c8528c1fcc4cc57ce7c084bd41c21a29049a38c6273d7273f61f35ef4dcbd9483edb6328fc1d0f350446e5caf0eb1
+EBUILD uftpd-2.6.ebuild 513 BLAKE2B 40927218cccbe80700c23723d4f96e2134e76039bbe2dc6887e9b743f4397f7af5ebd7b2afb37e12f5731be4d7b6217e0f02c24c7a731cd9f52bef4859c4a31a SHA512 b836ceee94a9b610c50ae864b320830cb2855093e4fa922caf5fbd7c8767f63a1b4fce0db196d1a2d20df5cbe88da12d78f16561aaa670c16169b5e32056327b
MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.6.ebuild b/net-ftp/uftpd/uftpd-2.6.ebuild
new file mode 100644
index 000000000000..db164de0144d
--- /dev/null
+++ b/net-ftp/uftpd/uftpd-2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The no nonsense TFTP/FTP server"
+HOMEPAGE="https://github.com/troglobit/uftpd"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/libite
+ dev-libs/libuev"
+
+RDEPEND="
+ ${DEPEND}
+ !net-misc/uftp
+ !net-ftp/atftp"
+
+src_install() {
+ emake DESTDIR="${D}" install doc_DATA=README.md
+}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 32a3b9f0b687..b59bde7d24b0 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -26,6 +26,6 @@ EBUILD vsftpd-3.0.2-r3.ebuild 3661 BLAKE2B 16ee2fdf7dfaf0c8a3149b02ab512caa9c66f
EBUILD vsftpd-3.0.2-r4.ebuild 3661 BLAKE2B f5ebacfb33b4ed0b5b91aff5bfcf15e13bde730ccaf3baee1f42a7aec2658ec2100b1ce28c95089c0d877a61f21dfa194a5b37213138e1b029f5f339ecf60d50 SHA512 7c08ecd9613820e3ddc97c39f10cd07b26b501881cebf2097d7fb2fb86682545dae6347e3551bb31cec1b9ac0045792435856bc8437cd556205d952d64f537d6
EBUILD vsftpd-3.0.2.ebuild 3149 BLAKE2B d0e49b3fcea35ef606a68754cfbcc1a27241978cd68be9d6147af914acf58c38cb92a85b99a16e16c5ae4f014087b60568a7a6bc35f4b01c33c0a88c79dd0709 SHA512 b34f37765dbce220c4416ac509e38c04b8770d280d4f05ed414a87940671b35f4b8959a2b3b551b9059993ef8f8e6f0163f628f087afcf166802f15c299ea2de
EBUILD vsftpd-3.0.3-r1.ebuild 3652 BLAKE2B c84736785a7023e1373d3439dc57a7da549d66d2febca816151b45a7cf0b0d0dc94a5738a96b3524fbc762734ae264396fc36b854e560f61e5d6ab4e4eb16780 SHA512 55b936fc31fe73981d89f5b87f8042e3824faaa1414df6403a9b4c7251d455b615e1cb548f88c05aa622c76f07757326ba95dc8e81ad1f1d270dcd763d500c33
-EBUILD vsftpd-3.0.3-r2.ebuild 3707 BLAKE2B 5b34da59ef11e8967962402bda5d68406a587a6ee8fd54e60e2fc11754b53f338187be610356de21afe2046ee3162e1bbb6ea6f2599e1dfd60378b0f674d8d26 SHA512 7db4315a4d89db53ff5e4c714e201a30a5f63a9efbbe07ce19adf170530814cf5175fd8d49f66efe77d097e200dfb64540ac1a7a71610b5289d1004f67b3da84
+EBUILD vsftpd-3.0.3-r2.ebuild 3706 BLAKE2B ea396f463bd91bab18c73b1a962b2f52e3e61552448d6a847b8014f723f3861f93da3794b41e18b224d6cc6c10935523cfebdc784b7cd23d9d7a867c2a5202d0 SHA512 6fb9ca1d426cbde4d668c1ec90bc01c09718259a05b04748c4e9b864f034707f79d9a9a1459b20d61cd90e0b43070f9facd7b5b53ed71f19ee4366b8edef9e8d
EBUILD vsftpd-3.0.3.ebuild 3594 BLAKE2B d12430e805fda76679da43feb7554fc63f2ceb39376c3ff5e6fd7378d29a5bce023d153e1e7ae20178b41bc87938226e3ba95e66cf51c382817aecd2af643f95 SHA512 967e258a7e72cab67c5adc433658687593fecd89894845e58999d0f40aa13ff39aef8a1eee53751b7b2fa623faa085830c7c6f0c75723c72ff68cd8611138649
MISC metadata.xml 372 BLAKE2B a6655b8af8eb08968f4d61f1b7ee6720aa0096f27ee54794fb97cc218d20700189a6769632e792d222ae86d368c47c7bd4d9f8d85bf25e26970e6c4d1d837a26 SHA512 d673dfbc265acd4e0231111adcd9d099b6a465a508f64b031edd12601ac45cded8994eab8b3bd912ab00858197c9d68c4f83d461cd19a488e67daa055c2db334
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 682c7ee1a2fc..058433db1b66 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="caps libressl pam tcpd ssl selinux xinetd"
DEPEND="caps? ( >=sys-libs/libcap-2 )
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 790e145d9b1b..c2c63b822512 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
Binary files differ
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index 7c5ebbadbb32..21022911b0e0 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -4,7 +4,9 @@ AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d49540
AUX turnserver.init 636 BLAKE2B b73a5c43ea89243a77039688822f8188cef1d49f5b9ba7aaf95516ed08f9fe7ba876083c556dd8a58d2c79b0c9b1d28039f2e1893ffd58b1f1b8508f5f7903b3 SHA512 bdfad74908009edce899298aca755cead6bcab77663893d0fb4c83134d5d5eb569493be6ae39c4654ddb0079d6bfa259e3932fbb275eae8f6af13c7c197776a7
DIST coturn-4.5.0.4.tar.gz 381015 BLAKE2B 838cbdbcc2a3a5b1bdd93f2688ecca8bd81b3349501b6729562b6d45037a8fc27fce6c39a035ecfd6f36d03402e78f796cf3b19a4894e5bfcd89ab3172980c36 SHA512 1d267b715b08853a5434d0a10cffd49e035624353e6733ff7349c549ef3f69240c2488097d81e33f7a551e02d72a26f1f430aefb9cbacda511a2ae6f883cd414
DIST coturn-4.5.0.6.tar.gz 394071 BLAKE2B 35a805d0e210439cd8f32621f342f3a2d9da17392d8fbae5ac8165bcefa6e8f0ed1a32a2c785bff075bcf33ab2f0f22da8c7c620e40f3ae6f582733f6802c431 SHA512 4ad7d482af675033d050258e2af04b813561414d4ba926cfd336c6548200dbf1a90f9511983b8cad20713c7edff2a424c9d6b11d401717794e3d1af6b7ed9208
+DIST coturn-4.5.0.7.tar.gz 396579 BLAKE2B ac66fbac772ad4b182f0c4b64178a780bfb364e4c1cf105fc340ac60da0a4c2e2b186c3ce08cade347a5d1a4b233bfed604db74eacd81967c3090e00bc1e36e8 SHA512 4e6e4efb456449752b2cd242c9be7c5dc2298472e338293d3de21c3a9da968f2f304625663372bb4d857c092c694aa4681630773a46e4928b9c60c69378adacc
EBUILD coturn-4.5.0.4-r1.ebuild 1848 BLAKE2B 45b06fe5697eb4c8acd4f1895a467a847aa077d69875b07817ff9db6f3f084b27b31a1af84f75853f272b303c8c84442247b6272dc190b152905d540e64cbedf SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e
EBUILD coturn-4.5.0.6.ebuild 1848 BLAKE2B 45b06fe5697eb4c8acd4f1895a467a847aa077d69875b07817ff9db6f3f084b27b31a1af84f75853f272b303c8c84442247b6272dc190b152905d540e64cbedf SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e
-EBUILD coturn-9999.ebuild 1848 BLAKE2B 45b06fe5697eb4c8acd4f1895a467a847aa077d69875b07817ff9db6f3f084b27b31a1af84f75853f272b303c8c84442247b6272dc190b152905d540e64cbedf SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e
+EBUILD coturn-4.5.0.7.ebuild 1868 BLAKE2B 5f596bb69b89cb55a559efb64f8f9e63766d8c74cbe96244ff0c13d15d50e35fd6afb64e33f421fd3aa019844cfda3c2f9fdebfee9958ad640e5f43d41054f52 SHA512 14034e8e9c47613b4132e42c07f0f625e836ec70213f05e1503bb5099f5b8ad86f56532301566e46cd22c7e309fa7e789131b0f666ec097af7432f9d797d6b43
+EBUILD coturn-9999.ebuild 1868 BLAKE2B 5f596bb69b89cb55a559efb64f8f9e63766d8c74cbe96244ff0c13d15d50e35fd6afb64e33f421fd3aa019844cfda3c2f9fdebfee9958ad640e5f43d41054f52 SHA512 14034e8e9c47613b4132e42c07f0f625e836ec70213f05e1503bb5099f5b8ad86f56532301566e46cd22c7e309fa7e789131b0f666ec097af7432f9d797d6b43
MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.0.7.ebuild b/net-im/coturn/coturn-4.5.0.7.ebuild
new file mode 100644
index 000000000000..438817b8c4a6
--- /dev/null
+++ b/net-im/coturn/coturn-4.5.0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user systemd tmpfiles
+DESCRIPTION="coturn TURN server project"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+
+if [ ${PV} = 9999 ]; then
+ KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+ DEPEND="dev-vcs/git"
+# S="${WORKDIR}/${PN}-master"
+else
+ KEYWORDS="~x86 ~amd64"
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="mongodb mysql postgres redis sqlite"
+RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl] )
+ mongodb? ( dev-libs/mongo-c-driver )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ redis? ( dev-libs/hiredis )
+ sqlite? ( dev-db/sqlite )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
+ -i "${S}/examples/etc/turnserver.conf" || die "sed for logdir failed"
+ sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
+ || die "sed for simple-log failed"
+ if ! use mongodb; then
+ export TURN_NO_MONGO=yes
+ fi
+ if ! use mysql; then
+ export TURN_NO_MYSQL=yes
+ fi
+ if ! use postgres; then
+ export TURN_NO_PQ=yes
+ fi
+ if ! use redis; then
+ export TURN_NO_HIREDIS=yes
+ fi
+ if ! use sqlite; then
+ export TURN_NO_SQLITE=yes
+ fi
+
+ econf $(use_with sqlite)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}/turnserver.init" turnserver
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate.${PN}" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+ tmpfiles_process "${PN}.conf"
+ enewgroup turnserver
+ enewuser turnserver -1 -1 -1 turnserver
+ elog "You need to copy /etc/turnserver.conf.default to"
+ elog "/etc/turnserver.conf and do your settings there."
+}
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 02115af32237..438817b8c4a6 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,13 +20,13 @@ fi
LICENSE="BSD"
SLOT="0"
IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="dev-libs/libevent[ssl]
- dev-libs/openssl:*
+RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl] )
mongodb? ( dev-libs/mongo-c-driver )
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql:* )
redis? ( dev-libs/hiredis )
sqlite? ( dev-db/sqlite )"
+
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 84f6b9d26c32..c537865d6855 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,5 @@
AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
AUX errd.initd 678 BLAKE2B 76486bbc011676007c36e5b23cd175e3ebb10fde822c9e92191b431ff83737fe07446cbddbc19dadddf6a40f324b889229fccfac15592ad0ed12d60c43d7b8d0 SHA512 c7a32d4d81f7f9bc6a598796b0b219e6c6b3187e0fcb9035824cf183b98e4ac95688c106e594f72ab09260d1c5bdc02e09e976e04674b58549d91e2a801752cb
DIST err-1.7.1.tar.gz 100716 BLAKE2B 6d47ec4e632210ed313342075f87e1857460b57dc9b32d4487b2980c9c99e2a852d27ae7a5c87ee6d8bc4bcd15577ca11934111f27c81979f8aca9d14223212d SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4
-EBUILD err-1.7.1-r1.ebuild 2012 BLAKE2B 919a3b3862c48dab3ffc84bfa08a034371d0beee3ac450d3a4edf81ba412b30f6d25c822a888bed3f3bf56bc9d20548cd167700a80a6810ecd477ef22d4b871b SHA512 a1d0551b5c4f02baa3d83c6c18a0514cbf7a16408f43468b9ef1bffcfd966d42d509c776e4a992a4a98bdeb0d30d157adf88979b6d9092dcefc97b34700ad971
+EBUILD err-1.7.1-r2.ebuild 1949 BLAKE2B ef9089cfa7d5f25b2f6d40d856f41f6cdb204986094750f499f6e0adfd9d3938ef71f415f5672a718d1b339c1082e8ccbf9e5e742312ffbfa74531a8f8360447 SHA512 e4ac8a7fde302d6b7192cfb17f65f1df3b9aa7ec2508c1b3b0ef1c5c97ae2baa58a25d45c91f10c900167e0ec6774773e4bb145845e057f38140cbacbe6eda46
MISC metadata.xml 689 BLAKE2B 095d0e9a4e0da1798fa3fc707bccd9e38a238e8658da288005f665e05f3f7e386beedeec95dabaeed0f7d2980f11b26549785a615ddf63cd4c757ecd41759954 SHA512 dfc61dbf4405fee8f0494a7872d1fc86e9b34cf5e12e133b88a9041301cca69606b1e26ba8249c0341fb148890b70058f9bcb1a875c1cd742e9559e3bcc1df36
diff --git a/net-im/err/err-1.7.1-r1.ebuild b/net-im/err/err-1.7.1-r1.ebuild
deleted file mode 100644
index ebb937892546..000000000000
--- a/net-im/err/err-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
-HOMEPAGE="https://gbin.github.com/err/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +plugins"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyfire[${PYTHON_USEDEP}]
- dev-python/python-daemon[${PYTHON_USEDEP}]
- dev-python/xmpppy[${PYTHON_USEDEP}]
- dev-python/yapsy[${PYTHON_USEDEP}]
- virtual/python-dnspython[${PYTHON_USEDEP}]
- irc? (
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/twisted-words[${PYTHON_USEDEP}]
- )
- plugins? ( dev-vcs/git )"
-
-# Testsuite is broken since 1.6.3
-RESTRICT="test"
-
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-# 2. Support for BOT_SENTRY option is missing, cause
-# we do not have apropriate packages in portage yet
-# 3. Internal web server is broken(dunno why :-()
-
-pkg_setup() {
- ebegin "Creating err group and user"
- enewgroup 'err'
- enewuser 'err' -1 -1 -1 'err'
- eend ${?}
-}
-
-python_prepare_all() {
- # Remove configparser and config from requirements as they are NOT needed
- sed -i \
- -e "/install_requires/s/'configparser', //" \
- -e "/install_requires/s/, 'config'//" \
- setup.py || die
-
- # Tests are broken and should not be installed
- rm -r tests || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- newinitd "${FILESDIR}"/errd.initd errd
- newconfd "${FILESDIR}"/errd.confd errd
-
- dodir /etc/${PN}
- dodir /var/lib/${PN}
- keepdir /var/log/${PN}
- fowners -R err:err /var/lib/${PN}
- fowners -R err:err /var/log/${PN}
-
- insinto /etc/${PN}
- newins errbot/config-template.py config.py
-}
diff --git a/net-im/err/err-1.7.1-r2.ebuild b/net-im/err/err-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..6ed14b926aec
--- /dev/null
+++ b/net-im/err/err-1.7.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Plugin based chatbot designed to be easily deployable, extensible and maintainable"
+HOMEPAGE="https://errbot.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyfire[${PYTHON_USEDEP}]
+ dev-python/python-daemon[${PYTHON_USEDEP}]
+ dev-python/xmpppy[${PYTHON_USEDEP}]
+ dev-python/yapsy[${PYTHON_USEDEP}]
+ virtual/python-dnspython[${PYTHON_USEDEP}]
+ irc? (
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ )
+ plugins? ( dev-vcs/git )"
+
+# Testsuite is broken since 1.6.3
+RESTRICT="test"
+
+# NOTES:
+# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
+# 2. Support for BOT_SENTRY option is missing, cause
+# we do not have apropriate packages in portage yet
+# 3. Internal web server is broken(dunno why :-()
+
+pkg_setup() {
+ ebegin "Creating err group and user"
+ enewgroup 'err'
+ enewuser 'err' -1 -1 -1 'err'
+ eend ${?}
+}
+
+python_prepare_all() {
+ # Remove configparser and config from requirements as they are NOT needed
+ sed -i \
+ -e "/install_requires/s/'configparser', //" \
+ -e "/install_requires/s/, 'config'//" \
+ setup.py || die
+
+ # Tests are broken and should not be installed
+ rm -r tests || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}"/errd.initd errd
+ newconfd "${FILESDIR}"/errd.confd errd
+
+ dodir /etc/${PN}
+ keepdir /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners -R err:err /var/lib/${PN}
+ fowners -R err:err /var/log/${PN}
+
+ insinto /etc/${PN}
+ newins errbot/config-template.py config.py
+}
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index d37bb92eccb7..059587637caa 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -3,4 +3,4 @@ DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d
EBUILD mcabber-1.0.5.ebuild 3283 BLAKE2B f74e6bf2aee41fb4756cdb4b12890adf3552e4447ff9df4f555ccfffdb85833c8e0fc57a55fa9db55ce6037efef16e7d98b52c00ddfa937e842b0112faf2eee7 SHA512 2db587bce1cf262276b7e109e6594ba7bf102594c95dde94fc36a9a140410b6eb71771bef913e98c7d245cf31dc328021f02ea8d01e3c51ffc15a3198f5473ea
EBUILD mcabber-1.1.0.ebuild 3285 BLAKE2B 07a9712f85075fe021f6585b07674f2b71e8b7eb5a10965c7f979ad5138b0093685e4b2115ee25590cc5e4fd584d78b05ae9dc6c648457885eeed407b9aa94ff SHA512 9b7791a3de2553605c91ba30e04f57580cc88d19b2fd20ce6d2486fd85cc96ff3993c12ceb015af1615273f4d1cd8795a1ca16bb7f24268e4ddf7bb54dfba5b8
EBUILD mcabber-9999.ebuild 3138 BLAKE2B 513c61fd6f6eb5b9187d90985541dde50f6be5d15b708430bb7a36e4474a37f6568169074d25575a326b6375da07c2ab05744691aaa2288683c4263a9e4f9544 SHA512 888e91b54c4344e9c38096eec5c5aeb0de924c5d5a883d79427dc9cf5fd628310a4d8fdf712342572bd2ac89411825f793c26513bf4784a8b1cacc53dfea91e0
-MISC metadata.xml 605 BLAKE2B bf648b8fb7f30597f313d006a2edd2be1b8e941de255660998c5bb0c1204c438d02e15b947f111ca32f783799078e03685bd83856d39565f84aeeed6dba459f7 SHA512 fcd4d0329f3059e48d6f9dbe072bfd56b2ba0d7e69fe23fc1df69516c1288a49ae9bed0d685e4f45b9bfdfa1efd74f151a293a7b39cc2e714b2b0ee6be934cd2
+MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index 7e7673a9397c..30df6e581bc7 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>andrey_utkin@gentoo.org</email>
+ <name>Andrey Utkin</name>
+ </maintainer>
<longdescription lang="en">
MCabber is a small Jabber console client that features
such as GPG encryption, SSL support, MUC (Multi-User Chat) support,
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
new file mode 100644
index 000000000000..d2797a948dd2
--- /dev/null
+++ b/net-im/ricochet/Manifest
@@ -0,0 +1,4 @@
+DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
+EBUILD ricochet-1.1.4.ebuild 1190 BLAKE2B e8b9b1dc7bfb57d74fad09bad7a7e6f97927bf52b7025bba8b9e487f7a08853fe5d60a699cc7cc7213e0d3bb877a2628c3462d38ec3f15d12de71943cee0c24a SHA512 e6fffbdaae86941cfbe89bb9ad70790a558d9a3df6dd7f2f6749013a4a4457626112a0052c790f78ca7f4d621a739ef54b29c306298eec196ab89c6605699325
+EBUILD ricochet-9999.ebuild 1391 BLAKE2B d8242a52a85a56c9bc78c6d4eb98e9a58d78f4b564d362e048c780a515c86e75b18a88a69c841c1448781a24e6cb4b44dba4779210677c598aebb574b21f17ff SHA512 1fe3d74db80e54efbf1847ee5e9697c96474c229a9ac47a2513820b2d895c64ada324c5cb98d83dfdfad922c92251ebbbd5a44a95c8c62e87a082df85cc6f77b
+MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
new file mode 100644
index 000000000000..6bf484adc0d0
--- /dev/null
+++ b/net-im/ricochet/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>lucianposton@pm.me</email>
+ <name>Lucian Poston</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild
new file mode 100644
index 000000000000..b26be1ac4f28
--- /dev/null
+++ b/net-im/ricochet/ricochet-1.1.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
+else
+ SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Privacy-focused instant messaging through Tor hidden services"
+HOMEPAGE="https://ricochet.im"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug hardened"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtwidgets:5
+ net-vpn/tor"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig"
+
+src_configure() {
+ local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' )
+ qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') )
+ qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') )
+
+ eqmake5 "${qmakeargs[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/ricochet/ricochet-9999.ebuild b/net-im/ricochet/ricochet-9999.ebuild
new file mode 100644
index 000000000000..b770332effdf
--- /dev/null
+++ b/net-im/ricochet/ricochet-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
+else
+ SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Privacy-focused instant messaging through Tor hidden services"
+HOMEPAGE="https://ricochet.im"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug hardened"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtwidgets:5
+ net-vpn/tor"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+
+ # workaround bug https://github.com/ricochet-im/ricochet/issues/582
+ cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet
+}
+
+src_configure() {
+ local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' )
+ qmakeargs+=( 'DEFINES+=APPARMOR' )
+ qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') )
+ qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') )
+
+ eqmake5 "${qmakeargs[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 29697ae32940..3e0ffa3d80a5 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,11 +1,9 @@
-DIST skypeforlinux_8.16.0.4-1.x86_64.rpm 105226365 BLAKE2B 377c4d646740c29efb10e7379b37e4661dd5e4f438e31895b4b32e2dacb922fcde8d6713790266f4532dbd6818a8ffefc5749ead0b495deafa0e85b00a8f4f00 SHA512 e499a3d9bb50695989ad629256a1e974bd9ccb3cfeeb5090cdc4986fca58fcdeb9dd9e969caacc0b42945481fc0f26b91353a0a0c60fe57a44581f6c3e27b1bb
-DIST skypeforlinux_8.17.0.2-1.x86_64.rpm 101588489 BLAKE2B 0a92756c403ae8a8b7f9aa4769cecc518988904d3b9cdc5e3cfc11518e2c369816df1c9e9c71e973cbef8200de3ca5be0ea18daa5e75432a0267f2dd09f9ce6c SHA512 121907e15b6b52d3ba35be7162ff0ba66b183d76fc929ca238a698d5035b625fcdf4efb93f2dbfd92fb18dc2aaf0b5bfbebac9fc96bd408478e4549d7e47454a
DIST skypeforlinux_8.18.0.6-1.x86_64.rpm 101968899 BLAKE2B 2aa2ed9d290f2f9307cb8db124b407b509a7b8f869805f25293df343978cc4911476a1734563325063bd1e3ef0e9044bc12d864edff838855af1f1b731dd4b39 SHA512 0917875b21b9d77f2299260ea2152b3c14c0b332343cb9832be2a613c875025b77ca782f60987f638d430d005d1bf78f1763fe82b7d91c3146c39e7fafbf1c11
DIST skypeforlinux_8.20.0.9-1.x86_64.rpm 115781688 BLAKE2B 24f197afeb034e0de6930af40508ada51dd3dc7a24d0a20bc05e65591bbdd8630d767bafcaf739cf70da5531f60ba52f8f51d53fb6f28e6974c4ca1be304585a SHA512 c39c672f03ac340ddd31641e80a780e2e5d624ba60aab3991f96611daedc93b1893fb44155b3895a84b21c04fa9498ba6dc158a40041b17ffc14f3b272eb72e3
DIST skypeforlinux_8.22.0.2-1.x86_64.rpm 96073264 BLAKE2B d5d85ac5ba852ef50286894a4a3ff830e3763eb962f8e40cf4d2b9a9511394113991bd0de6cfe54fb8286c5bbe25ce516a640097f9240a947c7e70c97c7bcec9 SHA512 c628bcde1a467bf69e66bd8fc134bba18a2489d857659d386addb0659492bdc7884c29087411d5728074ae7f108f98be876b6330b1178e8ffe9792662bc9105f
-EBUILD skypeforlinux-8.16.0.4.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
-EBUILD skypeforlinux-8.17.0.2.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
+DIST skypeforlinux_8.25.0.5-1.x86_64.rpm 90947986 BLAKE2B af778f6bad5440a97186d4ca6ef61c8d22099dd9958aa6176b77cd5bfd8ebced8e914df0a4c71ec5c6a7374af5650fbb2fe86592c0b0512792910f02b4ddacbe SHA512 009a6403a4a3188c9054354629a993b3eff120d45af275b19ddfe4a28c9e9b3de2058913069bf6439e92bf9f087e0b795f35bff1c4e8e313730fa951735d981e
EBUILD skypeforlinux-8.18.0.6.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
-EBUILD skypeforlinux-8.20.0.9.ebuild 3742 BLAKE2B 01cacb48e6ead708ce6212c8e0f1fccf6e0089101c184956da28ec159b510ec21bad7a020c3017640280471875f77b6837aedd9907ba9b186cdbf31f2bbeec0c SHA512 92738e89e73a59bebc846fc7ff3ce74a786595ba8a6be0ed57e2a1955b70a16208005705f44aefb8e4a191e3373f6f8e8c01b1df937d8de15ad1303a26bc05b8
-EBUILD skypeforlinux-8.22.0.2.ebuild 3743 BLAKE2B 0406a1696fe28e4ff35c8378aa27dfb8c072e524ebe8d71be309bac8aa14734c32cee773aa3e6587f60d65faa53439c0cac1a424d2584ee13e111eb85ce0deb4 SHA512 fe9de873c1eabfa01203430f29d7cad5b86eaf4bcd439b6095ebc6e2ba7f12d75de25dd6266a2bde2ef03d2269c5d74110753c582912ef9706cfdd9596729685
+EBUILD skypeforlinux-8.20.0.9.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
+EBUILD skypeforlinux-8.22.0.2.ebuild 3679 BLAKE2B a4ff23a906830aef06275015a5ad598c143189dec6382c6ee1f5db8f3659b98bad54745f7d1fbae7df4b2cb1cf41149fafd9e46343bf23d583c6ba2d2de985ff SHA512 2c2127e18afc15dd199716c95fecbd055c557596e901fd28ecd4f831881abafb60d6146e216aeedfb95965a37af2d3a3b9c2b4a6fc01564fdf76ecdfb866a102
+EBUILD skypeforlinux-8.25.0.5.ebuild 3679 BLAKE2B a4ff23a906830aef06275015a5ad598c143189dec6382c6ee1f5db8f3659b98bad54745f7d1fbae7df4b2cb1cf41149fafd9e46343bf23d583c6ba2d2de985ff SHA512 2c2127e18afc15dd199716c95fecbd055c557596e901fd28ecd4f831881abafb60d6146e216aeedfb95965a37af2d3a3b9c2b4a6fc01564fdf76ecdfb866a102
MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.16.0.4.ebuild b/net-im/skypeforlinux/skypeforlinux-8.16.0.4.ebuild
deleted file mode 100644
index d5e5dfdff41c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.16.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
- app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/nspr[${MULTILIB_USEDEP}]
- dev-libs/nss[${MULTILIB_USEDEP}]
- gnome-base/gconf:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib[${MULTILIB_USEDEP}]
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/libv4l[${MULTILIB_USEDEP}]
- net-print/cups[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-devel/gcc[cxx]
- virtual/ttf-fonts
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- x11-libs/libxkbfile[${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
- rpm_src_unpack ${A}
-}
-
-src_prepare() {
- default
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
- -i usr/bin/skypeforlinux || die
- sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
- -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
- -e "/^OnlyShowIn=/d" \
- -i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
- dodir /opt
- cp -a usr/share/skypeforlinux "${D}"/opt || die
-
- into /opt
- dobin usr/bin/skypeforlinux
-
- dodoc usr/share/skypeforlinux/*.html
- dodoc -r usr/share/doc/skypeforlinux/.
- # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
- dosym ${P} usr/share/doc/skypeforlinux
-
- doicon usr/share/pixmaps/skypeforlinux.png
-
- # compat symlink for the autostart desktop file
- dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
-
- local res
- for res in 16 32 256 512; do
- newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
- done
-
- domenu usr/share/applications/skypeforlinux.desktop
-
- if use pax_kernel; then
- pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
- pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
- ewarn "You have set USE=pax_kernel meaning that you intend to run"
- ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
- ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
- ewarn "you suspect that ${PN} is being broken by this modification,"
- ewarn "please open a bug."
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.17.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.17.0.2.ebuild
deleted file mode 100644
index d5e5dfdff41c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.17.0.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
- app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/nspr[${MULTILIB_USEDEP}]
- dev-libs/nss[${MULTILIB_USEDEP}]
- gnome-base/gconf:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib[${MULTILIB_USEDEP}]
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/libv4l[${MULTILIB_USEDEP}]
- net-print/cups[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-devel/gcc[cxx]
- virtual/ttf-fonts
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- x11-libs/libxkbfile[${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
- rpm_src_unpack ${A}
-}
-
-src_prepare() {
- default
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
- -i usr/bin/skypeforlinux || die
- sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
- -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
- -e "/^OnlyShowIn=/d" \
- -i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
- dodir /opt
- cp -a usr/share/skypeforlinux "${D}"/opt || die
-
- into /opt
- dobin usr/bin/skypeforlinux
-
- dodoc usr/share/skypeforlinux/*.html
- dodoc -r usr/share/doc/skypeforlinux/.
- # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
- dosym ${P} usr/share/doc/skypeforlinux
-
- doicon usr/share/pixmaps/skypeforlinux.png
-
- # compat symlink for the autostart desktop file
- dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
-
- local res
- for res in 16 32 256 512; do
- newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
- done
-
- domenu usr/share/applications/skypeforlinux.desktop
-
- if use pax_kernel; then
- pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
- pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
- ewarn "You have set USE=pax_kernel meaning that you intend to run"
- ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
- ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
- ewarn "you suspect that ${PN} is being broken by this modification,"
- ewarn "please open a bug."
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild b/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild
index e3c6ee2065b0..d5e5dfdff41c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.20.0.9.ebuild
@@ -20,7 +20,6 @@ S="${WORKDIR}"
QA_PREBUILT="*"
RESTRICT="mirror bindist strip" #299368
-# See bug 642054 about app-crypt/libsecret and MULTILIB_USEDEP.
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
dev-libs/atk[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
index b29bf79dd34f..134b0cc2d8af 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
@@ -20,7 +20,6 @@ S="${WORKDIR}"
QA_PREBUILT="*"
RESTRICT="mirror bindist strip" #299368
-# See bug 642054 about app-crypt/libsecret and MULTILIB_USEDEP.
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
dev-libs/atk[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild b/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild
new file mode 100644
index 000000000000..134b0cc2d8af
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.25.0.5.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop gnome2-utils pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+ app-crypt/libsecret[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr[${MULTILIB_USEDEP}]
+ dev-libs/nss[${MULTILIB_USEDEP}]
+ gnome-base/gconf:2[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]
+ media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libv4l[${MULTILIB_USEDEP}]
+ net-print/cups[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-devel/gcc[cxx]
+ virtual/ttf-fonts
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+ rpm_src_unpack ${A}
+}
+
+src_prepare() {
+ default
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+ -i usr/bin/skypeforlinux || die
+ sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
+ -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+ -e "/^OnlyShowIn=/d" \
+ -i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+ dodir /opt
+ cp -a usr/share/skypeforlinux "${D}"/opt || die
+
+ into /opt
+ dobin usr/bin/skypeforlinux
+
+ dodoc usr/share/skypeforlinux/*.html
+ dodoc -r usr/share/doc/skypeforlinux/.
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
+ dosym ${P} usr/share/doc/skypeforlinux
+
+ doicon usr/share/pixmaps/skypeforlinux.png
+
+ # compat symlink for the autostart desktop file
+ dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
+ local res
+ for res in 16 32 256 512; do
+ newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+ done
+
+ domenu usr/share/applications/skypeforlinux.desktop
+
+ if use pax_kernel; then
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+ ewarn "You have set USE=pax_kernel meaning that you intend to run"
+ ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+ ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
+ ewarn "you suspect that ${PN} is being broken by this modification,"
+ ewarn "please open a bug."
+ fi
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index fccbe4863a3c..3ec582b1190c 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,12 +1,8 @@
DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
-DIST slack-desktop-3.1.0-amd64.deb 60324688 BLAKE2B bf9184ed49d31baa8b03d430091a965434ebdb13d0e85c4872fc5ee4101782b548c817388ef3f52b2c769dd23ed931c997d2b9efe56929dae8640918b4afca38 SHA512 8b7c93e54a24bdd3b83dcaef7dbef5fe2da62719a8c84d9c0c78236a077de30bf7ebc5c29e25228fd2306594abcf3733364f6075aa08ecce1de86cb0223986b0
DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
-DIST slack-desktop-3.2.0-beta25a7a50e-amd64.deb 57959130 BLAKE2B b7c2b68a793022b069fc0b51621003e48c06c7f4b90d18fb3e2e8133d651ff058bed83e395dc4fc251da03c3fa17d52919c1f98c5317f7166b5b72a920e441be SHA512 d55b9a6f7383c7afc30df0e020863c42a03f8736c8a668064d8bcf016f6160e6c010a14042b76860a76edb7b793e565f88d15ae75e9d8f12cd532fece1aeac4a
DIST slack-desktop-3.2.1-amd64.deb 57873452 BLAKE2B 6445aabf6512c218779e769a05069ff29292ef31dd9f4e109f1d0044f3db117db86b2dfb86d6ce00c36933c763c2e4d4874f27f4c7cdd8a10837cd1ffd1228f1 SHA512 ba08afefc8383cfc46198a64de1278a924a6e3552057484cdb8823fbbb38861f4b6b457be44ffb7913c968e5d5d6e88893636ebecdd0a0a979a2f3639220333e
EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
-EBUILD slack-bin-3.1.0.ebuild 2699 BLAKE2B 8a9e783fe834acf90fe641201b3e4f7ae5d09e6f0f7bacfec54ab1ff2aec8ecf99de881a33f34ec3c2554faf02f6791462c6998f257507338ada37e752ecf091 SHA512 b6ac672083458d0fad588dae26090c4301831cd61aafcdfe97e78c8fab8d75a05a58b9cea4abd7e666430f1d78ec0831a8fdf620eb630cdd059d2db0f0db535c
-EBUILD slack-bin-3.1.1.ebuild 2701 BLAKE2B a06cfc7f770f6877e61612f913f376a600d2642bdc493e5874c1f014b3011380728ed17762c0c91bdf2f064579ce1bd4c4b714541d1e0dd792905876734f5a92 SHA512 ba60fcf61278a1849dbeeb186253f3f9b407a0ab40479dcc34a642e9339b1962c732d6813844f39a59f851e42faff829cf436723f56e497060826e83a484fcfe
-EBUILD slack-bin-3.2.0_beta2.ebuild 2742 BLAKE2B 8d95fb9418f01c62abeccc5ea2363a05aa9ba897e217107efa706efc95a1f2dde7a5034010f2acbe226efedde39a3a98abeb9a88a100ed69dcaef524fb8ee4cc SHA512 275c5b3cd4e692fef94a31c8808375f9d599f69525c685af2cfeee3de728a980c9359d2ba6c6efba00e98300ec7c8e8e01112e9a0e4a7a9ee84e2beec85bfbf7
-EBUILD slack-bin-3.2.1.ebuild 2701 BLAKE2B 38a01a2413cad547617a434db7f0a74922abcf035d60c87a209fc8f1cca4b146a0de0e6645253deba81d80dd5a05c859e08ec5b5207bae6c958cb58e878fb746 SHA512 71b37ea8727c0e271b1c145145edfc25764cc69a690b5a97976f63468992306442a38547598587c886adbd7c0e7d8f06ba4762de752ad5208f49616d075003db
+EBUILD slack-bin-3.1.1.ebuild 2734 BLAKE2B ae5cc6577c753a17c500e0d4cc873681f796abbff13f3586e4d1992b12c26a543a45d85657c120b171ade707f7bee9f1e2a8672528a5d4649f3e857e996a05c7 SHA512 90d8985fe16e357439b35f98138c635a4dc4f5bc550c0ae7992bda69e64198f1fae15770193382ba7bb5005ef4a79f19c9a667c503d921faa5a14d2224597fd9
+EBUILD slack-bin-3.2.1.ebuild 2734 BLAKE2B 078bc57225af42bb4a368aa3f2842119dbfa9919bbe31625b8aeaf39a09c39be01a90761af03cbd507ba038c14184661465cd0fe6eea60a717e17ac11320c5d9 SHA512 f7b7f996abaa7607937d028277e876b82b701982eea636202fdd4921ef2d921f6ae022fd69d3fc8ee3de8cf7bbc9c2e4c11a724f929551dc2931da20db03fd22
MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-3.1.0.ebuild b/net-im/slack-bin/slack-bin-3.1.0.ebuild
deleted file mode 100644
index 504150b0b299..000000000000
--- a/net-im/slack-bin/slack-bin-3.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="ayatana pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
- dev-libs/expat:0[${MULTILIB_USEDEP}]
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/nspr:0[${MULTILIB_USEDEP}]
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- gnome-base/gconf:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- net-misc/curl:0[${MULTILIB_USEDEP}]
- net-print/cups:0[${MULTILIB_USEDEP}]
- sys-apps/dbus:0[${MULTILIB_USEDEP}]
- x11-libs/cairo:0[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- x11-libs/libX11:0[${MULTILIB_USEDEP}]
- x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
- x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
- x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
- x11-libs/libXext:0[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
- x11-libs/libXi:0[${MULTILIB_USEDEP}]
- x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
- x11-libs/libXrender:0[${MULTILIB_USEDEP}]
- x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
- x11-libs/libXtst:0[${MULTILIB_USEDEP}]
- x11-libs/pango:0[${MULTILIB_USEDEP}]
- ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
- opt/slack/resources/app.asar.unpacked/node_modules/*
- opt/slack/libnode.so
- opt/slack/libffmpeg.so
- opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
-
- if use ayatana ; then
- sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
- usr/share/applications/slack.desktop \
- || die "sed failed for slack.desktop"
- fi
-}
-
-src_install() {
- doicon usr/share/pixmaps/slack.png
- doicon -s 512 usr/share/pixmaps/slack.png
- domenu usr/share/applications/slack.desktop
-
- insinto /opt/slack
- doins -r usr/lib/slack/.
- fperms +x /opt/slack/slack
- dosym ../../opt/slack/slack usr/bin/slack
-
- use pax_kernel && pax-mark -m ${ED%/}/opt/slack/slack
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.1.1.ebuild b/net-im/slack-bin/slack-bin-3.1.1.ebuild
index 73cdd0095e1f..8b2ae27b507d 100644
--- a/net-im/slack-bin/slack-bin-3.1.1.ebuild
+++ b/net-im/slack-bin/slack-bin-3.1.1.ebuild
@@ -15,11 +15,10 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64 -*"
-IUSE="ayatana pax_kernel"
+IUSE="ayatana gnome-keyring pax_kernel"
RESTRICT="bindist mirror"
-RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
dev-libs/expat:0[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr:0[${MULTILIB_USEDEP}]
@@ -48,7 +47,8 @@ RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
x11-libs/libXtst:0[${MULTILIB_USEDEP}]
x11-libs/pango:0[${MULTILIB_USEDEP}]
- ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )"
+ ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )
+ gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
QA_PREBUILT="opt/slack/slack
opt/slack/resources/app.asar.unpacked/node_modules/*
diff --git a/net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild b/net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild
deleted file mode 100644
index 430e2d4639b1..000000000000
--- a/net-im/slack-bin/slack-bin-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop eapi7-ver gnome2-utils multilib-build pax-utils unpacker xdg-utils
-
-MY_PV=$(ver_rs 3 -)
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${MY_PV}5a7a50e-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="ayatana pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
- dev-libs/expat:0[${MULTILIB_USEDEP}]
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/nspr:0[${MULTILIB_USEDEP}]
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- gnome-base/gconf:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- net-misc/curl:0[${MULTILIB_USEDEP}]
- net-print/cups:0[${MULTILIB_USEDEP}]
- sys-apps/dbus:0[${MULTILIB_USEDEP}]
- x11-libs/cairo:0[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- x11-libs/libX11:0[${MULTILIB_USEDEP}]
- x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
- x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
- x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
- x11-libs/libXext:0[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
- x11-libs/libXi:0[${MULTILIB_USEDEP}]
- x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
- x11-libs/libXrender:0[${MULTILIB_USEDEP}]
- x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
- x11-libs/libXtst:0[${MULTILIB_USEDEP}]
- x11-libs/pango:0[${MULTILIB_USEDEP}]
- ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
- opt/slack/resources/app.asar.unpacked/node_modules/*
- opt/slack/libnode.so
- opt/slack/libffmpeg.so
- opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
-
- if use ayatana ; then
- sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
- usr/share/applications/slack.desktop \
- || die "sed failed for slack.desktop"
- fi
-}
-
-src_install() {
- doicon usr/share/pixmaps/slack.png
- doicon -s 512 usr/share/pixmaps/slack.png
- domenu usr/share/applications/slack.desktop
-
- insinto /opt/slack
- doins -r usr/lib/slack/.
- fperms +x /opt/slack/slack
- dosym ../../opt/slack/slack usr/bin/slack
-
- use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.2.1.ebuild b/net-im/slack-bin/slack-bin-3.2.1.ebuild
index 9bc03e7bfad1..450982ce199c 100644
--- a/net-im/slack-bin/slack-bin-3.2.1.ebuild
+++ b/net-im/slack-bin/slack-bin-3.2.1.ebuild
@@ -15,11 +15,10 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64 -*"
-IUSE="ayatana pax_kernel"
+IUSE="ayatana gnome-keyring pax_kernel"
RESTRICT="bindist mirror"
-RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
dev-libs/expat:0[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr:0[${MULTILIB_USEDEP}]
@@ -48,7 +47,8 @@ RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
x11-libs/libXtst:0[${MULTILIB_USEDEP}]
x11-libs/pango:0[${MULTILIB_USEDEP}]
- ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+ ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
+ gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
QA_PREBUILT="opt/slack/slack
opt/slack/resources/app.asar.unpacked/node_modules/*
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index a241f95e58a4..858635430a2a 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,13 +1,13 @@
-DIST tdesktop-1.3.0.tar.gz 16974902 BLAKE2B 8a6d4a964e4b487c6a833eddd419bc50ab5056a37345b27676cc5b9e1bea72ecc53c93e33a890095396eabda3d792269eddf5d8d15e9840dff64483f58cf9396 SHA512 06118de30393c611b4e2194eb897ef425c2722b571df5f2cb9ae05191474c53d812f7b0a5df4f52d18a58485cd70a4e92b994d9ec7e21c83538fc447fecad313
DIST tdesktop-1.3.7.tar.gz 17056555 BLAKE2B 1ba22af19a5ad346ee3e540ded473128fe3582fb0260164c1bec3b141a94cedf34e2c75dd8601dd79c9832391bff5a59ff95aef60050f74cb36f109ffb8df98e SHA512 f92003335ac53c77ce5d320e0549734feceed6b60121429f167134cc8d16b547bd27ad3c85dcbf0da5f55ac8e1e60f5027c910082afd9f683d8a98cb7ac16d6b
DIST tdesktop-1.3.8.tar.gz 17127764 BLAKE2B ff9390803bbddbd939eb3173f89b42f161d06c81f3c4702562318d08ecbcfbcf548eab04b8bd80a6f4d546db2c6d5a20c3bf73d0db9ae8ccdd9f4c88048f8074 SHA512 4cef9a2b379b090f6993e4e391152d7fa02db3863c0758ea04f04bdac219ae96e4e43459a44a2857895264555f7bf93a03a9969b1f9bd194185cc7c6e746549a
-DIST tsetup.1.3.0.tar.xz 33542536 BLAKE2B 81f0361e89a8c92153277288ad74c469baffa0c9f75cbfea6bf387ef23a0c5a57443e90f57f9cadde9df847bed761e9e57f46e8d28ed176b1f6c48c562d3b943 SHA512 735592a09ca6e86bdd2d7375043a61fecf4ae7d768d2e7b177e60579fa56154d56046ae890317111c1d91a222a9a96b9549497efd5018938e0ca711e67439424
+DIST tdesktop-1.3.9.tar.gz 17133428 BLAKE2B b8a8d0bf6d1ae2a55625284c16347b9f5da0f39bdad594b4ae6a8cfe57dce595da2ed54344a13641b31bbe4035b3b83ab9a1b3bce6880777ebd78c3f631c2e89 SHA512 7d9b908e038179448678eb0d29bb9ca62969674e199b89970bac85383ac839156c528939126413e6675901084a2c7d96a254195ebd1780a0b0816ae063f7c7f1
DIST tsetup.1.3.7.tar.xz 33921540 BLAKE2B 4d309bab164299ff7729f72aed44e21716e8ff1e6c41434fcd3e6c8ce9238891a2b93e4d55e62c6e44846781e755a32258dda36e02351d56357241daede342eb SHA512 c4d1249cb2e1be0e9410ba6d7b5f34f342c420d1b44e6b78736aeb611fa3e11519e4c0dfe2fd6f9a819fea09030d8cf451b2c36fc283fb12e4007b4a29855949
DIST tsetup.1.3.8.tar.xz 34517696 BLAKE2B 2a3350b2bdb05c880e306965566f622aa6cb440cc8fe3b72e8487efe6473b2e769db988766903634a90c78b66bdcbe7893742346e163de3bef4a4611f657397a SHA512 31766007ca47fe8c47fad9cebb95b1cae0db3ddec8bfee6f0108dd5e490790822d2ef4fceff2c24ca8c09483724f43aa8fa3a6cf5cb0e09de2fc26911cb66fb2
-DIST tsetup32.1.3.0.tar.xz 35710316 BLAKE2B 68c5d3cd0c286d261cd090c34ebf6c8eedfd29cdbd579c38b65256f2c2dea0196450e06a91944bede2bf9319d9a6e6966178c49da0e8ac19093744cccd56c1a9 SHA512 437e5bdfd11673c5a85933da23f082ff51d4c7366d1aa6e115c9a8f5a6c63987a9102b891525887c27f31c293a8ed167790a6bcd9cb55aa338bbd4e8b870b159
+DIST tsetup.1.3.9.tar.xz 34532440 BLAKE2B 628597a1f04a676129f7b219fa991f1dcae51f70d95366d0ee6bd0c8c8592e4cd3f7453d01d4f980c760e8541f619e9b7ee79ffc7e66953dbf22739d6d600094 SHA512 e176a0d7fe7cad421ec1e09023c8e99f143fef6c6e7aabb344cff9f62e915c9cc3ea7afe4ab58bfb776d8eb304a6a9c140c622614fa9e7f6ef7ea62bb56cf88b
DIST tsetup32.1.3.7.tar.xz 36187736 BLAKE2B 3da383c0067192e523d5b85056acf12085ceea4de6d06135f11c298e1f58ae3b09ffc500fa6cf07b72a186c8c6f6fde592f8a8aaa956ac83f90489c1383a3dd9 SHA512 7b8e3ef29f557af0912ff15cee976b7e244e7367346f1d5b4d6fbdb52941930a8952e0c01f8dc53d4a8c2bd6eb0f1f309b3dbff4b60f8790c204ccaf60565108
DIST tsetup32.1.3.8.tar.xz 37194796 BLAKE2B bfcb48b9f65bc54e1b7c269b500424ec2687c45359aec89da310548d310c5abb9d71547e77a250580f63d077fcb9b477ccd4cd8ae40a4bb4666e216950a3b809 SHA512 cae2c1a6abf2f02515e2ad8df107ab2306c0d1d7d3edf8b04fbee5c2130a0ad4b9e61929fe9b7576dc6d55f42541c2b863c30c1e3aeb186be8c9948334ecdd44
-EBUILD telegram-desktop-bin-1.3.0.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
+DIST tsetup32.1.3.9.tar.xz 37241464 BLAKE2B e83927531ecda2fdb3181c105b26d320857d9f047bb50ed17b38c8c8686675240c6b0b7acc139e06064746edaf3fc69af8eb6d12ab06dc49642ca39621594a8b SHA512 8d90b4e6568730e304714afd09daa70937784e82c9ad1a84a9808104a7731a3b61101042be3644b8a2d0982b2aac97827a8228bc0c3be311e233183a806ec623
EBUILD telegram-desktop-bin-1.3.7.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
EBUILD telegram-desktop-bin-1.3.8.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
+EBUILD telegram-desktop-bin-1.3.9.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild
index 6522d0b976f6..6522d0b976f6 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild
diff --git a/net-im/transwhat/Manifest b/net-im/transwhat/Manifest
new file mode 100644
index 000000000000..22c5f3af5793
--- /dev/null
+++ b/net-im/transwhat/Manifest
@@ -0,0 +1,3 @@
+DIST transwhat-0.2.2.tar.gz 49494 BLAKE2B 2d34a697df74d010aa030cd0162d6b1523d3e6eb1935251efb3c76a6259c8111f8644f244141c9724018f6617fef67bbd503be22d29a42bee3ffd619932cc3fb SHA512 4a292ba7dd064214e1f7e90f3a0da4f9fbd42e1227fe648ab2269b35c345eb7feda4d47d90b3ab95a31c356e6c0ad19aa6ffbea6641947810835ab06fbda4b75
+EBUILD transwhat-0.2.2.ebuild 875 BLAKE2B 1430bed676d19e1c2ccd9ff0a5b5bb5184c17808e6fc6aeb3756a9951a7c5a4d528cf9276f36f1aea18f94aacde177531e98311bd206e6530bedf09fa77e76cc SHA512 3c3a0862fe22575f8ca53452e7b8c6403ef31cdb2bdb400f8bbfaffe22ffe689741b5d6ba0ba39dfd13b31dfd3f2746bff4a6e79ac40953f6d1743595172fe67
+MISC metadata.xml 481 BLAKE2B ac11f22fdd6b29218a3f4f1d509a4595b2a5809f6bf762a7472ced7b3e16bdb5e23b57cbcdcaa2eb8c5c32b024c54b780d2ecfe1f20c02a49eaec9edea276f8b SHA512 ae9ba799931d5f4c0cf8774254f4072de619412896eb6d1fa8fdafa243368f78d17128eee88d49e5a8b9231613d52af6a475844e92c797e1e3e88baca3794d59
diff --git a/net-im/transwhat/metadata.xml b/net-im/transwhat/metadata.xml
new file mode 100644
index 000000000000..91277090fe3b
--- /dev/null
+++ b/net-im/transwhat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ transWhat is a WhatsApp XMPP Gateway based on Spectrum 2 and Yowsup 2.
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/transwhat/transwhat-0.2.2.ebuild b/net-im/transwhat/transwhat-0.2.2.ebuild
new file mode 100644
index 000000000000..6b03897d8fc8
--- /dev/null
+++ b/net-im/transwhat/transwhat-0.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WhatsApp XMPP Gateway based on Spectrum 2 and Yowsup 2"
+HOMEPAGE="https://github.com/stv0g/transwhat"
+SRC_URI="https://github.com/stv0g/transwhat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/e4u[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-im/yowsup[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "INSTALL.rst" "README.rst" "USAGE.rst" )
+
+src_prepare() {
+ default
+
+ # Fixes for Spectrum2
+ mv config.py Spectrum2/config.py || die
+ sed -i -e 's/config import SpectrumConfig/Spectrum2.&/' transWhat/transwhat.py || die
+}
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
new file mode 100644
index 000000000000..f6c6a3af214a
--- /dev/null
+++ b/net-im/yowsup/Manifest
@@ -0,0 +1,4 @@
+AUX fix_newer_six_version.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
+DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
+EBUILD yowsup-2.5.7.ebuild 872 BLAKE2B cb055c3b21432d3114451f0d444a4fc5107e73b0ac79b4d4c7af870cd8d9c459136342b2af30ff2040f8fd79748fdc9e64068bea5eb4ec008852d0ee7f965900 SHA512 15cbb45959822fe511978e1a12b00ccaf10b9d0b6130e04ca89f8ee7d9f99d866fe72f3453ea7aa9abf46d1457ae65ff8c97071a25a9a478d294fdb99531917d
+MISC metadata.xml 874 BLAKE2B 42719d6bff7e94386fcc419fe562d412e3b2876b652b00a26d4d27b81200f7a565d4cea66ed1510907688436aaac47cdf531242f67eeee9e6597634073ad3e31 SHA512 0acd83cef9fd9ab80aa49db19580c53d49d2416e6cb42027bbf86dc10d69e2ad74d2dd61d34bb586fad517d2698e4d9bc90f73cc35265b784d05e56c8380926a
diff --git a/net-im/yowsup/files/fix_newer_six_version.patch b/net-im/yowsup/files/fix_newer_six_version.patch
new file mode 100644
index 000000000000..d1bfb27ce295
--- /dev/null
+++ b/net-im/yowsup/files/fix_newer_six_version.patch
@@ -0,0 +1,30 @@
+--- a/setup.py 2017-12-30 00:12:35.000000000 +0100
++++ b/setup.py 2018-04-29 20:51:23.000000000 +0200
+@@ -5,7 +5,7 @@
+ import platform
+ import sys
+
+-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
++deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
+
+ if sys.version_info < (2,7):
+ deps += ['importlib', "protobuf==3.4.0"]
+--- a/yowsup/env/env.py 2017-12-30 00:12:35.000000000 +0100
++++ b/yowsup/env/env.py 2018-04-29 20:51:44.000000000 +0200
+@@ -13,7 +13,6 @@
+ super(YowsupEnvType, cls).__init__(name, bases, dct)
+
+ class YowsupEnv(with_metaclass(YowsupEnvType, object)):
+- __metaclass__ = YowsupEnvType
+ __ENVS = {}
+ __CURR = None
+
+--- a/yowsup/layers/protocol_media/picture.py 2017-12-30 00:12:35.000000000 +0100
++++ b/yowsup/layers/protocol_media/picture.py 2018-04-29 20:52:30.000000000 +0200
+@@ -1,5 +1,5 @@
+ from yowsup.layers import YowLayer
+-from yowsup import ProtocolTreeNode
++from yowsup.structs import ProtocolTreeNode
+ from .mediadownloader import MediaDownloader
+ import shutil, os, logging
+ logger = logging.getLogger(__name__)
diff --git a/net-im/yowsup/metadata.xml b/net-im/yowsup/metadata.xml
new file mode 100644
index 000000000000..dc32909be69f
--- /dev/null
+++ b/net-im/yowsup/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/tgalal/yowsup/issues</bugs-to>
+ <remote-id type="github">tgalal/yowsup</remote-id>
+ </upstream>
+ <longdescription>
+ Yowsup is a Python library that enables you to build applications,
+ which use the WhatsApp service. Yowsup has been used to create two clients:
+ 1) An unofficial WhatsApp client Nokia N9 through the Wazapp project
+ which was in use by more than 200K users.
+ 2) Another fully featured unofficial client for Blackberry 10.
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/yowsup/yowsup-2.5.7.ebuild b/net-im/yowsup/yowsup-2.5.7.ebuild
new file mode 100644
index 000000000000..862206fd28dd
--- /dev/null
+++ b/net-im/yowsup/yowsup-2.5.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="readline"
+
+inherit distutils-r1
+
+DESCRIPTION="A library that enables you to build applications which use the WhatsApp service"
+HOMEPAGE="https://github.com/tgalal/yowsup"
+SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/configargparse[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/fix_newer_six_version.patch" )
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e4801d38fea9..279209744fce 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
Binary files differ
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 921ff698544e..c1f9d25c33e0 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,7 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-EBUILD quassel-0.12.5-r1.ebuild 4931 BLAKE2B 402cb8e1a970e49967f7be519b6297aaff03d1473faf2298a7b96c0e1f6093ac0f45cba7b9b9fd4eb812cbb53a111d3372960cbf456d8fabf9b6fa4670b73949 SHA512 971d0ca50fbc64987cbe62d6aaa05ec4bffc8744472204d10971f8098316e50ab33ee15987a04d2dd97549eb17dd35c441a9febe21bcd958106f98e835f63193
+EBUILD quassel-0.12.5-r2.ebuild 4944 BLAKE2B b98fa3138101abca722cbb1d2a8dd82a8e62bb3f8394e0a1fce4cfb6c41efdb3022ab7f93311d5451c494075189997447e911cd8354acf0b1ecd646ae5e9586d SHA512 977e4f053599fdd291289d4a6f089c2514ca1dcfeaa119ca3aa11841a516e11df2048b7992702f305f9957ad6799f1a100417447f89c3e4c71d28d0e62f52121
EBUILD quassel-0.12.5.ebuild 4885 BLAKE2B f732d9aea2322f507845cf69321a442c02ff835f24be64974b15f64858a661ac594894e8f2b81d7305469d50523a862fbd08186fc96aa7f2b20301c1ec77e467 SHA512 d59718ca4709c99279f2a0ef8a4786bb32a3b0a4ab57c4f65db13e4518dfd2add6ef9642532313a60c06fc72b9e46e462b791384da2cdacb2e8cc957380daf54
EBUILD quassel-9999.ebuild 4935 BLAKE2B 1fd769f104e51caa2ab20837368cb53d5c71f802c4f6fd8624403e265980a0d2870ef2c66c90b6a1f598e15d4d09f019430f68a0f210a38d1aa9a01377790602 SHA512 dfb30906d7bca817d6a14b1e7a1ac6df4a7076bd1b119e8af44cadfb582bf7bfffda6fa8daa25b8964138fac27d2a2a029c254d7efdd3050395f9be29edf0caa
MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.12.5-r1.ebuild b/net-irc/quassel/quassel-0.12.5-r1.ebuild
deleted file mode 100644
index 6bb7fb268122..000000000000
--- a/net-irc/quassel/quassel-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-else
- EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
- inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[qt5(+),ssl] )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
- dev-qt/qtdbus:5
- )
- kde? (
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/knotifications:5
- kde-frameworks/knotifyconfig:5
- kde-frameworks/ktextwidgets:5
- kde-frameworks/kwidgetsaddons:5
- kde-frameworks/kxmlgui:5
- kde-frameworks/sonnet:5
- )
- phonon? ( media-libs/phonon[qt5(+)] )
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- sys-libs/zlib
- monolithic? (
- ${SERVER_RDEPEND}
- ${GUI_RDEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_RDEPEND} )
- X? ( ${GUI_RDEPEND} )
- )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
- || ( X server monolithic )
- crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) dbus phonon )
- phonon? ( || ( X monolithic ) )
- postgres? ( || ( server monolithic ) )
- snorenotify? ( || ( X monolithic ) )
- syslog? ( || ( server monolithic ) )
- webkit? ( || ( X monolithic ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
-
-pkg_setup() {
- if use server; then
- QUASSEL_DIR=/var/lib/${PN}
- QUASSEL_USER=${PN}
- # create quassel:quassel user
- enewgroup "${QUASSEL_USER}"
- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT5=ON
- -DEMBED_DATA=OFF
- -DCMAKE_SKIP_RPATH=ON
- $(cmake-utils_use_find_package crypt QCA2-QT5)
- $(cmake-utils_use_find_package dbus dbusmenu-qt5)
- $(cmake-utils_use_find_package dbus Qt5DBus)
- -DWITH_KDE=$(usex kde)
- -DWITH_OXYGEN=$(usex !kde)
- -DWANT_MONO=$(usex monolithic)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- -DWANT_CORE=$(usex server)
- $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
- -DWITH_WEBKIT=$(usex webkit)
- -DWANT_QTCLIENT=$(usex X)
- )
-
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=( "-DHAVE_SSL=TRUE" )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # prepare folders in /var/
- keepdir "${QUASSEL_DIR}"
- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
- # init scripts & systemd unit
- newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
- newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
- systemd_dounit "${FILESDIR}"/quasselcore.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
- fi
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; then
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
- fi
-
- if use server; then
- einfo "If you want to generate SSL certificate remember to run:"
- einfo " emerge --config =${CATEGORY}/${PF}"
- fi
-
- if use server || use monolithic ; then
- einfo "Quassel can use net-misc/oidentd package if installed on your system."
- einfo "Consider installing it if you want to run quassel within identd daemon."
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
- einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
- openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
- -keyout "${QUASSEL_DIR}/quasselCert.pem" \
- -out "${QUASSEL_DIR}/quasselCert.pem"
- # permissions for the key
- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- else
- einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
- einfo "Remove it if you want to create new one."
- fi
- fi
-}
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.12.5-r2.ebuild
new file mode 100644
index 000000000000..dd632d791bb6
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+ KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+ EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+ inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+ dev-qt/qtscript:5
+ crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+ postgres? ( dev-qt/qtsql:5[postgres] )
+ !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+ syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dbus? (
+ >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+ dev-qt/qtdbus:5
+ )
+ kde? (
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/knotifications:5
+ kde-frameworks/knotifyconfig:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kxmlgui:5
+ kde-frameworks/sonnet:5
+ )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+ urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5[ssl?]
+ sys-libs/zlib
+ monolithic? (
+ ${SERVER_RDEPEND}
+ ${GUI_RDEPEND}
+ )
+ !monolithic? (
+ server? ( ${SERVER_RDEPEND} )
+ X? ( ${GUI_RDEPEND} )
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+ || ( X server monolithic )
+ crypt? ( || ( server monolithic ) )
+ dbus? ( || ( X monolithic ) )
+ kde? ( || ( X monolithic ) dbus phonon )
+ phonon? ( || ( X monolithic ) )
+ postgres? ( || ( server monolithic ) )
+ snorenotify? ( || ( X monolithic ) )
+ syslog? ( || ( server monolithic ) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
+
+pkg_setup() {
+ if use server; then
+ QUASSEL_DIR=/var/lib/${PN}
+ QUASSEL_USER=${PN}
+ # create quassel:quassel user
+ enewgroup "${QUASSEL_USER}"
+ enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_QT5=ON
+ -DEMBED_DATA=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ -DWITH_WEBKIT=OFF
+ $(cmake-utils_use_find_package crypt QCA2-QT5)
+ $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+ $(cmake-utils_use_find_package dbus Qt5DBus)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_OXYGEN=$(usex !kde)
+ -DWANT_MONO=$(usex monolithic)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ -DWANT_CORE=$(usex server)
+ $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+ -DWITH_WEBENGINE=$(usex urlpreview)
+ -DWANT_QTCLIENT=$(usex X)
+ )
+
+ # Something broke upstream detection since Qt 5.5
+ if use ssl ; then
+ mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use server ; then
+ # needs PAX marking wrt bug#346255
+ pax-mark m "${ED}/usr/bin/quasselcore"
+
+ # prepare folders in /var/
+ keepdir "${QUASSEL_DIR}"
+ fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+ # init scripts & systemd unit
+ newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+ newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+ systemd_dounit "${FILESDIR}"/quasselcore.service
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/quassel.logrotate" quassel
+ fi
+}
+
+pkg_postinst() {
+ if use monolithic && use ssl ; then
+ elog "Information on how to enable SSL support for client/core connections"
+ elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+ fi
+
+ if use server; then
+ einfo "If you want to generate SSL certificate remember to run:"
+ einfo " emerge --config =${CATEGORY}/${PF}"
+ fi
+
+ if use server || use monolithic ; then
+ einfo "Quassel can use net-misc/oidentd package if installed on your system."
+ einfo "Consider installing it if you want to run quassel within identd daemon."
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
+
+pkg_config() {
+ if use server && use ssl; then
+ # generate the pem file only when it does not already exist
+ if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+ einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+ openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+ -keyout "${QUASSEL_DIR}/quasselCert.pem" \
+ -out "${QUASSEL_DIR}/quasselCert.pem"
+ # permissions for the key
+ chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+ chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+ else
+ einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+ einfo "Remove it if you want to create new one."
+ fi
+ fi
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1758a11c096f..989280aed5ef 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 6cfdace1e656..a1af5341f6c5 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,5 +1,3 @@
-DIST aqbanking-5.6.10.tar.gz 3687687 BLAKE2B 9bb357db8ddf853867fb4c80c5e86d37bfdccb2244ec6458a3f6117b6e3316cb365e48054102227f8a72fdf2493ae37a6d7303abeda3ad8ea28f783ff36c21bc SHA512 2429be829bf8c7b81b608ceb39d1f7f7f1876b52961d98356c611196577c89991983a0e87575605deda1e4ef71c68a20466457c827c36910b316178d9a37352a
DIST aqbanking-5.7.8.tar.gz 3818825 BLAKE2B 6536b11251fda4977fd964f513f4b2bb23cd14d62adffdd18e7508afe85d660b86aa1aadc80fe4ba47c5b393659ba7139c65eaf342795f6f05599efdd2c3904d SHA512 4078c3bc2c0b6f38f853fed064e37b6188c0b8158416ca6482756232ef8fe71e9cc1df0abe8c6bcbe8a7e818c24210f553c367f540d60cb7b7cf0161a9ca7117
-EBUILD aqbanking-5.6.10.ebuild 1600 BLAKE2B bd7512c1157c27068ce0c766155f99d8a7b7f55baa9983ddd0cf481e07d271436d998576adad9be8b1ee7f5f84c41038336af8ac65641c22e1c3753c7fe17035 SHA512 5c13fcd67aebe5c8b4f19aa5b326794b267375c3a156544617da1573c7f24b87377b50a0c9e6d050ebd54d13435663ef9f2e1b9fdc8876f6b6f47e662f635e6c
EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-5.6.10.ebuild b/net-libs/aqbanking/aqbanking-5.6.10.ebuild
deleted file mode 100644
index de06edeee681..000000000000
--- a/net-libs/aqbanking/aqbanking-5.6.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_beta/beta}"
-DESCRIPTION="Generic Online Banking Interface"
-HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="chipcard debug doc ebics examples gtk ofx"
-
-RDEPEND=">=app-misc/ktoblzcheck-1.48
- >=dev-libs/gmp-5
- >=sys-libs/gwenhywfar-4.13.1[gtk?]
- virtual/libintl
- ofx? ( >=dev-libs/libofx-0.9.5 )
- chipcard? ( >=sys-libs/libchipcard-5.0.2 )
- ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-MAKEOPTS="${MAKEOPTS} -j1" # 5.0.x fails with -j9 on quadcore
-
-src_configure() {
- local backends="aqhbci aqnone"
- use ofx && backends="${backends} aqofxconnect"
- use ebics && backends="${backends} aqebics"
-
- local mytest
- use gtk && mytest="--enable-gui-tests"
-
- econf \
- $(use_enable debug) \
- $(use_enable doc full-doc) \
- --with-backends="${backends}" \
- --with-docpath=/usr/share/doc/${PF}/apidoc \
- ${mytest}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- rm -rv "${ED}"/usr/share/doc/ || die
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
- README.aqhbci-tool
-
- if use examples; then
- docinto tutorials
- dodoc tutorials/*.{c,h} tutorials/README
- fi
-
- prune_libtool_files --all
-}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e1930c9a456a..b6b78125b6f7 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -14,5 +14,5 @@ DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cf
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
EBUILD grpc-1.12.1.ebuild 4150 BLAKE2B 211375c9194684d63812417e4701ce54588237d65350d2d8bc956b5106b352f9ba204ffb174d8e7e8609851b282c816a008aa792e28e067d98a30a31db8f8591 SHA512 8531b6975d0f95dcfd8f1231caa2b6135a1f1ede25ee0ec2156719b3f238adaf9a5301e5cc7832e9b7fe62cc668fc2beb84d28e55ba16a8c4f3d099cf98e25d8
-EBUILD grpc-1.13.0.ebuild 4258 BLAKE2B 29910bd86ecdbf4aed8b1294a31a460884edc2c99eeb596d0c01c6c46868e3b43f9919d5adb376aa3ba45ac08e95126905490b875adacb6cd0cebfba438dd3fd SHA512 531d3e25eeda46db695702bb8fbbe47d82c982d34e47e6fb2340d9d6755c874d6bf963cd4c94b162850d3b73de8d4cadd449c4ec541e2c089e528be91ab00bea
+EBUILD grpc-1.13.0.ebuild 4259 BLAKE2B 6c034723907f6f1c464cac41aefa1762e36db3c027ec2708a851f5732dbcb8350266169d09b71ee10fa3830613252af657cf7690ec0c792d69155b598a9062c9 SHA512 701c7179e1b8adb308bc9acf6b892970d4fa2c261e13fbe56a3eb58c347709b593743b3a0adf239b78562bca3d00e71439cff9a768ca1b168c48bdc1fd8a3340
MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0.ebuild
index ff81aa55ff0d..824ec4b1aa05 100644
--- a/net-libs/grpc/grpc-1.13.0.ebuild
+++ b/net-libs/grpc/grpc-1.13.0.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/openssl-1.0.2:0=[-bindist]
- ~dev-libs/protobuf-${PROTOBUF_VERSION}:=
+ >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
dev-util/google-perftools
net-dns/c-ares:=
sys-libs/zlib:=
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index cb067d52ded2..1274a3144892 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -3,15 +3,11 @@ AUX librsync-0.9.7-format-security.patch 679 BLAKE2B e61655858050748a8e6c5aa992c
AUX librsync-0.9.7-getopt.patch 899 BLAKE2B 1a6ff6263ca5635f2e104bc4520ebb65c37c6ddcadd8fe6d3dbd1c9943193ed3afb1e7fac0d05b610a9f8ee4214d9b3b60b1cdc3436547997329bb90767895bd SHA512 6805197797eba2b994ccf79ab31e6a7cd2e607ad7f6d6fa30d68b94d58396ee477d2e3ef54705bf874e0d5a8cc58d96048d89800fbb2afbdaddf469caba7484b
AUX librsync-0.9.7-huge-files.patch 1022 BLAKE2B ca5a7c8e1932f9dfef882a592a30bce8b780ca1802d5806cb46772ea1b80b616911eb6f9c16f623fac2a6d0258d05da01d2860ed0183b18cbf198dd47f51b23a SHA512 e45d0422f7b0fc092b3e41be4ba29305de4940380f3946551e38516a0ccd314a767c0c91e2e4efcd75c2e3ebe684675dc49c37081fa38036c774a81fc68e8855
AUX librsync-0.9.7-implicit-declaration.patch 568 BLAKE2B 464ee837c8c4f33601edf7ae083547e9743249f3a55a27d48b2311e20dea99fdaf4a1722676eb6a64bef48dacd05589c29369d16448b83fdc6124ed2749847e2 SHA512 58dafcc71c52bf50e8ffc2729bbe54ba2022e16e851499218c724e101813b957b769511ab83a3f29ab359e3c3b4860867b71f97bd4bfa79d5ee69d53fe369f20
-AUX librsync-2.0.0-search.patch 358 BLAKE2B ffd694420fc4b320bb260866ffd95ab5876e758bebba7aa319992ea80a5ee8ef2f200b0a870e033a858282b6cd483754d3cb9e095045872f906369dad4d888dd SHA512 06f64c2d95fde23cda01c35d39e0d4d7e81b10750e0e23f87751a356fff7707bfe8481788aef14649875ff65f900c254f612217ee0bf3ddbc06d0471cc5106d7
AUX librsync-2.0.1-libdir.patch 500 BLAKE2B f500f461b0a4308d77b53358701d33bbfa314dd27a0d8d7fca5528c08a5611674821035882462f7e3889407db456f24dc501132db7d8526ac8cd103ed3c04233 SHA512 fcbc5247b6684322517ba048d578817bffd9921630a0cd350256d28a06496ad746548f21507dd687434b50aee6999f5628f235e065fdab633d9800f39c1d3295
DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
-DIST librsync-2.0.0.tar.gz 155049 BLAKE2B ca1d938cc8a60ffe5b16b804344164c69296738f6d01adb991a7d0f9685544c8be77608cd17aa269f14bd92cf7390896caa94c84e95313f17e6fa36a4c0e2a46 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0
DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
EBUILD librsync-0.9.7-r3.ebuild 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
-EBUILD librsync-2.0.0-r1.ebuild 821 BLAKE2B 7b5205c78edb58f35f15d286d17d61792bcca6d78cf19b788f8d1713e571e61cfea97054e3a7122d91c2dd864c69ff3dba06f6f1b5d56b437b44ec0aaf376e88 SHA512 17e51cf4bbac0e4b07de4e73a87786b191b87f2ba8b8f2170cb73af8186027dfe5ba95cc37e96a66f206a807f795538634a433a46dbb1dfb33bbb6afc1038574
-EBUILD librsync-2.0.0.ebuild 760 BLAKE2B 72253c352dcf02c9fda1e338bc65a5c3964e0e622ec61977e7c91f8121e373a4c2cfc0b250fa73fba400298187d05e18a178a87a4885c4ee3c147d8158fbd68d SHA512 d80266085dbc6282cd0ad1399879db63f42034c5d49e4274581f4f82c6ae25e152fc155e06e42a33c274ae2cbf3ca3d4b67c787e243f2bae84a19cc7807cb562
-EBUILD librsync-2.0.1-r1.ebuild 671 BLAKE2B 01fdb985ea603c3ab83be937adb13af69eead3897b43780841ad784b4b23adbc366b3f5d76c682a12bf41ffcd855d4eb53e6eb903c41606dfaf12500d6964f33 SHA512 86b38c4470282ec53dfa1232c6080d8ab15b9d98c22395675bf5c2c26e77875d6310d5c1922c721a15003d1856530ec27a408a93bd4a8eadbbe1d1132f275e78
+EBUILD librsync-2.0.1-r1.ebuild 670 BLAKE2B 4ce6598ddb823e0fffcf09097b226820dee13699b15e0df10481394014f803279674195f5781a17e4a417967f4acc86102ef69ab3c2f87b0169ddf677b9a8b52 SHA512 bb4ae215c3680313652ac5e919eb3c3458f9ab42b968b33b29fa250537bac4de32fe6522e122787a42c5991091cbd1f0459f2bddac48601762324570dc41d253
EBUILD librsync-2.0.2.ebuild 615 BLAKE2B 884a1929b644cf41e4caa4d11ded0a6b7318c76e95e0f8bb1ac539b2411441b02753eafedb31ad04dd58da1f13cc7a9c22e6c14322d574fc30bb47113f932b9e SHA512 80cf4f2a7edc12be596a3005a89ca34649d94cefe7a4faa7a62da6411d1281ebd936d7304e1a3b54c6839c8cbed59633282e9d30cf048054ff95cee093364603
MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/files/librsync-2.0.0-search.patch b/net-libs/librsync/files/librsync-2.0.0-search.patch
deleted file mode 100644
index 93b4106ee8b5..000000000000
--- a/net-libs/librsync/files/librsync-2.0.0-search.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/search.c b/src/search.c
---- a/src/search.c 2015-11-29 21:43:12.000000000 +0100
-+++ b/src/search.c 2016-01-31 19:11:54.847933060 +0100
-@@ -218,7 +218,7 @@
- r = m;
- }
-
-- if (l == r) {
-+ if ((l == r) && (l <= bucket->r)) {
- int i = sig->targets[l].i;
- rs_block_sig_t *b = &(sig->block_sigs[i]);
- if (weak_sum != b->weak_sum)
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
deleted file mode 100644
index ff95ffa9ab15..000000000000
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # isprefix_test does not work in portage environment
- sed -i '169 s/^/#/' CMakeLists.txt || die
-
- # fix compiling with multilib-strict feature enabled
- sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
-
- # fix bug 573144
- epatch "${FILESDIR}/${P}-search.patch"
-
- cmake-utils_src_prepare
-}
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
deleted file mode 100644
index d36f0754d76c..000000000000
--- a/net-libs/librsync/librsync-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Remote delta-compression library"
-HOMEPAGE="https://librsync.github.io/"
-SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # isprefix_test does not work in portage environment
- sed -i '169 s/^/#/' CMakeLists.txt || die
-
- # fix compiling with multilib-strict feature enabled
- sed -i "242 s/lib/$(get_libdir)/" CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
index e082d6abcc7f..c79a64554adb 100644
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index a13c8621b8fb..b4e35ee66523 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,4 +1,4 @@
AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
EBUILD loudmouth-1.5.3-r1.ebuild 1152 BLAKE2B 1a0b72fa0dc45ec5614a7ad180ed9438451c23f73d67b6c77c29ba6612e5dfaab5adf13467c421372508d8e7e4ebedb56cf0f0b3cd09363d73aa968465905bfe SHA512 7f52f7e6f8e5ee7df3cdead97ecb16289feb2669f3ba8c3c5d2c481c590cf2f0619ad3fb0f555fdd2035b97b134f7d80525de57e2991a415bb41eca8c8b6b524
-MISC metadata.xml 479 BLAKE2B 058f0c4e1ef93dc3fd61226cd866c8c2f5666f6c1a3e4e16a51cb5e284e7a0d481f27a04f68938b3881d13c8cd7e59997cbcbb635558d9dc35899bdf4c7e1cda SHA512 5a94a3093f15c3147f12eabbc14e259b188e0f832c23c4aa6380dbeb089c1d62268d71648f0157772f8e66953d1460533ee3edccd4157333ee53fe231648e27a
+MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
index 159c57ddc16e..6b630e38e30d 100644
--- a/net-libs/loudmouth/metadata.xml
+++ b/net-libs/loudmouth/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>andrey_utkin@gentoo.org</email>
+ <name>Andrey Utkin</name>
+ </maintainer>
<use>
<flag name="asyncns">Use <pkg>net-libs/libasyncns</pkg> for asynchronous name resolution.</flag>
<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support instead of gnutls (which is the default).</flag>
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a0f37317c60b..527b04cf3df2 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -5,7 +5,7 @@ DIST mbedtls-2.7.3.tar.gz 2145554 BLAKE2B 442d840f7046ae63508528fe76e9a12d438f14
DIST mbedtls-2.7.4.tar.gz 2147905 BLAKE2B 74473f53f241969485db0941339b1340f92d4c676d99f92734b9f5b64e76c2849b9a0f1def24e1569af8c78680fd2d26af68cac04f8d3ea916a67251bd6c3094 SHA512 530e2bb7d8dcd0dfcfb1c645f25bab6ca4c2004f988449e189e822223452e237f2ed86b901814c5c80d380701c151e160faea6d7c20cbeb198fe0908c8e534fe
DIST mbedtls-2.8.0.tar.gz 2132562 BLAKE2B ac0a67c51e4aeb59e947d16039b20de680ccd7daf372652c0a7d1a6694ce8fe213f959b47a4335cda236575d8f491c84a413ae2f408e86600519ac66a31f8c1a SHA512 baa2024e26cb1d772a525348cdcc84e2b5eabf58642d8c792fe88cf6c539b36f14e80d592e85bc474f6be036513ed4b8bc86f5808ad4f5b08f25ca7e43dc3921
DIST mbedtls-2.9.0.tar.gz 2163543 BLAKE2B b47e6242b5bad4f571bd900960e20ec0266e6f9f25c96df85c7d983dfa3d71f8b842b90f112eb69a09bf99ed3ef7c059c2c2d522ba66e92f4c9097754985323a SHA512 5490822aae18dfb3eb2cc94e673a575daf0cdaf9a4867ff84f0df9749376ea5c54a3f67902b4b86e2a853508af0585684618f9edac8bd92352cd3ca4461bda1c
-EBUILD mbedtls-2.10.0.ebuild 2419 BLAKE2B 080cd58d3206160bb46d4a9192b3cf8efd714f2a412ca2d7d0cee190e7d9f799e2a8d08cfaddc4ef04008f175ea2a7059f25f96924f0e119a41e9e07d8c0d2d8 SHA512 ebd59043b46767aaf3e880b7d958dc37e9fa51be27041efd240121197464aeccb93a4030b61e7292226768437cadcc403a5b4d7b306dc41bbc824f566ad2bc13
+EBUILD mbedtls-2.10.0.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
EBUILD mbedtls-2.11.0.ebuild 2426 BLAKE2B de326fe91fd634ae0b54b90e6e77eb647194c37c6a6274cc385cf6d2ee43be6bb255b3d3bd4522796c7d934aaa747afc1b04cd94581a4f61225caa419fec273f SHA512 59bdb3b597fe5ccbf499f927acd2fdcd7e0f53ae42da744065ff94c02b1622733966eefdc2bdb0ca209acaaea88cf49851b81911bb13d44c10f8b890de324e48
EBUILD mbedtls-2.7.2.ebuild 2415 BLAKE2B 124241763616413f50d6180e83489a5d215236c7498a21ebe6915cdb193fb822e2b9bd39ec9226a97bce55ead0e4b43d029dee755d1b596a1657c4ccda9a7b75 SHA512 1dc5dcc839abca03ef4fb2d997498987ddc14ff6a1dd7fd51dd8922793f8398d2483d58956d6f459a844c4dfc18ba0c444f885c0fbf1dbf45ea6cc3dc8a836e5
EBUILD mbedtls-2.7.3.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index 783c6747fdda..da4240ebb05c 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
RDEPEND="
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4375f33f2067..c8ea73c697fe 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
Binary files differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8522579bfbc9..fe9378ff7a9b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,5 @@
AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
+AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693
AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e8543a560b474dd4cd028d0a7bd1cc02e45c879bc2e7d636c2543e8aed3bd8e0b49b260703590be44fd1032ba3e1f4eb87a8e6f8ecf396 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4
DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39
@@ -14,8 +15,10 @@ DIST dovecot-2.2.35.tar.gz 6185237 BLAKE2B 7ad08816553683126c4c8d494770730c49c29
DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
DIST dovecot-2.3-pigeonhole-0.5.0.1.tar.gz 1783039 BLAKE2B 8452c11d1c5f26d2ee9a0c54a2c30642bce5117f1ad140db8a8509a2bcc03236361a99c6f622267279eb75c19c68de7d96947557b595c345db34e34a135b492c SHA512 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288
DIST dovecot-2.3-pigeonhole-0.5.1.tar.gz 1792702 BLAKE2B 219bc6b3182e303b7f3784cca0fb7fcc9d9aae62e60cc490d7f0a94fa4f9b805933d9fd67c4927cd8f9c864c3b73e28bfde1866848960c71dc47d5e36196b748 SHA512 5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4
+DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
DIST dovecot-2.3.0.1.tar.gz 6499984 BLAKE2B 4bfb38ba8bed154e58db03c53c0a6958632841fd66a118571c341be90f9d20a570a22699d4b8d117b72d4599fe074248c96cf4e7fc78ddd65c69662b4275cf97 SHA512 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
DIST dovecot-2.3.1.tar.gz 6703089 BLAKE2B a9a021531241f86083cd5bf31f7b9211df77b2423ad213ca35904e23002121631e81a6419e3b07a838eb699faff615dcb35f3b95a1da537f74068b3c15795b35 SHA512 fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79
+DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13f60da38990b55ef62960479af213a8a4eadb4de3b95a2d600089edccd3ec406cf97744d13918598020f18e756458 SHA512 e83a87950486c3f0b07b856b98430d99c42b42fb32fd796c1ef4ed192e05dc3d774429281e73a806855e809cec0e3ff1a7c6209de5d7608e01d17a29a3653bae
EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d
@@ -24,4 +27,5 @@ EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023
EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5
EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48
+EBUILD dovecot-2.3.2.1.ebuild 8792 BLAKE2B 34856e60e8aae3d17df882a5196743b4ee2a03a05bde6dc9e15ebaec7cac22111da43213b0953b54b3cb7db42f288aaf58114c12c4330dd5161bbfd7ce8ce180 SHA512 bb1ec91d9575dd4c3abc14d38372fae1581d47f2a95fe820656d7ac38410bdad8496f3809ca6fca32d97e6d8e7b29bd0d934138e7e2c958e9594ac1439b51fb0
MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
new file mode 100644
index 000000000000..49bdb7f94292
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# do not add a ssl USE flag. ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.5.2"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+ bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua:* )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ net-mail/mailbase"
+
+PATCHES=( "${FILESDIR}/${PN}-glibc226.patch" )
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+}
+
+src_prepare() {
+ default
+ # bug 657108
+ # elibtoolize
+ eautoreconf
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --with-rundir="${EPREFIX}/run/dovecot" \
+ --with-statedir="${EPREFIX}/var/lib/dovecot" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --disable-rpath \
+ --without-libbsd \
+ --with-icu \
+ --with-ssl \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $( use_with argon2 sodium ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with lua ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX%/}/var" \
+ --enable-shared \
+ --with-dovecot="${S}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install () {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+
+ elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-glibc226.patch b/net-mail/dovecot/files/dovecot-glibc226.patch
new file mode 100644
index 000000000000..adf1dd99aac8
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-glibc226.patch
@@ -0,0 +1,84 @@
+From 9a58361b08e1858e3bc7ea93934b7613261da476 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@dovecot.fi>
+Date: Mon, 9 Jul 2018 11:33:23 +0300
+Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists
+
+It's been removed in glibc 2.26
+---
+ m4/quota.m4 | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/m4/quota.m4 b/m4/quota.m4
+index 5840e3af89..0695b1e021 100644
+--- a/m4/quota.m4
++++ b/m4/quota.m4
+@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [
+
+ have_rquota=no
+ if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
+- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
+- have_rquota=yes
++ AC_CHECK_HEADER([rpc/rpc.h], [
++ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++ have_rquota=yes
++ ])
+ fi
+ AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
+ ])
+From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@dovecot.fi>
+Date: Mon, 9 Jul 2018 11:39:59 +0300
+Subject: [PATCH] m4, quota: Support rquota using libtirpc
+
+---
+ m4/quota.m4 | 13 ++++++++++---
+ src/plugins/quota/Makefile.am | 3 ++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/m4/quota.m4 b/m4/quota.m4
+index 0695b1e021..d75af447e1 100644
+--- a/m4/quota.m4
++++ b/m4/quota.m4
+@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [
+
+ have_rquota=no
+ if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
+- AC_CHECK_HEADER([rpc/rpc.h], [
+- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++ PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [
+ have_rquota=yes
++ QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)"
++ ], [
++ AC_CHECK_HEADER([rpc/rpc.h], [
++ have_rquota=yes
++ ])
+ ])
+ fi
++ if test "$have_rquota" = yes; then
++ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++ fi
+ AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
+ ])
+
+ AC_DEFUN([DOVECOT_QUOTA], [
+ AC_SEARCH_LIBS(quota_open, quota, [
+ AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
+- QUOTA_LIBS="-lquota"
++ QUOTA_LIBS="$QUOTA_LIBS -lquota"
+ ])
+ AC_SUBST(QUOTA_LIBS)
+ ])
+diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
+index f220d4f075..ffebc67404 100644
+--- a/src/plugins/quota/Makefile.am
++++ b/src/plugins/quota/Makefile.am
+@@ -19,7 +19,8 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/lib-storage/index/imapc \
+ -I$(top_srcdir)/src/lib-storage/index/maildir \
+ -I$(top_srcdir)/src/lib-program-client \
+- -I$(top_srcdir)/src/doveadm
++ -I$(top_srcdir)/src/doveadm \
++ $(LIBTIRPC_CFLAGS)
+
+ NOPLUGIN_LDFLAGS =
+ lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 1d6f48bc545a..b4a2c7ad637f 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -3,7 +3,6 @@ AUX hdr.at 1400 BLAKE2B f7b3c5a2bf5ca268adefaac2898ce9a2823357ed77b4ab0f73a67cb8
AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
AUX mailutils-2.99.98-readline-6.3.patch 1321 BLAKE2B 061f3fbb554b2b8b9ed8452920c40ee6d9a93343b22aefcb550bbe03f9e0051ac8c770e58f44e4451ae63e3cca8350a09eed972dcf1db50bc6c40f1fb33a32a5 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5
-AUX mailutils-3.2-fix-build.patch 2100 BLAKE2B a87e77ee7e8378fddb53d1001aafd01265fe1379af6563d20d2d03b7dc8caf514b3db1d489e8b99a5d7b0aa39bf3b7498b6ff7c4d00a9452850a03075de5fb28 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505
AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8567803f94e9cba58055b62a2bcfbd9e60db7cfd332c3c16faf5ac09ab3d9b7a43eb2b2b791ecf006e6d731ad555aa2da67 SHA512 2f10b61c47ec4981f912f180619627959338d7cf73e277bb25d6021044ae4752317773e6f7a13e7cba1dbf6782b3e32e92e77e1c265184bff89e8a79ce813954
AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
diff --git a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
deleted file mode 100644
index 7036cd68ca34..000000000000
--- a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From afbb33cf9ff750e93a9a4c1f51a3b62d584f056e Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Sun, 19 Mar 2017 17:31:08 +0200
-Subject: Fix a bug in field-map handling.
-
-* libmailutils/cfg/driver.c (parse_mapping): Fix expected value type.
-* libmu_auth/sql.c (get_field): Remove left-over mu_assoc_ref call
-(see 622bc770).
----
- NEWS | 2 +-
- libmailutils/cfg/driver.c | 7 ++++++-
- libmu_auth/sql.c | 11 +++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/libmailutils/cfg/driver.c b/libmailutils/cfg/driver.c
-index 7da75a8..8af543d 100644
---- a/libmailutils/cfg/driver.c
-+++ b/libmailutils/cfg/driver.c
-@@ -617,10 +617,15 @@ static int
- parse_mapping (void *item, void *data)
- {
- struct mapping_closure *clos = data;
-- char *str = item;
-+ struct mu_config_value *cval = item;
-+ char const *str;
- size_t len;
- char *key, *val;
- int rc;
-+
-+ if (mu_cfg_assert_value_type (cval, MU_CFG_STRING))
-+ return 1;
-+ str = cval->v.string;
-
- len = strcspn (str, "=");
- if (str[len] == 0)
-diff --git a/libmu_auth/sql.c b/libmu_auth/sql.c
-index d69c36c..c50598d 100644
---- a/libmu_auth/sql.c
-+++ b/libmu_auth/sql.c
-@@ -214,20 +214,23 @@ mu_sql_expand_query (const char *query, const char *ustr)
- static int
- get_field (mu_sql_connection_t conn, const char *id, char **ret, int mandatory)
- {
-- const char **name = mu_assoc_ref (mu_sql_module_config.field_map, id);
-- int rc = mu_sql_get_field (conn, 0, name ? *name : id, ret);
-+ int rc;
-+ const char *name = mu_assoc_get (mu_sql_module_config.field_map, id);
-+ if (!name)
-+ name = id;
-+ rc = mu_sql_get_field (conn, 0, name, ret);
- if (rc)
- {
- if (mandatory || rc != MU_ERR_NOENT)
- mu_error (_("cannot get SQL field `%s' (`%s'): %s"),
-- id, name ? *name : id, mu_strerror (rc));
-+ id, name, mu_strerror (rc));
- }
- else if (!*ret)
- {
- if (mandatory)
- {
- mu_error (_("SQL field `%s' (`%s') has NULL value"),
-- id, name ? *name : id);
-+ id, name);
- rc = MU_ERR_READ;
- }
- else
---
-cgit v1.0-41-gc330
-
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index adc98c6d885e..f5075c6b5689 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,4 +1,3 @@
-AUX qmHandle-gentoo-svc.patch 718 BLAKE2B efb684c0c11ab7c2a3df534f0ab9c5cf911c2936fc23c74bef8b88f64b2e4ed68293f5ac6427146ac593149ce9e1e809a88e62d7e717f87045750ccd3de27f37 SHA512 9beeb4a2b17c2577807620b3a67147c694de3f43f491452a7511fd213e5376950b3da55278f2a64b76b95129b3ea7153fc117c286fffd2f472dd9fc4a2f20992
DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
MISC metadata.xml 762 BLAKE2B f3d23ddb50669bab668e1e5279eec4ee45cb7bc44688aa41ba101c3c90ef128473f0bf396815fc16962f8b44336630cd908fb352a617d15370ed84a5170c59b0 SHA512 88d0d2a8527bf75f55da559f64ccf40e4dc08b64c6bda3a9354b6e0e59a53b8fcb5fd85b6012e30419bb9b03a672ab4b83a1aec93583dc77e64a3c0d1ffa08e4
diff --git a/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch b/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
deleted file mode 100644
index fc516d4e0b7a..000000000000
--- a/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qmHandle.orig 2005-08-24 19:39:11.000000000 +0200
-+++ qmHandle 2005-08-24 19:40:15.000000000 +0200
-@@ -29,8 +29,12 @@
- #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
-
- # While this is if you have a Debian GNU/Linux with its qmail package
--my ($stopqmail) = '/etc/init.d/qmail stop';
--my ($startqmail) = '/etc/init.d/qmail start';
-+#my ($stopqmail) = '/etc/init.d/qmail stop';
-+#my ($startqmail) = '/etc/init.d/qmail start';
-+
-+# Gentoo Linux:
-+my ($stopqmail) = '/usr/bin/svc -d /var/qmail/supervise/qmail-send';
-+my ($startqmail) = '/usr/bin/svc -u /var/qmail/supervise/qmail-send';
-
- # If you don't have scripts, leave $stopqmail blank (the process will
- # be hunted and killed by qmHandle):
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5b0947c4d226..9f0c9aaab2ca 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest
index 800f01b20987..b1d5b188c37d 100644
--- a/net-misc/babeld/Manifest
+++ b/net-misc/babeld/Manifest
@@ -1,3 +1,6 @@
+AUX babeld 321 BLAKE2B 3d2fbea692adc307bd94f9ed0155cdd322aeeae24f3d1bf600e030b6f65a7b9f6135430de1ba4f52db405b29d6b7e6161262ed3c1fd5c22ac32f8e78a8dca61a SHA512 9f47c606dc9975975b0a1532998b9c4a43111a9a3856ba3949154002cc4562b6177fd517f9ab8e5fb3f2cb668f8439f938e470250abf36e682422c9bccf1e408
DIST babeld-1.8.0.tar.gz 92124 BLAKE2B 43f24c64280597201880a257095235447a49b97e7fcfc4f53db1c6e45564e41dc751017ce664779e4accdf03cb134cb33856288e2deebc6f194ae1e3744bad4e SHA512 6665ea5108200fe9d158a221ee5697c35fa1bf1d59e99a354aabea844342505731d77c1e3dff3917d048c2154bbadcdda5904ad6e46f16c43f52b5c297480b7d
+DIST babeld-1.8.2.tar.gz 92852 BLAKE2B ddf64558ebe2c96812e0b68382cda118539a1221fa15df7ee5d6aa67cdb5e1da556e4518371580bfb9df61780f559892787057605a02b8870c0a8e1f2018fc5d SHA512 08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319
EBUILD babeld-1.8.0.ebuild 502 BLAKE2B a4bfaffc4f94305fc43d06ed1f5752e6f7664478ea395b23cedc54575e61fdd092169bde83cb19f0759cc30b19b3b68af8f024c3596f0fa2de9f26dbd68ed614 SHA512 b9bbc8a876416320d2e1deeb01bea933ba5e8e2682e606d06c45e43b35a6d46d4118a520f87f21ae9f61db43ce7a854d42ec640a5411ea769c23b1e85c613819
+EBUILD babeld-1.8.2.ebuild 531 BLAKE2B a37429166703e6079428e7706d16239a99b2ce97f424aeeb92e81a88fe1284246531741016091b50e42a3c63b8884b566c2843c82547270805234e0bcc4c7fca SHA512 2ff633bd21110e73e47c90c19c0862d8a1af0d995890cd44a0a2cc94ca7ca7f3c524a8cdb68de7420d33d31a93c3ba753e6416841324dc99af7a134c9421ac37
MISC metadata.xml 213 BLAKE2B 21f4d23acabbf3b15cd7161a8b3d63b042b273a0839be30ed713eb9cf4f0e36d2a579264fb35fc66b12168288ef24b5abd2418e85abdf4e1ea5f7de1a26ef28f SHA512 e8aad49b782740278a85d29c45a05a6545fb67fe68cd4b47ba72a759ea822eff4eb5ac8e620cfa0fa44840ecc134d89d2f7281e88434527c78cd6c9c92f704ed
diff --git a/net-misc/babeld/babeld-1.8.2.ebuild b/net-misc/babeld/babeld-1.8.2.ebuild
new file mode 100644
index 000000000000..a72348e3bd74
--- /dev/null
+++ b/net-misc/babeld/babeld-1.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a loop-free distance-vector routing protocol"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+ emake CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install(){
+ emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install
+ dodoc CHANGES README
+ doinitd "${FILESDIR}"/${PN}
+}
diff --git a/net-misc/babeld/files/babeld b/net-misc/babeld/files/babeld
new file mode 100755
index 000000000000..d45cf2d4e274
--- /dev/null
+++ b/net-misc/babeld/files/babeld
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="Babel routing daemon"
+command=babeld
+pidfile=/var/run/$command.pid
+command_args="-I $pidfile -S /var/lib/babeld/state"
+command_args_background="-D"
+retry="TERM/30/KILL/5"
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
new file mode 100644
index 000000000000..602d57ff3e69
--- /dev/null
+++ b/net-misc/connman-notify/Manifest
@@ -0,0 +1,3 @@
+DIST connman-notify-0_pre20140623.tar.bz2 2858 BLAKE2B b76865e5392f9b6ed2dada5b323e0f867fa70b5ba21bb6342069f7f6a28468d2915dc9c573bcb4ebc061c3039fa6f0bbfd6969464d264b710f3aee149b1162a5 SHA512 8da432cfe0653c29d83afffeacd11e9d66795be061040286ec8b90ce28c334c729af24cb7e1aee0f32e2b2626949f7ee9c95c52b4a3191392236bad7b204a267
+EBUILD connman-notify-0_pre20140623.ebuild 965 BLAKE2B 85b8442aac794b13553cfb4b3701db423e393b7540eaad16dd717460073c370a84f02d9e8bc6b20e6c7a0ead4ec9fd753336552a65c06e7994b5637a3872c9c8 SHA512 df2eb9b60c7705c7b0558238c75a65a4113b168c200fdb0e09eac2ddcb8b21fe9ad34c153de1f0cfa3f17801d3b3a08ff943a061e24d408a5d249c6feac084bc
+MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild b/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild
new file mode 100644
index 000000000000..3d32d97d793b
--- /dev/null
+++ b/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1 vcs-snapshot
+
+MY_COMMIT="0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d"
+
+DESCRIPTION="Desktop notification integration for connman"
+HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
+SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ dev-python/notify-python[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ net-misc/connman
+ virtual/notification-daemon"
+
+src_install() {
+ python_fix_shebang ${PN}
+ dobin ${PN}
+ dodoc README.rst
+
+ make_desktop_entry ${PN} ${PN} ${PN} Network
+}
diff --git a/net-misc/connman-notify/metadata.xml b/net-misc/connman-notify/metadata.xml
new file mode 100644
index 000000000000..435234188908
--- /dev/null
+++ b/net-misc/connman-notify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index dac5e83073f4..4746a9a08c94 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,6 +3,8 @@ AUX curl-7.59.0-libressl-compatibility.patch 2838 BLAKE2B 95726ee47d375a98e85145
AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13cf86ba201d69837f32c6b0011599a33507e65234cf3dccc5aa08ee558ff9c52998c50f0288738ba3992b6bc65 SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
+DIST curl-7.61.0.tar.bz2 2949354 BLAKE2B bb9fb6155aa6031d000081fa17410e772a58ec111401e7854ad0148c33169f1a7067bb04029965f117be7df20c51a6157bf93fb6439bc4a2d25849a4784baadc SHA512 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
EBUILD curl-7.60.0-r1.ebuild 7214 BLAKE2B c146b26c7a5872dff04bf4a77511df27597749ef09ddd625092e79fd6a6b756c65ba11f18fc4cf30f19c5480b6d44e083ed47a16aa5e79d66320556c26906ee4 SHA512 5a3ab159fdbff04d492a2e34f3f581944c163115bf52c4975bb9cde376101657435da985c522720651b7c2a6904de61087297bbcc22203f3bf8536d6f8d2f199
EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
+EBUILD curl-7.61.0.ebuild 7209 BLAKE2B 8b2d82cbf0d2974755d513f6849a4386dd39a8f21479c617a8cbcdb6b6881a9c1bf999fc6cce0042785d249bf97821c5fa4332889b6d12a5a6653259d1131910 SHA512 8fe630f4a1b4f2d8408add8e897f9461cea523bb602b073bf8c2860780ce1f472c850f16fc3faead8635c6c780b1290cd20133168d355fea39eb9e534c364a03
MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
new file mode 100644
index 000000000000..45cddf32ae70
--- /dev/null
+++ b/net-misc/curl/curl-7.61.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ brotli? ( app-arch/brotli:= )
+ ssl? (
+ curl_ssl_axtls? (
+ net-libs/axtls:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_gnutls? (
+ net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_libressl? (
+ dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_mbedtls? (
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_openssl? (
+ dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_nss? (
+ dev-libs/nss:0[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ )
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+ idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+ adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+ rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+ ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+ sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+# rtmp? (
+# media-video/rtmpdump
+# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+# )
+
+# ssl providers to be added:
+# fbopenssl $(use_with spnego)
+
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+ curl_ssl_winssl? ( elibc_Winnt )
+ threads? ( !adns )
+ ssl? (
+ ^^ (
+ curl_ssl_axtls
+ curl_ssl_gnutls
+ curl_ssl_libressl
+ curl_ssl_mbedtls
+ curl_ssl_nss
+ curl_ssl_openssl
+ curl_ssl_winssl
+ )
+ )"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/curl-config
+)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+ eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+ eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+ eapply_user
+ eprefixify curl-config.in
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin17 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=637252
+ sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+ configure || die
+ fi
+}
+
+multilib_src_configure() {
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+ local myconf=()
+ myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ if use ssl ; then
+ if use curl_ssl_axtls; then
+ einfo "SSL provided by axtls"
+ myconf+=( --with-axtls )
+ elif use curl_ssl_gnutls; then
+ einfo "SSL provided by gnutls"
+ myconf+=( --with-gnutls --with-nettle )
+ elif use curl_ssl_libressl; then
+ einfo "SSL provided by LibreSSL"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ elif use curl_ssl_mbedtls; then
+ einfo "SSL provided by mbedtls"
+ myconf+=( --with-mbedtls )
+ elif use curl_ssl_nss; then
+ einfo "SSL provided by nss"
+ myconf+=( --with-nss )
+ elif use curl_ssl_openssl; then
+ einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ elif use curl_ssl_winssl; then
+ einfo "SSL provided by Windows"
+ myconf+=( --with-winssl )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ fi
+ else
+ einfo "SSL disabled"
+ fi
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-crypto-auth \
+ --enable-dict \
+ --enable-file \
+ --enable-ftp \
+ --enable-gopher \
+ --enable-http \
+ --enable-imap \
+ $(use_enable ldap) \
+ $(use_enable ldap ldaps) \
+ --disable-ntlm-wb \
+ --enable-pop3 \
+ --enable-rt \
+ --enable-rtsp \
+ $(use_enable samba smb) \
+ $(use_with ssh libssh2) \
+ --enable-smtp \
+ --enable-telnet \
+ --enable-tftp \
+ --enable-tls-srp \
+ $(use_enable adns ares) \
+ --enable-cookies \
+ --enable-hidden-symbols \
+ $(use_enable ipv6) \
+ --enable-largefile \
+ --without-libpsl \
+ --enable-manual \
+ --enable-proxy \
+ --disable-sspi \
+ $(use_enable static-libs static) \
+ $(use_enable threads threaded-resolver) \
+ $(use_enable threads pthreads) \
+ --disable-versioned-symbols \
+ --without-cyassl \
+ --without-darwinssl \
+ $(use_with idn libidn2) \
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \
+ $(use_with metalink libmetalink) \
+ $(use_with http2 nghttp2) \
+ $(use_with rtmp librtmp) \
+ $(use_with brotli) \
+ --without-spnego \
+ --without-winidn \
+ --without-wolfssl \
+ --with-zlib \
+ "${myconf[@]}"
+
+ if ! multilib_is_native_abi; then
+ # avoid building the client
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+ fi
+
+ # Fix up the pkg-config file to be more robust.
+ # https://github.com/curl/curl/issues/864
+ local priv=() libs=()
+ # We always enable zlib.
+ libs+=( "-lz" )
+ priv+=( "zlib" )
+ if use http2; then
+ libs+=( "-lnghttp2" )
+ priv+=( "libnghttp2" )
+ fi
+ if use ssl && use curl_ssl_openssl; then
+ libs+=( "-lssl" "-lcrypto" )
+ priv+=( "openssl" )
+ fi
+ grep -q Requires.private libcurl.pc && die "need to update ebuild"
+ libs=$(printf '|%s' "${libs[@]}")
+ sed -i -r \
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \
+ libcurl.pc || die
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 168cbc6b0d1b..ad2e14946e39 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,7 +1,7 @@
DIST gns3-gui-1.5.3.1.tar.gz 5784326 BLAKE2B 535ef34b24a4069e597f0ac12900057d4ea10f03ab4dd4ee342091c72743d611b442cd2c3cdd9cde65a357ff26e776702e730be916533960c3cd0c9a53149553 SHA512 1d145d1565dc890d3e54386d9867826470cce2997d42f113cfcfd9a2cadd6e215e96753af8f0cdc9d2a7776341d9c4cb8ac473084126ba4ea76585de4c37dd0c
DIST gns3-gui-2.0.3.tar.gz 5528039 BLAKE2B 05831031780a163f650a3eef8b4fd67629f0550fcd8a0b3a76f53d18bec073199d437755c13e856a10a11a210d9c923c11ff7466a706d5a3b07291d5a04f51e2 SHA512 0c6955c885c1110acd4c791e92ba24db583d259938bb7f0c2147f3f648dabd4dcaeb2967b8e30e6169adca9f3b8ee667f00431bec66d6fb5fde1f9d90cca88f8
DIST gns3-gui-2.1.3.tar.gz 4792762 BLAKE2B 577381bdee06f967e4fddec3b0885920e8a25380d834ab1c983e010d40a14f63c69912f745bb72b4605e49cdf7192fe52ac57380d5f65f03d067a2f1dd03f7d6 SHA512 da90eea0920f9fc10bb5ea7e0039ca11bfaf36870e182a6b97ffdbab9f12da0d13b58c4a13ca747add675426324f3c1cde5eedbd858a68ee4bbefdcdff193904
-EBUILD gns3-gui-1.5.3.1.ebuild 1297 BLAKE2B b5189930d8cf8557c303aed8ef4eb4574a4061cc17ff2186ccfa306d8afc2c49da70c8ea8bdc64f41a0ba043e605886678d08b52e58edb45a28971714766ff14 SHA512 22caaff4f7e1c66379b5e6d0f8ea6be5a149e4c471503a34131308f4891f8f098c80ce2b3cc56fed877f0ffa35c398d100caf9500bf2116540220427cf7f29a3
-EBUILD gns3-gui-2.0.3-r1.ebuild 1121 BLAKE2B 136cd7afd962a8c646371e142541a8e7dc9f6f715ed2dcd2049f93cf7eed15cb7241524fcad3fcefe6a869ae4c72f54711376c7cb558d2de8456d2044301a036 SHA512 ffc3b9117a2fb85cc45f1f64f2e0234ff4d05e50f6ba8c9622eef4175e25b03ecba9f878826381ad045784bcc3741a81ff33827b6c702d7648ad3ed1d9488765
-EBUILD gns3-gui-2.1.3-r1.ebuild 1130 BLAKE2B f83d5c25cefd54c08125a0b22a0a8b13fb0b072832771cf903220f061b0e796427de874088a5eb027210833d1b928186539edb5ff613ad3dfb2ad387abdf98ec SHA512 08a42d922282d4755cfd68253ffaac04216f9ed79a54ed5dc90c8b6c423dea6668be9fc3749ef60dc54b55ae08c86148c2daa6c51c2fadd74921c0785d84f23a
+EBUILD gns3-gui-1.5.3.1.ebuild 1298 BLAKE2B d2d929f042245309c1ed7ec480cb308187a85d05afd4f6f4a6fc791d028f179e20875f6307929c8adba1940c1b334334f60fd9f238ffd456268b789722757a77 SHA512 c72192cacf1eef3aa51b7c61855de8a311cef10f45d868983b28160354421f3907a083fcc18425ebe7d1d607525da00f9b09f2b8282347962329a44d3e91729b
+EBUILD gns3-gui-2.0.3-r1.ebuild 1122 BLAKE2B 526c3900f792e3c35069889752978856159699313d80cce1c24adce2a17b1a1b29835e77c14eed5ca24718485a73061ae3b5a7ae322354855676507f8b0381e2 SHA512 fd193520fde60f2e32bc6e775ba6b35ed3954985172847cfb1823aa081ad7f379a8211861d764c2b533343f6ac4098e1c673aade05c7b634c26dddf31b82c27f
+EBUILD gns3-gui-2.1.3-r1.ebuild 1132 BLAKE2B 9ea73ce3b39d4fedf55e82555c5024efa465ff9d738fa362e0d764c5255e64f536fb3e4a633fdfafc950208c1780830c51dd31b6e9c44648a7a2996efcc0acd2 SHA512 16e3ebb36a594864f5e174977f4f7406b0ed2cd391f2c801f52b73783cb492ab4819ce96e034726130347a0bb6aac79b8db8a0bb8aec64e28ac971132feedbf2
MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
diff --git a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
index b0bf8d76cd11..705031598053 100644
--- a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
>=net-misc/gns3-converter-1.3.0[${PYTHON_USEDEP}]
- =net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+ ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
dev-qt/qtgui:5
dev-qt/qtsvg:5
dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
index 4e2020676ee9..a8118d51b05d 100644
--- a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
- =net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+ ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
index e8b9a99df0c5..f9cc17a23bd1 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
- ~net-misc/gns3-server-$PV[${PYTHON_USEDEP}]
+ ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index b2ce4ef8136d..1d589968dc3d 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,7 +1,8 @@
+AUX gns3-server-2.1.3-typing.patch 259 BLAKE2B 5950ecf364b86f472bab5d5a8c59982086be7b3c541b841f0b6c31e3b4b585d88c4a8e3e013939635cb5c89e8cadf65a428521429ec166879d1a5f90e776b92d SHA512 02a7cafb1c0c306be8177c8c206800511953dd115b428810baa6711ba2e8bba9ae5be7bd9768a87fceb1bf75618fc59c31349e5bf3d55eebe1636a3c71e7fb00
DIST gns3-server-1.5.3.1.tar.gz 847598 BLAKE2B 9a025150cea08830f39e63d4ff79897643bc846d4ccab4b9e3d37f8fa9b3de26296a30d3b93c38fdbb4e927653978e0aa4f1f4d5200b176f102f4c550bc7edd9 SHA512 79e8b2546d8239d78fcf621fe8e88c0ddc10bea2e216225ca1f48ebd4d0e307cebc81e63ded2e36cca50917d518d52d8619eed5a84b39123c3ce56f3a6606fd9
DIST gns3-server-2.0.3.tar.gz 1468528 BLAKE2B fac026020563386553841e98c8f056cc270b17a7896481fb268b1633a3166737a3be111b9cf7f38dacb85ee2e8bc371fa32490e4a3fe07e708b01c57af1d79c0 SHA512 a9927e414f6fc6558cecabd006f9d123752b0b6e5b88408a53a6d1f195d22047ffdc3e4ccc6e132d04135c434174aa4b58f29deae9e952f83ccc678037f25b8a
DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
-EBUILD gns3-server-1.5.3.1.ebuild 1589 BLAKE2B 4b654788be2921cafd9bfdaf7c0752d7a8744e9eb4f7e766425d2d51fbfcb6970ef663a95d99a170c362c0454ed0f6e2405f3df6f32377597642ee0578f63172 SHA512 55cc83a0f392f71f72b65e97654dd54d986c91fcf92c713ba4e1795c5a9d19969942d80346a015ad2b342a9e9fcbbe386a5905311c3a3c4282b321aed0303c3c
-EBUILD gns3-server-2.0.3-r1.ebuild 1650 BLAKE2B ff8a0a841c2a76c9846d2016e74cd3ecc27e92c8609fbcd081b60bf43719aec46f2b3d218598b0f950b294532303d9889a6e3b762776e5fdf290985e9722db56 SHA512 db2473bef2d12c9bb9ee5db48dcf73f14a8919d3eeab23b4d2071034df3426c2a73ea155452aa8faa9ad98d446820cb689b09a0180c6e7f53172f25ca701dd19
-EBUILD gns3-server-2.1.3-r1.ebuild 1800 BLAKE2B 6a05b1e711198504d3e8f577b996a031a52dc6cd9840032124a5434bdb98f5c7d2e54ba30ad98d4a4c900678aed3c874836bb79201dd50ca22172874f5a51133 SHA512 a6d6f942438c498a53b83f79df1c847d6f93ae85f9b853c743a1ae248b157ba0cf88dec079ebc0306436e89ecd308624f5cbb9be9d8a2ebdc3528e71acbdf823
-MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
+EBUILD gns3-server-1.5.3.1-r1.ebuild 1583 BLAKE2B f609acbb3ad6df54f9c01a6bc0553d59732a4b591d81d8fed3896dddc4c6985be2eb56acf14efbcffa405ed41e91dbb519c499f563ddc8dcb85ccb168e29fd95 SHA512 52a2ce317b0c3586a63be29bd358e0a3271474ae9fb11f87affb82f8fc8797a9696308483dd8fae75d2b409dc1e2ee98e4d27c9588885bccf8a557103781399a
+EBUILD gns3-server-2.0.3-r2.ebuild 1644 BLAKE2B 0437d9b2d7f0a199de1ab40391dd42c506b019ece76fcb0cdda18d2e969d9e59486601c51e2f5bc7f8c280efb9c1299f212c76d4a8393e72fcddace949e9db2a SHA512 b241a4d568ecf9405252087aa8b3240ab05071f64769f1bd5547dd602af24077fee6e0c5eb97330bb6471b698a19bff0fac6a7685d947947ef1b0cc5ba88ac59
+EBUILD gns3-server-2.1.3-r3.ebuild 1887 BLAKE2B aac42a46ac5c720c83931df923bd75fec153477c7764829c068a20d1d4433f84a11d1302228008901598b53926ce383fb8617ebda1ff9918e6856f1aeb62d45d SHA512 a6ad54a38c85a180757e60c47d04cd857f98a089e5510a19550a04ff5deecb2809cbf3c06271fe7676544d47bed0c4037f16b4bba6cd8a1db7d59a2ca793ecbd
+MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
diff --git a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
new file mode 100644
index 000000000000..99b32df27ad8
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
@@ -0,0 +1,9 @@
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -6,5 +6,5 @@
+ raven>=5.23.0
+ psutil>=3.0.0
+ zipstream>=1.1.4
+-typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
++typing>=3.5.3.0;python_version<"3.5" # Otherwise yarl fails with python 3.4
+ prompt-toolkit
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
new file mode 100644
index 000000000000..8bcb6c9c3b05
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+ >=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+ >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ >=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+ ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+ ewarn ""
+ ewarn "The following is a list of packages that can be added:"
+ ewarn "app-emulation/qemu, app-emulation/virtualbox"
+ ewarn "app-emulation/docker and net-analyzer/wireshark"
+ ewarn ""
+ ewarn "The following packages are currently unsupported:"
+ ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
deleted file mode 100644
index 624d2a1d1232..000000000000
--- a/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
- >=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
- >=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
- >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
- >=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
- >=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
- ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
- ewarn ""
- ewarn "The following is a list of packages that can be added:"
- ewarn "app-emulation/qemu, app-emulation/virtualbox"
- ewarn "app-emulation/docker and net-analyzer/wireshark"
- ewarn ""
- ewarn "The following packages are currently unsupported:"
- ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
deleted file mode 100644
index 667fc7a119c9..000000000000
--- a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
- =dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
- =dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
- >=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
- >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
- >=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
- ~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- rm -rf tests || die
- eapply_user
-}
-
-pkg_postinst() {
- ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
- ewarn ""
- ewarn "The following is a list of packages that can be added:"
- ewarn "app-emulation/qemu, app-emulation/virtualbox"
- ewarn "app-emulation/docker and net-analyzer/wireshark"
- ewarn ""
- ewarn "The following packages are currently unsupported:"
- ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..4dfbfec240f4
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+ =dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
+ =dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+ >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ rm -rf tests || die
+ eapply_user
+}
+
+pkg_postinst() {
+ ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+ ewarn ""
+ ewarn "The following is a list of packages that can be added:"
+ ewarn "app-emulation/qemu, app-emulation/virtualbox"
+ ewarn "app-emulation/docker and net-analyzer/wireshark"
+ ewarn ""
+ ewarn "The following packages are currently unsupported:"
+ ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
deleted file mode 100644
index c5055f961770..000000000000
--- a/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
- >=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
- <dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
- >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
- >=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
- dev-python/prompt_toolkit[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
- >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
- >=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
- >=dev-python/yarl-0.11[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- default
-
- # Package installs 'tests' package which is forbidden
- rm -rf tests || die
-}
-
-pkg_postinst() {
- ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
- ewarn ""
- ewarn "The following is a list of packages that can be added:"
- ewarn "app-emulation/qemu, app-emulation/virtualbox"
- ewarn "app-emulation/docker and net-analyzer/wireshark"
- ewarn ""
- ewarn "The following packages are currently unsupported:"
- ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..282ff6a38407
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+ >=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
+ <dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+ dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+ >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+ >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ >=dev-python/yarl-0.11[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/GNS3/gns3-server/pull/1368
+PATCHES=( "${FILESDIR}/${P}-typing.patch" )
+
+src_prepare() {
+ default
+
+ # Package installs 'tests' package which is forbidden
+ rm -rf tests || die
+}
+
+pkg_postinst() {
+ ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+ ewarn ""
+ ewarn "The following is a list of packages that can be added:"
+ ewarn "app-emulation/qemu, app-emulation/virtualbox"
+ ewarn "app-emulation/docker and net-analyzer/wireshark"
+ ewarn ""
+ ewarn "The following packages are currently unsupported:"
+ ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 7012b6c468af..1ff1650e8848 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -4,5 +4,7 @@
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">gns-3</remote-id>
+ <remote-id type="github">GNS3/gns3-server</remote-id>
+ <bugs-to>https://github.com/GNS3/gns3-server/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 372dbee57187..76421e545a06 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -1,8 +1,12 @@
AUX igmpproxy-conf.d 165 BLAKE2B df8526557acd0d88b017298dfd06b636c60537e79bca0fd5a1d6cca2b60ac7b4f917ac60fe5e11d3515890ef50675eb9eb8543bad224b47e785b1782d5298e86 SHA512 c09d4ba3756d5a391b0738c4ef1e83f083a9b9b4f23af66c1378b2f0b4aec6abdd509e48288c1fc96c7f43fe004cdf0c090702d83d2b665ef701a064fc2da80d
AUX igmpproxy-init.d 514 BLAKE2B 5022b5f458c1a2c4082f591a1f003129453d6d8846ca6976820bb03b980aae7fed81abc29499effa3f96daf84e977c00ec842cc6a3d63b12be86c1e254adf15f SHA512 7bb2812c27556d1355e415eaa8ebe5d3ed5a896e88c6813c4bce686b3268c6f0000507cea59afa37a3f474fa6e2ca20c91bf87a63cf4c8209cef2f5bbb01c1cf
-AUX igmpproxy.service 150 BLAKE2B 2b02ddf142d49dd264d4025a91a8a9335132b40eb0128d614bbd95f2cfbb886a3e69b8f6de09b8d6bdfb0901eee19c8f8e721284244ee380417ed3d1823f25d4 SHA512 675bfd38f542dfeb92372625058b443700726683a6f6ffc2e24a2f13e645b372cec5806957ec7aa6c764fd85b4d3b4a50d2640805eb8235fe30e9e269c974b09
+AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85b383bcb8e77570f33c2a9f2a52ba3690b9a4a69bf0df82926571326b9720e274f7cbfd8bb39215c9 SHA512 3c95e98d19b88bed32562e64e4e491ac34da3533acb5cfd39032443688bdfe889e4835544bc358ccd5f7a95356c1eb8013462f3bc4a13e8e083717bfaaba4b5f
+AUX igmpproxy.initd 439 BLAKE2B 05673b50c7a055dfaa9011a21ab761a0ed87d142773bbbaa9dff90b35608c31cdd3837bcb575186e098568867499ab660e53a0215ef76bc83b95b3e6d174d174 SHA512 65c2107558ec0402daa1814eb45acdaaed40dcf7d7529ac0e02870fc2826cf770d6d2a54508b44b6a38c19ae58a4db777b2b4bf625df7797d0842cc44fb4559e
+AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f54885d5eaaa5c69a32563b318a05540e123d4b19cd63a930d17934c1344fdf6467fad5c1de333d03e0a802e7912b SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4
+DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
DIST igmpproxy-0.2.tar.gz 170705 BLAKE2B a2a13399995f283fb77b500140c1750ed306511eb5f51a71491edc245c8d8f873809fac9a82dc7ba0be7a7390643d85d7f4a2a8521b3c2c20fb8f09ad33b507d SHA512 a06f95c912456191d0953c08058ccb987120f6b11426d15e329c2de95878b9fc6ee5742b253e2c06b8002771478c382a58a14a0af76fb835ebb1d132b9f34e4f
EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
+EBUILD igmpproxy-0.2.1.ebuild 602 BLAKE2B e3351e6d194227f05fc30582639776ccfdb610052ab0f9809002874ad834cc5f6f8286ed759730a149d55311d3a821549db06c3ed734cf3cd3aa1b52cb78d993 SHA512 ad5f68f84aedc6b557373053b3d3ff648d17e0543a621789d85a248d3a14a36722b7e2ee37a36e14f618d937ab37e19aa8a5c2912b3a7f832fe165f359074e47
EBUILD igmpproxy-0.2.ebuild 623 BLAKE2B 1712e810c9dd4e4420744c8d43a8887f6b505d68888d2febc0ed279c3761acec388725ab6e71ffd8c8ad63dbf03501b72754e7d68d358b88f1065541ac6fbc0e SHA512 dbe1f4d9674952c00cd625bdb0c598d0241d2c6075aeb16c56ce5798fbd5dc731c124223fa557439a6c11d829cac67161aba89cbbba0d73aeb4ae10014ee341c
-MISC metadata.xml 447 BLAKE2B 08ca9aadcb600bf783269eef2be66631a19afa27baf2b390a7bd6e7390660c66285789ec41d26826cfc71dac7882b27d1a6460d53c1c5b7e2c3da2c54dd7d998 SHA512 4c6c8c0023027fa3ca7acc3d164fb14f381df30850964bad7f1ccd0ccd4d2fcb301b0b4aba9493f4bce1cf96ee59197970489648db5be7e085a140c282ff30a5
+MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/files/igmpproxy.confd b/net-misc/igmpproxy/files/igmpproxy.confd
new file mode 100644
index 000000000000..cbbc38cb9167
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Additional command line options, see igmpproxy(8) for more information
+IGMPPROXY_OPTS=""
diff --git a/net-misc/igmpproxy/files/igmpproxy.initd b/net-misc/igmpproxy/files/igmpproxy.initd
new file mode 100644
index 000000000000..d8f727ba034c
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/${RC_SVCNAME}.conf"
+name="IGMPproxy"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+command="igmpproxy"
+command_args="${IGMPPROXY_OPTS} ${config}"
+procname="${RC_SVCNAME}"
+
+start_pre() {
+ if [ ! -f "${config}" ]; then
+ eerror "Please create ${config} before starting ${name}!"
+ return 1
+ else
+ return 0
+ fi
+}
diff --git a/net-misc/igmpproxy/files/igmpproxy.service b/net-misc/igmpproxy/files/igmpproxy.service
index a682bed09e0a..ae949566c9e4 100644
--- a/net-misc/igmpproxy/files/igmpproxy.service
+++ b/net-misc/igmpproxy/files/igmpproxy.service
@@ -1,9 +1,10 @@
[Unit]
-Description=IGMP proxy
-After=network.target
+Description=IGMPproxy
+After=network-online.target
[Service]
-ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf
+ExecStart=igmpproxy /etc/igmpproxy.conf
+Type=simple
[Install]
-WantedBy=multi-user.target
+WantedBy=network.target
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
new file mode 100644
index 000000000000..9154819d42db
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
+HOMEPAGE="https://github.com/pali/igmpproxy"
+SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}/igmpproxy.initd" igmpproxy
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ newconfd "${FILESDIR}/igmpproxy.confd" igmpproxy
+}
diff --git a/net-misc/igmpproxy/metadata.xml b/net-misc/igmpproxy/metadata.xml
index c2e066bde80c..37a86a4c127a 100644
--- a/net-misc/igmpproxy/metadata.xml
+++ b/net-misc/igmpproxy/metadata.xml
@@ -1,12 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
- IGMPproxy is a simple dynamic Multicast Routing Daemon using only IGMP signalling.
- It's intended for simple forwarding of Multicast traffic between networks.
+ IGMPproxy is a simple multicast router using only the IGMP protocol.
+ It is intended for forwarding of multicast traffic between networks,
+ like used by IPTV.
</longdescription>
<upstream>
- <remote-id type="sourceforge">igmpproxy</remote-id>
+ <bugs-to>https://github.com/pali/igmpproxy/issues</bugs-to>
+ <remote-id type="github">pali/igmpproxy</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
new file mode 100644
index 000000000000..89dfe507ae81
--- /dev/null
+++ b/net-misc/ipmiview/Manifest
@@ -0,0 +1,6 @@
+AUX fake-java.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
+AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
+DIST IPMIView_2.14.0_build.180213_bundleJRE_Linux.tar.gz 95430772 BLAKE2B 467f1b8b99df6e0b48bab0d652411ce097826eb532e92ac7889ea9c93ad53ff78a291508498d9ffa1463342951cc640fb46bfddd887669b4ebad9f1a9dd09941 SHA512 59fd4ad70f7f6da98a8ca1a95678e368cf963caa3c454e1e1c60006966aa5faeb964c7c68d4fc7f0f5804ffbb49c06d44ab56974bb47bcb77490ad737c707e92
+DIST IPMIView_2.14.0_build.180213_bundleJRE_Linux_x64.tar.gz 94006067 BLAKE2B 38e597401f3bfb27acb2b6c824ac1dcae17b7ca46fcba1ba64d3533142913915a836bbee6ccfbdb9d21f9a9976629b3412e5f6f40850c3ce139a97428bb25be1 SHA512 7b4f0e3438281da33cb85195048f21fe1101a44ec18a67f83f88665c875d01706664df44ea8eb7403b98685c09764094eaf553f985cebadce66c3dcf635151e1
+EBUILD ipmiview-2.14.0.180213.ebuild 2356 BLAKE2B c46d679078733f0400479296c6f4cba35ac970cd342c3dcd79c3712f8e30f4cb2127970853d41fe10a68907e1edefc894cc73c411ab81c07abf130d050e5acb4 SHA512 fadd6e19903ebf497f1bc136266267743c88ca78d51c73533bd8ae4602c0423d6b39f4992d711ea5b864e482ca7c3f8457b7148392bad0c1740513b57393ae83
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/net-misc/ipmiview/files/fake-java.bash b/net-misc/ipmiview/files/fake-java.bash
new file mode 100644
index 000000000000..7d4fbfe32a0b
--- /dev/null
+++ b/net-misc/ipmiview/files/fake-java.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+for ARG in "${@}"; do
+ case ${ARG} in
+ -jar)
+ EXE=${2}
+ shift 2
+ break
+ ;;
+ *)
+ shift
+ ;;
+ esac
+done
+
+if [[ ${EXE} != *.jar ]]; then
+ echo "error: could not find jar argument in java invocation" >&2
+ exit 1
+fi
+
+EXE=${EXE%.jar}
+EXE=${EXE,,}
+
+exec "${EXE}" "${@}"
diff --git a/net-misc/ipmiview/files/launcher-pre.bash b/net-misc/ipmiview/files/launcher-pre.bash
new file mode 100644
index 000000000000..11b3e52008d5
--- /dev/null
+++ b/net-misc/ipmiview/files/launcher-pre.bash
@@ -0,0 +1,3 @@
+gjl_pwd=${XDG_CONFIG_HOME:-${HOME}/.config}/ipmiview
+mkdir -p "${gjl_pwd}" || exit $?
+ln -snf /usr/share/ipmiview/jre "${gjl_pwd}"/ || exit $?
diff --git a/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild b/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild
new file mode 100644
index 000000000000..8b3eaa7b7209
--- /dev/null
+++ b/net-misc/ipmiview/ipmiview-2.14.0.180213.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eapi7-ver java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="IPMIView"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
+HOMEPAGE="https://www.supermicro.com/"
+SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
+ x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="net-misc/stunnel
+ virtual/jre:1.8"
+
+RESTRICT="bindist fetch mirror strip"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+pkg_nofetch() {
+ elog "Please download ${A} from"
+ elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+ elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+ unpack ${A}
+ mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
+}
+
+src_prepare() {
+ default
+
+ # Extract icons for menu entries
+ unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
+
+ # Don't use their scary launchers
+ rm -v lax.jar || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ java-pkg_dojar *.jar
+ java-pkg_doso $(usex amd64 '*64.so' '*32.so')
+
+ local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+ java-pkg_dolauncher ikvm --jar iKVM.jar -pre "${pre}"
+ java-pkg_dolauncher ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
+ java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
+ java-pkg_dolauncher jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+ java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
+
+ exeinto ${DIR}/jre/bin
+ newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
+
+ insinto ${DIR}/lib/BMCSecurity
+ doins BMCSecurity/*.{crt,key,pem,txt}
+
+ insinto ${DIR}/lib/BMCSecurity/linux
+ doins BMCSecurity/linux/stunnel.conf
+
+ dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+ dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+ doicon ipmi{view,trap}.ico
+ make_desktop_entry ipmiview IPMIView ipmiview.ico
+ make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
+
+ local DOCS=( *.pdf *.txt )
+ einstalldocs
+}
diff --git a/net-misc/ipmiview/metadata.xml b/net-misc/ipmiview/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/net-misc/ipmiview/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 535c775a62e5..42bf30c63a3b 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,11 +1,15 @@
AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
+AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d
AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54
AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443
AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338
AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada
DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99
+DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476
DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9
+DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
+EBUILD iputils-20180629.ebuild 3930 BLAKE2B 61bb13126203cb4a07d3431c410dc1a1cd522ba1ae604b64ffaa4df532e615337ea24faaf49ca9116069b3539d9508e44906780e0bcc5c00be5dc9090de681ab SHA512 725501c0bfb6c52ede0222130da9c5302a921c9fd5d2d1126e630f3ce3071372b077987a54877695c0c8ff3244066a9b8d34a79f1743c8acc978872c211ed71e
EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83
MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/files/iputils-20180629-musl.patch b/net-misc/iputils/files/iputils-20180629-musl.patch
new file mode 100644
index 000000000000..48742d966021
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20180629-musl.patch
@@ -0,0 +1,87 @@
+commit 5007d7067918fb3d950d34c01d059e5222db679a
+Author: Aric Belsito <lluixhi@gmail.com>
+AuthorDate: Mon Dec 4 00:10:29 2017 +0100
+Commit: Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Wed Jul 11 01:33:28 2018 +0200
+
+ Fix build on MUSL
+
+ Add missing AI_IDN and NI_IDN declarations.
+
+ Bug: https://bugs.gentoo.org/503914
+ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+
+diff --git a/arping.c b/arping.c
+index c2f2129..d753345 100644
+--- a/arping.c
++++ b/arping.c
+@@ -44,6 +44,13 @@
+
+ #ifdef USE_IDN
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
+ #endif
+
+ #include "SNAPSHOT.h"
+diff --git a/ping.h b/ping.h
+index 3e09685..1e51c67 100644
+--- a/ping.h
++++ b/ping.h
+@@ -37,6 +37,17 @@
+
+ #ifdef USE_IDN
+ #include <idn2.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
+ #else
+diff --git a/tracepath.c b/tracepath.c
+index 53bda16..9558e49 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -29,6 +29,14 @@
+
+ #ifdef USE_IDN
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags NI_IDN
+ #else
+ #define getnameinfo_flags 0
+diff --git a/traceroute6.c b/traceroute6.c
+index a1022f9..ab34615 100644
+--- a/traceroute6.c
++++ b/traceroute6.c
+@@ -246,6 +246,10 @@
+ #ifdef USE_IDN
+ #include <locale.h>
+
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define ADDRINFO_IDN_FLAGS AI_IDN
+ #define getnameinfo_flags NI_IDN
+ #else
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
new file mode 100644
index 000000000000..fb577b0efbb1
--- /dev/null
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors. This avoids ugly issues while
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+MY_PV="${PV/_pre/}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20180629-musl.patch
+)
+
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+ idn? ( net-dns/libidn2:=[static-libs(+)] )
+ ipv6? (
+ ssl? (
+ gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+ !gcrypt? (
+ nettle? ( dev-libs/nettle[static-libs(+)] )
+ !nettle? (
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ )
+ )
+ )
+ )
+"
+RDEPEND="arping? ( !net-misc/arping )
+ rarpd? ( !net-misc/rarpd )
+ traceroute? ( !net-analyzer/traceroute )
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ virtual/os-headers
+"
+if [[ ${PV} == "99999999" ]] ; then
+ DEPEND+="app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ "
+fi
+
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+src_prepare() {
+ use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+ default
+}
+
+src_configure() {
+ use static && append-ldflags -static
+
+ TARGETS=(
+ ping
+ $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+ )
+ if use ipv6 ; then
+ TARGETS+=(
+ $(usex traceroute 'traceroute6' '')
+ )
+ fi
+
+ myconf=(
+ USE_CRYPTO=no
+ USE_GCRYPT=no
+ USE_NETTLE=no
+ )
+
+ if use ipv6 && use ssl ; then
+ myconf=(
+ USE_CRYPTO=yes
+ USE_GCRYPT=$(usex gcrypt)
+ USE_NETTLE=$(usex nettle)
+ )
+ fi
+}
+
+src_compile() {
+ tc-export CC
+ emake \
+ USE_CAP=$(usex caps) \
+ USE_IDN=$(usex idn) \
+ IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+ TARGETS="${TARGETS[*]}" \
+ ${myconf[@]}
+
+ if [[ ${PV} == "99999999" ]] ; then
+ emake man
+
+ use doc && emake html
+ fi
+}
+
+src_install() {
+ into /
+ dobin ping
+ dosym ping /bin/ping4
+ if use ipv6 ; then
+ dosym ping /bin/ping6
+ dosym ping.8 /usr/share/man/man8/ping6.8
+ fi
+ doman doc/ping.8
+
+ if use arping ; then
+ dobin arping
+ doman doc/arping.8
+ fi
+
+ into /usr
+
+ if use tracepath ; then
+ dosbin tracepath
+ doman doc/tracepath.8
+ dosym tracepath /usr/sbin/tracepath4
+ fi
+
+ local u
+ for u in clockdiff rarpd rdisc tftpd ; do
+ if use ${u} ; then
+ case ${u} in
+ clockdiff) dobin ${u};;
+ *) dosbin ${u};;
+ esac
+ doman doc/${u}.8
+ fi
+ done
+
+ if use tracepath && use ipv6 ; then
+ dosym tracepath /usr/sbin/tracepath6
+ dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+ fi
+
+ if use traceroute && use ipv6 ; then
+ dosbin traceroute6
+ doman doc/traceroute6.8
+ fi
+
+ if use rarpd ; then
+ newinitd "${FILESDIR}"/rarpd.init.d rarpd
+ newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+ fi
+
+ dodoc INSTALL.md
+
+ use doc && dodoc doc/*.html
+}
+
+pkg_postinst() {
+ fcaps cap_net_raw \
+ bin/ping \
+ $(usex arping 'bin/arping' '') \
+ $(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 2a38233e1bca..5df903d00395 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
DIST kea-1.3.0.tar.gz 5996560 BLAKE2B 2037aed1d72c8db58f6be88caa695956e482776571879f439d39dad909c1f79e4fa4353fef1eacf1135e763109f777a8a30500892a9ee1d8d261d3fd41f6257c SHA512 4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b
-DIST kea-1.4.0.tar.gz 6552970 BLAKE2B bb12a19b156f58f5146904214dc2b0812a56827e7e72d6336db07e64b49bcc198ccc26245088dfccb268b058db574fc43e036341eadc3b1677a03816f6385990 SHA512 ce4e2bcdc6f06472c4dccfc9cc26b06ff10ce1ce947b2bdc8753bbb15ff77831f7317625bdd81d24c945cf0d4c33cf9eef0ae0be21149532b0b9b9bc8892dd14
+DIST kea-1.4.0-P1.tar.gz 6645111 BLAKE2B 290b7bcf8b32fcf2762240f2173cb45c035187c7dfd1affd0fd8a947721745ea9d8846be365ee3f9331d578b7bc248ee53a1e37666585a62c90d7dc541c7aaa5 SHA512 beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634
EBUILD kea-1.3.0.ebuild 1325 BLAKE2B 1ffdea5221ba73471253b50a1fcf1e6c974588f45e5df67ea04c11bb2e2207e9182e9277aabe1f547a4596c042b36782aad53af4c7b2c4d3337f9efbfdd5cad2 SHA512 b846b3b7c202bd05b4be60ea4d89142052f46ff1ef10bea4b04b8e70cf4160d34f6ca6a6d637b821e8803ba5c7fc393e2fd1b50e8d670e8deeea45526fc668b2
-EBUILD kea-1.4.0.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
-EBUILD kea-9999.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
+EBUILD kea-1.4.0_p1.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
+EBUILD kea-9999.ebuild 1485 BLAKE2B 44db9f6652a27c5a8f7b3a5dd45467db3b2f27ede3a0ffdfa590e4f12bb24c74aa5f2a7031c6dbb2b9cd120e4b6c91cfd720288c82b25416adfe9e76de624792 SHA512 b5c2cb3e99185a12187a0d9e9341322f48a15f165d55603c9981b7c0ce5abeb669c1bbc636fb3a6ab9267fa4fa2e5446119cbe4fd742de1559612ac06015352e
MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.4.0.ebuild b/net-misc/kea/kea-1.4.0_p1.ebuild
index b3312db88dd3..b3312db88dd3 100644
--- a/net-misc/kea/kea-1.4.0.ebuild
+++ b/net-misc/kea/kea-1.4.0_p1.ebuild
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index b3312db88dd3..3968b59aff2f 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
- [[ ${PV} = 9999* ]] && eautoreconf
+ [[ ${PV} = *9999 ]] && eautoreconf
# Brand the version with Gentoo
sed -i \
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 53d7bd3f7fa7..a75aacd5e282 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -12,6 +12,7 @@ DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214
DIST memcached-1.5.6.tar.gz 452038 BLAKE2B 357197c06a3211a7f2fcd90a3895f0ed3a56bc4e5b685e2dbe605cd9bbab676759b9707c9cedaeec9dbc59dddca92a7e6152cf5f4324ec66edbf7425bd7a7209 SHA512 b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4
DIST memcached-1.5.7.tar.gz 458062 BLAKE2B 5ff0b2a0f46472dde5037268ff97e88afa15f9f9406e93a8cb43827e2bf918a935e1a29456e756cca1e5adcbf6634b6f1e9a7b007e9f446c1400ff64c1480a1d SHA512 b20a6b0c79007904146c83c119c17e6af47b8c4d9993c316fe2557fade66a1bf14839fe8fdc371a52a7ab558433048a6d9386962647221743ed0908b277003fc
DIST memcached-1.5.8.tar.gz 459715 BLAKE2B b151a0c204c392f54551361ac6d12f61b511eaac3837406fc29a6dd64fd7522efb04f33a06f9f316d5e64ef33cf1940d4a90818bbe7401ac27a636cacaeff34b SHA512 6f0e3ce9cae3e424c41223597353b9520e7e7f97fb4719a5d520dfd34e1d917d4ee0e42bced0a5799042227b80bc4ed2778715a71b9941239db13cb367bdb088
+DIST memcached-1.5.9.tar.gz 462605 BLAKE2B e648cd968f64107be11ebb101efd1d61bfb7db677b3cb7ed1325ca1fd810949cb3067ebee07df974f89beff48a38133f4409fcb8cd176b195a5287ea91be3d53 SHA512 06f7f09a0ec1ec02353296f79776ce9229c648f4ca7c6914f82b3e50455c3b5c8d535c62d8a823f5a50375acddb9cb77470bec430c2acb37f107fb660fe29e54
EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568
EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
@@ -19,4 +20,5 @@ EBUILD memcached-1.5.5.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5
EBUILD memcached-1.5.6.ebuild 2934 BLAKE2B b299969c7503c6d6ffddfb0ff194e746b5da395531aa3f81eb075a80fddce43a1bc4863ac66eea4e5b767500c41b671025cdcd0cc8b28c1c53f8c42f474a9924 SHA512 d81a2ce839cca833369715dca2a0eb92693cfa6be4338052abdfaafa5e814970e7db7f86da7063a390209b651fcd244b0a00df725b35d203a44f16474ee30e67
EBUILD memcached-1.5.7.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
EBUILD memcached-1.5.8.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
+EBUILD memcached-1.5.9.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.9.ebuild b/net-misc/memcached/memcached-1.5.9.ebuild
new file mode 100644
index 000000000000..7b92758285f1
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+ https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+ dev-lang/perl
+ sasl? ( dev-libs/cyrus-sasl )
+ seccomp? ( sys-libs/libseccomp )
+ selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+ test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+ epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+ epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+ epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+ sed -i -e 's,-Werror,,g' configure.ac || die
+ sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+ eautoreconf
+ use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+ # Tweak upstream systemd unit to use Gentoo variables/envfile.
+ # As noted by bug #587440
+ sed -i -e '/^ExecStart/{
+ s,{USER},{MEMCACHED_RUNAS},g;
+ s,{CACHESIZE},{MEMUSAGE},g;
+ s,OPTIONS,MISC_OPTS,g;
+ };
+ /Environment=/{s,OPTIONS,MISC_OPTS,g;};
+ /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+ ' \
+ "${S}"/scripts/memcached.service
+ default
+}
+
+src_configure() {
+ econf \
+ --disable-docs \
+ $(use_enable sasl)
+ # The xml2rfc tool to build the additional docs requires TCL :-(
+ # `use_enable doc docs`
+}
+
+src_compile() {
+ # There is a heavy degree of per-object compile flags
+ # Users do NOT know better than upstream. Trying to compile the testapp and
+ # the -debug version with -DNDEBUG _WILL_ fail.
+ append-flags -UNDEBUG -pthread
+ emake testapp memcached-debug CFLAGS="${CFLAGS}"
+ filter-flags -UNDEBUG
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dobin scripts/memcached-tool
+ use debug && dobin memcached-debug
+
+ dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+ newconfd "${FILESDIR}/memcached.confd" memcached
+ newinitd "${FILESDIR}/memcached.init2" memcached
+ systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+ enewuser memcached -1 -1 /dev/null daemon
+
+ elog "With this version of Memcached Gentoo now supports multiple instances."
+ elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+ elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+ elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+ emake -j1 test
+}
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index a6937693d40e..06503487671f 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -8,6 +8,7 @@ DIST netifrc-0.4.0.tar.bz2 75517 BLAKE2B 2ae5169b040268d299ed6a043c169b132378ccb
DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d19d16ee4a3ebf736fce0e91c2a7a44bf2400b0854bbfc2cc0f3f0bc84ef917760326c2a73a59a60314c5a8f7d8 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0
DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
+DIST netifrc-0.6.1.tar.gz 79791 BLAKE2B e38236d189ce0e40eaa5ba7b94e2e74e444bbd185fbacf515c65ca1f0ff441525cdc44696e12ff33e4ae1f80f2766a91866cfef8f9b737d34e1c59290248f49b SHA512 798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb
EBUILD netifrc-0.2.2.ebuild 1752 BLAKE2B 552f4757411db13c143970b17cf8b116adcf23833d3251bc676ebaba425c5ee31a8735408d585a21b9944d26a40b1c1c51d67a1ff1df9e4bbf6ef3d44667708e SHA512 9a17d9736d823d17ffa5875924c93d99b3f194dbbce611daf41117fad1d21e199f8e3ce75d66fb8152431bb0403e66a70766ffb8742c13cc185a8b80f8b275d2
EBUILD netifrc-0.2.3.ebuild 1765 BLAKE2B 5b932b06a08cb7a6502d3aff31fddf185bef10959a08b4777eb07af3ab6c6e2b232ad48ad40f91d26952261b211b079fe412765c6a918b783d7a5cf6c65ed01b SHA512 9bc89bd39de12a76cfc72697704485c71da876848d004f03e6524af4253e27008c421be2874814eb4537fa452fc728ff5cfb54826c775dcf4c1e33e9985db6a9
EBUILD netifrc-0.2.4.ebuild 1775 BLAKE2B fd939f3a77fb3bbbf1b37d8e72bc0be2d0ad3033a5aee84fb972da8e54746a5d0c6ce088104c5e3c56045be5dd3a17195ba71ac755e1bf8dded4bbdc9551ddfc SHA512 df6ef2110e50c100862dfdeb85f9f2b0b0eea40b51312ebad4a2571b8f5cf0d7fdac412b654ed0eb474152e510bb15652373d06112e46ccc2a5f4e2fe70b095e
@@ -18,5 +19,6 @@ EBUILD netifrc-0.4.0.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc
EBUILD netifrc-0.5.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
EBUILD netifrc-0.5.1.ebuild 2120 BLAKE2B 2b713fe73b37fc4910742562f71fdb52485125cd9adbf5e69c669ee1a05c8ec38266b1354e208adc50071c349724738209655ea653532916d2509cec0e7367c9 SHA512 a905529a725ab32d1dbbf34d1710e65a191d77c9c29ad84cd5dcf77f57651ea9be27bbb84bc311d8a27b64c6f1e557c0b29521ff0e20a7b4ab2b36e8cdf1574f
EBUILD netifrc-0.6.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
+EBUILD netifrc-0.6.1.ebuild 2129 BLAKE2B 68a9324b1efa5c16d53281858e6c7228702cb4f0e344e4e6fe53e40efee3679d53a1af4b435f05c623c211b129ed66bf036c2d795d7d25dab5525c4ca84a3c34 SHA512 ee254f37080a9556b823cc288afc0a1cbeeef6e0af768917a5d4035e3debfc75d41719ef683ab298538b30d211824f1aa75f1e87aa2cedf48848bfb67b7661fa
EBUILD netifrc-9999.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.6.1.ebuild
new file mode 100644
index 000000000000..a331f4480a9a
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+ #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+ inherit git-r3
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+ !<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+ >=sys-apps/openrc-0.15
+ !<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ local ver="git-${EGIT_VERSION:0:6}"
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+ einfo "Producing ChangeLog from Git history"
+ GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+ fi
+
+ # Allow user patches to be applied without modifying the ebuild
+ epatch_user
+}
+
+src_compile() {
+ MAKE_ARGS="${MAKE_ARGS}
+ UDEVDIR=${EPREFIX}$(get_udevdir)
+ LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+ use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+ emake ${MAKE_ARGS} all
+}
+
+src_install() {
+ emake ${MAKE_ARGS} DESTDIR="${D}" install
+ dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+ # Install the service file
+ LIBEXECDIR=${EPREFIX}/lib/${PN}
+ UNIT_DIR="$(systemd_get_unitdir)"
+ sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+ systemd_newunit "${T}/net_at.service" 'net@.service'
+ dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+ if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+ elog "The network configuration scripts will use dhcp by"
+ elog "default to set up your interfaces."
+ elog "If you need to set up something more complete, see"
+ elog "${EROOT}/usr/share/doc/${P}/README"
+ fi
+}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 9ea72322e1b6..12b548e8a6dc 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-openvpn-1.8.2.tar.xz 540912 BLAKE2B e972a1767fa8219aff2ecfb18c69d309f0147db16ff08db2fe50f9154defea2e805142ac38e77854902f430390f0909c692110a8bcb2e18cec27ce9661a1510c SHA512 c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927
DIST NetworkManager-openvpn-1.8.4.tar.xz 547984 BLAKE2B bb637c824414b792c6272a1791a3e99ebb3c0fc7145b01b4fa6c9b0bc2d8a0879141b7e2d1f3157b8b05366e3d0410370d3523dbe0d2daf069e4f73cdd9cf84c SHA512 dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a
-EBUILD networkmanager-openvpn-1.8.2.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
-EBUILD networkmanager-openvpn-1.8.4.ebuild 1240 BLAKE2B c8911dc959564d912fafc6a6859bf3617050ad2ad1f4fb7fc0580c6656e9aaf0e78d93c6d707ac23844869da2ecf439279942043ffc1a9896fb4fecfdc032df3 SHA512 fc247669692c34a490028192cddeaffaed3837111d3422fbd4bc4e7383159702573aa45fbffbcdc960badd88256370ffec061a6a52cee0189c19ff4fbb4baf67
+EBUILD networkmanager-openvpn-1.8.4.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild
deleted file mode 100644
index 9f64c0d65ded..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=net-misc/networkmanager-1.7.0:=
- >=net-vpn/openvpn-2.1
- gtk? (
- >=app-crypt/libsecret-0.18
- >=gnome-extra/nm-applet-1.7.0
- >=x11-libs/gtk+-3.4:3
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-pkg_setup() {
- enewgroup nm-openvpn
- enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- # FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
- sed '/test_non_utf8_import (plugin, test_dir)/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --localstatedir=/var needed per bug #536248
- gnome2_src_configure \
- --localstatedir=/var \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- $(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
index cd96e2fddf41..9f64c0d65ded 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="gtk test"
RDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 220cb933af96..3c600756ca48 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,7 +6,7 @@ DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f08
DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-EBUILD networkmanager-1.10.10.ebuild 10771 BLAKE2B 7dd7758c97974b2775ef2657055e16a58c31eb5f848cf8501ad59d6b71f5fdb6a780ceddd18f7d4ec8367d062073d853170d737c7920ce3605e3cc388a7a7232 SHA512 017a56c1a9b38791088c243a9be22840fc7fd0f516e14e482529fa2b58ea1c09976c30c6218b1363f0c6ae3f1423d8c65fe5cd3132381e0d8748491fe6b79d5f
+EBUILD networkmanager-1.10.10.ebuild 10770 BLAKE2B 67dbefb85f4edcd0134f51b4e9393d13db0f356bc782d72460f7a2d191ce3adc6c83f0a2726fe25862dcf15297bffd26f80ca4857103fb4867b71d170ba62e3f SHA512 77c6fac337708f8295d50da5cd4783694c43389d1142f2dc7dd917bcac288c55fb2090ac30f310723cc299ed0192d6e212ddf213b761231f54eb1cdf56befd47
EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
EBUILD networkmanager-1.8.4.ebuild 10684 BLAKE2B 5f5459e190d2c682f9b0cd84495be993ddc22cc6df6bb5961928d647676e9c99b27b0ab8b0ce576228d86f7b623e8289ba7d9b810320367b5d24849be2a833b2 SHA512 95b658dd24645f839870548fd14c1ae03a6f774282adc30cca5ef57c9dcef013438b8894e258b201af37e777f4b1adcf2ea564a5a0475347c8078e3b1e468dd3
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index c5534157fd1f..4c6417e0f0a1 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
?? ( consolekit elogind systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 38e114ad357b..6cfb85ff05c4 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,6 +1,7 @@
AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6
AUX stunnel-5.39-compat-libressl.patch 5329 BLAKE2B b88f615e88940dc091c264b34ef3c71701e120cc907bd438cb6966b1b720fd9dd8b8bcab5235519b0eefaa1576e37cc8b4c9887cf4d6a2330ba5461347f6ded7 SHA512 a6390e1452f0cf7f2867b28ebc36e0b4f9f6ab8985b03f182625d1970a9bbc0228addaa966feb3c0df8925191b73fdaf48e1e65aef68d3d62962fd28760b3578
AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3
+AUX stunnel-5.48-compat-libressl.patch 4845 BLAKE2B 0c6bc9059902be43970a78269632dcdbb82a9e07a6cfa8dca6b960f79832953a7d7173097c74a24ccad8c59deca1353887519cfde107b22d10422204bb83e9cf SHA512 b03277b8487fc9cd763c11e0b32c3755dd4aea76ecc21238204d4f27f03b5cfc72ee7ab148aa813a6eb21bb588d8dadc2b0610049175fa1278e799681a946098
AUX stunnel-compat-libressl.patch 1871 BLAKE2B e7545ae95b173b868fff7159a681497655f8c80c994add9901a752787d2c51728c994ef940f540abc7538585b51ca4de41ddd20e0f929330188ffd2e0d2ded78 SHA512 590f6be1962ef3ca1c8f1c64c02b1e63b7211a2ba5cb5fd4eb09127e45ee5251a7ec701aae3eda25e34caa1977378ad5f7b75e826aee7d9d5ff8b9acbd298f36
AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c
AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
@@ -11,10 +12,12 @@ DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c
DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
+DIST stunnel-5.48.tar.gz 708356 BLAKE2B 6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba SHA512 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
EBUILD stunnel-5.43.ebuild 2924 BLAKE2B 689f16562224aa5bf7892c048e5037094903621faea7b90820dd77a9d7c0f283200ae2c7dc64e1e501758712344efa7394ecf0f95db707d1d46baa93251658f6 SHA512 e6038fccced6a034a6fe153683deb2ea71dc9f853554a9316f1752c1d124f63467ad4748ec907cde61bb290a9f8ad830023f8d27e385e59f1293648655635644
EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
EBUILD stunnel-5.46.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
+EBUILD stunnel-5.48.ebuild 2930 BLAKE2B 53abfb43b47f4eca2785109e8dcd38ba7d2e112401f49c4481bbc03e2678debd6eb660592f2cecd21f3931317189f5193144fa79eb3c5cb353d4fcee6c9bf525 SHA512 9ba4ca10038b20457a596a416b52a2249a206c78dee0273cde8d0f5dbd8063504119a637fd8845109321608f444906b67360101f09469047e1dc63eeb4eec5f4
MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch b/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch
new file mode 100644
index 000000000000..3161b1581b1a
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch
@@ -0,0 +1,114 @@
+diff -Naur stunnel-5.48.orig/src/common.h stunnel-5.48/src/common.h
+--- stunnel-5.48.orig/src/common.h 2018-06-08 13:30:15.000000000 -0400
++++ stunnel-5.48/src/common.h 2018-07-08 22:23:00.527131463 -0400
+@@ -446,7 +446,7 @@
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+@@ -473,7 +473,7 @@
+ #include <openssl/des.h>
+ #ifndef OPENSSL_NO_DH
+ #include <openssl/dh.h>
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
+ #endif /* OpenSSL older than 1.1.0 */
+ #endif /* !defined(OPENSSL_NO_DH) */
+diff -Naur stunnel-5.48.orig/src/ctx.c stunnel-5.48/src/ctx.c
+--- stunnel-5.48.orig/src/ctx.c 2018-07-02 17:30:10.000000000 -0400
++++ stunnel-5.48/src/ctx.c 2018-07-08 22:23:00.527131463 -0400
+@@ -311,7 +311,7 @@
+
+ #ifndef OPENSSL_NO_DH
+
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
+ return ctx->cipher_list;
+ }
+@@ -414,7 +414,7 @@
+ /**************************************** initialize OpenSSL CONF */
+
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
+diff -Naur stunnel-5.48.orig/src/options.c stunnel-5.48/src/options.c
+--- stunnel-5.48.orig/src/options.c 2018-07-02 17:30:26.000000000 -0400
++++ stunnel-5.48/src/options.c 2018-07-08 22:23:00.527131463 -0400
+@@ -4215,7 +4215,7 @@
+ }
+ #endif
+ /* engines can add new algorithms */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|
+ OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+ #else
+diff -Naur stunnel-5.48.orig/src/ssl.c stunnel-5.48/src/ssl.c
+--- stunnel-5.48.orig/src/ssl.c 2018-04-06 10:25:10.000000000 -0400
++++ stunnel-5.48/src/ssl.c 2018-07-08 22:23:00.527131463 -0400
+@@ -52,7 +52,7 @@
+ int index_session_authenticated, index_session_connect_address;
+
+ int ssl_init(void) { /* init TLS before parsing configuration file */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
+ OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL);
+ #else
+@@ -88,7 +88,7 @@
+ }
+
+ #ifndef OPENSSL_NO_DH
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0
+ * to be linked against the older versions */
+ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+diff -Naur stunnel-5.48.orig/src/verify.c stunnel-5.48/src/verify.c
+--- stunnel-5.48.orig/src/verify.c 2018-07-02 17:30:10.000000000 -0400
++++ stunnel-5.48/src/verify.c 2018-07-08 22:23:00.531131344 -0400
+@@ -51,7 +51,7 @@
+ NOEXPORT int verify_callback(int, X509_STORE_CTX *);
+ NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
+ NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+ NOEXPORT int cert_check_local(X509_STORE_CTX *);
+@@ -285,7 +285,7 @@
+ }
+
+ if(depth==0) { /* additional peer certificate checks */
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if(!cert_check_subject(c, callback_ctx))
+ return 0; /* reject */
+ #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
+@@ -296,7 +296,7 @@
+ return 1; /* accept */
+ }
+
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
+ X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+ NAME_LIST *ptr;
+@@ -346,7 +346,7 @@
+ cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+ subject=X509_get_subject_name(cert);
+
+-#if OPENSSL_VERSION_NUMBER<0x10100006L
++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
+ /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.48.ebuild b/net-misc/stunnel/stunnel-5.48.ebuild
new file mode 100644
index 000000000000..d7898dbcca06
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.48.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+ http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+ stunnel3? ( dev-lang/perl )
+ selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup stunnel
+ enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+ # Hack away generation of certificate
+ sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+ tools/Makefile.in || die "sed failed"
+
+ # libressl compat
+ eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
+
+ echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+ eapply_user
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ $(use_enable ipv6) \
+ $(use_enable tcpd libwrap) \
+ --with-ssl="${EPREFIX}"/usr \
+ --disable-fips
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -rf "${ED}"/usr/share/doc/${PN}
+ rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+ "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+ use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+ # The binary was moved to /usr/bin with 4.21,
+ # symlink for backwards compatibility
+ dosym ../bin/stunnel /usr/sbin/stunnel
+
+ dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+ docinto html
+ dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+ tools/importCA.html
+
+ insinto /etc/stunnel
+ doins "${FILESDIR}"/stunnel.conf
+ newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+ doenvd "${T}"/20stunnel
+
+ systemd_dounit "${S}/tools/stunnel.service"
+ systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+ if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+ install_cert /etc/stunnel/stunnel
+ chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ fi
+
+ einfo "If you want to run multiple instances of stunnel, create a new config"
+ einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+ einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 795d677833f6..e843c370d728 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.06.25.tar.gz 2990292 BLAKE2B 5ae41370c3f8ff19bf83368a1645ad86b0af4f1ed7de1dfae6c4088956d753dde643fff9fc707d95db0faf02aeb31a41c8a357b3f279b9810ae892e0957e5a20 SHA512 bff54dc724525b61afa1d9f988ae9b2399146b3eb38c74988ad6118f443fd1286bdaa140f61a56d9be90f14ef49a925b08c23c092bcbf5f378481081ca400741
DIST youtube-dl-2018.07.04.tar.gz 2993980 BLAKE2B 79bef6497c6dd5444608e8d75cffac72a0c1779d234a5537af16cb9e876a086bf7b57981e6e85f5f9504be794e0d6d1c46b3f98b1cae509d864799ce6ce7b03d SHA512 7a67948307d8909c0415635c9c560bdf809b085f1675aa2c4aafa8007b8f420beb6347a56e3fbe61507aca1b42ac932ce75ae46aa2cd62e129fa604cd6ceb6e0
+DIST youtube-dl-2018.07.10.tar.gz 3001810 BLAKE2B 4ffd9f678897be476983322921640007962cc307e1b0e095a012fd2840a26864bb1125b4f937ca43ba52134e32b80976b6ad185eb5e0f7523852915f61c1b293 SHA512 4f83bc02002d31bd04d9319d798c1b190b5a357864daca9661bcdeef3f71b258fb9b4b76ae1c19a0901ba5b0e56b834f0124353a4e4e3c6d0554a8f4f967c246
EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.06.25.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
EBUILD youtube-dl-2018.07.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.07.10.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.06.25.ebuild b/net-misc/youtube-dl/youtube-dl-2018.07.10.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.06.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.07.10.ebuild
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 6c5302f68466..115943e11fdd 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
Binary files differ
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index d0280249dfb3..7df5a1429c05 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -2,6 +2,6 @@ AUX qbittorrent-4.0.4-werror.patch 1073 BLAKE2B c7bab1a78362f41a8a2a26fd853c8120
DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969
DIST qbittorrent-4.1.1.tar.gz 7464014 BLAKE2B be005fbecd1d2c9ee977fbdc6782bbad9708e3c2c6d46deb5831ae4e7457954cb95ae87850b759e81e87e345ca682acfcd23684b7704c437c4261ebb5bb46f5d SHA512 700c084b97556ba85276b42e46f77d5f7896052ce02ba052cd4b3e6967c8a848c27bcf63a289bf8276b38841bb9a80b9ec16335c3feb30dce0851170f54d101e
EBUILD qbittorrent-4.0.4.ebuild 1362 BLAKE2B 075ce19a51f7b1e2c88ae7d02147cb9eecc6dc07dee37f67293b96ff888c72bc7a3ccd38cf0a15264e5fbc9c6fb73f7c66423d4312d4d68e7ca46351b0b20e89 SHA512 b3695c5cd4e4a15211f51237e835c6c1a75b44a61a4b1aa5811f5854d3182b00869061de266bd5ad149fa38d66919150c6919770dd3b65c66d39215be9e4e724
-EBUILD qbittorrent-4.1.1.ebuild 1427 BLAKE2B 0e200a6f8b2a20ea77fa14b760cad641bb351c0c4830bd5e2df9041ad0463955796e14a3e63cd50523e5d6cf6f52ea50cfcc3b635757f645c2bc6165b588ad90 SHA512 114c2985ab3e9e06219d4aa05c7eb47831ce586831d53c31da8da297785ef82af31c16e912d13c383f5fcb11e9eb102ed7808cabbf12a002a039f1090fd19453
+EBUILD qbittorrent-4.1.1.ebuild 1425 BLAKE2B 9ae1167d4559172a81256aedc125ea4020d07ef944633eb8d570ac6cf2e7dcd91a4b4094b70b2228bfa7010077c4c7b28401c412fcdd58cf8945370b71f70aa2 SHA512 d6f99855e4667dacbc705dece1cf557af4fb7961f92bc5f2b2a7849d30b2979daffa5b63c19d4951e8dffbcc54734c44a028dbe525639a9aaed0b4387a232f3a
EBUILD qbittorrent-9999.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d
MISC metadata.xml 563 BLAKE2B 6d89c3d5aa80da7890adedb109ba687303b2e020eb1e31d5d3a037213ceea658f58a01cef23abdb138e5e3fd5ec5411451ab9f1991d028d8ddd02e71b41b607a SHA512 9efe0774285533c85696e167c50b347a2d85da43b09763c6df0cf4907b9c5aed3e2fb96805109097992588f94696d941ba222f6898099da32c4c28579da33f7d
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
index fac9e4a29be2..8634804e8d26 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
else
SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~ppc64 x86"
S="${WORKDIR}/qBittorrent-release-${PV}"
fi
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index bb83dbf5bdd1..1cae65ec106e 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 2b4044f084de..76bfe9d2e26c 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,11 +1,11 @@
AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
-DIST cups-filters-1.20.2.tar.xz 1468792 BLAKE2B 75153e659aebf3b987bddac60c850a8b21038263bdb2a77772fa2d41295b36b6c35d9244e09efe19e29e19e7a6f1af5adb7be26197890d8a1e642e39b013ee28 SHA512 94cc2a452b8dc1ed5f03b98e0530d7489dd5a369413b0ab0e7b054fcb198e8fee283507de2ef836df8ce9fb7f217794737fa4851baba72e5b79e38ad02ee61ea
DIST cups-filters-1.20.3.tar.xz 1469468 BLAKE2B 4b76c751264cc87aaa4fed237ad577433ca2c5bb9f23d572466f0d81f3cd7ee4c78eb783269923603010f4edbf246353017e57ccdc75207855de9ae5f0fc5d4b SHA512 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31
+DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
-EBUILD cups-filters-1.20.2.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
EBUILD cups-filters-1.20.3.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
-EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
+EBUILD cups-filters-1.20.4.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
+EBUILD cups-filters-9999.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.20.2.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index be4ec7dfe0fa..be4ec7dfe0fa 100644
--- a/net-print/cups-filters/cups-filters-1.20.2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index bfed0b638e91..be4ec7dfe0fa 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f2e182b6252f..4d2e9c10fa3a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -5,5 +5,5 @@ DIST hplip-3.18.5.tar.gz 22437406 BLAKE2B d32c38209b8a60c6ca7fe89512409d4d32bf09
DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
EBUILD hplip-3.17.10.ebuild 7417 BLAKE2B 6a79d111d6b6c19a2b18b3d0995ba56828ed64f47fc9ce2098916303dd4c239f51dec295852a9a850dd93eb5e80f7421f35165585caecebd710e1175ff3deeb9 SHA512 855943629bf3dd0fdd85013e71b00fe40ea7414403cc3b761f93f63f7c4a7f2deab8f3d464c724ea1f585317ded9d855b99411d54872d96005241981aa6fc54a
EBUILD hplip-3.18.5.ebuild 7822 BLAKE2B d2d2f630089de97c290d9573657f581daa6867b26a012a1952c438c6dc121bf69a97fab22321ccee25d9734217870a2a108f4c970bba1581159bfb37e4a48766 SHA512 0f0c743f6c749b9f1b6de5fe284c95cf1a6e97ef9533ae62df615224ce562994e09e8c3a41b04771217b77a16c84a6c0af67725016a07b07757b9b48b7d6b319
-EBUILD hplip-3.18.6.ebuild 7820 BLAKE2B fbf0ba700b1ea6e054d988354d8792ff2ca37d53f789db0d1212b257359f67b2fc18a1676312dd42062126efbc1d5bb2a6da5655603583d8ce6dbe10a75e23cf SHA512 82dc5dfa16371f0d9d884a33d29c4f08d219668c7e0034501f6b94973ae2bcf29bc179cd2bd6c7b713c71eff880c1acfbde45c0a777c8e87087fbc65dd81fbff
+EBUILD hplip-3.18.6.ebuild 7819 BLAKE2B 396e6a2796b80ba1dca1f8d80a4fd1c88a6e7d55c00a78f4c581aa92af71152e991d2f6636b08fdd2af9cee300b22d3b22e7613d75effa36d7e85aae188bd0c3 SHA512 6bed14047d5807fbadf923c473991bb91c00cb576a61f26fc192f6f76ef672dc923acafbb7ab854b23b3b8d458317e87c720095c40e40cdbe25af7ec19b6368a
MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
diff --git a/net-print/hplip/hplip-3.18.6.ebuild b/net-print/hplip/hplip-3.18.6.ebuild
index 0c728bd59bdd..066d531a7ca7 100644
--- a/net-print/hplip/hplip-3.18.6.ebuild
+++ b/net-print/hplip/hplip-3.18.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index 25f5225a532b..bae405396403 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,4 +1,3 @@
-AUX 3proxy-0.5.3k-gentoo.patch 956 BLAKE2B 3df8e8bde875df4f892a1a6ef7baef63ad61f1d249bc7bb1e596ccacf46614d4d4a288ffd6538a1df8040fa30f46d492e3e78ad764a70b60e48361d0e66c0b73 SHA512 857d72ad85d5dc5158eda402f0ad81ccd9410e1849c5c1f1a2fd86946ae65073ce5ac09f19e0d9cae940d285d161252045cb0d2b936dcb6121fae161a77df113
AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a
DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815
EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4
diff --git a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
deleted file mode 100644
index a88a28780432..000000000000
--- a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.unix.orig 2005-04-30 18:29:00.000000000 +0000
-+++ Makefile.unix 2008-10-12 17:18:21.000000000 +0000
-@@ -9,10 +9,10 @@
- CC = gcc
-
- # you may need -L/usr/pkg/lib for older NetBSD versions
--CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -Wall -g -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o
- LN = gcc
--LDFLAGS = -Wall -O2 -pthread
-+LDFLAGS += -Wall -pthread
- # -lpthreads may be reuqired on some platforms instead of -pthreads
- LIBS =
- LNOUT = -o
---- src/stringtable.c.orig 2008-01-09 21:14:46.000000000 +0000
-+++ src/stringtable.c 2008-10-12 17:19:19.000000000 +0000
-@@ -23,7 +23,7 @@
- /* 19 */ NULL,
- #ifndef TPROXY_CONF
- #ifndef _WIN32
--/* 20 */ (unsigned char *)"/usr/local/etc/3proxy.cfg",
-+/* 20 */ (unsigned char *)"/etc/3proxy.cfg",
- #else
- /* 20 */ (unsigned char *)"3proxy.cfg",
- #endif
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ff192006a994..d1a4026492bd 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
Binary files differ
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0695551bcf22..8a0d3356dce1 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 30ec505ac6a3..69d94d49ff9a 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,12 +6,12 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
-DIST tor-0.3.3.6.tar.gz 6547166 BLAKE2B 6fe88b991cacf14541c264629fb916d049f73c13c70a1e82d6e5683edc42f3f6093df3ff3a3a313ba6373f36f4eb9b6a8fd92e678517cfcb0b0c5a9ec54494e1 SHA512 ab2a6324844c0015c58b65faf61e9b72fe1aca2c90dc3c2970939f962f7d999483e223b980f3088207035d2ad1dc6a5628a253a486e048a072b4c5022b9cb0d3
-DIST tor-0.3.3.7.tar.gz 6564968 BLAKE2B e153d72a29ce4adb558e8062fd4c2ebd37ac557834358661cdda243703505f2d6263282079b92535cccba673af7a9326be5086ee3f91e58f4b26b8ac7316a2c9 SHA512 70c7d089fecde7d5c4ccf4fc0c774aa3da2121f297012065292f9e5efda54206365ef1fa830116ee143b027f5023a5eadcd6fd4629c4d2d930c12fa9fa7abf9d
+DIST tor-0.3.3.8.tar.gz 6564878 BLAKE2B 1bb9adc4aaa6b207b544a98cb66349cce09a4d731a4e8908403da0d80b4b3ae3d4d5dabb9cd75bbecbac1b4f1233e06b235fb5c87bb2253a27a30a80f59074cf SHA512 b937f7f429690fa92d112d5bc48234c4b96f69614f319f04dab62e5b11b87e5e141d48642afac89e1dfe62a394d56b82ebf7fb1ac10de91923135a434a79718f
+DIST tor-0.3.3.9.tar.gz 6563091 BLAKE2B 9bb2009c309005ad913aa8f3e175ef8500a571de6210ecaa1a17947633e201092dd819e30e95a55918dff54858b8c420039e960113e9096b2b4f43ca596bb3bd SHA512 3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
DIST tor-0.3.4.2-alpha.tar.gz 6634506 BLAKE2B f5fd597c0df5d49230d380b8a989cc1549d7e0249269fe5dad4cbc62dcd4f1bf03320f330591379be97a6ca19625f9c3813fb16728be9e8e0b9b446da6e127a4 SHA512 cec88017f1a36a74234eebfe83cca0d983ac698c5e27c6861d107e3776d89074b4dd654fdea943e325ed0ca81d7a64dfd80bda61f26a73d29ec75b940323a930
EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
-EBUILD tor-0.3.3.6.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
-EBUILD tor-0.3.3.7.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
+EBUILD tor-0.3.3.8.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
+EBUILD tor-0.3.3.9.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
EBUILD tor-0.3.4.2_alpha.ebuild 2261 BLAKE2B df921bc4d42256443956133b20f35fd8f6bb9a5c096b10d0cca4e7b5799e021186386775eface12c880a41b1367859efdb251185f505273126a4ca97bc7ab457 SHA512 8d7a9de9a3ec18951cb416ad75c6bccc7771451b34286243ae8d8ed7675834d0903695fd76e56872c0ffc4ba296b83c4dde0fe408b0a70274f51f521950d2b36
MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.6.ebuild b/net-vpn/tor/tor-0.3.3.6.ebuild
deleted file mode 100644
index 655250741364..000000000000
--- a/net-vpn/tor/tor-0.3.3.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent[ssl]
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
- econf \
- --localstatedir="${EPREFIX}/var" \
- --enable-system-torrc \
- --enable-asciidoc \
- --disable-android \
- --disable-libfuzzer \
- --disable-rust \
- --disable-restart-debugging \
- $(use_enable lzma) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
- $(use_enable test coverage) \
- $(use_enable zstd)
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r8 tor
- systemd_dounit contrib/dist/tor.service
-
- keepdir /var/lib/tor
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.3.7.ebuild b/net-vpn/tor/tor-0.3.3.7.ebuild
deleted file mode 100644
index 655250741364..000000000000
--- a/net-vpn/tor/tor-0.3.3.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent[ssl]
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
- econf \
- --localstatedir="${EPREFIX}/var" \
- --enable-system-torrc \
- --enable-asciidoc \
- --disable-android \
- --disable-libfuzzer \
- --disable-rust \
- --disable-restart-debugging \
- $(use_enable lzma) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
- $(use_enable test coverage) \
- $(use_enable zstd)
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r8 tor
- systemd_dounit contrib/dist/tor.service
-
- keepdir /var/lib/tor
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.3.8.ebuild b/net-vpn/tor/tor-0.3.3.8.ebuild
new file mode 100644
index 000000000000..fd1ee6ae3935
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.3.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+ https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+# We need to keyword app-arch/zstd
+#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+ app-text/asciidoc
+ dev-libs/libevent[ssl]
+ sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ lzma? ( app-arch/xz-utils )
+ scrypt? ( app-crypt/libscrypt )
+ seccomp? ( sys-libs/libseccomp )
+ systemd? ( sys-apps/systemd )
+ zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+ "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+ export ac_cv_lib_cap_cap_init=$(usex caps)
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-system-torrc \
+ --enable-asciidoc \
+ --disable-android \
+ --disable-libfuzzer \
+ --disable-rust \
+ --disable-restart-debugging \
+ $(use_enable lzma) \
+ $(use_enable scrypt libscrypt) \
+ $(use_enable seccomp) \
+ $(use_enable systemd) \
+ $(use_enable tor-hardening gcc-hardening) \
+ $(use_enable tor-hardening linker-hardening) \
+ $(use_enable web tor2web-mode) \
+ $(use_enable test unittests) \
+ $(use_enable test coverage) \
+ $(use_enable zstd)
+}
+
+src_install() {
+ default
+ readme.gentoo_create_doc
+
+ newconfd "${FILESDIR}"/tor.confd tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
+ systemd_dounit contrib/dist/tor.service
+
+ keepdir /var/lib/tor
+
+ fperms 750 /var/lib/tor
+ fowners tor:tor /var/lib/tor
+
+ insinto /etc/tor/
+ newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-vpn/tor/tor-0.3.3.9.ebuild b/net-vpn/tor/tor-0.3.3.9.ebuild
new file mode 100644
index 000000000000..fd1ee6ae3935
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.3.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+ https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+# We need to keyword app-arch/zstd
+#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+ app-text/asciidoc
+ dev-libs/libevent[ssl]
+ sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ lzma? ( app-arch/xz-utils )
+ scrypt? ( app-crypt/libscrypt )
+ seccomp? ( sys-libs/libseccomp )
+ systemd? ( sys-apps/systemd )
+ zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+ "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+ export ac_cv_lib_cap_cap_init=$(usex caps)
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-system-torrc \
+ --enable-asciidoc \
+ --disable-android \
+ --disable-libfuzzer \
+ --disable-rust \
+ --disable-restart-debugging \
+ $(use_enable lzma) \
+ $(use_enable scrypt libscrypt) \
+ $(use_enable seccomp) \
+ $(use_enable systemd) \
+ $(use_enable tor-hardening gcc-hardening) \
+ $(use_enable tor-hardening linker-hardening) \
+ $(use_enable web tor2web-mode) \
+ $(use_enable test unittests) \
+ $(use_enable test coverage) \
+ $(use_enable zstd)
+}
+
+src_install() {
+ default
+ readme.gentoo_create_doc
+
+ newconfd "${FILESDIR}"/tor.confd tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
+ systemd_dounit contrib/dist/tor.service
+
+ keepdir /var/lib/tor
+
+ fperms 750 /var/lib/tor
+ fowners tor:tor /var/lib/tor
+
+ insinto /etc/tor/
+ newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 3831485b110e..3f77884a0e91 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,5 +1,4 @@
-AUX wireguard-openrc.sh 915 BLAKE2B 1185374a61591b0d6917f7c15f2040b9dd0fb76b5fd007f24cd25396a2814bcd323935c5d642ca2120f60fa16e82cf21ecb723741ecfc012f5404714b203e60d SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb
-DIST WireGuard-0.0.20180625.tar.xz 270732 BLAKE2B 8cfee50e02a24902c1742485003f6beefd2a07413b22c6e98e37f3485ea05fa30e209959ed2d46bf222fbc410489fd7db9e42b1cb4513bcb96dd94231ad5b605 SHA512 3bbbc4eeeb8512fe6ec5ce09a95dcf86a93d0dd49edeb70b03dddeafc1d87ca22060d35abe77f5ae52afca6e5cfd7c252fc248f5a1ebfa7e7f9cf55a7eb1cabb
-EBUILD wireguard-0.0.20180625.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
-EBUILD wireguard-9999.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
+DIST WireGuard-0.0.20180708.tar.xz 271816 BLAKE2B f8f8dd0ae90cc23fc0e8b339c97808d1dc81b5f245e08ec85b356391e3a7a84a61aded30295751e0fd63961214424bc1719ab8d9f85e5aff54dbe270fcbf215a SHA512 91e4eb5c863f7070dc139739bbb5f6ce5b7ff9e8bd293a6217e6b9ac8dcacc710c01bac9386df50bd1226f0534c5332f8e1e2c50e9483e167eac6345a616f6f6
+EBUILD wireguard-0.0.20180708-r1.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
+EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/files/wireguard-openrc.sh b/net-vpn/wireguard/files/wireguard-openrc.sh
deleted file mode 100644
index 9c53ef0ffa72..000000000000
--- a/net-vpn/wireguard/files/wireguard-openrc.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2016 Gentoo Foundation
-# All rights reserved. Released under the 2-clause BSD license.
-
-wireguard_depend()
-{
- program /usr/bin/wg
- after interface
- before dhcp
-}
-
-wireguard_pre_start()
-{
- [[ $IFACE == wg* ]] || return 0
- ip link delete dev "$IFACE" type wireguard 2>/dev/null
- ebegin "Creating WireGuard interface $IFACE"
- if ! ip link add dev "$IFACE" type wireguard; then
- eend $?
- return $?
- fi
- eend 0
-
- ebegin "Configuring WireGuard interface $IFACE"
- set -- $(_get_array "wireguard_$IFVAR")
- if [[ -f $1 && $# -eq 1 ]]; then
- /usr/bin/wg setconf "$IFACE" "$1"
- else
- eval /usr/bin/wg set "$IFACE" "$@"
- fi
- if [ $? -eq 0 ]; then
- _up
- eend 0
- return
- fi
- e=$?
- ip link delete dev "$IFACE" type wireguard 2>/dev/null
- eend $e
-}
-
-wireguard_post_stop()
-{
- [[ $IFACE == wg* ]] || return 0
- ebegin "Removing WireGuard interface $IFACE"
- ip link delete dev "$IFACE" type wireguard
- eend $?
-}
diff --git a/net-vpn/wireguard/wireguard-0.0.20180625.ebuild b/net-vpn/wireguard/wireguard-0.0.20180625.ebuild
deleted file mode 100644
index 3a4681c656a9..000000000000
--- a/net-vpn/wireguard/wireguard-0.0.20180625.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
- KEYWORDS=""
-else
- SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
- S="${WORKDIR}/WireGuard-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module +tools module-src"
-
-DEPEND="tools? ( net-libs/libmnl )"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
-
-pkg_setup() {
- if use module; then
- linux-mod_pkg_setup
- kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
- fi
-}
-
-src_compile() {
- BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
- use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
- use module && linux-mod_src_compile
- use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- use module && linux-mod_src_install
- if use tools; then
- dodoc README.md
- dodoc -r contrib/examples
- emake \
- WITH_BASHCOMPLETION=yes \
- WITH_SYSTEMDUNITS=yes \
- WITH_WGQUICK=yes \
- DESTDIR="${D}" \
- BASHCOMPDIR="$(get_bashcompdir)" \
- PREFIX="${EPREFIX}/usr" \
- -C src/tools install
- insinto /$(get_libdir)/netifrc/net
- newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh
- fi
- use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
- if use module-src && ! use module; then
- einfo
- einfo "You have enabled the module-src USE flag without the module USE"
- einfo "flag. This means that sources are installed to"
- einfo "${ROOT}usr/src/wireguard instead of having the"
- einfo "kernel module compiled. You will need to compile the module"
- einfo "yourself. Most likely, you don't want this USE flag, and should"
- einfo "rather use USE=module"
- einfo
- fi
- use module && linux-mod_pkg_postinst
-
- einfo
- einfo "This software is experimental and has not yet been released."
- einfo "As such, it may contain significant issues. Please do not file"
- einfo "bug reports with Gentoo, but rather direct them upstream to:"
- einfo
- einfo " team@wireguard.com security@wireguard.com"
- einfo
-
- if use tools; then
- einfo
- einfo "After installing WireGuard, if you'd like to try sending some packets through"
- einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
- einfo "test example script:"
- einfo
- einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
- einfo
- einfo "This will automatically setup interface wg0, through a very insecure transport"
- einfo "that is only suitable for demonstration purposes. You can then try loading the"
- einfo "hidden website or sending pings:"
- einfo
- einfo " \$ chromium http://192.168.4.1"
- einfo " \$ ping 192.168.4.1"
- einfo
- einfo "If you'd like to redirect your internet traffic, you can run it with the"
- einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
- einfo "purposes. It is for quick testing only."
- einfo
- einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
- einfo
- fi
- if use module; then
- local old new
- if [[ $(uname -r) != "${KV_FULL}" ]]; then
- ewarn
- ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
- ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
- ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
- ewarn "which this module was built."
- ewarn
- elif [[ -f /sys/module/wireguard/version ]] && \
- old="$(< /sys/module/wireguard/version)" && \
- new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
- [[ $old != "$new" ]]; then
- ewarn
- ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
- ewarn "However, the old version is still running on your system. In order to use the"
- ewarn "new version, you will need to remove the old module and load the new one. As"
- ewarn "root, you can accomplish this with the following commands:"
- ewarn
- ewarn " # rmmod wireguard"
- ewarn " # modprobe wireguard"
- ewarn
- ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
- ewarn "to gracefully remove them yourself prior."
- ewarn
- fi
- fi
-}
diff --git a/net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild b/net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild
new file mode 100644
index 000000000000..e7bf51b60e9c
--- /dev/null
+++ b/net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MODULES_OPTIONAL_USE="module"
+inherit linux-mod bash-completion-r1
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
+ S="${WORKDIR}/WireGuard-${PV}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +module +tools module-src"
+
+DEPEND="tools? ( net-libs/libmnl )"
+RDEPEND="${DEPEND}"
+
+MODULE_NAMES="wireguard(kernel/drivers/net:src)"
+BUILD_TARGETS="module"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
+
+pkg_setup() {
+ if use module; then
+ linux-mod_pkg_setup
+ kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
+ fi
+}
+
+src_compile() {
+ BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+ use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
+ use module && linux-mod_src_compile
+ use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ use module && linux-mod_src_install
+ if use tools; then
+ dodoc README.md
+ dodoc -r contrib/examples
+ emake \
+ WITH_BASHCOMPLETION=yes \
+ WITH_SYSTEMDUNITS=yes \
+ WITH_WGQUICK=yes \
+ DESTDIR="${D}" \
+ BASHCOMPDIR="$(get_bashcompdir)" \
+ PREFIX="${EPREFIX}/usr" \
+ -C src/tools install
+ fi
+ use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
+}
+
+pkg_postinst() {
+ if use module-src && ! use module; then
+ einfo
+ einfo "You have enabled the module-src USE flag without the module USE"
+ einfo "flag. This means that sources are installed to"
+ einfo "${ROOT}usr/src/wireguard instead of having the"
+ einfo "kernel module compiled. You will need to compile the module"
+ einfo "yourself. Most likely, you don't want this USE flag, and should"
+ einfo "rather use USE=module"
+ einfo
+ fi
+ use module && linux-mod_pkg_postinst
+
+ einfo
+ einfo "This software is experimental and has not yet been released."
+ einfo "As such, it may contain significant issues. Please do not file"
+ einfo "bug reports with Gentoo, but rather direct them upstream to:"
+ einfo
+ einfo " team@wireguard.com security@wireguard.com"
+ einfo
+
+ if use tools; then
+ einfo
+ einfo "After installing WireGuard, if you'd like to try sending some packets through"
+ einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+ einfo "test example script:"
+ einfo
+ einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
+ einfo
+ einfo "This will automatically setup interface wg0, through a very insecure transport"
+ einfo "that is only suitable for demonstration purposes. You can then try loading the"
+ einfo "hidden website or sending pings:"
+ einfo
+ einfo " \$ chromium http://192.168.4.1"
+ einfo " \$ ping 192.168.4.1"
+ einfo
+ einfo "If you'd like to redirect your internet traffic, you can run it with the"
+ einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
+ einfo "purposes. It is for quick testing only."
+ einfo
+ einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+ einfo
+ fi
+ if use module; then
+ local old new
+ if [[ $(uname -r) != "${KV_FULL}" ]]; then
+ ewarn
+ ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
+ ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
+ ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
+ ewarn "which this module was built."
+ ewarn
+ elif [[ -f /sys/module/wireguard/version ]] && \
+ old="$(< /sys/module/wireguard/version)" && \
+ new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
+ [[ $old != "$new" ]]; then
+ ewarn
+ ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
+ ewarn "However, the old version is still running on your system. In order to use the"
+ ewarn "new version, you will need to remove the old module and load the new one. As"
+ ewarn "root, you can accomplish this with the following commands:"
+ ewarn
+ ewarn " # rmmod wireguard"
+ ewarn " # modprobe wireguard"
+ ewarn
+ ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
+ ewarn "to gracefully remove them yourself prior."
+ ewarn
+ fi
+ fi
+}
diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
index 3a4681c656a9..e7bf51b60e9c 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -57,8 +57,6 @@ src_install() {
BASHCOMPDIR="$(get_bashcompdir)" \
PREFIX="${EPREFIX}/usr" \
-C src/tools install
- insinto /$(get_libdir)/netifrc/net
- newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh
fi
use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index cad9c3450c90..c359fd041deb 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
Binary files differ
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 2047815317e1..32d85f20128e 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -3,8 +3,10 @@ AUX aircrack-ng-1.2_rc4-openssl.patch 1227 BLAKE2B ac474222d14a25d6ea4f95c313f0f
DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
DIST aircrack-ng-1.2-rc4.tar.gz 4379880 BLAKE2B 8034e99a9a7117b0552ecd82603883661d7442970a24d26f4754122abd07cc661fbeb57519cecbefb6eea1fc0e8b0f228a116a04f07e1a7d2eb41ea4b5f6040b SHA512 f1e1d465813a5f00fd8f8b287353033ea30b657a4c3a9fe81281ab2546d3238690f0659076bff53703fbc796ba40efb16115804d21f8516adca2c774fefea20c
DIST aircrack-ng-1.2.tar.gz 4517658 BLAKE2B 1a3d17608dafe69a7a500526807310bf9ae8f0f14ed4198d06fc1cd6287fa25aeed996bad85c82b9ed87c214951e2bbc73384513361b7e8ce6ba05ef32f6530c SHA512 efc8cd17994fd74dcdd60e4ff26f81dc4f090a368668c2b1d62e204d2a9c001f2614a9d2ad0e4ae0ae38fb71e1957e0342f8216d757e38db105b1e467de82bd9
+DIST aircrack-ng-1.3.tar.gz 4182502 BLAKE2B d18d3644fd5bad7a45d8684a50a42d84d9e0e832e88876a34cb7b308c4496c7b1d39159cb24c19097b7ca4286f62560b509e84e816d65c77d2f72883dd3c9457 SHA512 bc092f84fb204b5764a16a230695b69ff916aceae865bf73827c56b155100e7bd64941d0c5f999585d25ee8faad2d35a3c580a57b60c320f7857bd8750558961
EBUILD aircrack-ng-1.2.ebuild 3179 BLAKE2B afccc183aff511d9cbe26c50580b7a9ca3d69d152980927fa9b66f8d7d0feff53142e65e986f64fe46ee5e989a05275f7ec2770478c914f04e451c938ba0ddec SHA512 fa5e63c1fca15ea1830d2ab2a566a65e05d684623ae6cab72f8aa0c3dd3923fd6d01baac519c55134dd05993d801caa93f6e9ce761b4ebe6c1ffc82941bc776a
EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
EBUILD aircrack-ng-1.2_rc4-r1.ebuild 2918 BLAKE2B f8f585175b7899e3e367875c23642a60a733118677c91daa68ea3087671cbdd3e853a02f48733080bcc3bf7c3040fb9777409a84e2275d1042b73733e03943b8 SHA512 2e396a16de545a0b39f38ffc243b35f041ecc1f4a62c1b2596a13d91793def3dbaba74a873ac635cbc684dec0c8ea21410ee35994ed3af0c00ed6a1d718ca33f
+EBUILD aircrack-ng-1.3.ebuild 3141 BLAKE2B 5d0160b1d4fbcedb63260a347a9d258306c098edd7325bdd442a2cbc42e078d8d24901c8d248a0bb7e965f7dbf663c03bddb2304ce894e533f16d5d4d8d3cc61 SHA512 46db3bec085439eaa894e5b301306bc357152191a5925c16961afa0bb76e5d5ce218a1b63dbb6d1e64f4666897950c65d35172814e1eb43fbe1ac2c11a8c94d9
EBUILD aircrack-ng-9999.ebuild 3110 BLAKE2B 9ca03f75ab07f78157a6cf27014e83c45a3928d0d0a457993e5e86201a30b06cea11485d060cfd7597556dbe227a3ae4915aa0a8cc7a0ee8bde151cff49de848 SHA512 4904ffb8f45ff1e7c63fb033b77543db69b9813e8549a1ef0c4e70da268563058d6d076f51b463c26151f47105aeacf237e70df6f4e54304f13721e66ea9278a
MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild
new file mode 100644
index 000000000000..af3515cb4635
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+ KEYWORDS=""
+else
+ MY_PV=${PV/_/-}
+ SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+ dev-libs/openssl:0=
+ netlink? ( dev-libs/libnl:3 )
+ pcre? ( dev-libs/libpcre )
+ airdrop-ng? ( ${PYTHON_DEPS} )
+ airgraph-ng? ( ${PYTHON_DEPS} )
+ experimental? ( sys-libs/zlib )
+ sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
+ net-wireless/iw
+ net-wireless/wireless-tools
+ sys-apps/ethtool
+ sys-apps/usbutils
+ sys-apps/pciutils )
+ sys-apps/hwids
+ airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+ airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ MAKE_COMMON=(
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ LD="$(tc-getLD)" \
+ RANLIB="$(tc-getRANLIB)" \
+ DESTDIR="${ED}"
+ )
+}
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-asan \
+ $(use_enable netlink libnl) \
+ $(use_with experimental) \
+ $(use_with sqlite sqlite3) \
+ --enable-shared \
+ --disable-static \
+ --without-opt
+}
+
+src_compile() {
+ if [[ $($(tc-getCC) --version) == clang* ]] ; then
+ #https://bugs.gentoo.org/show_bug.cgi?id=472890
+ filter-flags -frecord-gcc-switches
+ fi
+
+ emake "${MAKE_COMMON[@]}"
+
+ if use airgraph-ng; then
+ cd "${S}/scripts/airgraph-ng"
+ distutils-r1_src_compile
+ fi
+ if use airdrop-ng; then
+ cd "${S}/scripts/airdrop-ng"
+ distutils-r1_src_compile
+ fi
+}
+
+src_test() {
+ emake "${MAKE_COMMON[@]}" check
+}
+
+src_install() {
+ einstalldocs
+ emake "${MAKE_COMMON[@]}" install
+
+ if use airgraph-ng; then
+ cd "${S}/scripts/airgraph-ng"
+ distutils-r1_src_install
+ fi
+ if use airdrop-ng; then
+ cd "${S}/scripts/airdrop-ng"
+ distutils-r1_src_install
+ fi
+
+ #we don't need aircrack-ng's oui updater, we have our own
+ rm "${ED}"/usr/sbin/airodump-ng-oui-update
+}
+
+pkg_postinst() {
+ # Message is (c) FreeBSD
+ # http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+ if use kernel_FreeBSD ; then
+ einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+ einfo "mode of your wireless card. So do not care about what the manpages say about"
+ einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+ echo
+ einfo "To return from monitor mode, issue the following command:"
+ einfo " ifconfig \${INTERFACE} -mediaopt monitor"
+ einfo
+ einfo "For aireplay-ng you need FreeBSD >= 7.0."
+ fi
+}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6aa2d9264292..5c37b299c424 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -12,7 +12,7 @@ DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02d
DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
-EBUILD bluez-5.49-r1.ebuild 8103 BLAKE2B 7c1b06c44f25ca8185ce8d809b6cecc76e79594aa43a713af6b717214ba51378aa9759981947661d90d4a86ad91555d7c06ed895c05a772295e7b19742416337 SHA512 4bb3e121cce2dccbc793a5deaef40afb891cedee091baba8f220b08f5379ff6ef491d83a0e3d0c8e21d0581464c5de39fa1cafd145f89b823940b2db2836461c
+EBUILD bluez-5.49-r1.ebuild 8102 BLAKE2B 92d5688a2b0c476e2ca5767faec68442f8624b482f407db1af683d812e51149e6d8c1fe943b54c31e83227b3819b0d89ea3866a67b27ef5dd3cde27c942609a1 SHA512 20eaed74b8c10cce8dbd116c6be91c2d32f239c7e9fb9a04098e1f16e5a43f85916b9d6567abed9804bca50879ca080d4e9c6abdf45eaa5fb354effe4ca16ea0
EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
EBUILD bluez-5.50.ebuild 8028 BLAKE2B b62e272587e4c6b3648505e509cfb8f4ba8f3457e0777f62fd77c4bea5570f4b511c03f29bd80ac36cacd28d9c493125e8cc5435224a679611aab2beedba9664 SHA512 ad8969e317f12a6c1bf2d1966cf5c40ffa3b87d87258adca745c6b953f09df9ecc7c33162a52f9780cdb075e8347aceb7a87c858fa693ac76ea2f9e8e1303098
MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild
index b2be5a4fc777..26cea7716cdb 100644
--- a/net-wireless/bluez/bluez-5.49-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.49-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
# Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 45a1ec906ac8..1987bebdd149 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,11 +2,12 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf
AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-DIST gnuradio-3.7.12-qt5.tar.xz 31048 BLAKE2B 5665ecd7f5ab34852a0e2dc975c483331e7b547377adf8a4c38ab68a6e034d6ec9f009210f74bbf9a0fc76e214bd744558b267e853843f33f799bbf0a0f2a7fc SHA512 25da9415d7b7f9984075c2a8fcf092bc0585be550c0b9a7e6910d934fd3aab4be3135d7a2c83b01ce19b2ac8e0065ffb5ad1375fa29cc259d4dc2d1d92003f99
+DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
+DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
DIST gnuradio-3.7.13.3.tar.gz 4544605 BLAKE2B f059e8af860b7c18573f0efa909f3bf2b36b4d7208e26dd18a1c9de8cbf40e0d9079336f4a5f48430790e28dc21f5150ad2294fa1d664889c07e849d236160a0 SHA512 e4bf63899678fd792bc08baa2db673b192dc823d6e586124538cbdf12e60a882847e72cfca7f52ef906d52038a9cb48a8b5891593c9db1cb172c4077a54d4056
EBUILD gnuradio-3.6.5.1-r2.ebuild 5339 BLAKE2B 6e54dbf3381eed4556a52c1536ca36def8f724da6375140b06ddda7549c857d65ad029aa774326ab587edc82a0a804e009a72a6d12214bdfcacd2101608278ca SHA512 e632918a4543ea97158dd205548310bf268b295a69bbc288d1129c076c982b2bb87784ea7b519c0fa6a4fc7852cef2adbc444b68099a98929862105ea2351c7c
EBUILD gnuradio-3.7.11-r3.ebuild 7029 BLAKE2B 3d38a4b4288ef2d5d12a7433ee2ec2bffbc2a5cfe6cd70eee57c3eaf701122712d618490a2b460d2110a283e81085c1c2a7ddb40fd7ef73f6045b5d7211fe36f SHA512 647158607c8137ffd4a09344da964d22b9b800d5fb10c63451548292f6e3a8d173dee9d140cd2e7405af06819bd9b136e9dfdca33971c16f7a97297391a6b98b
-EBUILD gnuradio-3.7.13.3.ebuild 6785 BLAKE2B 2038f1ce0bcffd0c44e1f2224b618103ea797c6423dcdc23b819da53bc6061673975165713296f4d18650771e9a44fb3b8ce102851d349fbfc75c1a4fe631351 SHA512 4c8317d911c7c0643e7f977f83696e8e3b939d9737cfdde5864779e05248ed58863dd81ba9a6eb80c10db4b023b1118d25705efd4a77d2585d839acfc1a97993
+EBUILD gnuradio-3.7.13.3-r1.ebuild 7031 BLAKE2B d7ac48d383cac34bf4d92745d2c9091fadad1b155aee585146b74ea8afbcd657b4fc99888428af13fc7ee62f34c5c5938a012e4fb12639d951aeedc98b2193a2 SHA512 78ea71e611f844d87ad6fb030df53757d63b883369789329708aa718f325fe4b4a634f067853b093385c10a26ba47a35557982363f441c58d1bed11cf59d8427
EBUILD gnuradio-3.7.9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
EBUILD gnuradio-3.8.9999.ebuild 6654 BLAKE2B 2ecf927d0469ecd721e929ba77db619949cac4e11f2a4ee62e292cbcc6ac5c0969d8eae1d01b52f67756e6cc5165cadde94b7907658c950e181dff0107d893d6 SHA512 3a839947f80f483dc6e78b9b453c1f455c4be58a7a67cbf2b116bba7f2364c53485c6695bb236704ff5286fc28310fa8324b6a428b7d55105b393087069e340e
EBUILD gnuradio-9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
new file mode 100644
index 000000000000..64d520389a3a
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+ EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz
+ https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
+ https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+if [[ ${PV} == "3.7.9999" ]]; then
+ EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+ EGIT_BRANCH="next"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ audio? ( || ( alsa oss jack portaudio ) )
+ alsa? ( audio )
+ oss? ( audio )
+ jack? ( audio )
+ portaudio? ( audio )
+ analog? ( filter )
+ digital? ( filter analog )
+ dtv? ( fec )
+ pager? ( filter analog )
+ qt5? ( filter )
+ uhd? ( filter analog )
+ fcd? ( || ( alsa oss ) )
+ wavelet? ( analog )
+ wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+ >=dev-lang/orc-0.4.12
+ dev-libs/boost:0=[${PYTHON_USEDEP}]
+ !<=dev-libs/boost-1.52.0-r6:0/1.52
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ sci-libs/fftw:3.0=
+ alsa? (
+ media-libs/alsa-lib:=
+ )
+ fcd? ( virtual/libusb:1 )
+ filter? ( sci-libs/scipy )
+ grc? (
+ dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ )
+ jack? (
+ media-sound/jack-audio-connection-kit
+ )
+ log? ( dev-libs/log4cpp )
+ portaudio? (
+ >=media-libs/portaudio-19_pre
+ )
+ qt5? (
+ dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ x11-libs/qwt:6[qt5(+)]
+ dev-qt/qtwidgets:5
+ )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
+ utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+ vocoder? ( media-sound/gsm
+ >=media-libs/codec2-0.8.1 )
+ wavelet? (
+ >=sci-libs/gsl-1.10
+ )
+ wxwidgets? (
+ dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ )
+ zeromq? ( >=net-libs/zeromq-2.1.11 )
+ "
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.2
+ >=dev-lang/swig-3.0.5
+ virtual/pkgconfig
+ doc? (
+ >=app-doc/doxygen-1.5.7.1
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ grc? ( x11-misc/xdg-utils )
+ oss? ( virtual/os-headers )
+ test? ( >=dev-util/cppunit-1.9.14 )
+ zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+ gnome2_environment_reset #534582
+
+ if [[ ${PV} == "3.8.9999" ]]; then
+ true
+ else
+ epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+ fi
+ # Useless UI element would require qt3support, bug #365019
+ sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+ epatch "${WORKDIR}"/qt5-maint-00*.patch
+ epatch "${WORKDIR}"/codec2-next-00*.patch
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ python_export PYTHON_SITEDIR
+ mycmakeargs=(
+ -DENABLE_DEFAULT=OFF
+ -DENABLE_GNURADIO_RUNTIME=ON
+ -DENABLE_VOLK=ON
+ -DENABLE_PYTHON=ON
+ -DENABLE_GR_BLOCKS=ON
+ -DENABLE_GR_FFT=ON
+ -DENABLE_GR_AUDIO=ON
+ -DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+ -DENABLE_GR_ANALOG="$(usex analog)"
+ -DENABLE_GR_ATSC="$(usex atsc)"
+ -DENABLE_GR_CHANNELS="$(usex channels)"
+ -DENABLE_GR_DIGITAL="$(usex digital)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_SPHINX="$(usex doc)"
+ -DENABLE_GR_DTV="$(usex dtv)"
+ -DENABLE_GR_FCD="$(usex fcd)"
+ -DENABLE_GR_FEC="$(usex fec)"
+ -DENABLE_GR_FILTER="$(usex filter)"
+ -DENABLE_GRC="$(usex grc)"
+ -DENABLE_GR_AUDIO_JACK="$(usex jack)"
+ -DENABLE_GR_LOG="$(usex log)"
+ -DENABLE_GR_NOAA="$(usex noaa)"
+ -DENABLE_GR_AUDIO_OSS="$(usex oss)"
+ -DENABLE_GR_PAGER="$(usex pager)"
+ -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+ -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+ -DENABLE_TESTING="$(usex test)"
+ -DENABLE_GR_TRELLIS="$(usex trellis)"
+ -DENABLE_GR_UHD="$(usex uhd)"
+ -DENABLE_GR_UTILS="$(usex utils)"
+ -DENABLE_GR_VOCODER="$(usex vocoder)"
+ -DENABLE_GR_WAVELET="$(usex wavelet)"
+ -DENABLE_GR_WXGUI="$(usex wxwidgets)"
+ -DENABLE_GR_QTGUI="$(usex qt5)"
+ -DDESIRED_QT_VERSION="$(usex qt5 5)"
+ -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+ -DENABLE_GR_ZEROMQ="$(usex zeromq)"
+ -DENABLE_GR_CORE=ON
+ -DSYSCONFDIR="${EPREFIX}"/etc
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+ -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ )
+ use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples ; then
+ dodir /usr/share/doc/${PF}/
+ mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ # It seems that the examples are always installed
+ rm -rf "${ED}"/usr/share/${PN}/examples || die
+ fi
+
+ if use doc || use examples; then
+ #this doesn't appear useful
+ rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+ fi
+
+ # We install the mimetypes to the correct locations from the ebuild
+ rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+ rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+ # Install icons, menu items and mime-types for GRC
+ if use grc ; then
+ local fd_path="${S}/grc/scripts/freedesktop"
+ insinto /usr/share/mime/packages
+ doins "${fd_path}/${PN}-grc.xml"
+
+ domenu "${fd_path}/"*.desktop
+ doicon "${fd_path}/"*.png
+ fi
+
+ python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+ ctest -E qtgui
+}
+
+pkg_postinst()
+{
+ local GRC_ICON_SIZES="32 48 64 128 256"
+
+ if use grc ; then
+ xdg_desktop_database_update
+ xdg_mime_database_update
+ for size in ${GRC_ICON_SIZES} ; do
+ xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+ || die "icon resource installation failed"
+ xdg-icon-resource install --noupdate --context apps --size ${size} \
+ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+ || die "icon resource installation failed"
+ done
+ xdg-icon-resource forceupdate
+ fi
+}
+
+pkg_postrm()
+{
+ local GRC_ICON_SIZES="32 48 64 128 256"
+
+ if use grc ; then
+ xdg_desktop_database_update
+ xdg_mime_database_update
+ for size in ${GRC_ICON_SIZES} ; do
+ xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+ application-gnuradio-grc || ewarn "icon uninstall failed"
+ xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+ gnuradio-grc || ewarn "icon uninstall failed"
+
+ done
+ xdg-icon-resource forceupdate
+ fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
deleted file mode 100644
index 469c004b33d6..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
- EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz
- https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.12-qt5.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
- EGIT_BRANCH="maint"
-elif [[ ${PV} == "3.8.9999" ]]; then
- EGIT_BRANCH="next"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- audio? ( || ( alsa oss jack portaudio ) )
- alsa? ( audio )
- oss? ( audio )
- jack? ( audio )
- portaudio? ( audio )
- analog? ( filter )
- digital? ( filter analog )
- dtv? ( fec )
- pager? ( filter analog )
- qt5? ( filter )
- uhd? ( filter analog )
- fcd? ( || ( alsa oss ) )
- wavelet? ( analog )
- wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
- >=dev-lang/orc-0.4.12
- dev-libs/boost:0=[${PYTHON_USEDEP}]
- !<=dev-libs/boost-1.52.0-r6:0/1.52
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- sci-libs/fftw:3.0=
- alsa? (
- media-libs/alsa-lib:=
- )
- fcd? ( virtual/libusb:1 )
- filter? ( sci-libs/scipy )
- grc? (
- dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- )
- jack? (
- media-sound/jack-audio-connection-kit
- )
- log? ( dev-libs/log4cpp )
- portaudio? (
- >=media-libs/portaudio-19_pre
- )
- qt5? (
- dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- x11-libs/qwt:6[qt5(+)]
- dev-qt/qtwidgets:5
- )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
- utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
- vocoder? ( media-sound/gsm )
- wavelet? (
- >=sci-libs/gsl-1.10
- )
- zeromq? ( >=net-libs/zeromq-2.1.11 )
- "
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.2
- >=dev-lang/swig-3.0.5
- virtual/pkgconfig
- doc? (
- >=app-doc/doxygen-1.5.7.1
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
- grc? ( x11-misc/xdg-utils )
- oss? ( virtual/os-headers )
- test? ( >=dev-util/cppunit-1.9.14 )
- zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
- gnome2_environment_reset #534582
-
- if [[ ${PV} == "3.8.9999" ]]; then
- true
- else
- epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
- fi
- # Useless UI element would require qt3support, bug #365019
- sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
- epatch "${WORKDIR}"/qt5-maint-00*.patch
- cmake-utils_src_prepare
-}
-
-src_configure() {
- python_export PYTHON_SITEDIR
- mycmakeargs=(
- -DENABLE_DEFAULT=OFF
- -DENABLE_GNURADIO_RUNTIME=ON
- -DENABLE_VOLK=ON
- -DENABLE_PYTHON=ON
- -DENABLE_GR_BLOCKS=ON
- -DENABLE_GR_FFT=ON
- -DENABLE_GR_AUDIO=ON
- -DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
- -DENABLE_GR_ANALOG="$(usex analog)"
- -DENABLE_GR_ATSC="$(usex atsc)"
- -DENABLE_GR_CHANNELS="$(usex channels)"
- -DENABLE_GR_DIGITAL="$(usex digital)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_SPHINX="$(usex doc)"
- -DENABLE_GR_DTV="$(usex dtv)"
- -DENABLE_GR_FCD="$(usex fcd)"
- -DENABLE_GR_FEC="$(usex fec)"
- -DENABLE_GR_FILTER="$(usex filter)"
- -DENABLE_GRC="$(usex grc)"
- -DENABLE_GR_AUDIO_JACK="$(usex jack)"
- -DENABLE_GR_LOG="$(usex log)"
- -DENABLE_GR_NOAA="$(usex noaa)"
- -DENABLE_GR_AUDIO_OSS="$(usex oss)"
- -DENABLE_GR_PAGER="$(usex pager)"
- -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
- -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
- -DENABLE_TESTING="$(usex test)"
- -DENABLE_GR_TRELLIS="$(usex trellis)"
- -DENABLE_GR_UHD="$(usex uhd)"
- -DENABLE_GR_UTILS="$(usex utils)"
- -DENABLE_GR_VOCODER="$(usex vocoder)"
- -DENABLE_GR_WAVELET="$(usex wavelet)"
- -DENABLE_GR_QTGUI="$(usex qt5)"
- -DDESIRED_QT_VERSION="$(usex qt5 5)"
- -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
- -DENABLE_GR_ZEROMQ="$(usex zeromq)"
- -DENABLE_GR_CORE=ON
- -DSYSCONFDIR="${EPREFIX}"/etc
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
- -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- )
- use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- dodir /usr/share/doc/${PF}/
- mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
- docompress -x /usr/share/doc/${PF}/examples
- else
- # It seems that the examples are always installed
- rm -rf "${ED}"/usr/share/${PN}/examples || die
- fi
-
- if use doc || use examples; then
- #this doesn't appear useful
- rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
- fi
-
- # We install the mimetypes to the correct locations from the ebuild
- rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
- rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
- # Install icons, menu items and mime-types for GRC
- if use grc ; then
- local fd_path="${S}/grc/scripts/freedesktop"
- insinto /usr/share/mime/packages
- doins "${fd_path}/${PN}-grc.xml"
-
- domenu "${fd_path}/"*.desktop
- doicon "${fd_path}/"*.png
- fi
-
- python_fix_shebang "${ED}"
-}
-
-src_test()
-{
- ctest -E qtgui
-}
-
-pkg_postinst()
-{
- local GRC_ICON_SIZES="32 48 64 128 256"
-
- if use grc ; then
- xdg_desktop_database_update
- xdg_mime_database_update
- for size in ${GRC_ICON_SIZES} ; do
- xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
- "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
- || die "icon resource installation failed"
- xdg-icon-resource install --noupdate --context apps --size ${size} \
- "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
- || die "icon resource installation failed"
- done
- xdg-icon-resource forceupdate
- fi
-}
-
-pkg_postrm()
-{
- local GRC_ICON_SIZES="32 48 64 128 256"
-
- if use grc ; then
- xdg_desktop_database_update
- xdg_mime_database_update
- for size in ${GRC_ICON_SIZES} ; do
- xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
- application-gnuradio-grc || ewarn "icon uninstall failed"
- xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
- gnuradio-grc || ewarn "icon uninstall failed"
-
- done
- xdg-icon-resource forceupdate
- fi
-}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 05c21eb8e3b5..44b3acadf3b7 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,21 +1,15 @@
AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca9c7ea9e819d05dbcfb2c573be79140ad5fcab5e86a353e8ee591f581160e10ed9d8a011629bfa7d SHA512 4a799730074e4d2b0143bf77e9f7540819e042a7edcfc8bdc678a028c3752b1f96184f76d8a0557f6aeedbe333c91a1704aef8b8c873cce4abce6c3214ede3ce
AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
-AUX unifi.initd 840 BLAKE2B 1c0210a44f96d4ab9ce23cdaa1d4307eafafdf4d8969c6917def008b965dc4e46daa6c681d38426ecbb3fdea8c137efe3d012eb0ecde696a2410d501b5cf54d2 SHA512 882d932e667d89557fb6302aa16e0720c0f868c8fdcfd093609b9a580a92359c5b4860429434c6d83bbfc57710f386458330e895f949ce55efb27483c2565e0f
AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
-DIST unifi-5.7.28.zip 79362245 BLAKE2B 5edb7b92d602ba780b0fa7613360ada39f09b347b247945761af80d0180d4653b19cb5cd1d7bd11332a85de8481c4981b111e572cb755a83b676362494a5505c SHA512 f6ba667a2f0b5959ed715a190fdbdfe308ea256c2d485f96d43fe797912dfe6992cbaed95add5899293fabdd371c1814572bf1189a4ce93c632743dca40b87e3
-DIST unifi-5.8.23.zip 80086708 BLAKE2B ea7aec61d74132a47843084f1987e6e016c4fb1ec96d077dac2a9b122003274b0314927404468669a5d7cc0bdb6a307c97bca09f663b180d15bf18436b35408b SHA512 2b42df2a84574ac9e282c7ff59eb86ce29170ea7ef5957690dec8772c90acda3c08c633b3bceeac08bb73ff1460143207a64d2405de19436faf20a042849231b
DIST unifi-5.8.24.zip 80086706 BLAKE2B 00530b5e141e9444120efeb6ea5b3106781fb5b15a1ade44b71675a726ae7245221af694b36a922a4d047f78567a7bd9e1354d6dde442dfccd58a49f87079403 SHA512 cf7145eeeed779893c1c9709eef7364154503dd1232f88cce38facc748426d19c5422decbd5e3a80d857a2d82969258045944b491c7b228467d8e4a7c29a0ec1
+DIST unifi-5.8.25.zip 80091828 BLAKE2B f675ff304c2e7a87da7ed02bd4873015a1155949e6b3b2b4561db06565197e1660512cbea118a50bd975de7d6268a090fad6742e3a82bb4fdf20f19f39099ae2 SHA512 4572ebe55971d14ca76f39cf298eedf879c4ad597ac87e4fe13167f8219b8f822f3478002ccda7ca1d72daba05efa52932e6d163c1e2b5ac5d289020e351044f
+DIST unifi-5.9.12.zip 103000745 BLAKE2B 30613f8ee9bf832f5303d02cc2719cb91358a558afe4f998541b890be6c152a62171ad1711e78fd0f2e011161d03cdb9afa9c8dffc3b553b9c7b637f61f12b10 SHA512 0f8c549dfc390d71e3f8a58c05647b3cd062a55de248128267dda3c079f744a810a0138016616d5be6b2e05ecd34149172efd369c1cf4c1e24735ba982c266cb
DIST unifi-5.9.4.zip 102808708 BLAKE2B 3b1479bd65837667f2abff594426ecc3491475d1cf6d842d07cdc8868cabf59facc857263fcfb1ef30fdb8dbb4c0a037b7e04736b8debf0f4f795494fc62ee26 SHA512 01e2d8c2d48a552e3b5d03cb97b0241e0561a4c88e52f13ec2d2a8a8b7d75ba7d9eb7878e37876efe5581e439afaac359ae6e3e7b2bb3d0719ebdbb10b06778c
EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306aed4ce39f98bfe6783e85eb1c83ab0fc996e94d25b86cd4bad196ae898dace5eb7469147cb3394cda1699ffec1900 SHA512 4415d13c43c30238c756542f6931c12bb6cbcd0163cb6e2c522b6adef39f0c5d3c069d25facdb12575fc0463a8aa3fd479f3274009083a645139d656ce998ae2
-EBUILD unifi-5.6.39.ebuild 1726 BLAKE2B be5c3312dfb28320e32f2b01f9d4cbd997720b94da1a9bdd3395fe9fd975d472eda73eda175e4b0679bc320844aacc140622fd6b6339fa7dd4784588ee35b96f SHA512 60499cd250cc77eb1a9ae05932f55ce1d64ac61606a31cd515f8a603651ff1d0802e5644160d55ef6cf4072d620de81c49ca55c126950aa876fae8ac69a2e6d3
-EBUILD unifi-5.7.28-r1.ebuild 1750 BLAKE2B ab2381e2fce8a2e71723773acdb4bc0f8996c25663af28b580137f18e27dcaf511e8271b3249c87c062e530e6648049a034a174a523d2968485cbba3b0a6dd74 SHA512 e0c73eff569c7ed8d16ec9c2815312150f1abd3b058437a1449c0d01a4caa403d0f2878dc94ba4f8f3ecb97545232cf74e6abc586729e5c1f0691c978e52a581
-EBUILD unifi-5.7.28.ebuild 1747 BLAKE2B 99733735bc4d4dda54b67fc97830dc72a873e2998f92b7e2164d0f4bea1bd3f0aec450dfe1902111cfa1125b0efc17fe11410d9047098dea60f0432a89f6b00b SHA512 eda3ebcd582130663514729c2fce08647027ad39b545bdf21be587e317cabef7ffc2a8b714f88336cc41503f5f7640525199cc2207bc7c617906230f226c7171
-EBUILD unifi-5.8.23-r1.ebuild 1750 BLAKE2B f179a377d37061f017715280b8231a4e7b8219dad6821200a05445f5e2d52830b03e1ebfd092aa4141ee5e0611e538816901aaa9c74b2613b5faa78637f4f178 SHA512 f707d8793cda6db537bac979768bc7399a0473e102b3f9f9fbffaeb72269121daa3bc4047ac9af2da08545332f1bbb58b5bad7361e8436c9e5f5ab39683001b0
-EBUILD unifi-5.8.23.ebuild 1747 BLAKE2B ff3016996e6e78398aa2d124d2e3f74f3f0563a3baf90a7c21cb653477817d64a32da6915edebde763b6d9f2c16c7af52e36d25d29569bcb5bd2b59a969b490a SHA512 e1ff8abdc93ee260b538750f3f184a6cdc6a68f2cdd4b23f0a58e3a5552cf88f63a167924608b34a07b3301131800a7f4d1cac96432c89a2d357a92603c059bf
EBUILD unifi-5.8.24-r1.ebuild 1842 BLAKE2B 8466414f125504262ead905b6d90ac645b3876a5f8bb53b1fb3fed1a221575ca4632b6b3388f8326d92d8c6fae072ad68c21bd85ddf17c0823b2e5db7abda936 SHA512 42bcec2f8f3193bbcaa6569461917fce094135640ea4139b84d9d858d7d992b9fababc4287911cf2d40f322abbf7ea7df2d07a521200e9167f01b98da7fe426d
-EBUILD unifi-5.8.24.ebuild 1739 BLAKE2B eef3ca7c137f8f6e87395678d4560e14f0bc1c2f81ef6d7f8ec077fdf89016110fc9e3b588e0af3f619e40b8cc802e51db889279b6381a93ae0fcce102e840c2 SHA512 4c02705694d13aee8d582e2010de2feabc442e30397bc6ff2feaf0a5d703ecaadf6ef9e2a0b8c972cfb687acb93e6ac4b49a6d7288d3abf12a34d960bda76bd7
+EBUILD unifi-5.8.25.ebuild 1853 BLAKE2B dab351e3ae3b414f81d1b95bdef4d2a1fa406f804dc6d0331169e14138f5436d092803bb8ea86f7000b9d7a9b032dd1995da8130233c3f5db013a0e7bd7e1abf SHA512 cf2b4a2639c1bb4ef8cb73ca9bae37955f3d12e661f2fcf0187b1a880ff3eab67bab41b3292868940f27cf701eedc31a322cd19a0c80686e7bba5a9f7ebf2cc0
+EBUILD unifi-5.9.12.ebuild 1728 BLAKE2B 6ace4dd6ad55debae44bb45cce168c18ed87f15c884c121e19c97369df163fba45dd41b342ea124e7a95d59e6b3258991d6bc948dd474a2f9ee6dff538a1081b SHA512 e4cfb1a314dc146bd6032a6e8f88781653a6f9c41c4c06fb94324955d89076673f868aabed117d0d933c5cc3a839ae2da5f40f1bc4cae66fd395666173074155
EBUILD unifi-5.9.4-r1.ebuild 1727 BLAKE2B 8aca9dc5cd7ec20467bffd5f6d13a3818391383cb39b8bcc0f3b30fb4d4c26f8a3b92dfefc2c9b9b77d17a52a4d1bb1413ff51d6786f55cd910a666b13ebad96 SHA512 cd8b6b98ee2d203ae806572131c2985badf1e9252374ac7ef1051a97a99feb4b830bfe19ff60d09c450076c73f93948e9746a4115bd1285622e199bad4bc2926
-EBUILD unifi-5.9.4.ebuild 1724 BLAKE2B 1000c8803b9ec71ac2871fc0f7c3b3d20baa388807fc2f6c6b77689d6d55b0bb4cb31d57950fdd0cdca26ece065529a1c6c01526071b70e47827568679ec721a SHA512 5a5886ebc00a78e5c305f971d2eee93ef90de69f6bc0387be7be5f11ae17ecdd7c030f012087a08907fb7e2cb2e05a3206c9c5823c87034223b5c9e0b0c6af14
MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd
deleted file mode 100644
index 48fd9dd3b4a4..000000000000
--- a/net-wireless/unifi/files/unifi.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACE_LIB="lib/ace.jar"
-DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
-JAVA_OPTS="-Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
-UNIFI_GROUP="unifi"
-UNIFI_PATH="/usr/lib/unifi"
-UNIFI_USER="unifi"
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting UniFi Controller"
- start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} start
- eend $?
-}
-
-stop() {
- ebegin "Stopping UniFi Controller"
- start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} stop
- eend $?
-}
diff --git a/net-wireless/unifi/unifi-5.6.39.ebuild b/net-wireless/unifi/unifi-5.6.39.ebuild
deleted file mode 100644
index aeda8f7c164b..000000000000
--- a/net-wireless/unifi/unifi-5.6.39.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.6"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/armhf lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.7.28-r1.ebuild b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
deleted file mode 100644
index c164485244d9..000000000000
--- a/net-wireless/unifi/unifi-5.7.28-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5c442c6b54"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.7"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd-r1 unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.7.28.ebuild b/net-wireless/unifi/unifi-5.7.28.ebuild
deleted file mode 100644
index bc8c89abc804..000000000000
--- a/net-wireless/unifi/unifi-5.7.28.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5c442c6b54"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.7"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.23-r1.ebuild b/net-wireless/unifi/unifi-5.8.23-r1.ebuild
deleted file mode 100644
index 0bf53df426d5..000000000000
--- a/net-wireless/unifi/unifi-5.8.23-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-d5a5bbfda4"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd-r1 unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.23.ebuild b/net-wireless/unifi/unifi-5.8.23.ebuild
deleted file mode 100644
index 265ecf2d858d..000000000000
--- a/net-wireless/unifi/unifi-5.8.23.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-d5a5bbfda4"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.24.ebuild b/net-wireless/unifi/unifi-5.8.24.ebuild
deleted file mode 100644
index 307f0db8a4f1..000000000000
--- a/net-wireless/unifi/unifi-5.8.24.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd-r1 unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.25.ebuild b/net-wireless/unifi/unifi-5.8.25.ebuild
new file mode 100644
index 000000000000..5e504bcbf6c9
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.25.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-34502471b9"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.8"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+ virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+ enewgroup unifi
+ enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+ # Remove unneeded files Linux, Mac and Windows
+ rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+ if ! use systemd; then
+ rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+ fi
+
+ default
+}
+
+src_install() {
+ # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+ # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+ exeinto /usr/lib/unifi/bin
+ newexe "${FILESDIR}"/mongod-wrapper mongod
+
+ insinto /usr/lib/unifi
+ doins -r dl lib webapps
+
+ diropts -o unifi -g unifi
+ keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+ for symlink in conf data run tmp work; do
+ dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+ done
+ dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+ newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+ systemd_dounit "${FILESDIR}"/unifi.service
+
+ newconfd "${FILESDIR}"/unifi.confd unifi
+
+ echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+ doenvd "${T}"/99unifi
+
+ einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.9.12.ebuild b/net-wireless/unifi/unifi-5.9.12.ebuild
new file mode 100644
index 000000000000..ad64b5df30fe
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.9.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-ZD3vz8Yw57I"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.9"
+
+RDEPEND="dev-db/mongodb
+ virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+ enewgroup unifi
+ enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+ # Remove unneeded files Linux, Mac and Windows
+ rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+
+ default
+}
+
+src_install() {
+ # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+ # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+ exeinto /usr/lib/unifi/bin
+ newexe "${FILESDIR}"/mongod-wrapper mongod
+
+ insinto /usr/lib/unifi
+ doins -r dl lib webapps
+
+ diropts -o unifi -g unifi
+ keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+ for symlink in conf data run tmp work; do
+ dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+ done
+ dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+ newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+ systemd_dounit "${FILESDIR}"/unifi.service
+
+ newconfd "${FILESDIR}"/unifi.confd unifi
+
+ echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+ doenvd "${T}"/99unifi
+
+ einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.9.4.ebuild b/net-wireless/unifi/unifi-5.9.4.ebuild
deleted file mode 100644
index 9ca7b2b27c36..000000000000
--- a/net-wireless/unifi/unifi-5.9.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-b647df56b7"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.9"
-
-RDEPEND="dev-db/mongodb
- virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
- enewgroup unifi
- enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
- # Remove unneeded files Linux, Mac and Windows
- rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
- default
-}
-
-src_install() {
- # Install MongoDB wrapper script, to avoid problems with >= 3.6.0
- # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
- exeinto /usr/lib/unifi/bin
- newexe "${FILESDIR}"/mongod-wrapper mongod
-
- insinto /usr/lib/unifi
- doins -r dl lib webapps
-
- diropts -o unifi -g unifi
- keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
- for symlink in conf data run tmp work; do
- dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
- done
- dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
- newinitd "${FILESDIR}"/unifi.initd unifi
- systemd_dounit "${FILESDIR}"/unifi.service
-
- newconfd "${FILESDIR}"/unifi.confd unifi
-
- echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
- doenvd "${T}"/99unifi
-
- einstalldocs
-}
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 37ff57d66838..e7f6ea2512b2 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
Binary files differ
diff --git a/perl-core/Module-CoreList/Manifest b/perl-core/Module-CoreList/Manifest
index 3ed2b28bf728..b53090a66484 100644
--- a/perl-core/Module-CoreList/Manifest
+++ b/perl-core/Module-CoreList/Manifest
@@ -1,5 +1,9 @@
DIST Module-CoreList-5.20170923.tar.gz 100356 BLAKE2B b28a9f9ed0571a3ade0491766d779146c1a5abfb053e306972267d27fa444c21eb757318366747d96ef52ce5f9306e3b9d8ab7a67e7dac7b75ab7ba688a14d3c SHA512 9ed80b007234c25c30234d5519637601b088623dce0cb877f34357a37e95764b404fda1396d964ef3075efe5dc7d9ec267bfe3b0cf408db5be3c81f05f04ffc1
DIST Module-CoreList-5.20180414.tar.gz 104823 BLAKE2B 14c1d90b22019ebaf7e5cfa391c954799e1fd19c2b3d3f68fccecb3b4fe792ec26dcabd53a74c28adea20c78b9b74f85f54315ad0db1a1049dba81c4d88bf2c7 SHA512 1e0dcd7f14e50c2bfac48615c476a1012ae14f068221839e5ecc0a03d68b48f4afb8ba207285d8543268791526764437046a0ac2f2e1eb7843380948a38a4421
+DIST Module-CoreList-5.20180622.tar.gz 105173 BLAKE2B 1fbac573fe0f613b1d4625ddb5752ddc73e3d4f49f1ce67379f4b3c7d3e0dbe41a114278573669033f92ef5a29f997a8d9dac07a4e6f2b3cdf562bcd7edb4f9e SHA512 cc5e31f05a0c6fae716f3b58b52f918f0ecfadf7faa01a475200c28d8962daadd46535c26da43118b586e087159ae851a37e92ba7f6ec01ee6ed94423695b5f9
+DIST Module-CoreList-5.20180626.tar.gz 105236 BLAKE2B 47d7ceaae99bd765f0aea08fb687cc246e97f3c299cd4c6e22e3658f77441e539966aa55f12ba8f729e4a1193baf0d59192aa66fb07c9896c3d2a4564cb0408d SHA512 35a0602e47e0b113d031d135ac188f95ad81db1a4ca245379bb83c6315ed78a75b4084fa110652d4769b0e21e6d5d6c9e70908e38733ad8083fdb37d485651f5
EBUILD Module-CoreList-5.201.709.230.ebuild 530 BLAKE2B 23c6c17d00c8884f7331b23a269c9ce16fbec123e2bd10be23615f7da094ac9fdf866a5691707ea96bf5e1ebbaf6b1c42bab03c5117f00f938dc62261d17ff3e SHA512 55469a43b9a58d576fce7e3863991c78880e34358e2630971fb0a7cd597f6a0717d8c3202b58f1de3b1d93c040eae11a30a295730b74996416d9ad8b9622a87f
EBUILD Module-CoreList-5.201.804.140.ebuild 574 BLAKE2B d834bbe07d3adb206124db4bb111143c977b85eb49718b041da01c12d80e398f2127cf2ecf0a57f5005f2c26fa3ee052d95f943f991bf68a8e2b1c54b04af649 SHA512 59c4b43f52a61b82ea60f9b68107903733802c469d6485d395cf03c53314194535c3c5fe5897fd56c7a367792c2b4c29ae438430aa93f5a1ceb3c0c5bc3ccb30
+EBUILD Module-CoreList-5.201.806.220.ebuild 574 BLAKE2B cfdd86a044713b20539e82595e04254c33491043822e23d73e8213ca8b3e56286beaa4e73e551dd0ed5ba4f1d760cb52670913c6e3d7c8f8e555c2820110f2ed SHA512 f32d7d4e4563509d21bf9c724aaaf1db6adcb7e14c67671e35cb13525975a6d882d7211d5cc17f6bf679543c983d1e0e654931fd621096454c47d2a9df739df1
+EBUILD Module-CoreList-5.201.806.260.ebuild 574 BLAKE2B af9811d1380e858d8c5825c2d2746a7c34bb3145226456afd6154cc852b6740a35882a977795fc637b54ac0197a5fb5b848441e1907ac6aff4ccd151ffdf0c00 SHA512 5936a410d27d35dddd1778aab6f74ebb16043e4c184a422825411e66f0f17e50a37b1449562585513a63fa8e11666cdc7d207a3e266be7f31e39900e19d5ccbe
MISC metadata.xml 472 BLAKE2B 31543c4ecf9e5cd758f5a8f394070bb229aef462261aee63f1ca8d2f1e4f3151ecbc7d3fd16201a54ac5d36f3f62d8854646da948fb91c80f2542683051afa05 SHA512 000f8ee8e9a4db118cf59cc7688b5e1b5eae0520f05d8e4729f2a4dc8e480a404af160477543575104a289184f344385395d0555c7440759d3d41a6f946fa545
diff --git a/perl-core/Module-CoreList/Module-CoreList-5.201.806.220.ebuild b/perl-core/Module-CoreList/Module-CoreList-5.201.806.220.ebuild
new file mode 100644
index 000000000000..8ba371dd94f9
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-5.201.806.220.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=5.20180622
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PERL_RM_FILES=("t/maintainer.t" "t/pod.t")
diff --git a/perl-core/Module-CoreList/Module-CoreList-5.201.806.260.ebuild b/perl-core/Module-CoreList/Module-CoreList-5.201.806.260.ebuild
new file mode 100644
index 000000000000..2589a6155ae3
--- /dev/null
+++ b/perl-core/Module-CoreList/Module-CoreList-5.201.806.260.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=5.20180626
+inherit perl-module
+
+DESCRIPTION="what modules shipped with versions of perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PERL_RM_FILES=("t/maintainer.t" "t/pod.t")
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c213f3690a2c..3f6ca0e41ec4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 7ef77fce94be..3bc017ef9a61 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Brian Evans <grknight@gentoo.org> (16 Dec 2017)
# Needs dev-lang/php:7.1 stable
php_targets_php7-1
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index b5a541324b9c..1fc437119b70 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
# dev-db/firebird is keyworded ~amd64
firebird
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 144142b62ad7..7c318aca470c 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Patrick McLean <chutzpah@gentoo.org> (12 Jul 2018)
+# requires nodejs
+>=sys-cluster/ceph-13
+
# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
# Broken multilib dependencies.
net-im/mattermost-desktop-bin
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 91c3f277d6b7..c890d5991f36 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2018)
# Not stable, bug #642822
qt5
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 88dbd0dff5f3..7f72321bf40f 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,12 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (07 Jul 2018)
+# Unkeyworded dependencies.
+dev-python/matplotlib doc
+net-libs/gnome-online-accounts gnome
+x11-libs/gksu gnome
+
# Thomas Deutschmann <whissi@gentoo.org> (04 Jul 2018)
# dev-libs/xxhash not keyworded for arm64
app-admin/rsyslog xxhash
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 0c08ee777acd..e7c721a3a47c 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,10 @@
-neon
-armvfp
+# Michał Górny <mgorny@gentoo.org> (09 Jul 2018)
+# No OpenCL provider is available on arm64.
+opencl
+
# Michał Górny <mgorny@gentoo.org> (03 Feb 2018)
# dev-lang/luajit not tested here.
luajit
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 51ffb918bc86..5a2f6022136b 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Mart Raudsepp <leio@gentoo.org> (06 May 2018)
# net-print/cups not stable yet
cups
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be..7b9d312ba398 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Not stable
mkl
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 5668fa2390af..a36770e86d76 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,12 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Pacho Ramos <pacho@gentoo.org> (27 May 2018)
+# kde-frameworks/kdelibs4support not keyworded on ppc
+# Michał Górny <mgorny@gentoo.org> (09 Jul 2018)
+# Moved to parent powerpc profile as it applies to ppc64 as well
+x11-wm/sawfish kde
+
# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
# Requires unported sys-libs/netbsd-csu
sys-devel/clang-runtime crt
@@ -23,6 +29,7 @@ net-vpn/tor test
# Sergei Trofimovich <slyfox@gentoo.org> (27 Mar 2018)
# dev-qt/qtwebengine is not ported to powerpc
+net-irc/quassel urlpreview
www-client/otter webengine
# Matthias Maier <tamiko@gentoo.org> (18 Mar 2018)
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 128b2317214d..fa955997fbd1 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,10 +1,6 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# Pacho Ramos <pacho@gentoo.org> (27 May 2018)
-# kde-frameworks/kdelibs4support not keyworded on ppc
-x11-wm/sawfish kde
-
# Andreas Sturmlechner <asturm@gentoo.org> (29 Jan 2018)
# Requires media-libs/libffado, which requires dev-python/PyQt5,
# which is not keyworded.
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 7f3d00880ab9..49f0bee80f65 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,8 @@
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Mikle Kolyada <zlogene@gentoo.org> (24 Apr 2018)
# no stable net-misc/aria2 on ppc
aria2
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index e797af411b72..a47ca75152f7 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -3,3 +3,8 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 6e2409773e28..283bf2459f75 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -9,7 +9,7 @@ dev-vcs/subversion kwallet
app-text/ghostscript-gpl cups
# not really interested in supporting alternative
# VCS for oberlays yet.
-app-portage/layman darcs mercurial
+app-portage/layman bazaar darcs mercurial
# Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a381058c68d3..127d5cf20fb7 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
# Drop stable ruby on sparc
ruby
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 13064b699d26..85f2fc153000 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
+# dev-lang/python:3.7 is not stable.
+python_targets_python3_7
+python_single_target_python3_7
+
# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
# dev-db/firebird is keyworded ~x86
firebird
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 93e36f459c62..ee4a7c236404 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -62,6 +62,7 @@ dev-lang/python-exec python_targets_python2_7
dev-lang/python-exec python_targets_python3_4
dev-lang/python-exec python_targets_python3_5
dev-lang/python-exec python_targets_python3_6
+dev-lang/python-exec python_targets_python3_7
dev-lang/python-exec python_targets_jython2_7
dev-lang/python-exec python_targets_pypy
dev-lang/python-exec python_targets_pypy3
diff --git a/profiles/desc/enlightenment_modules.desc b/profiles/desc/enlightenment_modules.desc
new file mode 100644
index 000000000000..b5adc17e45bd
--- /dev/null
+++ b/profiles/desc/enlightenment_modules.desc
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of ENLIGHTENMENT_MODULES USE_EXPAND
+# for x11-wm/enlightenment.
+
+appmenu - Gadget that holds the menubar of the foreground application
+backlight - Backlight control slider gadget
+battery - A gadget to visualize your battery status
+bluez4 - Configure Bluetooth devices
+clock - Nice clock gadget to show current time
+connman - Control Wifi and wired networks as a user
+cpufreq - Gadget to monitor and change the CPU frequency
+everything - The run command module provides an application launcher dialog
+fileman - Enlightenment's integrated file manager
+fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
+gadman - Module to manage gadgets on the desktop
+geolocation - Geolocation information
+ibar - Iconic application launcher
+ibox - A home for your iconified applications
+lokker - Screen locker
+luncher - Iconic application launcher
+mixer - A module to provide a mixer for changing volume
+msgbus - DBus Extension
+music-control - Control your music in your shelf
+notification - Notification-daemon alternative
+packagekit - Package manager integration
+pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
+pager-plain - A simpler desktop pager
+quickaccess - Enlightenment Quickaccess Launcher
+shot - Simple screenshot+save/upload module
+start - Enlightenment's 'Start' button equivalent
+syscon - Provides a unified popup dialog for all the system actions in Enlightenment
+sysinfo - A gadget to visualize your system info
+systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
+tasks - Gadget to allow you to switch tasks
+teamwork - Enable teamwork module
+temperature - Temperature monitor
+time - Time related gadgets
+tiling - Positions/resizes your windows tilingly
+vkbd - Virtual keyboard
+winlist - A module to show the list of client applications presently running
+wizard - First Run Wizard
+wireless - WiFi monitoring
+wl-buffer - Wayland buffer
+wl-desktop-shell - Enlightenment Wayland Desktop Shell
+wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
+wl-text-input - Wayland text input support
+wl-weekeyboard - Wayland virtual keyboard
+wl-wl - Wayland-in-Wayland module
+wl-x11 - Wayland-in-X11 module
+xkbswitch - Keyboard layout configuration and switcher
+xwayland - X/Wayland integration
+conf - Settings Panel
+conf-applications - Allows configuration of Ibar, Restart, and Startup applications
+conf-bindings - Input Control Settings
+conf-dialogs - Configure default dialog properties
+conf-display - Used to configure your screen
+conf-interaction - Configure Mouse and Touch input
+conf-intl - Used to select a default language
+conf-menus - Configures menu behavior
+conf-paths - Specifies the Enlightenment search paths and default directories
+conf-performance - Used to configure certain performance related items as frame rates and cache settings
+conf-randr - Used to configure your screen's resolution
+conf-shelves - Shelf configuration dialog
+conf-theme - Used to configure your theme preferences
+conf-window-manipulation - Configures window raise, resistance, and maximize policies
+conf-window-remembers - Delete existing window remembers
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index f86e7fff6686..806875d947af 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -7,6 +7,7 @@ python2_7 - Build for Python 2.7 only
python3_4 - Build for Python 3.4 only
python3_5 - Build for Python 3.5 only
python3_6 - Build for Python 3.6 only
+python3_7 - Build for Python 3.7 only
jython2_7 - Build for Jython 2.7 only
pypy - Build for PyPy only
pypy3 - Build for PyPy3 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 4a637db96162..d338bba3b194 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -7,6 +7,7 @@ python2_7 - Build with Python 2.7
python3_4 - Build with Python 3.4
python3_5 - Build with Python 3.5
python3_6 - Build with Python 3.6
+python3_7 - Build with Python 3.7
jython2_7 - Build with Jython 2.7
pypy - Build with PyPy
pypy3 - Build with PyPy3
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index 2a1686418a8f..a2ccaca4c8e2 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,7 +1,9 @@
# >=python-3 is masked
+python_single_target_python3_7
python_single_target_python3_6
python_single_target_python3_5
python_single_target_python3_4
+python_targets_python3_7
python_targets_python3_6
python_targets_python3_5
python_targets_python3_4
diff --git a/profiles/license_groups b/profiles/license_groups
index 3cc9f8a7c89a..9fb680107ae9 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
# License agreements that try to take away your rights. These are more
# restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x AMD-GPU-PRO-EULA ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
# Local Variables:
# mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 6038bea18e9b..76afbdcb1885 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,91 @@
#--- END OF EXAMPLES ---
+# Corentin Pazdera <nado@troglodyte.be> (12 Jul 2018)
+# Pulseeffects depends on atoms only found in gnome overlay
+>=media-sound/pulseeffects-4.0.0
+
+# Michał Górny <mgorny@gentoo.org> (12 Jul 2018)
+# Abandoned upstream, no reverse dependencies. Collides with
+# dev-python/promises (that has revdeps).
+# Removal in 30 days. Bug #651156.
+dev-python/promise
+
+# Jonas Stein <jstein@gentoo.org> (10 Jul 2018)
+# Package is not maintained, has a broken SRC_URI and
+# we may not mirror the files.
+# Removal on (10 Aug 2018) Bug #660750
+media-sound/neroaac
+
+# Kent Fredric <kentnl@gentoo.org> (10 Jul 2018)
+# Perl 5.28 Staging block
+=dev-lang/perl-5.28.0
+=virtual/perl-Attribute-Handlers-1.10.0
+=virtual/perl-B-Debug-1.260.0
+=virtual/perl-CPAN-2.200.0
+=virtual/perl-Carp-1.500.0
+=virtual/perl-Compress-Raw-Zlib-2.76.0
+=virtual/perl-Data-Dumper-2.170.0
+=virtual/perl-Devel-PPPort-3.400.0
+=virtual/perl-Digest-SHA-6.10.0
+=virtual/perl-Encode-2.970.0
+=virtual/perl-Exporter-5.730.0
+=virtual/perl-ExtUtils-CBuilder-0.280.230
+=virtual/perl-ExtUtils-Constant-0.250.0
+=virtual/perl-ExtUtils-Install-2.140.0
+=virtual/perl-ExtUtils-MakeMaker-7.340.0
+=virtual/perl-ExtUtils-ParseXS-3.390.0
+=virtual/perl-File-Path-2.150.0
+=virtual/perl-File-Spec-3.740.0
+=virtual/perl-Filter-Simple-0.950.0
+=virtual/perl-Getopt-Long-2.500.0
+=virtual/perl-I18N-LangTags-0.430.0
+=virtual/perl-IO-Socket-IP-0.390.0
+=virtual/perl-IO-1.390.0
+=virtual/perl-IPC-Cmd-1.0.0
+=virtual/perl-JSON-PP-2.970.10
+=virtual/perl-Locale-Maketext-1.290.0
+=virtual/perl-Math-BigInt-FastCalc-0.500.600
+=virtual/perl-Math-BigInt-1.999.811
+=virtual/perl-Math-BigRat-0.261.300
+=virtual/perl-Net-Ping-2.620.0
+=virtual/perl-Scalar-List-Utils-1.500.0
+=virtual/perl-Socket-2.27.0
+=virtual/perl-Storable-3.80.0
+=virtual/perl-Test-Harness-3.420.0
+=virtual/perl-Test-Simple-1.302.133
+=virtual/perl-Test-1.310.0
+=virtual/perl-Time-HiRes-1.975.900
+=virtual/perl-Time-Piece-1.320.400
+=virtual/perl-Unicode-Collate-1.250.0
+=virtual/perl-Unicode-Normalize-1.260.0
+=virtual/perl-XSLoader-0.300.0
+=virtual/perl-bignum-0.490.0
+=virtual/perl-if-0.60.800
+=virtual/perl-libnet-3.110.0
+=virtual/perl-podlators-4.100.0
+=virtual/perl-threads-shared-1.580.0
+=virtual/perl-threads-2.220.0
+=virtual/perl-version-0.992.300
+
+# Andreas Schuerch <nativemad@gentoo.org> (10 Jul 2018)
+# Packages have open bugs and mayor component is not working since years
+# Removal in 30 days. Bug 608540
+net-misc/guacamole-server
+www-apps/guacamole
+
+# Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2018)
+# Hasn’t been updated in years, upstream’s download source is blank, and depends
+# on an outdated twisted-core (Bug 660668). Removal after 2018-08-08.
+dev-python/pgasync
+
+# Louis Sautier <sbraz@gentoo.org> (8 July 2018)
+# Superseded, respectively by dev-python/setuptools_scm
+# and dev-python/jaraco-* + dev-python/tempora.
+# Removal in a month. See https://bugs.gentoo.org/582728
+dev-python/hgtools
+dev-python/jaraco-utils
+
# Brian Dolbec <dolsen@gentoo.org> (4 July 2018)
# No longer needed, newer gpg-2 versions have simple cli options
# for generating new keys and doing key maintenance. Removal in a month
@@ -98,11 +183,6 @@ app-i18n/ibus-qt
app-i18n/qimhangul
=app-i18n/tagainijisho-1.0*
-# Nick Sarnie <sarnex@gentoo.org> (24 Jun 2018)
-# Does not build if previous version is installed
-# Bug #658900
-=media-libs/vulkan-loader-1.1.77.0
-
# Thomas Deutschmann <whissi@gentoo.org> (23 Jun 2018)
# Doesn't pass QA full boot test
=sys-kernel/ck-sources-4.16.17
@@ -211,10 +291,6 @@ games-strategy/gorky17-demo
net-vpn/miredo
# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to build (#642996). Removal in a month.
-games-engines/gargoyle
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
# Fails to compile (#648430), crashes from time to time (#222065). Removal
# in a month.
app-misc/wyrd
@@ -366,22 +442,6 @@ media-plugins/gst-plugins-schroedinger
dev-lang/php:7.3
virtual/httpd-php:7.3
-# Andreas Sturmlechner <asturm@gentoo.org> (10 Jun 2018)
-# Dead upstream, no more revdeps after LO dropped support.
-# Masked for removal in 30 days, bug #657400
-media-libs/libgltf
-
-# Mikle Kolyada <zlogene@gentoo.org> (9 June 2018)
-# Fails to buil, dead upstream, EAPI=2
-# Only the live enuild in the tree.
-# Masked for removal in 30 days
-sys-fs/yaffs-utils
-
-# Daniel Pielmeier <billie@gentoo.org> (8 June 2018)
-# Does not support PyQt5 as well as python 3. Upstream unresponsive.
-# Masked for removal in 30 days. Bug #649112.
-media-sound/puddletag
-
# Mike Pagano <mpagano@gentoo.org> (30 May 2018)
# Masking due to bad commit in the networking stack.
=sys-kernel/gentoo-sources-4.14.46
diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index a953069a8059..7e47b5dd84fd 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -8,3 +8,4 @@
python_targets_python3_4
python_targets_python3_5
python_targets_python3_6
+python_targets_python3_7
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 0a06390604fc..afac0df64f6a 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -93,31 +93,6 @@ arm default/linux/arm/13.0/armv7a dev
arm default/linux/arm/13.0/armv7a/desktop dev
arm default/linux/arm/13.0/armv7a/desktop/gnome dev
arm default/linux/arm/13.0/armv7a/developer dev
-arm default/linux/arm/17.0 stable
-arm default/linux/arm/17.0/desktop dev
-arm default/linux/arm/17.0/desktop/gnome dev
-arm default/linux/arm/17.0/desktop/gnome/systemd dev
-arm default/linux/arm/17.0/developer dev
-arm default/linux/arm/17.0/armv4 dev
-arm default/linux/arm/17.0/armv4/desktop dev
-arm default/linux/arm/17.0/armv4/desktop/gnome dev
-arm default/linux/arm/17.0/armv4/developer dev
-arm default/linux/arm/17.0/armv4t dev
-arm default/linux/arm/17.0/armv4t/desktop dev
-arm default/linux/arm/17.0/armv4t/desktop/gnome dev
-arm default/linux/arm/17.0/armv4t/developer dev
-arm default/linux/arm/17.0/armv5te dev
-arm default/linux/arm/17.0/armv5te/desktop dev
-arm default/linux/arm/17.0/armv5te/desktop/gnome dev
-arm default/linux/arm/17.0/armv5te/developer dev
-arm default/linux/arm/17.0/armv6j dev
-arm default/linux/arm/17.0/armv6j/desktop dev
-arm default/linux/arm/17.0/armv6j/desktop/gnome dev
-arm default/linux/arm/17.0/armv6j/developer dev
-arm default/linux/arm/17.0/armv7a dev
-arm default/linux/arm/17.0/armv7a/desktop dev
-arm default/linux/arm/17.0/armv7a/desktop/gnome dev
-arm default/linux/arm/17.0/armv7a/developer dev
# ARM64 Profiles
# @MAINTAINER: arm64@gentoo.org
diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask
index 2a0fa24c12a7..1df5dca362c3 100644
--- a/profiles/releases/13.0/package.mask
+++ b/profiles/releases/13.0/package.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Patrick McLean <chutzpah@gentoo.org> (10 Jul 2018)
+# requires >=nodejs-8.10 which is not available in 13.0 based profiles.
+# Please migrate to one of the 17.0 release profiles
+>=sys-cluster/ceph-13
+
# Andreas K. Hüttel <dilfridge@gentoo.org> (29 Jan 2018)
# Requires >=icu-60, which is not available in 13.0 based profiles.
# Please migrate to one of the 17.0 release profiles.
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 54236e654589..d2abc3d4a5ce 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -6,6 +6,7 @@ cran http://cran.r-project.org http://cran.us.r-project.org
debian http://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
fedora-dev http://archives.fedoraproject.org/pub/archive/fedora/linux/
freebsd https://download.freebsd.org/ftp/
+freedesktop https://www.freedesktop.org/software/
gentoo https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
gimp https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.org/gimp.org/pub/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
github https://github.com/downloads
@@ -40,4 +41,4 @@ sourceforge.jp http://iij.dl.sourceforge.jp http://osdn.dl.sourceforge.jp http:/
ubuntu http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.tcc.wa.edu.au/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ http://mirror.dhakacom.com/ubuntu-archive/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://archive.ubuntu.mirror.dkm.cz/ http://ftp.cvut.cz/ubuntu/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ftp.stw-bonn.de/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://mirror.network32.net/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ http://nl3.archive.ubuntu.com/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ http://free.nchc.org.tw/ubuntu/ http://ftp.yzu.edu.tw/ubuntu/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ http://ubuntu.volia.net/ubuntu-archive/ http://mirror.sax.uk.as61049.net/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirrors.namecheap.com/ubuntu/
vdr-developerorg http://projects.vdr-developer.org/attachments/download
vdrfiles http://gentoo.fh-luh.de/files
-xfce http://archive.xfce.org
+xorg https://www.x.org/releases/individual
diff --git a/profiles/updates/3Q-2018 b/profiles/updates/3Q-2018
new file mode 100644
index 000000000000..692c402ac5f1
--- /dev/null
+++ b/profiles/updates/3Q-2018
@@ -0,0 +1 @@
+move app-crypt/sbsigntool app-crypt/sbsigntools
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 088b16762d3c..e2af270f8fc2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -214,7 +214,6 @@ app-arch/engrampa:packagekit - Enable support for installing via app-admin/packa
app-arch/file-roller:nautilus - Build contextual menu extension for gnome-base/nautilus.
app-arch/file-roller:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
app-arch/gzip:pic - disable optimized assembly code that is not PIC friendly
-app-arch/innoextract:c++0x - Compile innoextract using the C++11 standard
app-arch/innoextract:debug - Enable debug logging and the --debug command-line option
app-arch/innoextract:lzma - Enable support for extracting lzma-compressed installers using app-arch/xz-utils
app-arch/libarchive:bzip2 - Allow accessing bzip2-compressed archives through libbz2 (which comes with app-arch/bzip2). This only affects libarchive's native support: bsdtar will keep using bunzip2 as a filter if that's not built-in.
@@ -356,6 +355,7 @@ app-doc/csound-manual:html - Install HTML documentation
app-doc/doxygen:clang - support for sys-devel/clang assisted parsing
app-doc/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
app-doc/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
+app-doc/gnucash-docs:l10n_C - English
app-doc/kicad-doc:html - Generate documentation in HTML format
app-doc/kicad-doc:pdf - Generate documentation in PDF format
app-doc/linuxfromscratch:htmlsingle - Install all-on-one-page HTML version.
@@ -990,9 +990,7 @@ app-misc/lirc:devinput - Support the devinput input device
app-misc/lirc:ftdi - Support FTDI devices
app-misc/lirc:gtk - Include GTK support which enables the use of lirc-setup
app-misc/lirc:hardware-carrier - The transmitter device generates its clock signal in hardware
-app-misc/lirc:iguanair - Support iguanaIR devices
app-misc/lirc:inputlirc - Add a dependency on app-misc/inputlircd
-app-misc/lirc:irman - Add a dependency on media-libs/libirman
app-misc/lirc:transmitter - Add transmitter support to some lirc-drivers (e.g. serial)
app-misc/lirc:uinput - Enable support for uinput
app-misc/mc:edit - Compile and install the mcedit application
@@ -1108,7 +1106,6 @@ app-office/kraft:pim - Enable support for KDE PIM resources integration
app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
-app-office/libreoffice:gtk3 - Enable experimental gtk3 frontend
app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
app-office/libreoffice:odk - Build the Office Development Kit
app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
@@ -1380,6 +1377,10 @@ dev-ada/gtkada:shared - Build gtkada as shared library
dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
dev-ada/libadalang:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/libadalang:shared - Build shared library
+dev-ada/libadalang-tools:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+dev-ada/libadalang-tools:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/libadalang-tools:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
@@ -2044,9 +2045,14 @@ dev-lang/ruby:jemalloc - Use dev-libs/jemalloc for memory allocation.
dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
+dev-lang/rust:cargo - Install cargo component
dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
+dev-lang/rust:rls - Install rls component
+dev-lang/rust:rustfmt - Install rustfmt component
dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
+dev-lang/rust-bin:cargo - Install cargo component
+dev-lang/rust-bin:rustfmt - Install rustfmt component
dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -2055,6 +2061,7 @@ dev-lang/spidermonkey:system-icu - Use the system-wide dev-libs/icu instead of b
dev-lang/spidermonkey:threadsafe - Build a threadsafe version of spidermonkey
dev-lang/swi-prolog:archive - Use libarchive for extension packs
dev-lang/swi-prolog:uuid - Use ossp-uuid for UUID pack
+dev-lang/swi-prolog:yaml - Use libyaml for YAML pack
dev-lang/swig:ccache - build ccache-swig(a fast compiler cache)
dev-lang/yap:R - Enable support for connecting R to Prolog
dev-libs/DirectFB:bmp - build BMP image provider
@@ -2881,6 +2888,7 @@ dev-ruby/ruby-sdl:image - Enable media-libs/sdl-image support
dev-ruby/ruby-sdl:mixer - Enable media-libs/sdl-mixer support
dev-ruby/ruby-sdl:sge - Enable sdl-sge support
dev-ruby/rubygems:server - Install support for the rubygems server
+dev-scheme/gauche:mbedtls - Enable support for net-libs/mbedtls
dev-scheme/gauche-gl:cg - Enable NVidia Cg binding
dev-scheme/gauche-gtk:glgd - Enable GL graph draw
dev-scheme/guile:debug-freelist - Include garbage collector freelist debugging code
@@ -2955,6 +2963,8 @@ dev-util/cppcheck:htmlreport - install cppcheck-htmlreport
dev-util/ctags:json - Enable JSON output support
dev-util/ctags:xml - Enable XML parsing support
dev-util/ctags:yaml - Enable YAML parsing support
+dev-util/cutter:jupyter - Add support for jupyter notebook
+dev-util/cutter:webengine - Use dev-qt/qtwebengine for in-app jupyter browser
dev-util/cwdiff:a2ps - install app-text/a2ps for postscript output
dev-util/cwdiff:mercurial - install hg wdiff alias for dev-vcs/mercurial
dev-util/devhelp:gedit - Install plugin for app-editors/gedit
@@ -3078,6 +3088,8 @@ dev-util/sysdig:modules - Build kernel modules needed for tracing local events.
dev-util/sysprof:systemd - Build the sysprofd daemon service, required to run the UI without root permissions. Relies on sys-apps/systemd running as the init system.
dev-util/systemtap:libvirt - Support probing of libvirt domains.
dev-util/trace-cmd:udis86 - Enable support for dev-libs/udis86 disassembler library
+dev-util/vulkan-tools:cube - Build the cube/cubepp demos
+dev-util/vulkan-tools:vulkaninfo - Build the vulkaninfo utility
dev-vcs/bzr:sftp - Enable sftp support
dev-vcs/cssc:valgrind - Enable usage of dev-util/valgrind in tests
dev-vcs/cvs:server - Enable server support
@@ -3222,6 +3234,7 @@ games-emulation/dolphin:lto - Add support for link-time optimizations.
games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
games-emulation/fceux:logo - Enable the ability to add a logo screen when creating AVIs
games-emulation/generator:sdlaudio - Enable SDL Audio
+games-emulation/hatari:sdl2 - Use libsdl2 instead of libsdl
games-emulation/higan:icarus - Build icarus library manager
games-emulation/higan:udev - Enable udev based input
games-emulation/m64py:7z - Ensure support for .7z archives.
@@ -3253,6 +3266,7 @@ games-emulation/vbam:link - Enable GBA linking functionality
games-emulation/yabause:pic - disable optimized assembly code that is not PIC friendly
games-emulation/zsnes:debug - Enable the builtin debugger
games-emulation/zsnes:pax_kernel - Triggers a paxmarking of the binary
+games-engines/exult:sdl2 - Use libsdl2 instead of libsdl
games-engines/frobtads:tads2compiler - Build TADS2 compiler
games-engines/frobtads:tads3compiler - Build TADS3 compiler
games-engines/odamex:master - Build master server target (advertises odamex server list)
@@ -3295,6 +3309,7 @@ games-fps/eduke32:sc-55 - Install the Duke Nukem 3D Roland SC-55 music files.
games-fps/eduke32:sdk - Install the SDK files.
games-fps/eduke32:server - Enable support for multiplayer.
games-fps/eduke32:tools - Install the support tools for mapster32.
+games-fps/eduke32:voxels - Install the Duke Nukem 3D Voxels Pack.
games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
games-fps/eduke32:xmp - Enable support for media-libs/exempi.
games-fps/lsdldoom:freedoom - Install games-fps/freedoom wad file
@@ -3589,7 +3604,6 @@ kde-apps/kopete:translator - Translate incoming and outgoing messages.
kde-apps/kopete:urlpicpreview - Enables in conversation pictures preview.
kde-apps/kopete:webpresence - Show your status and some more information on web.
kde-apps/kopete:winpopup - Enable pop-up messages sending on windows. (same as good old "net send" messages ;])
-kde-apps/kopete:yahoo - Enable yahoo protocol support.
kde-apps/kopete:zeroconf - Enable Link-Local Messaging via the bonjour protocol.
kde-apps/kpimtextedit:designer - Build plugins for dev-qt/designer
kde-apps/kpimtextedit:speech - Enable text-to-speech support
@@ -4727,6 +4741,7 @@ media-sound/mpfc:wav - Enable wav audio codec support
media-sound/mpg123:int-quality - Use rounding instead of fast truncation for integer output, where possible
media-sound/mumble:g15 - Enable support for the Logitech G15 LCD (and compatible devices).
media-sound/mumble:opus - Enable Opus codec support via media-libs/opus.
+media-sound/mumble:rnnoise - Enable alternative noise suppression option based on RNNoise.
media-sound/mumble:speech - Enable text-to-speech support in Mumble.
media-sound/murmur:ice - Use dev-libs/Ice to enable remote control capabilities.
media-sound/musescore:portmidi - Enable support for building against media-libs/portmidi
@@ -4758,10 +4773,6 @@ media-sound/pragha:peas - Enable various plugins that will pull in dev-libs/libp
media-sound/pragha:playlist - Enable enhanced playlist support using dev-libs/totem-pl-parser
media-sound/pragha:rygel - Share music on DLNA using net-misc/rygel
media-sound/pragha:soup - Search metadata on AcoustID and radios on TuneIn using net-libs/libsoup
-media-sound/puddletag:acoustid - Use media-libs/chromaprint for acoustic fingerprinting
-media-sound/puddletag:cover - Enables editing of FLAC cover art
-media-sound/puddletag:musicbrainz - Enables support for musicbrainz, needs dev-python/python-musicbrainz
-media-sound/puddletag:quodlibet - Enables support for editing media-sound/quodlibet databases
media-sound/pulseaudio:X - Build the X11 publish module to export PulseAudio information through X11 protocol for clients to make use. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
media-sound/pulseaudio:alsa-plugin - Request installing media-plugins/alsa-plugins with PulseAudio plugin enabled. This ensures that clients supporting ALSA only will use PulseAudio.
media-sound/pulseaudio:asyncns - Use libasyncns for asynchronous name resolution.
@@ -4780,6 +4791,10 @@ media-sound/pulseaudio:ssl - Use dev-libs/openssl to provide support for RAOP (A
media-sound/pulseaudio:system-wide - Allow preparation and installation of the system-wide init script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
media-sound/pulseaudio:systemd - Build with sys-apps/systemd support to replace standalone ConsoleKit.
media-sound/pulseaudio:webrtc-aec - Uses the webrtc.org AudioProcessing library for enhancing VoIP calls greatly in applications that support it by performing acoustic echo cancellation, analog gain control, noise suppression and other processing.
+media-sound/pulseeffects:bs2b - Enable use of media-libs/libbs2b
+media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/pulseeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
+media-sound/pulseeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
media-sound/qmidiarp:lv2 - Enables Ladspa V2 plugins.
media-sound/qmmp:analyzer - Enable visual analyzer
media-sound/qmmp:archive - Enable archiving plugin via app-arch/libarchive.
@@ -5144,12 +5159,15 @@ media-video/mpv:sdl - Enable media-libs/libsdl2 based video and audio outputs (N
media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv
media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet
media-video/mpv:vulkan - Enable support for various Vulkan-based video backends
-media-video/noad:libmpeg2 - Support for libmpeg2 library
+media-video/noad:libmpeg2 - Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg
media-video/nvidia-settings:gtk3 - Additionally build the GTK 3 library
media-video/nvidia_video_sdk:tools - Build and install example tools.
media-video/obs-studio:fdk - Enable libfdk support for AAC encoding.
media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead of FFmpeg.
-media-video/obs-studio:nvenc - Enable NVENC encoding for nVidia video cards
+media-video/obs-studio:luajit - Build support for scripting via Luajit.
+media-video/obs-studio:nvenc - Enable NVENC encoding for nVidia video cards.
+media-video/obs-studio:python - Build support for scripting via Python 3.
+media-video/obs-studio:speexdsp - Enable noise suppression filter support via media-libs/speexdsp.
media-video/ogmrip:ogm - Support for OGM container format
media-video/ogmrip:srt - Support for SRT subtitle format
media-video/orion:mpv - Use the media-video/mpv player (upstream default) instead of the dev-qt/qtmultimedia one
@@ -5229,7 +5247,6 @@ media-video/vlc:macosx-notifications - Enable Mac OS X notifications module (for
media-video/vlc:macosx-qtkit - Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module
media-video/vlc:macosx-quartztext - Enable Mac OS X quartz text module
media-video/vlc:matroska - Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)
-media-video/vlc:microdns - Enable Chromecast auto-detection using net-libs/libmicrodns
media-video/vlc:mpeg - Add libmpeg2 support for mpeg-1 and mpeg-2 video streams
media-video/vlc:nfs - Enable support for nfs protocol via net-fs/libnfs
media-video/vlc:omxil - Enable OpenMAX Integration Layer codec module
@@ -5758,6 +5775,7 @@ net-fs/samba:cluster - Enable support for clustering
net-fs/samba:dmapi - Enable support for DMAPI. This currently works only in combination with XFS.
net-fs/samba:gpg - Use app-crypt/gpgme for AD DC
net-fs/samba:iprint - Enabling iPrint technology by Novell
+net-fs/samba:json - Enable json audit support through dev-libs/jansson
net-fs/samba:quota - Enables support for user quotas
net-fs/samba:system-heimdal - Use app-crypt/heimdal instead of bundled heimdal.
net-fs/samba:system-mitkrb5 - Use app-crypt/mit-krb5 instead of app-crypt/heimdal.
@@ -7325,6 +7343,7 @@ sci-libs/coinor-utils:glpk - Enable GNU Linear Programming Kit sci-mathematics/g
sci-libs/dlib:cblas - Build with CBLAS virtual/cblas
sci-libs/dlib:cuda - Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)
sci-libs/dlib:mkl - Enable support for Intel FFT sci-libs/mkl
+sci-libs/dlib:python - Enable support for Python API bindings
sci-libs/dmlc-core:s3 - Support for the Amazon Simple Storage Service
sci-libs/fftw:float - Link default library to single precision instead of double (symlinks only and fftw-2.1)
sci-libs/fftw:quad - Build quadruple precision lib
@@ -7712,6 +7731,7 @@ sys-apps/fwupd:dell - Enable Dell-specific support.
sys-apps/fwupd:gpg - Enable GPG support.
sys-apps/fwupd:man - Build and install man pages
sys-apps/fwupd:pkcs7 - Enable PKCS7 verification support via net-libs/gnutls.
+sys-apps/fwupd:redfish - Install redfish plugin
sys-apps/fwupd:uefi - Enable UEFI support
sys-apps/fwupd:uefi_labels - Enable UEFI labels support
sys-apps/gawk:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
@@ -7735,6 +7755,7 @@ sys-apps/iproute2:elf - support loading eBPF programs from ELFs (e.g. LLVM's eBP
sys-apps/iproute2:iptables - include support for iptables filtering
sys-apps/iproute2:minimal - only install ip and tc programs, without eBPF support
sys-apps/irqbalance:numa - Support balancing IRQs across NUMA nodes
+sys-apps/irqbalance:tui - Enable build of irqbalance terminal user interface
sys-apps/kexec-tools:booke - Include support for Book-E memory management
sys-apps/kexec-tools:lzma - Enables support for LZMA compressed kernel images
sys-apps/kexec-tools:xen - Enable extended xen support
@@ -8508,6 +8529,7 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
www-apps/gitit:network-uri - Get Network.URI from the network-uri package.
www-apps/gitit:plugins - enables optional plugin runtime loader
www-apps/guacamole:noauth - enable support for leaving out any authentication on the webinterface
+www-apps/hugo:sass - Enable SASS/SCSS support
www-apps/icingaweb2:nginx - Adds support for nginx
www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
@@ -8521,6 +8543,21 @@ www-apps/nikola:watchdog - Use dev-python/watchdog to monitor file system events
www-apps/nikola:webmedia - Use dev-python/micawber to extract metadata from web media links
www-apps/nikola:websocket - Add websocket support thru dev-python/ws4py
www-apps/otrs:mod_perl - Provide all dependencies for use of mod_perl instead of cgi
+www-apps/phpsysinfo:apcupsd - Install sys-power/apcupsd to display those stats.
+www-apps/phpsysinfo:dmraid - Install sys-fs/dmraid to display those stats.
+www-apps/phpsysinfo:freeipmi - Install sys-libs/freeipmi to display those stats.
+www-apps/phpsysinfo:hddtemp - Install app-admin/hddtemp to display those stats.
+www-apps/phpsysinfo:ipmitool - Install sys-apps/ipmitool to display those stats.
+www-apps/phpsysinfo:ipmiutil - Install sys-apps/ipmiutil to display those stats.
+www-apps/phpsysinfo:iptables - Install net-firewall/iptables to display those stats.
+www-apps/phpsysinfo:lm_sensors - Install sys-apps/lm_sensors to display those stats.
+www-apps/phpsysinfo:mdadm - Install sys-fs/mdadm to display those stats.
+www-apps/phpsysinfo:megactl - Install sys-block/megactl to display those stats.
+www-apps/phpsysinfo:nut - Install sys-power/nut to display those stats.
+www-apps/phpsysinfo:quota - Install sys-fs/quota to display those stats.
+www-apps/phpsysinfo:smart - Install sys-apps/smartmontools to display those stats.
+www-apps/phpsysinfo:snmp - Install net-analyzer/net-snmp to display those stats.
+www-apps/phpsysinfo:uptime - Install app-misc/uptimed to display those stats.
www-apps/postfixadmin:vacation - Install vacation.pl script and dependencies
www-apps/radicale:bcrypt - Depend on passlib to enable bcrypt and md5 authentication methods
www-apps/redmine:markdown - Enable support for Markdown
@@ -8851,6 +8888,10 @@ x11-misc/light-locker:screensaver - Lock the screen on screensaver activation.
x11-misc/lightdm:gtk - Pull in the gtk+ greeter
x11-misc/mate-notification-daemon:gtk3 - Build with GTK+3 instead of GTK+2
x11-misc/mozo:gtk3 - Build with GTK+3 instead of GTK+2
+x11-misc/mugshot:gnome - Add support for gnome-base/gnome-control-center
+x11-misc/mugshot:libreoffice - Add support for app-office/libreoffice and app-office/libreoffice-bin
+x11-misc/mugshot:pidgin - Add support for setting the avatar in net-im/pidgin
+x11-misc/mugshot:webcam - Add support for setting a profile photo in media-video/cheese
x11-misc/openbox-menu:icons - Enable support for icons in menus
x11-misc/openbox-menu:svg - Support SVG icons
x11-misc/polybar:i3wm - Add support for i3 window manager
@@ -8969,68 +9010,6 @@ x11-themes/zuki-themes:xfce - Install theme for xfce-base/xfwm4
x11-themes/zukitwo:gnome-shell - Install theme for gnome-base/gnome-shell
x11-wm/echinus:xrandr - Enable support for multihead configuration
x11-wm/enlightenment:egl - Enable EGL rendering
-x11-wm/enlightenment:enlightenment_modules_appmenu - Gadget that holds the menubar of the foreground application
-x11-wm/enlightenment:enlightenment_modules_backlight - Backlight control slider gadget
-x11-wm/enlightenment:enlightenment_modules_battery - A gadget to visualize your battery status
-x11-wm/enlightenment:enlightenment_modules_bluez4 - Configure Bluetooth devices
-x11-wm/enlightenment:enlightenment_modules_clock - Nice clock gadget to show current time
-x11-wm/enlightenment:enlightenment_modules_conf - Settings Panel
-x11-wm/enlightenment:enlightenment_modules_conf-applications - Allows configuration of Ibar, Restart, and Startup applications
-x11-wm/enlightenment:enlightenment_modules_conf-bindings - Input Control Settings
-x11-wm/enlightenment:enlightenment_modules_conf-dialogs - Configure default dialog properties
-x11-wm/enlightenment:enlightenment_modules_conf-display - Used to configure your screen
-x11-wm/enlightenment:enlightenment_modules_conf-interaction - Configure Mouse and Touch input
-x11-wm/enlightenment:enlightenment_modules_conf-intl - Used to select a default language
-x11-wm/enlightenment:enlightenment_modules_conf-menus - Configures menu behavior
-x11-wm/enlightenment:enlightenment_modules_conf-paths - Specifies the Enlightenment search paths and default directories
-x11-wm/enlightenment:enlightenment_modules_conf-performance - Used to configure certain performance related items as frame rates and cache settings
-x11-wm/enlightenment:enlightenment_modules_conf-randr - Used to configure your screen's resolution
-x11-wm/enlightenment:enlightenment_modules_conf-shelves - Shelf configuration dialog
-x11-wm/enlightenment:enlightenment_modules_conf-theme - Used to configure your theme preferences
-x11-wm/enlightenment:enlightenment_modules_conf-window-manipulation - Configures window raise, resistance, and maximize policies
-x11-wm/enlightenment:enlightenment_modules_conf-window-remembers - Delete existing window remembers
-x11-wm/enlightenment:enlightenment_modules_connman - Control Wifi and wired networks as a user
-x11-wm/enlightenment:enlightenment_modules_cpufreq - Gadget to monitor and change the CPU frequency
-x11-wm/enlightenment:enlightenment_modules_everything - The run command module provides an application launcher dialog
-x11-wm/enlightenment:enlightenment_modules_fileman - Enlightenment's integrated file manager
-x11-wm/enlightenment:enlightenment_modules_fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
-x11-wm/enlightenment:enlightenment_modules_gadman - Module to manage gadgets on the desktop
-x11-wm/enlightenment:enlightenment_modules_geolocation - Geolocation information
-x11-wm/enlightenment:enlightenment_modules_ibar - Iconic application launcher
-x11-wm/enlightenment:enlightenment_modules_ibox - A home for your iconified applications
-x11-wm/enlightenment:enlightenment_modules_lokker - Screen locker
-x11-wm/enlightenment:enlightenment_modules_luncher - Iconic application launcher
-x11-wm/enlightenment:enlightenment_modules_mixer - A module to provide a mixer for changing volume
-x11-wm/enlightenment:enlightenment_modules_msgbus - DBus Extension
-x11-wm/enlightenment:enlightenment_modules_music-control - Control your music in your shelf
-x11-wm/enlightenment:enlightenment_modules_notification - Notification-daemon alternative
-x11-wm/enlightenment:enlightenment_modules_packagekit - Package manager integration
-x11-wm/enlightenment:enlightenment_modules_pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
-x11-wm/enlightenment:enlightenment_modules_pager-plain - A simpler desktop pager
-x11-wm/enlightenment:enlightenment_modules_quickaccess - Enlightenment Quickaccess Launcher
-x11-wm/enlightenment:enlightenment_modules_shot - Simple screenshot+save/upload module
-x11-wm/enlightenment:enlightenment_modules_start - Enlightenment's 'Start' button equivalent
-x11-wm/enlightenment:enlightenment_modules_syscon - Provides a unified popup dialog for all the system actions in Enlightenment
-x11-wm/enlightenment:enlightenment_modules_sysinfo - A gadget to visualize your system info
-x11-wm/enlightenment:enlightenment_modules_systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
-x11-wm/enlightenment:enlightenment_modules_tasks - Gadget to allow you to switch tasks
-x11-wm/enlightenment:enlightenment_modules_teamwork - Enable teamwork module
-x11-wm/enlightenment:enlightenment_modules_temperature - Temperature monitor
-x11-wm/enlightenment:enlightenment_modules_tiling - Positions/resizes your windows tilingly
-x11-wm/enlightenment:enlightenment_modules_time - Time related gadgets
-x11-wm/enlightenment:enlightenment_modules_vkbd - Virtual keyboard
-x11-wm/enlightenment:enlightenment_modules_winlist - A module to show the list of client applications presently running
-x11-wm/enlightenment:enlightenment_modules_wireless - WiFi monitoring
-x11-wm/enlightenment:enlightenment_modules_wizard - First Run Wizard
-x11-wm/enlightenment:enlightenment_modules_wl-buffer - Wayland buffer
-x11-wm/enlightenment:enlightenment_modules_wl-desktop-shell - Enlightenment Wayland Desktop Shell
-x11-wm/enlightenment:enlightenment_modules_wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
-x11-wm/enlightenment:enlightenment_modules_wl-text-input - Wayland text input support
-x11-wm/enlightenment:enlightenment_modules_wl-weekeyboard - Wayland virtual keyboard
-x11-wm/enlightenment:enlightenment_modules_wl-wl - Wayland-in-Wayland module
-x11-wm/enlightenment:enlightenment_modules_wl-x11 - Wayland-in-X11 module
-x11-wm/enlightenment:enlightenment_modules_xkbswitch - Keyboard layout configuration and switcher
-x11-wm/enlightenment:enlightenment_modules_xwayland - X/Wayland integration
x11-wm/enlightenment:ukit - Use upower/udisks to automount devices
x11-wm/fluxbox:bidi - Enable bidirectional language support with dev-libs/fribidi
x11-wm/fluxbox:slit - Enables the Fluxbox slit (or dock)
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 47ecdc432e49..c9a339e6fed1 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
Binary files differ
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 1e2c7de4a04a..2f6a9702a974 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -22,5 +22,5 @@ DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff
EBUILD kicad-4.0.4.ebuild 7381 BLAKE2B a0368f595f54dcaf15d4053be3be8cfdbba40b4729f5e68700e2e970792eeba8b50e8eadd2c2e84de3fd6831f5d0a004ee8128c06809851c11bd6eea8fbb49a8 SHA512 c7784cab7473803eb7c51b62fe09c48d38b1f27dc9b33382cd5a7194fc08572f2024aa8d4564ff2f51eb1b1e651eadf6e389ee25b7d01eb2953ca04bc7a2d3c4
EBUILD kicad-4.0.5-r1.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
EBUILD kicad-4.0.6.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
-EBUILD kicad-4.0.7.ebuild 6657 BLAKE2B 2a364a089bc42ba9ba7b52b88cecc1724bc27fec1c271835636ac28355af3ceeded0c54acc877f85988fea7c151c160d335827cccc48447056e877e5d33fea43 SHA512 3022c0051d507758747ae86b1e2f0276cad1981b22e99cdb06a7b2e7243b0606545d9223ea7efeabc2afbc941cf08804f980840e3464d0d811d05a6a85f5c4c0
+EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
MISC metadata.xml 971 BLAKE2B 7f048f2b1d87a7590f0d2bee633f18913e735253b5c6bf209e95ed250c3b0071032860ada3482d52140acf249958b0266748c3367cf71b3ce7a8e1f0148deb54 SHA512 17e95b02c75fb0b36ef3e9f4ab4cc04e98bfb42481cc45f6860f8767cdc56941a140b2f0a417fde62e4644e386439eccc9d04f652914f01701d6c6e4ee86795f
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index d7108063bd58..dd5b21104e16 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
LICENSE="GPL-2+ GPL-3+ Boost-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="debug doc examples github i18n libressl minimal +python"
LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
for lang in ${LANGS} ; do
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 59549242ae8a..3ed75776d302 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 8590adfe71d0..8588f87887c3 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -5,5 +5,5 @@ DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab8
EBUILD cfitsio-3.360.ebuild 1466 BLAKE2B 2fb223fb28e174080819389a09174685a77cb4ac1f96015e15932b16d81e059f908fa4052b7bee6fb1db20497eafa312e6fb92f2499b7cf01eb29af1ce052a02 SHA512 d0b05587db82dae7c49250b9e4a426b7d12c6a1c904210da1b08d0dbb0db44ae01cb53f0c28adba97f5487f74bcdc7c1c19b9c4286dcb3ea232a2e77c64b7068
EBUILD cfitsio-3.38-r1.ebuild 1591 BLAKE2B 4a4360c3b04dee99f0b62d0a03b60c02798211fccc4d3f64af726ce0775337510125d35a1d51a38ddc78db46a2b9b6deff5ec4224d10e93b687a8ab8e1582c3d SHA512 ee50da814b874ab5f3d3835ab7658694d94940eba4e7d58f9dec53c4b8fe4c1a9c98b8f5b61e3d2a1b195d8839d72b046645f0eceb8354f703c350b0a5d92308
EBUILD cfitsio-3.39.ebuild 1596 BLAKE2B 7a167a2855fdcb796610ac1b3a17701c003bae05d0b64d1e9272ba8541116e2a5df9ebf2ec1be457d840e753a07a39bcab8b5720667d81e8c8c4a1e445d2b290 SHA512 0e2d890700a61a280fd8330679babc890f046e4a7e3cc85c724e4b7a3bea6e5da7f17ecd88ac7f84286ef174aaedce2b483491a7b66b8c423775c51a68c8d395
-EBUILD cfitsio-3.410.ebuild 1591 BLAKE2B b22a4cfbcd35f40b2ede042465cfbe9975380a5d81daf79ad02145efbdc79862e526949bf2e90687e34fb349cd8c62f38f63eb1f6cb1fe501836813e11008883 SHA512 59bdd0e3d7d931290df5004fa84b10efcf64e65f5213218616a4f6d8163450c62c7212093d8750a5fc3daea86df9a22a050884336dacca940c82bc23f34bf698
+EBUILD cfitsio-3.410.ebuild 1590 BLAKE2B b4bec4603d86823e19d85676bb180611e90f48d798b8888934dd8d2d78c4e6a42cb5af47d2a30a5434f3121e2d57e4199a53ed3b3903dd2f59c6d307138f47c8 SHA512 caa9b4805389dd41b9489389be2eddf82bdc17ac47e73cdb96ec1f1938428a1cf1072eeae664dcdce8f13dc3ac84ad892a38e7c4be6f483f34f736dd352190e1
MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index e9cc7246e436..5642876b34f3 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="bzip2 doc examples fortran static-libs +tools threads"
RDEPEND="
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 7f8dac9b170a..3673a79a3621 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,7 @@
DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
+DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
EBUILD dlib-19.4.ebuild 1797 BLAKE2B 45fd4d3b434852fa3a8d1571e30fee6ffbdb254ed471433fac534c26854ab69352b981dae4ad45b404cc6ff8525a92bb22915bd058c18e0f00d4c3cce9157164 SHA512 ef2172c18b446cf98c79e9b6a4dcf622ca62d05cc353d82d35385a16a334a94d5689af5117f9fee26e9e32346da57227beb83ca35b4b216135ad15b214042328
EBUILD dlib-19.7.ebuild 1795 BLAKE2B beb38d516fb6c854f7958c6d63d83d5612acfdd384986df8ef7cfc58bca1a2c323078d96711882f4a2adeef775520fdef9e08caee550667d2493eead4fa7e9c8 SHA512 e3b82055fc6e093d2cbd7850b91354cf3e5b62cbf0d614b1c62316cdcf7aed0082808400161ea072d21a4296f901d5edeebc039ff5db73aaa0a921b6cba106ee
-MISC metadata.xml 932 BLAKE2B f1813511ac45950f8735ba2ec54e3908429bd48fec96e7242d9e8f4f0c7a71c0bb1ee761aa6870642a65196581153b6c3de27b23d1149b1df8327ae998dcabd9 SHA512 38d0f5760d78564c96dd27209468513c89ae9fd87d517dea16f87d4cd110ce25239b6baf07e58f66d871a2a794545e74f9841569bb2ff2b57782722b026a658a
+EBUILD dlib-19.9.ebuild 1998 BLAKE2B 57bcf753826ddf3366f0c6001ca4e98292173ff6834419eb7b99db9df53b6b939d81a4788cbf63463c1fa4bf289060262085f2c9709cdd5fd7c1600e138ac94e SHA512 15e4a3d3d024e11c9554d0d2c6b163fa612f3f39fb9e291bb78bdf9e2c898b4b22e04181e26b6eed5a34ecd6bac8036a8b31052c9c32f32f0ab46d80d2bd474d
+MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
new file mode 100644
index 000000000000..82d750cd9a8c
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-r1 cmake-utils cuda
+
+DESCRIPTION="Numerical and networking C++ library"
+HOMEPAGE="http://dlib.net/"
+SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+ cblas? ( virtual/cblas:= )
+ cuda? ( dev-libs/cudnn:= )
+ jpeg? ( virtual/jpeg:0= )
+ lapack? ( virtual/lapack:= )
+ mkl? ( sci-libs/mkl:= )
+ png? ( media-libs/libpng:0= )
+ python? ( ${PYTHON_DEPS} )
+ sqlite? ( dev-db/sqlite:3= )
+ X? ( x11-libs/libX11:= )
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ cmake-utils_src_prepare
+ sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ -DDLIB_ENABLE_ASSERTS="$(usex debug)"
+ -DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
+ -DDLIB_GIF_SUPPORT="$(usex gif)"
+ -DDLIB_JPEG_SUPPORT="$(usex jpeg)"
+ -DDLIB_PNG_SUPPORT="$(usex png)"
+ -DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
+ -DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
+ -DDLIB_USE_BLAS="$(usex cblas)"
+ -DDLIB_USE_CUDA="$(usex cuda)"
+ -DDLIB_USE_LAPACK="$(usex lapack)"
+ -DBOOST_LIBRARYDIR="${EPREFIX}/usr/$(get_libdir)"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ mkdir "${BUILD_DIR}"/dlib/test || die
+ pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+ cmake "${S}"/dlib/test && emake
+ ./dtest --runall || die
+ popd > /dev/null || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use python; then
+ python_foreach_impl python_domodule ${PN}
+ fi
+ dodoc docs/README.txt
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}
+ fi
+}
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 422f29c52e5a..97d198eb46be 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -15,6 +15,7 @@
<flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag>
<flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag>
<flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag>
+ <flag name="python">Enable support for Python API bindings</flag>
</use>
<upstream>
<remote-id type="github">davisking/dlib</remote-id>
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 4c58fa58fcbf..7dd51a2b51a2 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,6 +1,6 @@
AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87
DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
EBUILD flann-1.9.1-r1.ebuild 2242 BLAKE2B c36832b645ca46e3aa622882cca34b644d8b667def8b900f1e5eea83fa0d55677f65c14c4a17134f080b4b7fe863023a71a7aeac72385bc25a9c2a4048fb33bb SHA512 08de8ba5d423999f8403104be8efbd678e6c4981790a314e717944d6f5ca714cf97219efa445894145acc47d896ce11a49867e19c654b6c403db3b55700b5ab0
-EBUILD flann-1.9.1.ebuild 2184 BLAKE2B b30802c31a247f9665be199ed77ffe5dbaf9d5f5d7650b2a8c8cf472af63cebdd1bc7b7a258136d23b43f96c015069c8905fe9300a34a51e4b8dcbba8a331a2b SHA512 eba3ebb2798f06e6785c008077a664136ab4e58fda5d647e411e03778036895d43884838176f0a761b2dd392f09abdb4e5dd91f4ff5ea3b27eb1048d620bf930
+EBUILD flann-1.9.1.ebuild 2183 BLAKE2B 8de25772b012bbbe70e13db8876688ee283d1dada1978bb9c982d1f1bc26f3daea9adaf7f12663d1a0590c03730e6da604f10bfa356a8728262681c7173af13a SHA512 7f5ff08c1fe83379577043d01b2c7cda91b4a44237cd65aa1e2cb36e10331238efdc40a9d1698b41d3ff493ac50cfa61cfc5ccae33d5cb9a03e47a94458dd05c
EBUILD flann-9999.ebuild 2178 BLAKE2B de6de98ab61428b3f19b8b229b5ad947a3e73478f21c45900b0752bcf6e382317d59020618d876e8a3908f2ae9ae770ef204959fff5f3f8bdd0d67825fb62256 SHA512 0ff48c8f14166bf2a4a77ec562618156b7ec7a40282ea0f61d233ff79a9fb3bb84195ac0465dd7b9dde7fc25889dae11a3f0088a0db3a51de00cb9627343d6bd
MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index 48b07167075c..98e3f17c9fdc 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="cuda doc examples mpi openmp octave static-libs"
RDEPEND="
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index dbdf2f74fff3..9f8e8b12f815 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -7,7 +7,7 @@ AUX mpir-2.7.2-sed-backport.patch 704 BLAKE2B a4e2083008ddb0acb2cd81886e53fc1e9e
DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c21c4b215162f824bed3a395972f734907f966bc14c58a28d30bb35f441b16b2762a9c8ef9c02d164f804bc82 SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-2.6.0-r2.ebuild 1711 BLAKE2B 81824570d51db14fe4108333e58ec1cec03f9a2a6188776fe54fc05f78fb36517876d01b605ed6fbb54836493f8dabb32c28b9a97cda9e12c0117bfe6b127220 SHA512 486ea7d02039dc73eb1e93d04d0aaea352bd7cf2839601d26a9f964f22983ba73393a9568e30076b6837d55f134e4c0438aa51202be66fb2a055f1399cb179f4
+EBUILD mpir-2.6.0-r2.ebuild 1718 BLAKE2B 20d17fc3e1f9ce93365b387fff094e5bb416dc932954938b75e24d2ace74560d3dcbd03289493a490ed8e9a613263be35d7a60e3396862141bdb75c40d70f40e SHA512 7e104c8c81ad2445788768e83bd40abf0dc370b7c33a77ac6cc498813b043001f57b7f902a5198df4fd1259fefa2fff9370fc7aa17a997fad04911a71f046da8
EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
EBUILD mpir-3.0.0.ebuild 1730 BLAKE2B d2e2d53e2ef88eae283bd03aa1ed38f3b5bfc9b796208d56a6ad56a44b652215b86167fda36391c1cf401639a408cb697d76924a82b73a9bbd90bad481164377 SHA512 17a52f08f460bf5b446c101831d6113a8edf6d77736115e27523bba0e00833cb931c87661d41ccb2b1577ae0bcb3ed9a8d36d2b3caa077a4b37508dac515391e
MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-2.6.0-r2.ebuild b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
index 18eb96653552..5ad238f36cfa 100644
--- a/sci-libs/mpir/mpir-2.6.0-r2.ebuild
+++ b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.lzma"
LICENSE="LGPL-3"
SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="+cxx cpudetection static-libs"
DEPEND="x86? ( dev-lang/yasm )
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 77d6c0dbcb12..cf1d427ad18c 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -2,8 +2,10 @@ AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 5995 BLAKE2B
AUX tensorflow-1.8.0-0002-dont-strip.patch 1181 BLAKE2B 98d25909f9b7a40e2f140dc47a6a1b79d332eba465e09c67c1088ca07301144f0fdc83d9a5b88b480bc2f4ec360da8011d281fa6b00f992f1f65b5861d4a0983 SHA512 af2311856f2efe3ea6ecf84aef4446f2a5dd79238fee26737b7ae9c1af861d8e95128046750f403c05be1c6c2a25129013f74f9d21f4204283938b50e1fc4356
DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072
DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
+DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4cafbca71446681a615884e82ae7fcdd4d8d6fdfa8e409a646115c3577972cdfcee8d792af0a1d82a8efbbd1 SHA512 49afca13b9683ed571c274380bb5e111236903b12d19bcb8781d6bbc00f711766b0d62de0b36536c85309cc9ff9e9d0aaa708e27bae9be6cfcaed8ba91e5545d
DIST abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz 875263 BLAKE2B f11af5582ef3e00155361de2185b703fc9edde1b6cbefce62224da7b13e1beae219076f144b7b8d4bf63d1b21a73beb77fbb437e6d91e6d59a233846d91c1a99 SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
DIST abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz 189090 BLAKE2B ac4e7ffffb6dc2ad922d03cbfee1858335728fffe5721761fb0207b242ccf0f8d9739bed29987c8cc718f7cc3c297e05bf7506b36f31a06b9019be8215f842a7 SHA512 faf00229a062dcf71d9147bc76538dd4ee3adcb76b7e46943663eb43e3023587c68819d1ca157709c3f071e5796bbcf8e10277ccca1f5b83f33fb0025520d373
+DIST abseil-py-pypi-v0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
DIST abseil_cpp-720c017e30339fd1786ce4aac68bc8559736e53f.tar.gz 529637 BLAKE2B fea7eceda492764613ffe944331e6b08af33d600036e9b2453f4c09e892f22f79a95b00a29a9bdf9e705d11502027d88659e19aa484cf4a02158209b058cec13 SHA512 3ac70cb924518627dfc6ec2eb5f65bc0e1235898eefebb0d0410867270065aa745d21456f1212b916e732b3f5dada18b03e526e02d09a09f445531798219006e
DIST abseil_py-acec853355ef987eae48a8d87a79351c15dff593.tar.gz 175877 BLAKE2B f3c9b36101321f1e72c4eb2cbf11b42e36dc95bb1682b124b77652d2a2bee912459fa92f40718c80aa22f18611c77d13ad08e2888b20ae8895c115191e2b7397 SHA512 154056acee09b8c193d0bc8c64dd98bab87bfd779b04f81b1da7ace3004fcdf780f3ed0066ca3204850c2b80a6b1185e5e435ed852b73af85a6d899addc1c8bc
DIST astor-0.6.2.tar.gz 29494 BLAKE2B aec99ed7702da3125f7a8666b0e432ca7f32511451b0922a7c7b2239414674be205f555ba4d1672f3d44f9140c0690d17e0374d339b2bbcd40737d69d748e95a SHA512 a6df0e65f429025caa0fbdd95f119fff94867709c10ade99fdc681a9886e916b67411384bf6ca37ceea478c65add5dc0a74585e17aafc706c8f0363e3c8585a4
@@ -14,35 +16,49 @@ DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 43
DIST boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz 22702000 BLAKE2B d54e52832ea2655590ee6d3c9063f684cd1ac1efacc6e6c60fe3177f799eaae6cf3d6fbb1a616e98514dd0bdc84ee35731bd9e285b5cd7a91a19b9493f694582 SHA512 879a48626fb58263d117f8a8b1c5b69fa99e1f06e71d5321620b16c107011c1f22d3e3443b5ad6a908ca139fcc55bdfc36fb80e884fe4490fc4dd982b668f128
DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
DIST curl-7.49.1.tar.gz 8885826 BLAKE2B 89bcc9f775bd26ac2f7f38097c8e506a5098f22264aab1d0db9f474bd1161d434264faaf4829882cb9df8817e680d314fb2e1288fcaba3df73b6d569eba2eefe SHA512 eb7cf0d34130b7085f342d2fd44457479e6e9d55e9fc4c46b6c5631d8c792eb376275501a89867b64ef1134084ffc7cd6e91f732a2265c331dc1d405dd65d1a3
+DIST curl-7.60.0.tar.gz 3949173 BLAKE2B 5cb206174a11612400eaa379ded71cb94c4d9a1d5b71c5894a2be8253a28d9d5c37bbccea2803fd6244ee2a173e05f90c748be593cda901062e65b2711f65226 SHA512 f25c8d79be87bfbcae93cd200b319f664efd62aea8f1a94bb441407a9e1489bd935943cfd1347f3b252f94b9a0286da8aeb04b407a2ba95ebfa717dff80e891b
DIST cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz 1796107 BLAKE2B 65cd3ec2e83cfdaec2998091eed6506071a8b28a1bf41d9f59ed8ab05a0559355e831d1c6b550aa3fcc65959e29f6c531c30bf6869a5fd968a351d3f4f8eeef8 SHA512 556377644ebe111a36061768560a06d70484749cc78be0b53a9ad4dd9d40fb7c3aac4ad09af1cf7a5e8274e7289ac540f58c3026522ff5e251ddddaf840ef955
DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
DIST eigen-6913f0cf7d06.tar.gz 2296773 BLAKE2B f3d4ed1577abc7f722fb600e79bcb1294ae5d6a4499668df05a8b9014bfafb576e6d15d3e311080e6e6ed3afd00e60ccd0c1092161a218d200a32668bef83ea2 SHA512 e1cbd55edfc128ee5c2d0bc08a7fec051efb5713f78e2d323ce49074bf1b86d63e7fcc06c01e469c01d2476dd369e4159ecb306f6d28371a3274402d0ea25e87
+DIST eigen-e5e305a158a0.tar.gz 2312776 BLAKE2B 268419895e1c49963bd15b6e9142775d782f8d7e6aa88f55eaa7b5dd42ce11456c8687235ff2478bedaf232b7df71832fdbaed62026f7880501c0403cfcf6d4d SHA512 f6070e2cec18c059f296857405c90e06566f643a4e3499a6eceaab8682597c192f8b9b91bdbbfa53aa654969a2269cda6a1c044b92e4a9f8362e8831e773daf8
+DIST eigen-fd6845384b86.tar.gz 2312810 BLAKE2B aae02b053e9b22b0c063d1173b28fd7d71cdec6b6e6702624b8fdeb707ada24e5415079f1a1c7b8fe108c7e632c6c736e13cfbdc101270742565b7045a57616a SHA512 b999e60236abf7a6a5062aa55b0aeefe9254b204416092649d4a88d42fef7c571e3ba563bbbf94033093f789511793d614c1ce94a0a0f3eb4b18df466b6345a5
DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
DIST fft.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
DIST flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz 613854 BLAKE2B 982142b7dd81791f221d7f3cbbecf6539549c86c436e0cf3ae0c57bd7535b90083c7d2709abc811abcf3b6fee417a16b1d8dcdedcce58fd8715db7ae785a7bff SHA512 01ffc047483edaaccc13bf256d59eef0c4cb7488618f1e908c74e0dcc599f00856d052d209a079d35e385bef973a4c6daf401107c4be85bba46dcc3b4f453b26
+DIST flatbuffers-v1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
DIST gast-0.2.0.tar.gz 9400 BLAKE2B 1392b9ef3a007d89b6b7af5ca49f3dcaa0689e166845ea25c2e544578f65915114d763b54503825dc2b6958a71ac284ec7ae2cc2cfa861494da28df786d679b4 SHA512 651719c3035d21e02e39cd83fd54212a12c39addf69f7c9e8810ccb7bb9aae7828e176ad0adf55182f0628f18d76cb1e286e498a9665ddb12e91a51dc2303381
DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
DIST gemmlowp-7c7c744640ddc3d0af18fb245b4d23228813a71b.zip 903072 BLAKE2B 26e49a36f7af265ba4fd720864fd148055e9491d0c0100988b474c41920a0b9d698c634a59280f458941a21af15017966bbb2f65e3b399bbcbf836e1232b9d7e SHA512 b754e9b4fb28884e5fbca56bf0fd59d8bbfa3e01900bf6860a2ee24047b21c71cd076ac27d5cc5b3f44c325fb6fb516529dfdcf720fecdb27e7fef38a4f6da13
DIST giflib-5.1.4.tar.gz 738552 BLAKE2B 414cfdb488a12bcebc6e6e1db9face0e69430e5af94929e7935dc38ff2355182e223b5d87aef53d405f5f79867b4bc1e756f84134d60a01bcb8b5bf5b6859fa1 SHA512 d9a98a593bcfbbfb2fcbeef1382ca9669a6b85276512e6828c92869d16c7cfe980bbb318766fc176be3c9f7deff7878d2be8aeda1d40af2cc4ac723fe6121b83
+DIST google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz 617576 BLAKE2B d59967fa2bff125060d9c7a20b4dd892e414dd0fc5169a26145977383174410492ef184e00409a98736f5f53d6ab97e17a966140cded3c891e1efd6ac4590c51 SHA512 b9b2c39b4e18bb11f15ff573c1565742bfdb5f8acff33d85e592ba38cf38f7ef80981bb8184bf187cf2f0fb7af801d3d31d538029aea243408385e9e64ab61fa
+DIST googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip 1099608 BLAKE2B 7b27f5355d68a0785b7d715d2da71a8e2f9c9609b090d3e2cf3fe974ac13b78c5e9fc43b88cc2ee5e8b268243ef8fe1b81cc4c27cb21b9a26fbe0825724bd8a7 SHA512 d63b5d824bbc73079db44671173f06353ca8c55ad86a86483ffd4dd88b0ef2b5ccb857d56b6e6e73c3bd7fd098b887ffbbbd138faaea9291ade34ff46502bfea
DIST grpc-bd6bdf93279a39a8cd92978fd7c9d14eccd98fc2.tar.gz 13478349 BLAKE2B 81f6722c893332c6be7875f9bd4f8311eca989c6dcaf87e47de038abe43b4d8eef5aaa0326a15a7c4f5c7a922e85bc006ace244ef4004ed78bf91645711adc12 SHA512 9268fc28bc128d2ad944fff4d9e1764a5cf0ab7c4d3f693607f42413cccdb766ec349b8f2e487bef823ac65007da9b9e3fdf91a7f623634616d91a68477b2951
DIST grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz 13432340 BLAKE2B 68a0da37600fe15632542da2b477c47488c92a1eff578088187ca3ce2a4feaa8487dd4f6777c62af59be907984a9fa9f8170fc016a31d193bfafb472ed789a75 SHA512 7fc5a3f4a09317cb81a95fc82654379fb4361797f96a5e20e3bda4b425f57b8369922342ddf4ab4d401246abf4be8669ecb0a46f50c9065824901f14d3d21a6a
DIST highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz 121307 BLAKE2B 73402228c12dd0044960db0a2366d63dc6aaa3b8b093bfed7a1f32dfe063499913094beb4d93d67e1926b6854625bafc2f3e279e84e01220b279a3afd1cc3300 SHA512 235ede2ca52e22aa335e31969d2318fd0e413f07492d599bfc0a605ad53090731fe1285be177e2c66b6eb8379e98cbb8389f4d1c7b2bae20d3808bbcf5ecfb51
DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
DIST jemalloc-4.4.0.tar.gz 444180 BLAKE2B fde0ce34e56deab10e01387aeeb3ec1c5c01a21324c2144a3dfd5c96798aa38fdd4320a91a3b4cdd0ccc956adc107f8db893a1c129a83721ec19f014cea6e638 SHA512 77ee7554e8c4621d1c8ef65402213044718137c513c4c44249929f2df7e89029ea710dec3e67b9068feeb89a87634fa5c2093cd875b8aed98153c7fb5a9d999f
+DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
DIST jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz 164140 BLAKE2B 17a50cbbfa95c84b746a9168670ab755424a93d60b535414d4a744631cf012499b5b0c4b33198c3744210a62bbfe5c3269aee955eb1b055076c0df748a48cb90 SHA512 8b99c55fa76661d3c37b23b3a6035b3bf1f98ef6fe336536e49ac50a92563657066677e32c6cdffff6f04848e86417144236111ce2b37fd5a84ab24754380a18
DIST libjpeg_turbo-1.5.1.tar.gz 1204374 BLAKE2B 22463c083f1255c059e6376ea104a9eb54a18aba6c66a563dcd1173eb2a271eb1d040eb21cd1d7623d04aa99a3b1eda36de4aed6502d6a8a2d5fba93b3773383 SHA512 5dc11da0d1008dc8e288e9e3242a68c2bc6700b0dcff818d3774815ca255441e8c60eb46df6934e578383b5530e9ebdfebad47c55137ca57a109e8d2ebc66c40
DIST libjpeg_turbo-1.5.3.tar.gz 1218419 BLAKE2B 58c0636cb4a3874eba31be66e3206c491cf608aa1c5cecf87566a6a890f1d9470260c5d72cb48a572c555247fff0b9f5f80025508b898720499dfcf27864efb1 SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
DIST libpng-v1.6.34.tar.gz 1146972 BLAKE2B 5d9c1e38cf5170b8b86a9b8bde380e735cd765bbac339cbe17269a116d64fa9e9c3b99b04e483f725b6cb1fdf778128278f1670062ecaa2565c91db59d4d2b03 SHA512 23b6112a1d16a34c8037d5c5812944d4385fc96ed819a22172776bdd5acd3a34e55f073b46087b77d1c12cecc68f9e8ba7754c86b5ab6ed3016063e1c795de7a
DIST librdkafka-v0.11.1.tar.gz 859238 BLAKE2B bc53f358320aa40d1acb209daa2594f18421bb6913bad7ba08a5612dfd6683e65489dc31ed67adc9df090d719ea6ab1031f46e524f055c61cab3f1f941a7163b SHA512 24aba6cfbd5df6a010a735fde455a9272c85b26055b172893b8e5259c2d6a7f2adc9637699f7f3b7270200a280cd95d52779a8f89fbb6af5fc035488ff54310e
+DIST librdkafka-v0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
DIST libxsmm-1.8.1.tar.gz 893332 BLAKE2B b09879ef45a8d3007846361aaad8536dac526297583d29f28378a91c05fdd3a4c51e399d7d5b05dd4456268d5fd3e7014d889a41be61c1d99425dd7234b0dd6e SHA512 30388de1edf46ae40b2ccdf224bd9febd1ffbb91f8250c89c03044fe1ea75754ce5155107ec9d027fe2e08963f1ac9d2e526ea84618d2cf50c2d5dfe8a1e074d
+DIST libxsmm-1.9.tar.gz 1881825 BLAKE2B fb227b80f53335c100fd3562e852e3657dc020e8e57b0b8ae9fe61ce9fc72749ae33684fe33f4921deef6c6eabd6696d74f216e1193ccf2e678c186ebc1d5577 SHA512 fb0e1dc5ab7f32caf3e225a5bea14666af38ce35fb593a80f6d5fa4936383266458d8db37c25f70985c635f1bd04e69281f7b6875a774ec133691ad277c1ed4f
DIST llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz 39754833 BLAKE2B 30fe6c9267b89c9e0f046082af114c9eb9c32baeb13ab1f12b6c9c9ce7e8f83643635879fda4b3a82f5039b1aa6ff63f67546806cc7e6834e8e5399fa1d1f2d6 SHA512 b1ccaa3f39ad38946a2c177e08692719469b0747fbb63afa3054e161d24a61b5223a0c35eb0c5cc226d08416accda34035fa538803da320de205a4eb114b4f02
+DIST llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz 41625322 BLAKE2B 1dbd96a8b1257d90a2ee3aefb23af615340350164c1e3bc3301cd285ca0e639c9d2881b0627bfad11bc6ff1df2e049a9885f629f2991123a189171fcdc4cb185 SHA512 6f99f334464b69559c254e2dc2255ded97a435c8abe987e770c926b36780937a1f9d24dfaf7babaa01245f51706f079b98d2dbf03e7663196b87dbbed8ce7392
DIST mkl_dnn-v0.12.tar.gz 759597 BLAKE2B ad790db940ca5353bc20db9e012356761e5a87d6646eeae983880881e1df271a0a4deb3b6810546fa8cf6f2c35c45509c57630cf8d493d72d557d33864f780f3 SHA512 e6a257679b872d16e320556ca2c1ddb5c04a949ee8b8d6b4de350c46ad4ea79749d5d9f92940c592706719490ad837210335027f782a8df46da1a2029ae5adcc
DIST nasm-2.12.02.tar.bz2 961257 BLAKE2B f45c35571fa1254ccc01ed59de8a46cb480300404c701b444a7a751d077d23f64a7dbeeeb044d7daed8a6f895b1100f76f2db75ced6417ab56cb83b9494eece1 SHA512 7744a078647861382212de798d200b683cc4044881474fc1931acb14dfa0340ce026d1b3f64ac1ece87878ccd0ddcb69b8c0c850415313f47e01f0332e56a8f8
DIST nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz 151680 BLAKE2B 280f8800e8674fbab90d15c09ab7e260b3230bfcf0fb44c998955c9bd4aaf07b4a9073a74479c8879811c56863d4c28693e408a4b205e5b5d9c801bb82159216 SHA512 ef61f9f0b12cf1252840966243ef4b4a0cc18afde7eddedb7e3f6ea31fa8a89da5570cfe6be536d721e4b7593249d05bb1c60372f6668635ad8bcde78bfc8dee
+DIST nsync-1.20.0.tar.gz 153026 BLAKE2B 65c6d8d5c2998b4c3edc3500d2a97e649073935bc85cbdddc9e4bf97ccf3d66fc4f4e3396f8393a7f89609f2900f6fc4e692c7bdeb89bf3423f16870c944fa42 SHA512 a50ab4e2312c384819ceef77b5261afaf6cac37f1b33ebf2df802737a8a1694961e2040331d2c1a89c90dae89bfad8cf9488cd8f1943b8dd017f6971d32c4d7d
DIST nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz 47849 BLAKE2B fb2a6fc1e45057c4150c1dae2a5058a12d8641b3f5dfdd982661b4351ec9df39ac3aefaf4dfa9c8606ddf7fd1c4a8b35683e5e5eddd74cbc63ee025b33d4b731 SHA512 eb555030e9d60d68c4094e85f16e0b74de7f61602c742d57bc2029d12c719084a2fd1214c13467ff262f6f3932508754159af5f014e6f16d279d14e1fafa9b8a
DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
DIST pcre-8.39.tar.gz 2062258 BLAKE2B 1bc2b7b822383ba67b3e9707178fd100a13370a3a4ce8e6527fe0356f7d3e604a9ece11cef5e9e85925fc309698887389e67759d820b8b7a99703cc1cd3ccc88 SHA512 1724b2d6d8575af19fc20a13e50d71cb8024a66458d63cbc006b5bca01230845730535f3446d3850ddd580c93031f38c3ebf547adce0d279dfd18101677403da
+DIST pcre-8.42.tar.gz 2081413 BLAKE2B a1ff306e213122bdb0fcd83fab3d4cdea7e9e273c0311446de2a5b49b937e0bd7d2e7f233e3e60a3be7b8e3731a0a52fede8c4170f20d5aba1c2e5630c268c0d SHA512 db28b6efef64127f247898208bbf4ac3d6f50d222b84a857b7d45a0c24eaa4522262a305211cd59fb023b9d05e7d3b5b2add4662b8e95ed8c775a6735bd4e69b
+DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
DIST protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz 4803167 BLAKE2B 466db7931c46df5f05018f4ebee0f1061a416b43486dce1fb4953a677f73138c74cbb97f333447862a571bcefe34dd0be3aac18e51b24f9921cb344e4e033af9 SHA512 5af4ebdd8a86a5e50c14c18590e372ea9454cadb101555e00008ebffe448acbaa8c57eeae857a53f20c64c0174ffe0a4d19ba393e2ca53beebad61d5b1db06c1
+DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
DIST re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz 387722 BLAKE2B 122b9f30ec2534877580227fadfce6da6db00e9a3ec29140082580d71e6c4c510d5b6b7400633987d9cb546f88d26726ea6cbc7944aa925272a6dfccfbf728c9 SHA512 cbc81a948c8150416ba437f9fd7248d4e15c03160635d41702c79b981f05092dc052c5c0ee89a9fb7e163dffe148585c652207d9707214488c30bfd3aaaec18d
DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
@@ -50,12 +66,18 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f
DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
+DIST tensorflow-1.9.0.tar.gz 23571524 BLAKE2B 2961ef5a35d3271512999478f6e260c90c48537e251b41d60ae9e033386c0dd9e1337af85c5441afca1b8cf5b3726349ba0e56cccdfa95fdf1c5e9e4d4db8af5 SHA512 eb25dafccf2ec600c4ca28612362c8317b8b9160610ca9fb60f265815651c155b19ae5be3f213a0d9e716d9e25637d6502164433955247cf6fa5d75408b7ac84
DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
+DIST tensorflow-1.9.0_rc2.tar.gz 24167723 BLAKE2B b676c8d521a060487fb5d31b75beda2e7c301396ceaa887776e368a16541ed0be0ad85c92901a45d8df324a857a324b706a6d0f38c91a2d991dcd7c40d3ecb3a SHA512 e8544b56a040b0b1a65c92455e002ea33e65d1fcd5f7eb94b4abcae74e0d8aa6982624c0133e9bdda6e57f52f410861977e866112fc1fc28ba9b4c836836a11a
+DIST tensorflow-patches-1.9.0.tar.bz2 8588 BLAKE2B 7fbdaa680b3bc372c760861709776cf333d587398297fb596332bb7394a7747c86cdc87615ae6f74e81d4e6b39a34aa3a9b6ee7cab95237316f20a315773b12b SHA512 35d56a1e71e500f41e423a2b58d58d210737afd2d9cd955aed227036a066506be1b39e7809f71d82c80f055ed43dfe1813213975acfb8d86be38baf24510e0f3
DIST tensorflow-patches-1.9.0_rc1-r2.tar.bz2 9372 BLAKE2B fe6d33deff5cdf1158319f2e30c7c79130c555d8d8c5f8fa719c7760e1edcc1083118fcff04c0e8aedd089dd95641e19240d14d6d10e28d2dd6ae9f4ec75f185 SHA512 fc904e2396e4a0e98baa463d1bdfc421402a5e17609fe7d4ec30f6c3e5692a432f5db36ba7fa9083e9eebf4dba29b48865102fb24429bde072c738c76478d377
+DIST tensorflow-patches-1.9.0_rc2.tar.bz2 8038 BLAKE2B b416abcd1aaf3fa221eecd8e5e13bece47e13b42666c754388acf93fef4ca9f1e6a178027053402dfcabc8c9b220867fe63a73d97f56b62ec51def537d2706c4 SHA512 e6d7e8771bb9f27e5c5099b6d33f7f44bc4a2e40df1e3996e1fd7473eb836f33348c31931a28ab5d46771219b90b2eebc57d78471ee77d0ccb49fb437cd96a07
DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
+EBUILD tensorflow-1.9.0.ebuild 15867 BLAKE2B aecea66f13473f900ea978df0c53cb0f0f6785d9919eeeb138bcb50a6b43f7c990a6718e4f2d0e808097c681580a02891a6bdd9fc6111ec399581f9b5b9434a7 SHA512 8a7d4f14c0a6f9fa3ffd2d0adcfd00a5a19b3c7f70af8fd4c669ce0759e58d8d3d65c57f78c423dae355955f66243ce432b6a77b2058bf3d97701b3189e07134
EBUILD tensorflow-1.9.0_rc1-r1.ebuild 14203 BLAKE2B b917672bd1af89c78f04f0494005d7f060633ccf5f98fe69ff3b747420d7c43a6820206d73cf97fa970a6ff888c1da8f5879afac5de817f2693b538ce9f76f57 SHA512 3d65dbc8ab6ab91ecfde615a73d4bb3671f8b2ad0fee2477f82b1b9b2839f9acf4e9285e870bccc7adea788c0fc80fd291ae5eaf1e7102d545fcc7749eecb692
EBUILD tensorflow-1.9.0_rc1-r2.ebuild 15253 BLAKE2B b5e9ed0a73d8baaf7cea580424300104f21c2a1a6274f529ef9e6f88260b59f507d01d9f9f988a388a112f85abbf3fe5190150210ce96a77e63cc2a55d286977 SHA512 1490ccd3332dd31c99dfba4af61e433953d582370273192cc50f7b3c26e52962eda9aee5a0746d529ac50e472730345b3e07824e0042fbc7247392991856a657
+EBUILD tensorflow-1.9.0_rc2.ebuild 15341 BLAKE2B 8e451a6dcd55465d7f86a14cfcde3f5f9f1db8734286f3133cdf9be164d50b20ed28cfd15f9551f6646e0eda814b4117a942b9e255d54053daf8006ea67108eb SHA512 db12768b2429f8fb977f227052e27cde31032c25d04517f8593bc03b3bcf691394d0e1783481d2d8d7d6af0fa43e81fac2dc9252fd0dea4e73e603217bbe2f81
MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
new file mode 100644
index 000000000000..824e9cc079ef
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
@@ -0,0 +1,425 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+ IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+ http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+ https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+ https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
+ https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+ https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+ https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+ https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+ https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+ https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
+ https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
+ https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
+ https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
+ cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz )
+ python? (
+ https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+ https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
+ https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
+ https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz
+ https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+ https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+ https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/53f822805e77ea7715f5b52c592a162c515c7219.tar.gz -> google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz
+ https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz
+ https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+ https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
+ https://github.com/llvm-mirror/llvm/archive/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz
+ https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+ https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+ https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+ !system-libs? (
+ http://ftp.exim.org/pub/pcre/pcre-8.42.tar.gz
+ http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
+ https://curl.haxx.se/download/curl-7.60.0.tar.gz
+ https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
+ https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
+ https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+ https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-v1.9.0.tar.gz
+ https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
+ )
+ )
+ !system-libs? (
+ http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
+ http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
+ https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
+ https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
+ https://github.com/google/re2/archive/2018-04-01.tar.gz -> re2-2018-04-01.tar.gz
+ https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
+ https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
+ https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
+ https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
+ https://zlib.net/zlib-1.2.11.tar.gz
+ )"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+ ${bazel_external_uris}"
+
+RDEPEND="
+ cuda? (
+ >=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+ >=dev-libs/cudnn-6.0
+ )
+ mpi? ( virtual/mpi )
+ system-libs? (
+ app-arch/snappy
+ dev-db/lmdb
+ dev-db/sqlite
+ >=dev-libs/flatbuffers-1.8.0
+ >=dev-libs/jsoncpp-1.8.4
+ dev-libs/libpcre
+ >=dev-libs/protobuf-3.6.0
+ >=dev-libs/re2-0.2018.04.01
+ media-libs/giflib
+ media-libs/libjpeg-turbo
+ media-libs/libpng:0
+ >=net-libs/grpc-1.12.1[${PYTHON_USEDEP}]
+ net-misc/curl
+ sys-libs/zlib
+ jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/absl-py[${PYTHON_USEDEP}]
+ dev-python/astor[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ )
+ )"
+DEPEND="${RDEPEND}
+ !python? ( dev-lang/python )
+ app-arch/unzip
+ >=dev-util/bazel-0.14.0
+ dev-java/java-config
+ dev-python/mock
+ system-libs? (
+ dev-lang/nasm
+ dev-lang/swig
+ dev-python/cython
+ )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+ local i f=()
+ # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+ for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+ use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+ done
+ use cpu_flags_x86_fma3 && f+=( -mfma )
+ echo "${f[*]}"
+}
+
+bazel-get-flags() {
+ local i fs=()
+ for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ done
+ for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${CPPFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${LDFLAGS}; do
+ fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+ done
+ echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+ if [[ -f "${T}/bazelrc" ]]; then
+ return
+ fi
+
+ # F: fopen_wr
+ # P: /proc/self/setgroups
+ # Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+ # https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+ # https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+ addpredict /proc
+
+ mkdir -p "${T}/bazel-cache" || die
+ mkdir -p "${T}/bazel-distdir" || die
+
+ cat > "${T}/bazelrc" <<-EOF
+ startup --batch
+
+ # dont strip HOME, portage sets a temp per-package dir
+ build --action_env HOME
+
+ # make bazel respect MAKEOPTS
+ build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+ build --compilation_mode=opt --host_compilation_mode=opt
+
+ # Use standalone strategy to deactivate the bazel sandbox, since it
+ # conflicts with FEATURES=sandbox.
+ build --spawn_strategy=standalone --genrule_strategy=standalone
+ test --spawn_strategy=standalone --genrule_strategy=standalone
+
+ build --strip=never
+ build --verbose_failures --noshow_loading_progress
+ test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+ # make bazel only fetch distfiles from the cache
+ fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+ build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+ EOF
+}
+
+ebazel() {
+ setup_bazelrc
+
+ # Use different build folders for each multibuild variant.
+ local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+ local output_base="${WORKDIR}/bazel-base${base_suffix}"
+ mkdir -p "${output_base}" || die
+
+ einfo Running: bazel --output_base="${output_base}" "$@"
+ bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+ # Populate the bazel distdir to fetch from since it cannot use the network
+ # Bazel looks in distdir but will only look for the original filename, not
+ # the possibly renamed one that portage downloaded. If the line has -> we
+ # need to rename it back, otherwise a simple copy is fine.
+
+ local src dst uri rename
+
+ while read uri rename dst; do
+ src="${uri##*/}"
+ [[ -z $src ]] && continue
+ if [[ "$rename" != "->" ]]; then
+ dst="${src}"
+ fi
+
+ [[ ${A} =~ ${dst} ]] || continue
+
+ if [[ "$dst" == "$src" ]]; then
+ einfo "Copying $dst to bazel distdir $src ..."
+ else
+ einfo "Copying $dst to bazel distdir ..."
+ fi
+ cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
+ done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ # Only unpack the main distfile
+ unpack "${P}.tar.gz"
+ unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+ export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+ setup_bazelrc
+ load_distfiles
+
+ eapply "${WORKDIR}"/patches/*.patch
+
+ default
+ use python && python_copy_sources
+
+ if use cuda; then
+ for i in /dev/nvidia*; do
+ addpredict $i
+ done
+ fi
+}
+
+src_configure() {
+ export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+ do_configure() {
+ export CC_OPT_FLAGS=" "
+ export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+ export TF_NEED_GCP=0
+ export TF_NEED_HDFS=0
+ export TF_NEED_S3=0
+ export TF_NEED_AWS=0
+ export TF_NEED_KAFKA=0
+ export TF_ENABLE_XLA=0
+ export TF_NEED_GDR=0
+ export TF_NEED_VERBS=0
+ export TF_NEED_OPENCL_SYCL=0
+ export TF_NEED_OPENCL=0
+ export TF_NEED_COMPUTECPP=0
+ export TF_NEED_MKL=0
+ export TF_NEED_MPI=$(usex mpi 1 0)
+ export TF_SET_ANDROID_WORKSPACE=0
+
+ if use python; then
+ python_export PYTHON_SITEDIR
+ export PYTHON_BIN_PATH="${PYTHON}"
+ export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+ else
+ export PYTHON_BIN_PATH="$(which python)"
+ export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+ fi
+
+ export TF_NEED_CUDA=$(usex cuda 1 0)
+ export TF_DOWNLOAD_CLANG=0
+ export TF_CUDA_CLANG=0
+ export TF_NEED_TENSORRT=0
+ if use cuda; then
+ export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
+ export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+ export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+ export TF_NCCL_VERSION="1"
+
+ TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+ TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+ export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+ einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+ TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+ TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+ export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+ einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+ fi
+
+ # Only one bazelrc is read, import our one before configure sets its options
+ echo "import ${T}/bazelrc" >> ./.bazelrc
+
+ # This is not autoconf
+ ./configure || die
+
+ sed -i '/strip=always/d' .tf_configure.bazelrc || die
+
+ if use system-libs; then
+ echo 'build --action_env TF_SYSTEM_LIBS="astor_archive,com_googlesource_code_re2,curl,cython,flatbuffers,gif_archive,grpc,jemalloc,jpeg,lmdb,nasm,org_sqlite,pcre,png_archive,six_archive,snappy,swig,termcolor_archive,zlib_archive"' >> .tf_configure.bazelrc || die
+ fi
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir do_configure
+ else
+ do_configure
+ fi
+}
+
+src_compile() {
+ export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+ if use python; then
+ python_setup
+ local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+ cd "${S}-${MULTIBUILD_VARIANT}" || die
+ fi
+
+ ebazel build \
+ //tensorflow:libtensorflow_framework.so \
+ //tensorflow:libtensorflow.so
+ ebazel build //tensorflow:libtensorflow_cc.so
+
+ do_compile() {
+ ebazel build //tensorflow/tools/pip_package:build_pip_package
+ }
+ use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+ local i j
+ export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+ do_install() {
+ einfo "Installing ${EPYTHON} files"
+ local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+ mkdir -p "${srcdir}" || die
+ bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+ cd "${srcdir}" || die
+ esetup.py install
+
+ # Symlink to the main .so file
+ python_export PYTHON_SITEDIR
+ rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+ dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+
+ python_optimize
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir do_install
+
+ rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
+
+ # Symlink to python-exec scripts
+ for i in "${D}"/usr/lib/python-exec/*/*; do
+ n="${i##*/}"
+ [[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
+ done
+
+ python_setup
+ local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+ cd "${S}-${MULTIBUILD_VARIANT}" || die
+ fi
+
+ einfo "Installing headers"
+ # Install c c++ and core header files
+ for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
+ insinto /usr/include/${PN}/${i%/*}
+ doins ${i}
+ done
+
+ einfo "Installing generated headers"
+ for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+ j=${i#bazel-genfiles/}
+ insinto /usr/include/${PN}/${j%/*}
+ doins ${i}
+ done
+
+ einfo "Installing Eigen headers"
+ ebazel build //third_party/eigen3:install_eigen_headers
+ insinto /usr/include/${PN}/
+ doins -r bazel-genfiles/third_party/eigen3/include/*
+
+ einfo "Installing libs"
+ # Generate pkg-config file
+ ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+ dolib.so bazel-bin/tensorflow/lib${PN}.so
+ dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+ einstalldocs
+}
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild
new file mode 100644
index 000000000000..8729b2afbc39
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+ IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+ http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+ https://bitbucket.org/eigen/eigen/get/e5e305a158a0.tar.gz -> eigen-e5e305a158a0.tar.gz
+ https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
+ https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+ https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+ https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+ https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+ https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+ https://github.com/google/nsync/archive/1.20.0.tar.gz -> nsync-1.20.0.tar.gz
+ https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
+ https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.4.tar.gz
+ https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
+ cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz )
+ python? (
+ https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+ https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-pypi-v0.2.2.tar.gz
+ https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
+ https://github.com/edenhill/librdkafka/archive/v0.11.4.tar.gz -> librdkafka-v0.11.4.tar.gz
+ https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+ https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+ https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/53f822805e77ea7715f5b52c592a162c515c7219.tar.gz -> google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz
+ https://github.com/hfp/libxsmm/archive/1.9.tar.gz -> libxsmm-1.9.tar.gz
+ https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+ https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
+ https://github.com/llvm-mirror/llvm/archive/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz
+ https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+ https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+ https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+ !system-libs? (
+ http://ftp.exim.org/pub/pcre/pcre-8.42.tar.gz
+ http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
+ https://curl.haxx.se/download/curl-7.60.0.tar.gz
+ https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
+ https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
+ https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+ https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-v1.9.0.tar.gz
+ https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
+ )
+ )
+ !system-libs? (
+ http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
+ http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
+ https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
+ https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
+ https://github.com/google/re2/archive/2018-04-01.tar.gz -> re2-2018-04-01.tar.gz
+ https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
+ https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
+ https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
+ https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
+ https://zlib.net/zlib-1.2.11.tar.gz
+ )"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+ ${bazel_external_uris}"
+
+RDEPEND="
+ cuda? (
+ >=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+ >=dev-libs/cudnn-6.0
+ )
+ mpi? ( virtual/mpi )
+ system-libs? (
+ app-arch/snappy
+ dev-db/lmdb
+ dev-db/sqlite
+ >=dev-libs/flatbuffers-1.8.0
+ >=dev-libs/jsoncpp-1.8.4
+ dev-libs/libpcre
+ >=dev-libs/protobuf-3.6.0
+ >=dev-libs/re2-0.2018.04.01
+ media-libs/giflib
+ media-libs/libjpeg-turbo
+ media-libs/libpng:0
+ >=net-libs/grpc-1.12.1[${PYTHON_USEDEP}]
+ net-misc/curl
+ sys-libs/zlib
+ jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/absl-py[${PYTHON_USEDEP}]
+ dev-python/astor[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ )
+ )"
+DEPEND="${RDEPEND}
+ !python? ( dev-lang/python )
+ app-arch/unzip
+ >=dev-util/bazel-0.14.0
+ dev-java/java-config
+ dev-python/mock
+ system-libs? (
+ dev-lang/nasm
+ dev-lang/swig
+ dev-python/cython
+ )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+ local i f=()
+ # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+ for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+ use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+ done
+ use cpu_flags_x86_fma3 && f+=( -mfma )
+ echo "${f[*]}"
+}
+
+bazel-get-flags() {
+ local i fs=()
+ for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ done
+ for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${CPPFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${LDFLAGS}; do
+ fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+ done
+ echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+ if [[ -f "${T}/bazelrc" ]]; then
+ return
+ fi
+
+ # F: fopen_wr
+ # P: /proc/self/setgroups
+ # Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+ # https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+ # https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+ addpredict /proc
+
+ mkdir -p "${T}/bazel-cache" || die
+ mkdir -p "${T}/bazel-distdir" || die
+
+ cat > "${T}/bazelrc" <<-EOF
+ startup --batch
+
+ # dont strip HOME, portage sets a temp per-package dir
+ build --action_env HOME
+
+ # make bazel respect MAKEOPTS
+ build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+ build --compilation_mode=opt --host_compilation_mode=opt
+
+ # Use standalone strategy to deactivate the bazel sandbox, since it
+ # conflicts with FEATURES=sandbox.
+ build --spawn_strategy=standalone --genrule_strategy=standalone
+ test --spawn_strategy=standalone --genrule_strategy=standalone
+
+ build --strip=never
+ build --verbose_failures --noshow_loading_progress
+ test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+ # make bazel only fetch distfiles from the cache
+ fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+ build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+ EOF
+}
+
+ebazel() {
+ setup_bazelrc
+
+ # Use different build folders for each multibuild variant.
+ local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+ local output_base="${WORKDIR}/bazel-base${base_suffix}"
+ mkdir -p "${output_base}" || die
+
+ einfo Running: bazel --output_base="${output_base}" "$@"
+ bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+ # Populate the bazel distdir to fetch from since it cannot use the network
+ # Bazel looks in distdir but will only look for the original filename, not
+ # the possibly renamed one that portage downloaded. If the line has -> we
+ # need to rename it back, otherwise a simple copy is fine.
+
+ local src dst uri rename
+
+ while read uri rename dst; do
+ src="${uri##*/}"
+ [[ -z $src ]] && continue
+ if [[ "$rename" != "->" ]]; then
+ dst="${src}"
+ fi
+
+ [[ ${A} =~ ${dst} ]] || continue
+
+ if [[ "$dst" == "$src" ]]; then
+ einfo "Copying $dst to bazel distdir $src ..."
+ else
+ einfo "Copying $dst to bazel distdir ..."
+ fi
+ cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
+ done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+ export JAVA_HOME=$(java-config --jre-home)
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ # Only unpack the main distfile
+ unpack "${P}.tar.gz"
+ unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+ setup_bazelrc
+ load_distfiles
+
+ eapply "${WORKDIR}"/patches/*.patch
+
+ default
+ use python && python_copy_sources
+
+ if use cuda; then
+ for i in /dev/nvidia*; do
+ addpredict $i
+ done
+ fi
+}
+
+src_configure() {
+ do_configure() {
+ export CC_OPT_FLAGS=" "
+ export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+ export TF_NEED_GCP=0
+ export TF_NEED_HDFS=0
+ export TF_NEED_S3=0
+ export TF_NEED_AWS=0
+ export TF_NEED_KAFKA=0
+ export TF_ENABLE_XLA=0
+ export TF_NEED_GDR=0
+ export TF_NEED_VERBS=0
+ export TF_NEED_OPENCL_SYCL=0
+ export TF_NEED_OPENCL=0
+ export TF_NEED_COMPUTECPP=0
+ export TF_NEED_MKL=0
+ export TF_NEED_MPI=$(usex mpi 1 0)
+ export TF_SET_ANDROID_WORKSPACE=0
+
+ if use python; then
+ python_export PYTHON_SITEDIR
+ export PYTHON_BIN_PATH="${PYTHON}"
+ export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+ else
+ export PYTHON_BIN_PATH="$(which python)"
+ export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+ fi
+
+ export TF_NEED_CUDA=$(usex cuda 1 0)
+ export TF_DOWNLOAD_CLANG=0
+ export TF_CUDA_CLANG=0
+ export TF_NEED_TENSORRT=0
+ if use cuda; then
+ export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
+ export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+ export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+ export TF_NCCL_VERSION="1"
+
+ TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+ TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+ export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+ einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+ TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+ TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+ export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+ einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+ fi
+
+ # Only one bazelrc is read, import our one before configure sets its options
+ echo "import ${T}/bazelrc" >> ./.bazelrc
+
+ # This is not autoconf
+ ./configure || die
+
+ sed -i '/strip=always/d' .tf_configure.bazelrc || die
+
+ if use system-libs; then
+ echo 'build --action_env TF_SYSTEM_LIBS="astor_archive,com_googlesource_code_re2,curl,cython,flatbuffers,gif_archive,grpc,jemalloc,jpeg,lmdb,nasm,org_sqlite,pcre,png_archive,six_archive,snappy,swig,termcolor_archive,zlib_archive"' >> .tf_configure.bazelrc || die
+ fi
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir do_configure
+ else
+ do_configure
+ fi
+}
+
+src_compile() {
+ if use python; then
+ python_setup
+ local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+ cd "${S}-${MULTIBUILD_VARIANT}" || die
+ fi
+
+ ebazel build \
+ //tensorflow:libtensorflow_framework.so \
+ //tensorflow:libtensorflow.so \
+ //tensorflow:libtensorflow_cc.so
+
+ do_compile() {
+ ebazel build //tensorflow/tools/pip_package:build_pip_package
+ }
+ use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+ local i j
+ do_install() {
+ einfo "Installing ${EPYTHON} files"
+ local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+ mkdir -p "${srcdir}" || die
+ bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+ cd "${srcdir}" || die
+ esetup.py install
+
+ # Symlink to the main .so file
+ rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+ dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+
+ python_optimize
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir do_install
+
+ rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
+
+ # Symlink to python-exec scripts
+ for i in "${D}"/usr/lib/python-exec/*/*; do
+ n="${i##*/}"
+ [[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
+ done
+
+ python_setup
+ local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+ cd "${S}-${MULTIBUILD_VARIANT}" || die
+ fi
+
+ einfo "Installing headers"
+ # Install c c++ and core header files
+ for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
+ insinto /usr/include/${PN}/${i%/*}
+ doins ${i}
+ done
+
+ einfo "Installing generated headers"
+ for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+ j=${i#bazel-genfiles/}
+ insinto /usr/include/${PN}/${j%/*}
+ doins ${i}
+ done
+
+ einfo "Installing Eigen headers"
+ ebazel build //third_party/eigen3:install_eigen_headers
+ insinto /usr/include/${PN}/
+ doins -r bazel-genfiles/third_party/eigen3/include/*
+
+ einfo "Installing libs"
+ # Generate pkg-config file
+ ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+ dolib.so bazel-bin/tensorflow/lib${PN}.so
+ dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+ einstalldocs
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index f415cee47683..7c4ec3675d15 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
Binary files differ
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index f3a08fa4035a..9f10ce0c12d4 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,5 +1,4 @@
AUX 2.12.4.0-ldflags.patch 4026 BLAKE2B 75aecbb3d8e3cc03ff8e2ef248d7b54adf7417c2de730fb8e1957a159e16d62b76a1116e08cfd13039a5770d216c962cd257f9ea07034ac6c2d1094dc8ba9bfe SHA512 d0e6ca66504962e9c6b037a598b06239475c8a1b2e9152945ebec70be60f3b4e43dfbec95ac46bcc15d79ea5f81622a499807d523ee3f4ffb2b1134a00829433
-AUX calc-2.12.2.2-libdir-fix.patch 570 BLAKE2B 20a50ab8c9c3715420f70e1fd83ac42db15543d7cb8de36563da1d2e00c787daf8a0f30e8be3885efa995dbbefecc59e64c7f7d29360c9c4f6b1a0c6f8cacfcb SHA512 ad15beeb3a52682e8119582b67abbecbe6de0aeac207b5cc88d085d986c34617b09e08678eae49a105577e415381ea99c6514a454d26c40cd77bfab8b375d79c
AUX calc-2.12.4.13-prefix.patch 3189 BLAKE2B 888798c53afbbd85375ab01a0cbbf0e790de52f82481a4e26a1c54d349789662484e3def5a0d2fedb4c81bb36d7219f295354ea3cda33e1019cb5cd2928da61f SHA512 aedaf30a8837cc1ff545b502e60e3284e4d8df37dd9d98516fbed17788f3d9a497aa3ba66f4613bd237de6152c041b339f26c89ff20ccdc1fb15387f9dba166e
AUX calc-2.12.5.4-as-needed.patch 6226 BLAKE2B cb75c4ffbc5fd916e6d94d00bd32f8170be6eb82f47f1fde3d2d5968853ac7c7719883844563df6b545aa7226b178f9f54f7adb89a843fdd9ab7b92701193276 SHA512 fd65cdc727b9859d8d1a55e4140bb74301dc1941f647f5d52026818a1da56f90d21eea26a578bfd4fb0988cb3c516985239e8a06a3de15a9109fbe77b9536466
DIST calc-2.12.4.13.tar.bz2 970778 BLAKE2B 0e34df7d445a84de89e2c662ea7e8da4a350eaeef984b5027befe5947bf8e863180dd07bbe525c4bc04a6e3aa53bfbb2f3d719c8bfff3c238b16941b701d4b4d SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
diff --git a/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch b/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch
deleted file mode 100644
index f265793ab871..000000000000
--- a/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur calc-2.12.2.2.old/Makefile calc-2.12.2.2/Makefile
---- calc-2.12.2.2.old/Makefile 2007-09-29 12:58:19.000000000 -0400
-+++ calc-2.12.2.2/Makefile 2007-10-24 06:40:10.000000000 -0400
-@@ -1131,7 +1131,7 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
-+DEFAULT_LIB_INSTALL_PATH= /lib:/usr/lib:${LIBDIR}:/usr/local/lib
- LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 96ee6c8b58d6..f5e9c215c6fa 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,4 +1,4 @@
AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805
DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
-EBUILD glpk-4.63.ebuild 1370 BLAKE2B dbccbe5e61a11564984550cf1f39f0658b0201442e0330b292468afd5212780a803e72b0c81ac91c9657cdc986d0efb5b6655724ec741afaba1a6dcfb4d2782b SHA512 a6661f6f70dbdd0d47bd37029b9b23c0227554cc76538a8f29a721e2543ab38c45e562585910093398bdf6feeea5e20d5ec94c96cb8af674057bdb60b15ff08d
+EBUILD glpk-4.63.ebuild 1482 BLAKE2B 481b980c053570f4c01fcd01ed1f25795afe60b17b3fa9dc2b81016658322bfa9f77b25a416c5a703ca5a2f207e7384664bb7ecd3acb1b8851b4014868307ec3 SHA512 5f6724c325437111f9d8ecfee98080c753104bbb546b7b9bec170321560c09a0d052d30dcca70ae595dc63092d04931ba68eafe20d7f6dbe6fd886fcebd0b573
MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index 4721b1832852..b32475f03a75 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
)
src_prepare() {
+ sed -e 's#CPPFLAGS="-I/usr/include/mysql#CPPFLAGS="-I'"${EPREFIX}"'/usr/include/mysql#' -i configure.ac || die
use odbc && [[ -z $(type -P odbc_config) ]] && \
append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index d1fd3138ac77..acf43503242f 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,4 +1,7 @@
AUX why3-for-spark-2017-gentoo.patch 1300 BLAKE2B 616ed7cf1d5c8494a0b9f724ef1b011ad51e9f7edfb8bc88892902ad0cdc23793c8f8cd0e491757be08d90cb1159878d8bd3a34e1ebba62c927b9f676f58c241 SHA512 7ec992b1d0f0f285903b69876b853a8d368c73f4ed3dfccc25f5ae18e72e0c6f71ce9b81e18f2a685d19a7bfa8e69571cb71d4faa5ec67e0fbf2231202c2ea3d
+AUX why3-for-spark-2018-gentoo.patch 1015 BLAKE2B 201846ae0ef17bc6d777b7c1a8baddd1f684e82b811b16d2cce447423189a899f3e599cbf5cbd01630e2b246f8257ba5a890b20aaf62b0c1bc24e46642a37600 SHA512 871534c90f4f7c680f07dcd0bcacc4ce75c43b3132e8570b73e66316fe4333c244b9c443998916af7ff8fd297c20f7079ec5e8bf4c97207d0b7537722cd010a6
DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 BLAKE2B d9eb7201dfd5962c88ac8995e3cd800bf318f575a5e6ff7d0219941c0f0c9052e6b2c95c7c16fcd81b90cac647d503041bf16560bd44b58e7e0ced1ef2314bd2 SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1
+DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
EBUILD why3-for-spark-2017.ebuild 1797 BLAKE2B 8ca7d6ea2787bbe271924d1cecb1807da5c26f7e6342cac62c53d3c9f451c21eb892b8528900ea61fc54aa00bf5fa503dc4a77c7a13fcfceb342c6344d7d3bdc SHA512 b033c9f507637dfd10b759f9f7ffe89a1e7516d43fba2b1ad5e2cf4769d61fce9c6c61c6743ef54f5277994e9aec1656c981eac540b777d085232bcb79d2bd37
+EBUILD why3-for-spark-2018.ebuild 1709 BLAKE2B ed0f018d0025ef7d7c01624eb21387fb2ba506d3a5c08012ad9ec01afd8cacc2f4e2525ba197dc2308584a9e7cc931a7286844459c299385aebeb6e1394327e9 SHA512 a61b98a07a0e939be7ef65266df80be84e898dda3342d51c2e135300a1f3030b6b660de71023b3007805adc1a5ab016c652c05787380ee4e25c3a4599db76339
MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
new file mode 100644
index 000000000000..9d7165cbed78
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
@@ -0,0 +1,25 @@
+--- why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml.old 2017-10-18 09:07:03.118919785 +0200
++++ why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml 2017-10-18 09:07:45.198216939 +0200
+@@ -12,10 +12,7 @@
+ | Limit_Check of Gnat_expl.check
+ | Limit_Line of Gnat_loc.loc
+
+-let spark_prefix =
+- (Filename.dirname
+- (Filename.dirname (Filename.dirname
+- (Filename.dirname Sys.executable_name))))
++let spark_prefix = "/usr"
+
+ let rec file_concat l =
+ match l with
+--- why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4.old 2017-10-26 22:25:55.289094778 +0200
++++ why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4 2017-10-26 22:26:10.719807270 +0200
+@@ -1352,7 +1352,7 @@
+ let limit =
+ { Call_provers.empty_limit with Call_provers.limit_time = timelimit } in
+ let call = Driver.prove_task ~command ~limit drv !task in
+- wait_on_call call
++ wait_on_call (ServerCall call)
+ with
+ | NotFO ->
+ if debug then Printexc.print_backtrace stderr; flush stderr;
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
new file mode 100644
index 000000000000..e766cce4ade3
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a43
+ -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
+RESTRICT=strip
+
+DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
+ dev-ml/menhir
+ coq? ( sci-mathematics/coq )
+ doc? ( dev-tex/rubber )
+ gtk? ( dev-ml/lablgtk[sourceview] )
+ emacs? ( app-editors/emacs:* )
+ html? ( dev-tex/hevea )
+ hypothesis-selection? ( dev-ml/ocamlgraph )
+ zarith? ( dev-ml/zarith )
+ zip? ( >=dev-ml/camlzip-1.07 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+REQUIRED_USE="html? ( doc )"
+
+src_configure() {
+ econf \
+ --disable-pvs-libs \
+ --disable-isabelle-libs \
+ $(use_enable coq coq-libs) \
+ $(use_enable coq coq-tactic) \
+ $(use_enable doc) \
+ $(use_enable emacs emacs-compilation) \
+ $(use_enable gtk ide) \
+ $(use_enable html html-doc) \
+ $(use_enable hypothesis-selection) \
+ $(use_enable ocamlopt native-code) \
+ $(use_enable profiling) \
+ $(use_enable zarith) \
+ $(use_enable zip)
+}
+
+src_compile() {
+ emake -j1
+ if use ocamlopt; then
+ emake byte
+ fi
+ use doc && emake doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" -j1 install
+ emake DESTDIR="${D}" -j1 install-lib
+ emake DESTDIR="${D}" install_spark2014_dev
+ einstalldocs
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ if use doc; then
+ dodoc doc/manual.pdf
+ use html && dodoc -r doc/html
+ fi
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 5dea7e7ecd9f..3b44e9290719 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
Binary files differ
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index bc1f59d15c37..9d6e3c5cbf46 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -11,5 +11,5 @@ EBUILD clhep-2.2.0.1.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e31009
EBUILD clhep-2.2.0.5.ebuild 1374 BLAKE2B 09920510732f5ca752c01672c11ed7e7d3f261dfd2c5ed82f824e3c4bccb1faed4e0ee8f1b376a7a97e5dd0ce037103445bdec7775a212628b99bf06dacd6f8e SHA512 a11977b880aed6a7a678f5e3f8f661a2687a05ac611f2dccbcacccd56c9f5e27456b46e6af512627a3a849507c70b8df3d13188c589443052fe1b38275d608ef
EBUILD clhep-2.3.1.0.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
EBUILD clhep-2.3.3.1.ebuild 1274 BLAKE2B e3e82e240abda4f14520c3713d25e73a4d291d18daa6ef35c0827d567b345d6f11c1f54e7885f3d3ffe8a49c7b10ebecf57786f8bd7671b6a1d7ca62045f0c74 SHA512 26954289283caf6666d84f4fb48f1ab1514f42d9c694657485c1d84e69524cfeeb7fb89b11a4ce4d9fb946f05493746172c3e69836f40accd60f242fee46e248
-EBUILD clhep-2.4.0.4.ebuild 1154 BLAKE2B 0bcdf8701785f71cfe5bacdc2b39131fa26f41f4a9591ea42f2d65299f3586b47d0471d07dc38579e2f754a08cbe4b407615f591524508baa66ba9122c322d57 SHA512 408e8bce20625744034195901de41f80c61898879dc50c30006e9ba9e4ada697099ce0e9755f2c7e61afd399c0a33dfb086b254967b485085417746ce9f8d6f8
+EBUILD clhep-2.4.0.4.ebuild 1153 BLAKE2B 2f25784e72e25a96be71df937588d4e085331d66fe97c94bb38ed6b3166e7051f2662a2e15e7118530fbb14209eca68cfe7d8e836f85021087264284eab59e63 SHA512 437d3f6c1380c29a9eb2b84b10534454d9a5686be0734ed0e710646c6d9d1741e427ff58b9aebe3b4908b52abcb64987a585206b22d0b4437d8218363ae8aa16
MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
index 1ac5e383a361..08425f145ab5 100644
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://cern.ch/clhep"
SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
LICENSE="GPL-3 LGPL-3"
SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test threads"
RDEPEND=""
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 607e9e91c52e..ae2a79d0c9a4 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
Binary files differ
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index f3e075224daa..4317a15a97d9 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,9 +1,6 @@
AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
-AUX paraview-5.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac0138803327984c4a7defee2921a9d42ba69a75788d3b5abde03c99c33024e3c89de71b93f24d3ba2a60011a24445919f16824fbf4 SHA512 9ffd209bfc5de42e6100669614771a20c904b809cea7beda90709b5b2e2c36a533ab3474495d6f6e6e7141d033e2cc53ff1dfc241287eadfb13996b7a123eadf
AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
-DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
-DIST ParaView-v5.5.0.tar.gz 51414419 BLAKE2B 832a01701d21f463c07186912501796756c2477063803fa3b2b67dbb9ac2c9db28a45a8b3d22077085255adf16eb429c3289093848b3712ebab46c0ae4c17956 SHA512 0915eac75a710736334fa9d436369a14546e2f90a1b55f9a0f7a96fedb94ced043d27576d2a179f275478be17e326cd3bee76f06266a776d586f6510722f3172
-EBUILD paraview-5.4.1.ebuild 8162 BLAKE2B e5ac791d2e598f6f18b238bcc2ddc73677ef7a73e0094880b7df3b80084a92025e463eee46ae3d9f7438117c351f46804f845bd163c4172d3e09a424064f2aa2 SHA512 f2e4c0939dfe6b3413d4d6683c21793ad3449061c0b7f867f5e9999e319fa1f97b1e9b86c112789adbcd997fa7df28c01da0c7f2f8d1b46656a5cd27687ec703
-EBUILD paraview-5.5.0.ebuild 8306 BLAKE2B a29723366f2524727657cd25f4994e62385d984d5c24ce236dc52a4e678942a14602d5aa91d95577886957cb0955ee9d66b49ffc7ad4eec8f03fea81827c56ba SHA512 dc733226df988c419cc56b8b2cc1a567f7d9f7f9aa6b2888edbb50c790178d9dfd449f7eabeb7d76e2f2e844f0570e8daaeb646672877842bbc7862415d090fc
+DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
+EBUILD paraview-5.5.2.ebuild 8355 BLAKE2B 024db792d3b708049e4bf09a294621e802de48e1d3c0f528330f61431e26e67c75226918a2db3356f7c50990fc0dc44c36ce4dfdbc6c1c353aa3ca21db983f98 SHA512 da6247117d63f194d5d24a3aa1f8ab91b58bceaa5be919a450e0f32d6d9950dac6a0bd94bf47418d23aebaf68d7677999cc31febfe56505acb3b2234675877e7
MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
deleted file mode 100644
index b4b64e94eef8..000000000000
--- a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-index b6e2b55..d27ad9d 100644
---- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-+++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-@@ -788,7 +788,10 @@ public:
- this->GetSettingBelowPriority(propertySettingCString, highestPriority);
- if (lowerPriorityValue.isNull())
- {
-- if (!proxyValue.removeMember(property->GetXMLName()).isNull())
-+ // Allocated as done in Json::Value removeMember(const char* key).
-+ Json::Value removedValue;
-+ if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
-+ !removedValue.isNull())
- {
- this->Modified();
- }
-
diff --git a/sci-visualization/paraview/paraview-5.4.1.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
deleted file mode 100644
index f1b68b99b8af..000000000000
--- a/sci-visualization/paraview/paraview-5.4.1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
-
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
-RESTRICT="test"
-
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libxml2:2
- dev-libs/protobuf
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sci-libs/xdmf2
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- coprocessing? (
- plugins? (
- dev-python/PyQt5
- dev-qt/qtgui:5[-gles2]
- )
- )
- ffmpeg? ( virtual/ffmpeg )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- python? (
- ${PYTHON_DEPS}
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qthelp:5
- dev-qt/qtopengl:5[-gles2]
- dev-qt/qtsql:5
- dev-qt/qttest:5
- dev-qt/qtwebkit:5
- dev-qt/qtx11extras:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/cmake-3.4
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${P}-jsoncpp_1.8.4.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
- eerror "For USE=openmp a gcc with openmp support is required"
- eerror
- return 1
- fi
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
- sed -i \
- -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
- VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- CMakeLists.txt \
- ParaViewConfig.cmake.in \
- CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
- ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
- ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
-
- # no proper switch
- if ! use nvcontrol; then
- sed -i \
- -e '/VTK_USE_NVCONTROL/s#1#0#' \
- VTK/Rendering/OpenGL/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- local mycmakeargs=(
- -DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_COLOR_MAKEFILE=TRUE
- -DCMAKE_VERBOSE_MAKEFILE=ON
- -DVTK_Group_StandAlone=ON
- -DVTK_RENDERING_BACKEND=OpenGL2
- -DVTK_USE_FFMPEG_ENCODER=OFF
- -DVTK_USE_OFFSCREEN=TRUE
- # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_INCREMENTAL=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_OGGTHEORA=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_PROTOBUF=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_XDMF2=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF
- -DVTK_USE_SYSTEM_ZLIB=ON
- # force this module due to incorrect build system deps
- # wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
- )
-
- mycmakeargs+=(
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-
- -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
-
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- -DModule_AutobahnPython="$(usex python)"
- -DModule_pqPython="$(usex python)"
- -DModule_Twisted="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DModule_ZopeInterface="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- -DBUILD_EXAMPLES="$(usex examples)"
-
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- -DModule_vtksqlite="$(usex sqlite)"
-
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- -DModule_vtkTclTk="$(usex tcl)"
- -DModule_vtkWrappingTcl="$(usex tcl)"
- -DBUILD_TESTING="$(usex test)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- # TODO: MantaView VaporPlugin VRPlugin
- mycmakeargs+=(
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-
- newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
- make_desktop_entry paraview "Paraview" paraview
-
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
diff --git a/sci-visualization/paraview/paraview-5.5.0.ebuild b/sci-visualization/paraview/paraview-5.5.0.ebuild
deleted file mode 100644
index 82c2a17ce248..000000000000
--- a/sci-visualization/paraview/paraview-5.5.0.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
-
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
-RESTRICT="test"
-
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libxml2:2
- dev-libs/protobuf
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sci-libs/xdmf2
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- coprocessing? (
- plugins? (
- dev-python/PyQt5
- dev-qt/qtgui:5[-gles2]
- )
- )
- ffmpeg? ( virtual/ffmpeg )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( virtual/mysql )
- python? (
- ${PYTHON_DEPS}
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qthelp:5
- dev-qt/qtopengl:5[-gles2]
- dev-qt/qtsql:5
- dev-qt/qttest:5
- dev-qt/qtwebkit:5
- dev-qt/qtx11extras:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-util/cmake-3.4
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
- eerror "For USE=openmp a gcc with openmp support is required"
- eerror
- return 1
- fi
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_COLOR_MAKEFILE=TRUE
- -DCMAKE_VERBOSE_MAKEFILE=ON
- -DVTK_Group_StandAlone=ON
- -DVTK_RENDERING_BACKEND=OpenGL2
- -DVTK_USE_FFMPEG_ENCODER=OFF
- -DVTK_USE_OFFSCREEN=TRUE
- # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_INCREMENTAL=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_OGGTHEORA=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_PROTOBUF=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_XDMF2=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF
- -DVTK_USE_SYSTEM_ZLIB=ON
- # force this module due to incorrect build system deps
- # wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
- )
-
- mycmakeargs+=(
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-
- -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- -DModule_AutobahnPython="$(usex python)"
- -DModule_pqPython="$(usex python)"
- -DModule_Twisted="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DModule_ZopeInterface="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- -DBUILD_EXAMPLES="$(usex examples)"
-
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- -DModule_vtksqlite="$(usex sqlite)"
-
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- -DModule_vtkTclTk="$(usex tcl)"
- -DModule_vtkWrappingTcl="$(usex tcl)"
- -DBUILD_TESTING="$(usex test)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- # TODO: MantaView VaporPlugin VRPlugin
- mycmakeargs+=(
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # install libraries into correct directory respecting get_libdir:
- mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
- mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
- mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
- rmdir "${ED}"/usr/lib_tmp || die
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${T}"/40${PN}
-
- newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
- make_desktop_entry paraview "Paraview" paraview
-
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
diff --git a/sci-visualization/paraview/paraview-5.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
new file mode 100644
index 000000000000..b34d4ec9805e
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+ mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+ app-arch/lz4
+ dev-libs/expat
+ dev-libs/jsoncpp
+ dev-libs/libxml2:2
+ dev-libs/protobuf
+ dev-libs/pugixml
+ media-libs/freetype
+ media-libs/glew:0
+ media-libs/libpng:0
+ media-libs/libtheora
+ media-libs/tiff:0=
+ sci-libs/cgnslib
+ sci-libs/hdf5[mpi=]
+ >=sci-libs/netcdf-4.2[hdf5]
+ >=sci-libs/netcdf-cxx-4.2:3
+ sci-libs/xdmf2
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ coprocessing? (
+ plugins? (
+ dev-python/PyQt5
+ dev-qt/qtgui:5[-gles2]
+ )
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ mpi? ( virtual/mpi[cxx,romio] )
+ mysql? ( virtual/mysql )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/constantly[${PYTHON_USEDEP}]
+ dev-python/incremental[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ || ( dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ )
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ mpi? ( dev-python/mpi4py )
+ qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtgui:5[-gles2]
+ dev-qt/qthelp:5
+ dev-qt/qtopengl:5[-gles2]
+ dev-qt/qtsql:5
+ dev-qt/qttest:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtx11extras:5
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/cmake-3.4
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+ doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+ "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+ "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+ eerror "For USE=openmp a gcc with openmp support is required"
+ eerror
+ return 1
+ fi
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # lib64 fixes
+ sed -i \
+ -e "s:/lib/python:/$(get_libdir)/python:g" \
+ VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+ sed -i \
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+ ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+ if use qt5; then
+ export QT_SELECT=qt5
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_COLOR_MAKEFILE=TRUE
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DVTK_Group_StandAlone=ON
+ -DVTK_RENDERING_BACKEND=OpenGL2
+ -DVTK_USE_FFMPEG_ENCODER=OFF
+ -DVTK_USE_OFFSCREEN=TRUE
+ # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
+ -DVTK_USE_SYSTEM_CGNS=ON
+ -DVTK_USE_SYSTEM_PUGIXML=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
+ -DVTK_USE_SYSTEM_GLEW=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_INCREMENTAL=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_JSONCPP=ON
+ -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_LZ4=ON
+ -DVTK_USE_SYSTEM_NETCDF=ON
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_PROTOBUF=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_XDMF2=ON
+ -DVTK_USE_SYSTEM_XDMF2=OFF
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ # force this module due to incorrect build system deps
+ # wrt bug 460528
+ -DModule_vtkUtilitiesProcessXML=ON
+ )
+
+ mycmakeargs+=(
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+
+ -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
+ -DModule_vtkGUISupportQtSQL="$(usex qt5)"
+ -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
+ -DModule_vtkRenderingQt="$(usex qt5)"
+ -DModule_vtkViewsQt="$(usex qt5)"
+ -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
+ -DVTK_Group_ParaViewQt="$(usex qt5)"
+ -DVTK_Group_Qt="$(usex qt5)"
+ -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+ $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+ -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+
+ -DModule_vtkInfovisBoost="$(usex boost)"
+
+ -DPARAVIEW_USE_ICE_T="$(usex mpi)"
+ -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
+ -DPARAVIEW_USE_MPI="$(usex mpi)"
+ -DVTK_Group_MPI="$(usex mpi)"
+ -DVTK_XDMF_USE_MPI="$(usex mpi)"
+ -DXDMF_BUILD_MPI="$(usex mpi)"
+
+ -DModule_AutobahnPython="$(usex python)"
+ -DModule_pqPython="$(usex python)"
+ -DModule_Twisted="$(usex python)"
+ -DModule_vtkmpi4py="$(usex python)"
+ -DModule_vtkPython="$(usex python)"
+ -DModule_vtkWrappingPythonCore="$(usex python)"
+ -DModule_ZopeInterface="$(usex python)"
+ -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
+ -DXDMF_WRAP_PYTHON="$(usex python)"
+
+ -DBUILD_DOCUMENTATION="$(usex doc)"
+
+ -DBUILD_EXAMPLES="$(usex examples)"
+
+ -DModule_vtkIOMySQL="$(usex mysql)"
+
+ -DModule_vtksqlite="$(usex sqlite)"
+
+ -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+ -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+ -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+ -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+ -DVTK_Group_Tk="$(usex tk)"
+ -DVTK_USE_TK="$(usex tk)"
+ -DModule_vtkRenderingTk="$(usex tk)"
+ -DModule_vtkTclTk="$(usex tcl)"
+ -DModule_vtkWrappingTcl="$(usex tcl)"
+ -DBUILD_TESTING="$(usex test)"
+ )
+
+ if use openmp; then
+ mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+ fi
+
+ # TODO: MantaView VaporPlugin VRPlugin
+ mycmakeargs+=(
+ -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
+ # these are always needed for plugins
+ -DModule_vtkFiltersFlowPaths="$(usex plugins)"
+ -DModule_vtkPVServerManagerApplication="$(usex plugins)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # remove wrapper binaries and put the actual executable in place
+ for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+ if [ -f "${ED}"/usr/lib/"$i" ]; then
+ mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+ fi
+ done
+
+ # install libraries into correct directory respecting get_libdir:
+ mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
+ mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
+ mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
+ rmdir "${ED}"/usr/lib_tmp || die
+
+ # set up the environment
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+ doenvd "${T}"/40${PN}
+
+ newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+ make_desktop_entry paraview "Paraview" paraview
+
+ use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 828f12151859..3c8b680ed154 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
Binary files differ
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index f4b231eb9941..94ef3d4b64dc 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-abrt-2.20170805-r2.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
-EBUILD selinux-abrt-2.20170805-r3.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-abrt-2.20180114-r1.ebuild 278 BLAKE2B 14448ac8460247df1f60f95ba332b8d6bc23956950e06d76520d300be140d6625786ddacd487180a1742ae5885ba7148ad8ff31b8a3bec7ec2f16c02a5e25741 SHA512 5738cc689707e85c7e449eb799b149c352d78b0bc26e2ca1adbb919a5433359f5313c9bd1c9f86f36bdb4cc9d9f78c2b5a4280343f14a9b0b0d81b1c181d0cca
EBUILD selinux-abrt-2.20180114-r2.ebuild 278 BLAKE2B 14448ac8460247df1f60f95ba332b8d6bc23956950e06d76520d300be140d6625786ddacd487180a1742ae5885ba7148ad8ff31b8a3bec7ec2f16c02a5e25741 SHA512 5738cc689707e85c7e449eb799b149c352d78b0bc26e2ca1adbb919a5433359f5313c9bd1c9f86f36bdb4cc9d9f78c2b5a4280343f14a9b0b0d81b1c181d0cca
EBUILD selinux-abrt-2.20180114-r3.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
+EBUILD selinux-abrt-2.20180701-r1.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
MISC metadata.xml 314 BLAKE2B a9aeb3ee56eda731aac4307519a5adcc7bc1530574eff9720c6110b7f509881f50fef50fcd32ee5efcfca1b75bb9cce9e1f438b9a368ba40fa5c77eb3c2f2d5a SHA512 b3d4a77a87b4deac8607f1b27a93c8b98e56ab0006d47d295bbd6da521788e8259d0497cd7369de74908d8d50d592d7c2a866957cd472c66de603bdc4e07a28a
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..16244467e5a4
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index a198781a4a94..1ad381a7cfd0 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-accountsd-2.20170805-r2.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
-EBUILD selinux-accountsd-2.20170805-r3.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-accountsd-2.20180114-r1.ebuild 381 BLAKE2B e690461f73a6637048aa192893210d832dd9f4a7d0b776bfc784c2e8ee421521c763dd51a587bfeb8a37e74df4fbde58001bf3e5df29b7ae24a74f45d36212ac SHA512 19d467e07a13ef8dd187c498c4350bb4fcb28c2e6b7e1ffc8e26822888cc561fdce22b2fbdfc2b20af099f32a5e6401421f43d2c78336e01914230fefed3c8a1
EBUILD selinux-accountsd-2.20180114-r2.ebuild 381 BLAKE2B e690461f73a6637048aa192893210d832dd9f4a7d0b776bfc784c2e8ee421521c763dd51a587bfeb8a37e74df4fbde58001bf3e5df29b7ae24a74f45d36212ac SHA512 19d467e07a13ef8dd187c498c4350bb4fcb28c2e6b7e1ffc8e26822888cc561fdce22b2fbdfc2b20af099f32a5e6401421f43d2c78336e01914230fefed3c8a1
EBUILD selinux-accountsd-2.20180114-r3.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
+EBUILD selinux-accountsd-2.20180701-r1.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
MISC metadata.xml 319 BLAKE2B 2db1e4990fa93a4687f70a6f07fc9c5ac1de4115ec232f4586a8279158bedd333caa185421da45832561ab34fbf54ceefe6665e28843e71d66215f5e74fea157 SHA512 d6458bc554feed33eabcf07a330ffba0317fbf3fcd3704f93db022cf555ca2ab257b59c62bb903c8e104cf7f606248946907540e0cadd1854e39e2ea6878d9e4
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.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"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.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"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4d002b6a69b
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 2737769e9a76..92f0cfb8846d 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-acct-2.20170805-r2.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
-EBUILD selinux-acct-2.20170805-r3.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-acct-2.20180114-r1.ebuild 278 BLAKE2B 835818028645cf6268a1085d6ebf81f17e160163f496072001a190d65a4d6de340670780b9012f813f73ac6e2226edd9aa2759987ef3a24274490711c490613a SHA512 6cb60c6543e3dd6b9dc50c5100a1be11d5dd272c6cb6ab6cfbb7e8344130782dcbbb8abf0682524e630116f2c75adefadb35a8e786033f5f1f9432cb86813db6
EBUILD selinux-acct-2.20180114-r2.ebuild 278 BLAKE2B 835818028645cf6268a1085d6ebf81f17e160163f496072001a190d65a4d6de340670780b9012f813f73ac6e2226edd9aa2759987ef3a24274490711c490613a SHA512 6cb60c6543e3dd6b9dc50c5100a1be11d5dd272c6cb6ab6cfbb7e8344130782dcbbb8abf0682524e630116f2c75adefadb35a8e786033f5f1f9432cb86813db6
EBUILD selinux-acct-2.20180114-r3.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
+EBUILD selinux-acct-2.20180701-r1.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
EBUILD selinux-acct-9999.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
MISC metadata.xml 314 BLAKE2B 9a10659585a888cbb5577aadf1ac833608cf700a42f27a8048835bdc873f4b9aebb60a1b529f21e8d1b7c828cf50bd2e0457f623ae2b555053db097b18f00dc7 SHA512 3baaefcdf1846cec59a14866f9a1bcd9a0fbad615069a45eb2c6d74df733533d10bb03adbeef08496c7c4462694649eb619ae36eccdf1e9e91740c495edcb054
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bb4f2d3ea880
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index f694dbc32e33..351de254c63f 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ada-2.20170805-r2.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
-EBUILD selinux-ada-2.20170805-r3.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ada-2.20180114-r1.ebuild 276 BLAKE2B 80b3e73e990ba36ed8e2b50617e44af17635bf603fb9e0752e0023ffb7cfff63795736f19dfb11cee844618dd953724aaff06ae0a38fe9689bad3d2b30b17b33 SHA512 adc70da605ba9a69a6ffc3aa7fd79cc11d7daccf174ac4c33415561bb432281626faf2a3660f82f0f4dd1362935c38dd4ce13d4e0ba3f7da26cdf2e89d979d11
EBUILD selinux-ada-2.20180114-r2.ebuild 276 BLAKE2B 80b3e73e990ba36ed8e2b50617e44af17635bf603fb9e0752e0023ffb7cfff63795736f19dfb11cee844618dd953724aaff06ae0a38fe9689bad3d2b30b17b33 SHA512 adc70da605ba9a69a6ffc3aa7fd79cc11d7daccf174ac4c33415561bb432281626faf2a3660f82f0f4dd1362935c38dd4ce13d4e0ba3f7da26cdf2e89d979d11
EBUILD selinux-ada-2.20180114-r3.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
+EBUILD selinux-ada-2.20180701-r1.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
MISC metadata.xml 313 BLAKE2B ede61a44528842cd37d2a8fe8ad6a0f3018510bc2d37f2029fc4d2b9b59ac4844e0d2d2ecf91b61f044bad161d1e292fce1d7e26efa24d2cc9d874de6862bc69 SHA512 9412dc7f263273b69ac4665caa58138477732b72b6c3f1fcbb09781127434b532d34384c40c2b92bb2e10396b2bc67135a8e767c4fdae16e253b39684104b4cc
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b224e8eab965
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index d4d778439dd4..85a972cc797b 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-afs-2.20170805-r2.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
-EBUILD selinux-afs-2.20170805-r3.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-afs-2.20180114-r1.ebuild 276 BLAKE2B fbb22198b0062c249cf53b7d1d21bc7b21fa6d84fc6831ce141b8d47a9ba4ddf349f787bab859cd600bd0da1b26e01b2984c7dda622be53b8587345f9e02d2cd SHA512 3a333da5eccc519db3f4cdfcc7498b56e399d75aa1f098d3a53f6b0a339c79eb6f7296a710dabdcf36219edfd12d2a9c45026526d709888ce7bd82a8d3819794
EBUILD selinux-afs-2.20180114-r2.ebuild 276 BLAKE2B fbb22198b0062c249cf53b7d1d21bc7b21fa6d84fc6831ce141b8d47a9ba4ddf349f787bab859cd600bd0da1b26e01b2984c7dda622be53b8587345f9e02d2cd SHA512 3a333da5eccc519db3f4cdfcc7498b56e399d75aa1f098d3a53f6b0a339c79eb6f7296a710dabdcf36219edfd12d2a9c45026526d709888ce7bd82a8d3819794
EBUILD selinux-afs-2.20180114-r3.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
+EBUILD selinux-afs-2.20180701-r1.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
EBUILD selinux-afs-9999.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
MISC metadata.xml 313 BLAKE2B 7b38235217ab30ab97d9ca8da2d57e2f776f75b6f6ac4946477c20ddc13408d1302baa55f73d315613d35ba3c55eafde625888cae5a6929ac7ab5346f2603650 SHA512 b684826f0ad47ac371f231ebc834fbed092a7bc39730ca9aeb5a28eb1b604e19b21ec6e731b7f9f54f8e5580fe35dc87332dd44c37c9fba44c4bf78a7daa04ef
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8b497cad73df
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index a3eb01e50ec4..479aacdb8cbb 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-aide-2.20170805-r2.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
-EBUILD selinux-aide-2.20170805-r3.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-aide-2.20180114-r1.ebuild 278 BLAKE2B 8f21d5fb6bf2a8c006bb995864832c2c2ae9a641f93fa781f43a23e69c28a0a25724e28b1df770b6b964117c346ccb010df71aed5795940ebfb25f9690c8a8ea SHA512 6312bbc2c5520eb0c407ce2f174ddafb6302960f7e6cc4b9db7c9f4af302d9c3a55a35333c432feaa9f90b4ac279d43017f5e2745c02642613e052cbd57f990a
EBUILD selinux-aide-2.20180114-r2.ebuild 278 BLAKE2B 8f21d5fb6bf2a8c006bb995864832c2c2ae9a641f93fa781f43a23e69c28a0a25724e28b1df770b6b964117c346ccb010df71aed5795940ebfb25f9690c8a8ea SHA512 6312bbc2c5520eb0c407ce2f174ddafb6302960f7e6cc4b9db7c9f4af302d9c3a55a35333c432feaa9f90b4ac279d43017f5e2745c02642613e052cbd57f990a
EBUILD selinux-aide-2.20180114-r3.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
+EBUILD selinux-aide-2.20180701-r1.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
EBUILD selinux-aide-9999.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
MISC metadata.xml 314 BLAKE2B e34b139fe06e3ea9cbce95a309248a9ac900d5e97897761294d05e3d89d5c4fc6e4841ce4f8de90827b45a78572d007c192973a9380de30cc1968b049dfb9699 SHA512 3ae94807091069e074f1efdd413a2acb748d0cae2f5ac3edaa1469536aebf9f8c1125298696dbaa50a48ee6ca1f212cf5e02c7ec2664b48633a2f345e4c5421d
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9764c0700398
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index dbac1791daa6..4a0bc5d7cbe6 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-alsa-2.20170805-r2.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
-EBUILD selinux-alsa-2.20170805-r3.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-alsa-2.20180114-r1.ebuild 278 BLAKE2B 69e4037e0ec56d6a24d935ff153c8251783a9671605ccd19841b481f684c8d938665695f5172bd6435d334b72942beb1668dac34c2178c6d3c5bcdc925d78c3f SHA512 6362acb4f3828c8a0917d4a4968f75a23a119d2a46c32c731341aeb85a62f2e0bd118c82c45d9561ecdd7b98cc655f05e9269ce584adbcca3fe1483b0c79e381
EBUILD selinux-alsa-2.20180114-r2.ebuild 278 BLAKE2B 69e4037e0ec56d6a24d935ff153c8251783a9671605ccd19841b481f684c8d938665695f5172bd6435d334b72942beb1668dac34c2178c6d3c5bcdc925d78c3f SHA512 6362acb4f3828c8a0917d4a4968f75a23a119d2a46c32c731341aeb85a62f2e0bd118c82c45d9561ecdd7b98cc655f05e9269ce584adbcca3fe1483b0c79e381
EBUILD selinux-alsa-2.20180114-r3.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
+EBUILD selinux-alsa-2.20180701-r1.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
MISC metadata.xml 314 BLAKE2B 804e8fd77ee3d8a8ef928de31a5db28fe522eafed3695574154fd70316f49d793c62a758dd53e5902c322c23bd9edc4f18888258e41b8701d3ae5cf4c573560c SHA512 dec699cdcba4fb0219f7fb71afbfca634d1a5767121078a206289fda39d33a622f2986064e29f16548290f4ca8aa71150667e92fbb4d799ece93209b2f1967c2
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c13f83b1040f
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 4d41b0dcb001..9fbbcc4962a8 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-amanda-2.20170805-r2.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
-EBUILD selinux-amanda-2.20170805-r3.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-amanda-2.20180114-r1.ebuild 376 BLAKE2B 3b573737fb73e34f5a3a17aeca31bf0b34e32c0dd0df0515c4b8929693c0a4efc42193cb5dbcf1800249ca5ef3c965ec9158ec4b5e1dec646ea30504e388285f SHA512 ca2dde23325eab0bead876188b4b95f370737c24eaa58f35aac195cb9430d11dcd1ea958a137695f46e26072782bbdc5648dbc850ff35d5340b5b67b74fdd151
EBUILD selinux-amanda-2.20180114-r2.ebuild 376 BLAKE2B 3b573737fb73e34f5a3a17aeca31bf0b34e32c0dd0df0515c4b8929693c0a4efc42193cb5dbcf1800249ca5ef3c965ec9158ec4b5e1dec646ea30504e388285f SHA512 ca2dde23325eab0bead876188b4b95f370737c24eaa58f35aac195cb9430d11dcd1ea958a137695f46e26072782bbdc5648dbc850ff35d5340b5b67b74fdd151
EBUILD selinux-amanda-2.20180114-r3.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
+EBUILD selinux-amanda-2.20180701-r1.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
MISC metadata.xml 316 BLAKE2B 31b7d1885430846c69fc4563f57d45836ff9a08877ae5e96df4b464cc445ade4843d6cda2bb12aa1154fee717eef45f24d4a79e98d7419153115df81d1976d15 SHA512 175f419f4f7218403e30c562aea9be81f919761be0aec6ff0e931328e2f4b0c260f80f1ef9d883507e86fb749e73049fdd45d30851df3eee7ad0c915d0e89284
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6cce4fee502d
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index dc7a81779fb8..95a1e2a63e74 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-amavis-2.20170805-r2.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
-EBUILD selinux-amavis-2.20170805-r3.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-amavis-2.20180114-r1.ebuild 282 BLAKE2B 1b857a90d864e2beecff6e6b2f9894fc2a8ad5ec7c6b32e4f23f24e38fe19e2c818517f9a54a6329223be3699ce73c494cf68b9e16ff29d52002bff18d9f3851 SHA512 e131b48bf6d80e892cbbe610e3dd5fe7b0b07f2c2a021e6cf069fffc1a223a10da62991bc811b0552ac57735e16791d82ff564dd170387577936292fb8bb582f
EBUILD selinux-amavis-2.20180114-r2.ebuild 282 BLAKE2B 1b857a90d864e2beecff6e6b2f9894fc2a8ad5ec7c6b32e4f23f24e38fe19e2c818517f9a54a6329223be3699ce73c494cf68b9e16ff29d52002bff18d9f3851 SHA512 e131b48bf6d80e892cbbe610e3dd5fe7b0b07f2c2a021e6cf069fffc1a223a10da62991bc811b0552ac57735e16791d82ff564dd170387577936292fb8bb582f
EBUILD selinux-amavis-2.20180114-r3.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
+EBUILD selinux-amavis-2.20180701-r1.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
MISC metadata.xml 316 BLAKE2B aa2a01d791833d7cbabf044b7cbd8d1644ec81d305e02bd43fa0a5f71444d02dd9719cae25a656144a592d75be8bbd8c0593e1365e1d28a3c9c1e6e957da0146 SHA512 fe718a2ad4043b9e7a44e68158c792a8f27f604632640d186fdedc222e3d6c9c74cbcb5e39e443df698aa33ba699e7d056974843e62b9f9616524dc718f5965b
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..35bcba26802e
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index e482de1d1f0b..f70aa9d1fa51 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-android-2.20170805-r2.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
-EBUILD selinux-android-2.20170805-r3.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-android-2.20180114-r1.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
EBUILD selinux-android-2.20180114-r2.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
EBUILD selinux-android-2.20180114-r3.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
+EBUILD selinux-android-2.20180701-r1.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
MISC metadata.xml 317 BLAKE2B 0eb943554a2dce9c3ddd27c1599d70bf3023fa16142d335ba27922287a8201002822ce6b396551cae6b1ee47c686de96638c1aa44906c14a673cbdea181775c2 SHA512 fdaad87814ab78792c7bb30ba017e2f7ae7e25dd11701b2cca62c6847f5f79a59d453865aee812ce0c1d6842f9ba1867ac0206fecfd2edbc40da6ee45f56a428
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-java
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-java
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-java
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-java
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1090e96d263d
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-java
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-java
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index e79f858bd909..de1f3178aa1a 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apache-2.20170805-r2.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
-EBUILD selinux-apache-2.20170805-r3.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-apache-2.20180114-r1.ebuild 382 BLAKE2B 2b6773e146e41eb3242ea6f1a006423fb8975446ff7ede91d94487b8293d18ff651f8c7807cc4d061b3257448cd3a70fe4b763f8500c723bc0c1dab557ef5676 SHA512 a5a4fcfe6652fab2b6a29b42ee96cbfc119ab33490a3390435c7ea04b5c24b80d42b432dca97b737b3f9c7d23d1b34de2169b0df7e8eaac9f718b3458f7b6086
EBUILD selinux-apache-2.20180114-r2.ebuild 382 BLAKE2B 2b6773e146e41eb3242ea6f1a006423fb8975446ff7ede91d94487b8293d18ff651f8c7807cc4d061b3257448cd3a70fe4b763f8500c723bc0c1dab557ef5676 SHA512 a5a4fcfe6652fab2b6a29b42ee96cbfc119ab33490a3390435c7ea04b5c24b80d42b432dca97b737b3f9c7d23d1b34de2169b0df7e8eaac9f718b3458f7b6086
EBUILD selinux-apache-2.20180114-r3.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
+EBUILD selinux-apache-2.20180701-r1.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
MISC metadata.xml 316 BLAKE2B 7bc6c7cc3d055719a8d6fd244d495a0c7eb666157ccd55ddda35ae818dbb8afc8c4b5cd2777610dd872bcfd3ff0ce63b96b478d41517857efacc672f2e38ad08 SHA512 f8795858dc0c9f6b6384f67f6f83c6a59ba1da9ba3c1ef070604e2fbade2f202e88ca876e995512da3f89c1b0f163e8e206734c1f4a78a4170307a6840976293
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..077ce01d6342
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-kerberos
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-kerberos
+"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index a21e54e71ecc..3b424eeab18a 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apcupsd-2.20170805-r2.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
-EBUILD selinux-apcupsd-2.20170805-r3.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-apcupsd-2.20180114-r1.ebuild 380 BLAKE2B a1a225da65e7e43c1b38a9f284d5287d744b69930a3a506bbf6d27c7b995be75d55ac5f044cbf7dbef3c9ee80f9e5c7817489a1e24d77cecbd93041101087e4e SHA512 2b348194d990c1459abc4e84b2e59a20a6179fd8cb6dfa3eaf2e41572c6bdeb5b6b1e32406d39bbc02986385667d1aec889c795f4bd069842227651df5e16dd7
EBUILD selinux-apcupsd-2.20180114-r2.ebuild 380 BLAKE2B a1a225da65e7e43c1b38a9f284d5287d744b69930a3a506bbf6d27c7b995be75d55ac5f044cbf7dbef3c9ee80f9e5c7817489a1e24d77cecbd93041101087e4e SHA512 2b348194d990c1459abc4e84b2e59a20a6179fd8cb6dfa3eaf2e41572c6bdeb5b6b1e32406d39bbc02986385667d1aec889c795f4bd069842227651df5e16dd7
EBUILD selinux-apcupsd-2.20180114-r3.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
+EBUILD selinux-apcupsd-2.20180701-r1.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
MISC metadata.xml 317 BLAKE2B 36a8cdec46ee79e127fad419024564374d2ccea486979e0275ea3aefcccf87f6ad519954bc696e700cca523fb04f4da7d5e66e703b2ae195934e15ad9cb0c421 SHA512 60b1efe0a05b69802dc9be53e4420921416667159ec6a0803a119c1ef4524cf9178ef60521f1f5a12c62c3d405ca3fc145f71aedbffa14190933614091379a01
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..67784a4a30c6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index d5bde33e68ab..2b128987be1d 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apm-2.20170805-r2.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
-EBUILD selinux-apm-2.20170805-r3.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-apm-2.20180114-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
EBUILD selinux-apm-2.20180114-r2.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
EBUILD selinux-apm-2.20180114-r3.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
+EBUILD selinux-apm-2.20180701-r1.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
MISC metadata.xml 313 BLAKE2B 909f5fce3d131c6329123f5e35a79476a45dcf4efd8a0ac47ae70abe6ee6da7a4816d42e85ddb22ca425259c296108762dc85e962d8f83ed3f6ad2f06b6e58f4 SHA512 9616055313d194ea536d3d633887c199e71a976f044e357de7da9da4e53b274105869f4c85539133d66ced469fab27d44524251bb389dbdbf3298d7799baec3a
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
deleted file mode 100644
index d0e664f67c7b..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
- # "apm" module got renamed to "acpi", must remove apm first
- # the contexts are okay even tho the modules are not
- # replaced in the same command (doesnt become unlabeled_t)
- for i in ${POLICY_TYPES}; do
- if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
- semodule -s "${i}" -r apm
- fi
- done
- selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
- for i in ${POLICY_TYPES}; do
- if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
- semodule -s "${i}" -r apm
- fi
- done
- selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
deleted file mode 100644
index d0e664f67c7b..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
- # "apm" module got renamed to "acpi", must remove apm first
- # the contexts are okay even tho the modules are not
- # replaced in the same command (doesnt become unlabeled_t)
- for i in ${POLICY_TYPES}; do
- if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
- semodule -s "${i}" -r apm
- fi
- done
- selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
- for i in ${POLICY_TYPES}; do
- if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
- semodule -s "${i}" -r apm
- fi
- done
- selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a5f7f30b0e7a
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acpi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acpi"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+pkg_postinst() {
+ # "apm" module got renamed to "acpi", must remove apm first
+ # the contexts are okay even tho the modules are not
+ # replaced in the same command (doesnt become unlabeled_t)
+ for i in ${POLICY_TYPES}; do
+ if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+ semodule -s "${i}" -r apm
+ fi
+ done
+ selinux-policy-2_pkg_postinst
+}
+
+pkg_postrm() {
+ for i in ${POLICY_TYPES}; do
+ if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+ semodule -s "${i}" -r apm
+ fi
+ done
+ selinux-policy-2_pkg_postrm
+}
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 7d190713de9d..a84900ff3ce6 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-arpwatch-2.20170805-r2.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
-EBUILD selinux-arpwatch-2.20170805-r3.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-arpwatch-2.20180114-r1.ebuild 286 BLAKE2B 4968a9834da18a657aba2ef8532e84922fb472697c15e0c7bf508ef8b0c1daaca4ce9e37bea461ddea71cbde7a2a06679c9ce53d04420ebe3ea62ff42c2b3627 SHA512 165337e1d0f661a4b82a43c70712f4a50dcd1396ce58206e969c05c9c32a199de71d001d80ffa2899945d9bf5910f14e551e1bd07edae678602dc76c664ea9b6
EBUILD selinux-arpwatch-2.20180114-r2.ebuild 286 BLAKE2B 4968a9834da18a657aba2ef8532e84922fb472697c15e0c7bf508ef8b0c1daaca4ce9e37bea461ddea71cbde7a2a06679c9ce53d04420ebe3ea62ff42c2b3627 SHA512 165337e1d0f661a4b82a43c70712f4a50dcd1396ce58206e969c05c9c32a199de71d001d80ffa2899945d9bf5910f14e551e1bd07edae678602dc76c664ea9b6
EBUILD selinux-arpwatch-2.20180114-r3.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
+EBUILD selinux-arpwatch-2.20180701-r1.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
MISC metadata.xml 318 BLAKE2B 5ae25a1f92a7aaf41d0dc2cf33495365e90bad3310c41af2ab48c7aaafe0449f5b2ca1d1d31c37f2a69cfc2e793859de8f57e6f0d5d3eb99a86530f960badc1b SHA512 4917bd6c1284df4face1c8b14e2df39187fb36bd5094fd460bd324bebfdd69b825b783daab79ff957b77579ddfaef98ff65121a78cc15cbbcae37e8fea53d8db
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a07ffc2e1c8f
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index df7531826208..1a769f011b7a 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-asterisk-2.20170805-r2.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
-EBUILD selinux-asterisk-2.20170805-r3.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-asterisk-2.20180114-r1.ebuild 286 BLAKE2B bb616b27ae9224cac9cb951051aac7b19504a7caadce81adac53e131aa2bd521168bc5970103fa34f097efd9b77ee2d20768d8d25730f5e22a1490ba3bf4c36b SHA512 e70983ecb1324229b6df0d19ea3d767132762649bff5c78f5cb95f7427734cf3ee57a7a9cb68356bb849fe1c9b5a57139c37da325ba87f707cbd1d450445d4d8
EBUILD selinux-asterisk-2.20180114-r2.ebuild 286 BLAKE2B bb616b27ae9224cac9cb951051aac7b19504a7caadce81adac53e131aa2bd521168bc5970103fa34f097efd9b77ee2d20768d8d25730f5e22a1490ba3bf4c36b SHA512 e70983ecb1324229b6df0d19ea3d767132762649bff5c78f5cb95f7427734cf3ee57a7a9cb68356bb849fe1c9b5a57139c37da325ba87f707cbd1d450445d4d8
EBUILD selinux-asterisk-2.20180114-r3.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
+EBUILD selinux-asterisk-2.20180701-r1.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
MISC metadata.xml 318 BLAKE2B 19b2f4f1ae7f3ca7873f362bf74b0c997ee59f5273f16774c01cb9dd094e315389d09dc124381495ad4c83bec68093b981ffde7a5f7fa593e07eaedeafce2d6c SHA512 33015c2f0865e82401513b3615960fa0f13b51839ab82fe874f3134d1d4240ad4ac5f7c34b0cb3b6db50fb6f5860634db84281ec6518de23d4d56f2e9cf20ae5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..76ca59655949
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 8439f2b52c03..31a823e788cd 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-at-2.20170805-r2.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
-EBUILD selinux-at-2.20170805-r3.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-at-2.20180114-r1.ebuild 274 BLAKE2B acd4fc9fc65ac9860a277331fb1984825239270ae6d7db5e0ce903a402a47b393a47e519793cec5f7f52726affb93864f2d267d45b44b036557287946b59e0e5 SHA512 2d00e67eb2b74e87d8672246241253d7c79f3748cbf2ffc0a3bf427a296cc102a0241f271604987dd10eadc2953162b1e36bcc35324aeb6923554dbcfc1267b3
EBUILD selinux-at-2.20180114-r2.ebuild 274 BLAKE2B acd4fc9fc65ac9860a277331fb1984825239270ae6d7db5e0ce903a402a47b393a47e519793cec5f7f52726affb93864f2d267d45b44b036557287946b59e0e5 SHA512 2d00e67eb2b74e87d8672246241253d7c79f3748cbf2ffc0a3bf427a296cc102a0241f271604987dd10eadc2953162b1e36bcc35324aeb6923554dbcfc1267b3
EBUILD selinux-at-2.20180114-r3.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
+EBUILD selinux-at-2.20180701-r1.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
EBUILD selinux-at-9999.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
MISC metadata.xml 312 BLAKE2B cd411cd53bcbd27cdb2e71835c8d78684618419c265d17c3b9844abc9c14427ff3369ac949392bc1ad632a14926f2891b640941e6c59bc57a9033700856e6f13 SHA512 0d8118c4453dfb4796c10532034c98ab3ed08255c27881959dfa818486918c9c36616d0b9921fbe5af35f238593d6b39011d48a9c8b302e577ea2ee7ed5fd333
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d5d07f6dd98d
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index b03234911b19..868b30e9fabe 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-automount-2.20170805-r2.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
-EBUILD selinux-automount-2.20170805-r3.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-automount-2.20180114-r1.ebuild 288 BLAKE2B 90115b2a0412af2744c8231106169e7ec3ec917d3aec09728cd8bb79d99436658542386972fd2672d9f3f043bae41cb6ba6cf638dbd7b5766c6f9189ef59ff5b SHA512 69f594cc4963ce677ac5b918cbac3089283820db6bcb51ca8cb30c70043bc7955abebdd6b2f5caa1c0cf5279319c6f35c57884ac4c1d0b678d180daf67ce1f0a
EBUILD selinux-automount-2.20180114-r2.ebuild 288 BLAKE2B 90115b2a0412af2744c8231106169e7ec3ec917d3aec09728cd8bb79d99436658542386972fd2672d9f3f043bae41cb6ba6cf638dbd7b5766c6f9189ef59ff5b SHA512 69f594cc4963ce677ac5b918cbac3089283820db6bcb51ca8cb30c70043bc7955abebdd6b2f5caa1c0cf5279319c6f35c57884ac4c1d0b678d180daf67ce1f0a
EBUILD selinux-automount-2.20180114-r3.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
+EBUILD selinux-automount-2.20180701-r1.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
MISC metadata.xml 319 BLAKE2B 9d1c7f70a181a970e9c1e12a4708344025d78e5008e81323d255093af8e7974eaad668e0807e7ca9a7b7be0a1825cd290620c7f2e5ff48ac6c0722249eecfa0b SHA512 df7fb7f023892cb790bb12bcf25abd4ed0bffe469cfcdffa399d0e3f13535e5a9b29c8aebc8ef11c9171f033da569597c9824cf1789d1042e0493f4d14aa6fec
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..98c74562e3e3
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 0a64232bd21a..d2b394eb30b2 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-avahi-2.20170805-r2.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
-EBUILD selinux-avahi-2.20170805-r3.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-avahi-2.20180114-r1.ebuild 280 BLAKE2B 25f9d63f4734aacde5f3ce57f69027611ad6d80de1852da701a6cf00774505c99ad005949fc6b73bd1b0d6944ddae67870f55bf3fa6fab46105847e2acee398c SHA512 3f0682b759ddaf2c9a079c0764526f5e76af1a087a2fe7e9c20526cba089e58864442b40c9fd9e0571dd2207457582e56fda49ae3f6fa8bb8bde3f0ebce7e278
EBUILD selinux-avahi-2.20180114-r2.ebuild 280 BLAKE2B 25f9d63f4734aacde5f3ce57f69027611ad6d80de1852da701a6cf00774505c99ad005949fc6b73bd1b0d6944ddae67870f55bf3fa6fab46105847e2acee398c SHA512 3f0682b759ddaf2c9a079c0764526f5e76af1a087a2fe7e9c20526cba089e58864442b40c9fd9e0571dd2207457582e56fda49ae3f6fa8bb8bde3f0ebce7e278
EBUILD selinux-avahi-2.20180114-r3.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
+EBUILD selinux-avahi-2.20180701-r1.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
MISC metadata.xml 315 BLAKE2B 7cda989834ad58ea2460821062d71ad45f8e2e563caf4a2bc582262362d2ae282403e0be36eeb4bb2a3c28a55fca9ae5341d6fb5e3604fa57a71768b841ed246 SHA512 891d4ca0710d0f8ebbeaae86e71ff03f0011ded5cdafde29af66684e39f27ab8a6ff3b447b9138434503938484b7c9947c1f386a67860acb316ed1fdd91177e3
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ff1e5370ad15
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 9407982a930e..4e75eb2c09a5 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-awstats-2.20170805-r2.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
-EBUILD selinux-awstats-2.20170805-r3.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-awstats-2.20180114-r1.ebuild 380 BLAKE2B 7b3f43aceb65a7ea8d0707346e4e028256d9cf5312de85f8db2b2914f6c648756e3f132aa01ebd608a04b35d41ddac9dcf0a5751ae77112fc1d6d37376cef1d1 SHA512 5c9e7529915516a76e81dac38ccde11359f2c1b31734c01a259d8a521d92688f002bb2d40684bc4ebe5373550456a6e1ed3422574f78c1d9c1046bc8acc6fe90
EBUILD selinux-awstats-2.20180114-r2.ebuild 380 BLAKE2B 7b3f43aceb65a7ea8d0707346e4e028256d9cf5312de85f8db2b2914f6c648756e3f132aa01ebd608a04b35d41ddac9dcf0a5751ae77112fc1d6d37376cef1d1 SHA512 5c9e7529915516a76e81dac38ccde11359f2c1b31734c01a259d8a521d92688f002bb2d40684bc4ebe5373550456a6e1ed3422574f78c1d9c1046bc8acc6fe90
EBUILD selinux-awstats-2.20180114-r3.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
+EBUILD selinux-awstats-2.20180701-r1.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
MISC metadata.xml 317 BLAKE2B ef3132bec05c99928997bde44181ef17235bc9dd2ff78bf1fbab078c2bf2925622e19419d624a51aa6574f1f880191690f3184c1472407cdf286c416544bef04 SHA512 0b9ddebb84974b0eef29ff4eb9b3449593d2652944d17648e297db2a6f301531c1c003efac88215970b739b9e6c2fc733e21edb3257f2138ce8aa95047a70fa9
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..967aa579c24d
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 2ed1176f1ed2..9390db8dfdba 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-backup-2.20170805-r2.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
-EBUILD selinux-backup-2.20170805-r3.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-backup-2.20180114-r1.ebuild 295 BLAKE2B 7ff6c3e188b4af86155f93c0fe042034de10641f0f4ca11bb5ce55b02c453706a355b8d934833cc40c8a847bb43ccc2af42e0d1662e41d111c9ccd5cabf0ab58 SHA512 df3a7d48d57c85ed85560ff6d161c0d54298b98ec15e90954b8c29a24078a79a485dc914cad1d0303cabed1e4b45054777e68e99fe4c41d85355ea9918ec7883
EBUILD selinux-backup-2.20180114-r2.ebuild 295 BLAKE2B 7ff6c3e188b4af86155f93c0fe042034de10641f0f4ca11bb5ce55b02c453706a355b8d934833cc40c8a847bb43ccc2af42e0d1662e41d111c9ccd5cabf0ab58 SHA512 df3a7d48d57c85ed85560ff6d161c0d54298b98ec15e90954b8c29a24078a79a485dc914cad1d0303cabed1e4b45054777e68e99fe4c41d85355ea9918ec7883
EBUILD selinux-backup-2.20180114-r3.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
+EBUILD selinux-backup-2.20180701-r1.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
EBUILD selinux-backup-9999.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
MISC metadata.xml 329 BLAKE2B a10467077df9d62a7d16cb8c0ae23601c02dfcbd65ddeee59f6c3185e04c41e3a6de49607f03b43181b692446714e7b8e64a1b37beafc57b5d8ae581da38526c SHA512 0c171ebf47304dac2737f47f0b7246540d41a8b14a59b7354b64ec0a0dd70345fe0fb634cd8c03636b9a8c3510bede5d1a9a12f072e6c91fae04734d334d1f20
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..235b2655afe2
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 949a7f74eb31..783feed8e589 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bacula-2.20170805-r2.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
-EBUILD selinux-bacula-2.20170805-r3.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-bacula-2.20180114-r1.ebuild 282 BLAKE2B 89ff8825fcade423ab0edfbe5f73ef5ddede8fefc53940b3ac9b4da9babb926aa99fe5f87c8f476473b03f96e068ffc4f210dbee16e491b65f08202f5d755078 SHA512 8a713ac2301c3051472692d9ed1e00c9217e3c4dfa1801d43372759c8edf86df3f51533be81ea76e48d7e6553da3bf4ea476ddfa0cc52d50e6f702d3986c72a0
EBUILD selinux-bacula-2.20180114-r2.ebuild 282 BLAKE2B 89ff8825fcade423ab0edfbe5f73ef5ddede8fefc53940b3ac9b4da9babb926aa99fe5f87c8f476473b03f96e068ffc4f210dbee16e491b65f08202f5d755078 SHA512 8a713ac2301c3051472692d9ed1e00c9217e3c4dfa1801d43372759c8edf86df3f51533be81ea76e48d7e6553da3bf4ea476ddfa0cc52d50e6f702d3986c72a0
EBUILD selinux-bacula-2.20180114-r3.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
+EBUILD selinux-bacula-2.20180701-r1.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
MISC metadata.xml 316 BLAKE2B dc6935ac38b7c07ca95aee076ada83f985acacc3fb09eeb221466886c6d5362fc84fd24c16f068a2f733dc23dd3b4f5ef5173432e099002029785c2fbb7fc4ed SHA512 372cf73fefff21230ab25228a49d88abf1d32ba3dbb9241ebcba8d18b6802f8ac4965ff05f92f680cbc3057115b8821eeb6be263ee187f17b1ef563fa8d22d1f
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b50372799c1e
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index fa6727d8de79..629bec77919c 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-base-policy-2.20170805-r2.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
-EBUILD selinux-base-policy-2.20170805-r3.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-base-policy-2.20180114-r1.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
EBUILD selinux-base-policy-2.20180114-r2.ebuild 3935 BLAKE2B 41ffc6a7ed124e125f198aaaad62eb37b334056d9609800ef5e92902da0dd106fa0c73e77216f2c831a478db2602d4303dc50ebbbedaf355078780d1d11b19e4 SHA512 28d121da52cc3a99f0e232159e172d88f8d4e5556107a9a260c897ed53f806b6b24ce21a17b9f429743e930f6ed405baaa6d751bfc8f70589239a0bf02f64496
EBUILD selinux-base-policy-2.20180114-r3.ebuild 3937 BLAKE2B 9d2f4297edd38a837f6299f0fc1a1424e391ac5fa7f1c77f187e049545a0e4cdc3bffbdeb7b86f6bde30af093b813f4a8bd3ce85b8a25a4ab514bc8a5464e010 SHA512 6a7a3ac43cfc10aedd4cce05190c34877075da8ec699adb0ebfe15e94bcc5e026b7f0876cb7fb7f18f657a511f9906db1c8e6323d019f25679bfe778767a7591
-EBUILD selinux-base-policy-9999.ebuild 3937 BLAKE2B 9d2f4297edd38a837f6299f0fc1a1424e391ac5fa7f1c77f187e049545a0e4cdc3bffbdeb7b86f6bde30af093b813f4a8bd3ce85b8a25a4ab514bc8a5464e010 SHA512 6a7a3ac43cfc10aedd4cce05190c34877075da8ec699adb0ebfe15e94bcc5e026b7f0876cb7fb7f18f657a511f9906db1c8e6323d019f25679bfe778767a7591
+EBUILD selinux-base-policy-2.20180701-r1.ebuild 3945 BLAKE2B 47f89b64fc441cff562f35b04c80d2c3da1ba5bc93b9f39e074f91cb30de8f93eba5b5306e62d7804c8519e380f0b3bf96ed2f172f07520d5093663f38404d17 SHA512 5ebc07f14d215ad2bbfe3e168915e0a6b5d5ff020d1078e2a4f1a5d1c8b0b61db804fc8af166f863e088dd1a3c887b5afa11ee92cbd5ae8cbfe57039831c2173
+EBUILD selinux-base-policy-9999.ebuild 3945 BLAKE2B 47f89b64fc441cff562f35b04c80d2c3da1ba5bc93b9f39e074f91cb30de8f93eba5b5306e62d7804c8519e380f0b3bf96ed2f172f07520d5093663f38404d17 SHA512 5ebc07f14d215ad2bbfe3e168915e0a6b5d5ff020d1078e2a4f1a5d1c8b0b61db804fc8af166f863e088dd1a3c887b5afa11ee92cbd5ae8cbfe57039831c2173
MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
deleted file mode 100644
index a72df4c245a4..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
- EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
- inherit git-r3
-else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
- if use systemd; then
- MODS="${MODS} systemd"
- fi
-}
-
-pkg_pretend() {
- for i in ${POLICY_TYPES}; do
- if [[ "${i}" == "targeted" ]] && ! use unconfined; then
- die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
- fi
- done
-}
-
-src_prepare() {
- local modfiles
-
- if [[ ${PV} != 9999* ]]; then
- einfo "Applying SELinux policy updates ... "
- eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
- fi
-
- eapply_user
-
- # Collect only those files needed for this particular module
- for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
- done
-
- for i in ${POLICY_TYPES}; do
- mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
- cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
- || die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
- cp ${modfiles} "${S}"/${i} \
- || die "Failed to copy the module files to ${S}/${i}"
- done
-}
-
-src_compile() {
- for i in ${POLICY_TYPES}; do
- emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
- done
-}
-
-src_install() {
- local BASEDIR="/usr/share/selinux"
-
- for i in ${POLICY_TYPES}; do
- for j in ${MODS}; do
- einfo "Installing ${i} ${j} policy package"
- insinto ${BASEDIR}/${i}
- doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
- done
- done
-}
-
-pkg_postinst() {
- # Override the command from the eclass, we need to load in base as well here
- local COMMAND="-i base.pp"
- if has_version "<sys-apps/policycoreutils-2.5"; then
- COMMAND="-b base.pp"
- fi
-
- for i in ${MODS}; do
- COMMAND="${COMMAND} -i ${i}.pp"
- done
-
- for i in ${POLICY_TYPES}; do
- einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
- cd /usr/share/selinux/${i}
-
- semodule -s ${i} ${COMMAND}
- done
-
- # Relabel depending packages
- local PKGSET="";
- if [[ -x /usr/bin/qdepends ]] ; then
- PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- elif [[ -x /usr/bin/equery ]] ; then
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- fi
- if [[ -n "${PKGSET}" ]] ; then
- rlpkg ${PKGSET};
- fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
deleted file mode 100644
index a72df4c245a4..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
- EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
- inherit git-r3
-else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
- if use systemd; then
- MODS="${MODS} systemd"
- fi
-}
-
-pkg_pretend() {
- for i in ${POLICY_TYPES}; do
- if [[ "${i}" == "targeted" ]] && ! use unconfined; then
- die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
- fi
- done
-}
-
-src_prepare() {
- local modfiles
-
- if [[ ${PV} != 9999* ]]; then
- einfo "Applying SELinux policy updates ... "
- eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
- fi
-
- eapply_user
-
- # Collect only those files needed for this particular module
- for i in ${MODS}; do
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
- modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
- done
-
- for i in ${POLICY_TYPES}; do
- mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
- cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
- || die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
- cp ${modfiles} "${S}"/${i} \
- || die "Failed to copy the module files to ${S}/${i}"
- done
-}
-
-src_compile() {
- for i in ${POLICY_TYPES}; do
- emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
- done
-}
-
-src_install() {
- local BASEDIR="/usr/share/selinux"
-
- for i in ${POLICY_TYPES}; do
- for j in ${MODS}; do
- einfo "Installing ${i} ${j} policy package"
- insinto ${BASEDIR}/${i}
- doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
- done
- done
-}
-
-pkg_postinst() {
- # Override the command from the eclass, we need to load in base as well here
- local COMMAND="-i base.pp"
- if has_version "<sys-apps/policycoreutils-2.5"; then
- COMMAND="-b base.pp"
- fi
-
- for i in ${MODS}; do
- COMMAND="${COMMAND} -i ${i}.pp"
- done
-
- for i in ${POLICY_TYPES}; do
- einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
- cd /usr/share/selinux/${i}
-
- semodule -s ${i} ${COMMAND}
- done
-
- # Relabel depending packages
- local PKGSET="";
- if [[ -x /usr/bin/qdepends ]] ; then
- PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- elif [[ -x /usr/bin/equery ]] ; then
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
- fi
- if [[ -n "${PKGSET}" ]] ; then
- rlpkg ${PKGSET};
- fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f68a3519c796
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+ EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+ inherit git-r3
+else
+ SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+ https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_setup() {
+ if use systemd; then
+ MODS="${MODS} systemd"
+ fi
+}
+
+pkg_pretend() {
+ for i in ${POLICY_TYPES}; do
+ if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+ die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+ fi
+ done
+}
+
+src_prepare() {
+ local modfiles
+
+ if [[ ${PV} != 9999* ]]; then
+ einfo "Applying SELinux policy updates ... "
+ eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+ fi
+
+ eapply_user
+
+ # Collect only those files needed for this particular module
+ for i in ${MODS}; do
+ modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+ modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+ done
+
+ for i in ${POLICY_TYPES}; do
+ mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+ cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+ || die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+ cp ${modfiles} "${S}"/${i} \
+ || die "Failed to copy the module files to ${S}/${i}"
+ done
+}
+
+src_compile() {
+ for i in ${POLICY_TYPES}; do
+ emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+ done
+}
+
+src_install() {
+ local BASEDIR="/usr/share/selinux"
+
+ for i in ${POLICY_TYPES}; do
+ for j in ${MODS}; do
+ einfo "Installing ${i} ${j} policy package"
+ insinto ${BASEDIR}/${i}
+ doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+ done
+ done
+}
+
+pkg_postinst() {
+ # Set root path and don't load policy into the kernel when cross compiling
+ local root_opts=""
+ if [[ "${ROOT%/}" != "" ]]; then
+ root_opts="-p ${ROOT%/} -n"
+ fi
+
+ # Override the command from the eclass, we need to load in base as well here
+ local COMMAND="-i base.pp"
+ if has_version "<sys-apps/policycoreutils-2.5"; then
+ COMMAND="-b base.pp"
+ fi
+
+ for i in ${MODS}; do
+ COMMAND="${COMMAND} -i ${i}.pp"
+ done
+
+ for i in ${POLICY_TYPES}; do
+ einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+ cd "${ROOT%/}/usr/share/selinux/${i}"
+
+ semodule ${root_opts} -s ${i} ${COMMAND}
+ done
+
+ # Don't relabel when cross compiling
+ if [[ "${ROOT%/}" == "" ]]; then
+ # Relabel depending packages
+ local PKGSET="";
+ if [[ -x /usr/bin/qdepends ]] ; then
+ PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ elif [[ -x /usr/bin/equery ]] ; then
+ PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+ fi
+ if [[ -n "${PKGSET}" ]] ; then
+ rlpkg ${PKGSET};
+ fi
+ fi
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index b2976ccee54b..f68a3519c796 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+ SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
fi
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index eed24d11b812..2bdb67313235 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,16 +1,14 @@
AUX config 631 BLAKE2B 7c7c5ad7e2349cf8dd6877bba7947f256b6bdee492ef76a44ac378eafb9203c0d7ad6f188a762c61b80672a56dca65767567cd68c998aa67d58a9579e5c0cae6 SHA512 f3c4fece54e5786de94fc97c8e7678f9901c6963828d28b020c423458ac258480191f216522fed7658e7ad1c94fd25557efc524a4b75ec8837116c6a14c2328a
AUX selinux.conf 119 BLAKE2B c877aec601cfc066b42493a3b45e179834d30b7f0eb34b625f3758795c2fd2e58744cf539fdb5b06c002365fb264bdf6e953c1f6e30c7b2d310e22206ea5a37f SHA512 a057f84388b2b494b5e7623b076450c1856687c50a4ccb5aa22215748461786a0c71fdd9f76e9ed8639bcd3040006fb010aa5497192d6c0cab432a1b9c028b3b
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-base-2.20170805-r2.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9c2973721ed9fa29d1aa50fb338752df06cc8a2c01ef451aefa579652e88ad4e63898de0927234df1e6506f28da69acd55a9889 SHA512 c656f41074d167d28b8a89b0278a72ecd960bd5151cc8ea8bf387f30ba8278213fbb6461c19b1b418d58d2a85fbff325d69a42ec8deb862b92ac64210b5fbffc
-EBUILD selinux-base-2.20170805-r3.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9c2973721ed9fa29d1aa50fb338752df06cc8a2c01ef451aefa579652e88ad4e63898de0927234df1e6506f28da69acd55a9889 SHA512 c656f41074d167d28b8a89b0278a72ecd960bd5151cc8ea8bf387f30ba8278213fbb6461c19b1b418d58d2a85fbff325d69a42ec8deb862b92ac64210b5fbffc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-base-2.20180114-r1.ebuild 4225 BLAKE2B 787204b62302c43e3bb5025ae66c9973e0fe1b8f5574e487c2cc916f553aff15ebf14f6047e69299ca14b2f9faf18c39bd711bb4e1acb2aeb75ed1b45d2dec7c SHA512 6c1c7932dbbdf55075b0d0c04fa96767ad490785ce70449f9b4a3344c3a890b361980a04dab62c8d9c30c08fec3436f4c5a60cfac9809c8e913639570e04d66c
EBUILD selinux-base-2.20180114-r2.ebuild 4225 BLAKE2B 787204b62302c43e3bb5025ae66c9973e0fe1b8f5574e487c2cc916f553aff15ebf14f6047e69299ca14b2f9faf18c39bd711bb4e1acb2aeb75ed1b45d2dec7c SHA512 6c1c7932dbbdf55075b0d0c04fa96767ad490785ce70449f9b4a3344c3a890b361980a04dab62c8d9c30c08fec3436f4c5a60cfac9809c8e913639570e04d66c
EBUILD selinux-base-2.20180114-r3.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
-EBUILD selinux-base-9999.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
+EBUILD selinux-base-2.20180701-r1.ebuild 4235 BLAKE2B bcd08b9b37cbc8e19a85e757ef1bfe0736a8736f206d8262cf7081d7db20fe47cb7f5321702a02fc2fc02a025d1ce673fa83416d886c12a838feecc8821b1093 SHA512 8d6fc573e71558279535eeea8847433828d786a9bcbd0fcf8e7830024605f66d408420893d199eb237c2aaaaa4853a06132aac1d3e92cfe806ff6dbbe9e9fe86
+EBUILD selinux-base-9999.ebuild 4235 BLAKE2B bcd08b9b37cbc8e19a85e757ef1bfe0736a8736f206d8262cf7081d7db20fe47cb7f5321702a02fc2fc02a025d1ce673fa83416d886c12a838feecc8821b1093 SHA512 8d6fc573e71558279535eeea8847433828d786a9bcbd0fcf8e7830024605f66d408420893d199eb237c2aaaaa4853a06132aac1d3e92cfe806ff6dbbe9e9fe86
MISC metadata.xml 839 BLAKE2B 797f551065b80455c9538f115d680016954b7fc05cd5232ca09b86d83163c81e9ed868ea6b9be08d3c1284dcfd3527e88660befb747a631f4d2292331410cb52 SHA512 330017a98a3f9f4e6d6004955eb939c8d9c1c92fe6d091f78cdd7d2f6a02838c67a8a3268f38dad7df27f909ff51dc295d5de748f9767a257b5dad36c74d921a
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
deleted file mode 100644
index 072e411f021f..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
- EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
- inherit git-r3
-else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
- virtual/udev"
-DEPEND="${RDEPEND}
- sys-devel/m4
- >=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
- if [[ ${PV} != 9999* ]]; then
- einfo "Applying SELinux policy updates ... "
- eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
- fi
-
- eapply_user
-
- cd "${S}/refpolicy" || die
- emake bare
-}
-
-src_configure() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- # Update the SELinux refpolicy capabilities based on the users' USE flags.
-
- if ! use peer_perms; then
- sed -i -e '/network_peer_controls/d' \
- "${S}/refpolicy/policy/policy_capabilities" || die
- fi
-
- if ! use open_perms; then
- sed -i -e '/open_perms/d' \
- "${S}/refpolicy/policy/policy_capabilities" || die
- fi
-
- if ! use ubac; then
- sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
- || die "Failed to disable User Based Access Control"
- fi
-
- if use systemd; then
- sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
- || die "Failed to enable SystemD"
- fi
-
- echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
- # Prepare initial configuration
- cd "${S}/refpolicy" || die
- emake conf || die "Make conf failed"
-
- # Setup the policies based on the types delivered by the end user.
- # These types can be "targeted", "strict", "mcs" and "mls".
- for i in ${POLICY_TYPES}; do
- cp -a "${S}/refpolicy" "${S}/${i}" || die
- cd "${S}/${i}" || die
-
- #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
- sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
- sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
- "${S}/${i}/build.conf" || die "build.conf setup failed."
-
- if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
- then
- # MCS/MLS require additional settings
- sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
- || die "failed to set type to mls"
- fi
-
- if [ "${i}" == "targeted" ]; then
- sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
- "${S}/${i}/config/appconfig-standard/seusers" \
- || die "targeted seusers setup failed."
- fi
-
- if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
- sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
- "${S}/${i}/config/appconfig-${i}/seusers" \
- || die "policy seusers setup failed."
- fi
- done
-}
-
-src_compile() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- for i in ${POLICY_TYPES}; do
- cd "${S}/${i}" || die
- emake base
- if use doc; then
- emake html
- fi
- done
-}
-
-src_install() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- for i in ${POLICY_TYPES}; do
- cd "${S}/${i}" || die
-
- emake DESTDIR="${D}" install \
- || die "${i} install failed."
-
- emake DESTDIR="${D}" install-headers \
- || die "${i} headers install failed."
-
- echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
- echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
- # libsemanage won't make this on its own
- keepdir "/etc/selinux/${i}/policy"
-
- if use doc; then
- docinto ${i}/html
- dodoc -r doc/html/*;
- fi
-
- insinto /usr/share/selinux/devel;
- doins doc/policy.xml;
-
- done
-
- docinto /
- dodoc doc/Makefile.example doc/example.{te,fc,if}
-
- doman man/man8/*.8;
-
- insinto /etc/selinux
- doins "${FILESDIR}/config"
-
- insinto /usr/share/portage/config/sets
- doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
deleted file mode 100644
index 072e411f021f..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
- EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
- inherit git-r3
-else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
- https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
- virtual/udev"
-DEPEND="${RDEPEND}
- sys-devel/m4
- >=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
- if [[ ${PV} != 9999* ]]; then
- einfo "Applying SELinux policy updates ... "
- eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
- fi
-
- eapply_user
-
- cd "${S}/refpolicy" || die
- emake bare
-}
-
-src_configure() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- # Update the SELinux refpolicy capabilities based on the users' USE flags.
-
- if ! use peer_perms; then
- sed -i -e '/network_peer_controls/d' \
- "${S}/refpolicy/policy/policy_capabilities" || die
- fi
-
- if ! use open_perms; then
- sed -i -e '/open_perms/d' \
- "${S}/refpolicy/policy/policy_capabilities" || die
- fi
-
- if ! use ubac; then
- sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
- || die "Failed to disable User Based Access Control"
- fi
-
- if use systemd; then
- sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
- || die "Failed to enable SystemD"
- fi
-
- echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
- # Prepare initial configuration
- cd "${S}/refpolicy" || die
- emake conf || die "Make conf failed"
-
- # Setup the policies based on the types delivered by the end user.
- # These types can be "targeted", "strict", "mcs" and "mls".
- for i in ${POLICY_TYPES}; do
- cp -a "${S}/refpolicy" "${S}/${i}" || die
- cd "${S}/${i}" || die
-
- #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
- sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
- sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
- "${S}/${i}/build.conf" || die "build.conf setup failed."
-
- if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
- then
- # MCS/MLS require additional settings
- sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
- || die "failed to set type to mls"
- fi
-
- if [ "${i}" == "targeted" ]; then
- sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
- "${S}/${i}/config/appconfig-standard/seusers" \
- || die "targeted seusers setup failed."
- fi
-
- if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
- sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
- "${S}/${i}/config/appconfig-${i}/seusers" \
- || die "policy seusers setup failed."
- fi
- done
-}
-
-src_compile() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- for i in ${POLICY_TYPES}; do
- cd "${S}/${i}" || die
- emake base
- if use doc; then
- emake html
- fi
- done
-}
-
-src_install() {
- [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
- for i in ${POLICY_TYPES}; do
- cd "${S}/${i}" || die
-
- emake DESTDIR="${D}" install \
- || die "${i} install failed."
-
- emake DESTDIR="${D}" install-headers \
- || die "${i} headers install failed."
-
- echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
- echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
- # libsemanage won't make this on its own
- keepdir "/etc/selinux/${i}/policy"
-
- if use doc; then
- docinto ${i}/html
- dodoc -r doc/html/*;
- fi
-
- insinto /usr/share/selinux/devel;
- doins doc/policy.xml;
-
- done
-
- docinto /
- dodoc doc/Makefile.example doc/example.{te,fc,if}
-
- doman man/man8/*.8;
-
- insinto /etc/selinux
- doins "${FILESDIR}/config"
-
- insinto /usr/share/portage/config/sets
- doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..000ddea14dd4
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+ EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+ inherit git-r3
+else
+ SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+ https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.8
+ virtual/udev"
+DEPEND="${RDEPEND}
+ sys-devel/m4
+ >=sys-apps/checkpolicy-2.8"
+
+S=${WORKDIR}/
+
+src_prepare() {
+ if [[ ${PV} != 9999* ]]; then
+ einfo "Applying SELinux policy updates ... "
+ eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+ fi
+
+ eapply_user
+
+ cd "${S}/refpolicy" || die
+ emake bare
+}
+
+src_configure() {
+ [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+ # Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+ if ! use peer_perms; then
+ sed -i -e '/network_peer_controls/d' \
+ "${S}/refpolicy/policy/policy_capabilities" || die
+ fi
+
+ if ! use open_perms; then
+ sed -i -e '/open_perms/d' \
+ "${S}/refpolicy/policy/policy_capabilities" || die
+ fi
+
+ if ! use ubac; then
+ sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+ || die "Failed to disable User Based Access Control"
+ fi
+
+ if use systemd; then
+ sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+ || die "Failed to enable SystemD"
+ fi
+
+ echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
+
+ # Prepare initial configuration
+ cd "${S}/refpolicy" || die
+ emake conf || die "Make conf failed"
+
+ # Setup the policies based on the types delivered by the end user.
+ # These types can be "targeted", "strict", "mcs" and "mls".
+ for i in ${POLICY_TYPES}; do
+ cp -a "${S}/refpolicy" "${S}/${i}" || die
+ cd "${S}/${i}" || die
+
+ #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+ sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
+
+ sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+ "${S}/${i}/build.conf" || die "build.conf setup failed."
+
+ if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+ then
+ # MCS/MLS require additional settings
+ sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+ || die "failed to set type to mls"
+ fi
+
+ if [ "${i}" == "targeted" ]; then
+ sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+ "${S}/${i}/config/appconfig-standard/seusers" \
+ || die "targeted seusers setup failed."
+ fi
+
+ if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+ sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+ "${S}/${i}/config/appconfig-${i}/seusers" \
+ || die "policy seusers setup failed."
+ fi
+ done
+}
+
+src_compile() {
+ [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+ for i in ${POLICY_TYPES}; do
+ cd "${S}/${i}" || die
+ emake base
+ if use doc; then
+ emake html
+ fi
+ done
+}
+
+src_install() {
+ [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+ for i in ${POLICY_TYPES}; do
+ cd "${S}/${i}" || die
+
+ emake DESTDIR="${D}" install \
+ || die "${i} install failed."
+
+ emake DESTDIR="${D}" install-headers \
+ || die "${i} headers install failed."
+
+ echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
+
+ echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
+
+ # libsemanage won't make this on its own
+ keepdir "/etc/selinux/${i}/policy"
+
+ if use doc; then
+ docinto ${i}/html
+ dodoc -r doc/html/*;
+ fi
+
+ insinto /usr/share/selinux/devel;
+ doins doc/policy.xml;
+
+ done
+
+ docinto /
+ dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+ doman man/man8/*.8;
+
+ insinto /etc/selinux
+ doins "${FILESDIR}/config"
+
+ insinto /usr/share/portage/config/sets
+ doins "${FILESDIR}/selinux.conf"
+}
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index b779ed9e7cf9..000ddea14dd4 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+ SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
@@ -23,11 +23,11 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
LICENSE="GPL-2"
SLOT="0"
-RDEPEND=">=sys-apps/policycoreutils-2.7
+RDEPEND=">=sys-apps/policycoreutils-2.8
virtual/udev"
DEPEND="${RDEPEND}
sys-devel/m4
- >=sys-apps/checkpolicy-2.7"
+ >=sys-apps/checkpolicy-2.8"
S=${WORKDIR}/
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 0f54eedf1758..c3cf8733f0cc 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bind-2.20170805-r2.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
-EBUILD selinux-bind-2.20170805-r3.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-bind-2.20180114-r1.ebuild 278 BLAKE2B e15df438ee73bbf4b95d6534c5200f09ee892e28447a5ea3918d9d8ebfebaa085f89afe8e2a175b96fdcce5934caf46d3cd88daa34ca6862771350f2a6ab0e79 SHA512 8a5250f11f9f8b62db99503731e4b144730d710a6677004a13187f41147f63b4a5fbd3f42bf640189f67ae1d6d97710e2f531e32ad536d0d2d96faf46db803e4
EBUILD selinux-bind-2.20180114-r2.ebuild 278 BLAKE2B e15df438ee73bbf4b95d6534c5200f09ee892e28447a5ea3918d9d8ebfebaa085f89afe8e2a175b96fdcce5934caf46d3cd88daa34ca6862771350f2a6ab0e79 SHA512 8a5250f11f9f8b62db99503731e4b144730d710a6677004a13187f41147f63b4a5fbd3f42bf640189f67ae1d6d97710e2f531e32ad536d0d2d96faf46db803e4
EBUILD selinux-bind-2.20180114-r3.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
+EBUILD selinux-bind-2.20180701-r1.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
EBUILD selinux-bind-9999.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
MISC metadata.xml 314 BLAKE2B d4d110f172517ad4a4913425d261f06ce6111ac5e67455e148212f5f1934cbbdcc0471b110c891bd546b19fd144b325589aba60aa032ed1ce9f807f872415582 SHA512 9062d22c1c459260c2f1202823ac2bc9e2a6ba8214380785a6f92b5eeb2470017249d24e64e1abc92dfe58910a45b860f5b81cfdc0643198b5c5bf84e6598372
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c08eed19e706
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index 35772e834953..1e705c2fa425 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bitcoin-2.20170805-r2.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
-EBUILD selinux-bitcoin-2.20170805-r3.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-bitcoin-2.20180114-r1.ebuild 284 BLAKE2B 3e02f143a0f2551f5e4929a1ea35ec6bb2d1d5e5732c60d613fdd2900c5aaa0d2af7cc67ae23fc97098ee370d438a443755e6ffb906a47da2f8ff66befa84c13 SHA512 581f829392330d42dd27a4a987b12113d4d111f1abd50205dfb8a96577fc1ee0615576d167f3c391248fdcb1d8257d249f2f0f43f4a5ba70216aca1a373772bd
EBUILD selinux-bitcoin-2.20180114-r2.ebuild 284 BLAKE2B 3e02f143a0f2551f5e4929a1ea35ec6bb2d1d5e5732c60d613fdd2900c5aaa0d2af7cc67ae23fc97098ee370d438a443755e6ffb906a47da2f8ff66befa84c13 SHA512 581f829392330d42dd27a4a987b12113d4d111f1abd50205dfb8a96577fc1ee0615576d167f3c391248fdcb1d8257d249f2f0f43f4a5ba70216aca1a373772bd
EBUILD selinux-bitcoin-2.20180114-r3.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
+EBUILD selinux-bitcoin-2.20180701-r1.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
MISC metadata.xml 317 BLAKE2B 2bf5e205be759496e9432490df495d4131fdb36a5e809709eb8a506e1d5a36fe4894a5dcbb64604910b2dcada0c7da5cf5fc71e175704e181d3170d33228bfcb SHA512 3478dc7035310237bd5df88943831b1ec05b7c8975c0d275a67b2f0c216a3447942077c131244efa347bbb8cdf91543e290a2d84f153e603fcc492e4079e7537
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6b32fb1c8d60
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitcoin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitcoin"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index e205ad1e3f96..3b52ed6a6600 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bitlbee-2.20170805-r2.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
-EBUILD selinux-bitlbee-2.20170805-r3.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-bitlbee-2.20180114-r1.ebuild 379 BLAKE2B e5395c419305a03362f28f21b5f556e662cf35372a19fd6bfef3a7d745406b941a1acf6191612edd6a72e96a9988c90e0c57f92d822464c094c340f8299ae3c3 SHA512 86d51c755948f624185db623a6769f0c2b2988925458701c077fd438a6937ba816a54cd36a3613bb747c6826fe607eac29e6873522c9227b00a9abcdc534c412
EBUILD selinux-bitlbee-2.20180114-r2.ebuild 379 BLAKE2B e5395c419305a03362f28f21b5f556e662cf35372a19fd6bfef3a7d745406b941a1acf6191612edd6a72e96a9988c90e0c57f92d822464c094c340f8299ae3c3 SHA512 86d51c755948f624185db623a6769f0c2b2988925458701c077fd438a6937ba816a54cd36a3613bb747c6826fe607eac29e6873522c9227b00a9abcdc534c412
EBUILD selinux-bitlbee-2.20180114-r3.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
+EBUILD selinux-bitlbee-2.20180701-r1.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
MISC metadata.xml 317 BLAKE2B f9c9b5fcf4de89f18b2a74b18af457fd54942be1c9a9b0a43a07ee34df828599dfecf84a0dcda60dd5cf8b7e98d8e2792b0a8e3aa1ca6e71bc0201b4932ec880 SHA512 551ce283639086916b90d0e0da81e66946c957e946c333fd4b11d482e57483e6adfe5145417e37bc7bb7ee47da60b645e34271e82ffe86cb05e22f65da348df9
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.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"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.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"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..78fbf6bdc40b
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 60e8edba4745..d84811b0678a 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bluetooth-2.20170805-r2.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
-EBUILD selinux-bluetooth-2.20170805-r3.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-bluetooth-2.20180114-r1.ebuild 288 BLAKE2B 76f5481de8be8635754463a7aa44edbd009c37141362bb21865d0076d9597ca7eff135e098dd3ef6c648e4c32632394a8c029ff2635a650e3103ea577fbf95f0 SHA512 92b3ad02cd3abcef4c3a26752631d4b96f65fdc89d37419b8fc3878dee3625789c1b44252d5a7f7c08f6bbe4bd4c3b94396294ecc27119c03e9a75e8961f8023
EBUILD selinux-bluetooth-2.20180114-r2.ebuild 288 BLAKE2B 76f5481de8be8635754463a7aa44edbd009c37141362bb21865d0076d9597ca7eff135e098dd3ef6c648e4c32632394a8c029ff2635a650e3103ea577fbf95f0 SHA512 92b3ad02cd3abcef4c3a26752631d4b96f65fdc89d37419b8fc3878dee3625789c1b44252d5a7f7c08f6bbe4bd4c3b94396294ecc27119c03e9a75e8961f8023
EBUILD selinux-bluetooth-2.20180114-r3.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
+EBUILD selinux-bluetooth-2.20180701-r1.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
MISC metadata.xml 319 BLAKE2B 77895c048b499cf4233a28baa860e5e9bcb4c52d919342c27d619cce316973b3f71a1f4a10edb2e3b605442a8bd6ff5bdf2eedf32e58de89d7354c7dcf796c5d SHA512 23cc2ad068f0758998957a4d8cfaa9f2ee39fbd8a7dee48834f6907611229e2d623f78b8f169eaf1cae6c66665d663d28d9072b98506947de8c6d84ca0398c0a
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e708bb5381a9
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 50077dd74be2..0085c108aaaa 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-brctl-2.20170805-r2.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
-EBUILD selinux-brctl-2.20170805-r3.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-brctl-2.20180114-r1.ebuild 280 BLAKE2B 58236f0cbd1cadcb492edb1c1890c233a0c466021e6e4ec44b88a8689b3e3245b786878c11a625171e1b2109459b117294e4537881acdbf342075807650e832c SHA512 76d27b343160c1253b98ebb265257e6de54e41e6af09ad19ba5d84c1e787e8ba3e559fae6d838d3a0d4b6c38304b2d678d29cb357593eaac326aee8b4fa16a75
EBUILD selinux-brctl-2.20180114-r2.ebuild 280 BLAKE2B 58236f0cbd1cadcb492edb1c1890c233a0c466021e6e4ec44b88a8689b3e3245b786878c11a625171e1b2109459b117294e4537881acdbf342075807650e832c SHA512 76d27b343160c1253b98ebb265257e6de54e41e6af09ad19ba5d84c1e787e8ba3e559fae6d838d3a0d4b6c38304b2d678d29cb357593eaac326aee8b4fa16a75
EBUILD selinux-brctl-2.20180114-r3.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
+EBUILD selinux-brctl-2.20180701-r1.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
MISC metadata.xml 315 BLAKE2B 21a1f569bbdae9a692fa08c5d226bb6304010fd00bdbb30d8295d8ebc8da159029ed67cb151225af0aadb2a004391c4fe80204e6d53efa21dd21c809a5ae3154 SHA512 23d754daa42126bda3f13dca1fc91726bf4562978ce88efacaefe003b19365c97356b716db8a53a12f99b119fbfd890dbe9d6d782e63cee9722c61cb047f65f6
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e160f1e6735f
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index c02825bc26ee..877be6efae72 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cachefilesd-2.20170805-r2.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
-EBUILD selinux-cachefilesd-2.20170805-r3.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cachefilesd-2.20180114-r1.ebuild 292 BLAKE2B 45a9fb567074a09e72d256e0fdd21f1dd50d9daa308f77e4da0d1e7f86384ed832166e8ff51026a0dd62ae37220806c528cc9b0405b0a0110750f2f4671326d9 SHA512 a7e2a15540d79ee880a63026e9b999203c43836e8eaa7aafe4e94b8770336c82db7afbc92f283b730941dc5eecea65570714192e0815a107d1281e2c0a18f3b8
EBUILD selinux-cachefilesd-2.20180114-r2.ebuild 292 BLAKE2B 45a9fb567074a09e72d256e0fdd21f1dd50d9daa308f77e4da0d1e7f86384ed832166e8ff51026a0dd62ae37220806c528cc9b0405b0a0110750f2f4671326d9 SHA512 a7e2a15540d79ee880a63026e9b999203c43836e8eaa7aafe4e94b8770336c82db7afbc92f283b730941dc5eecea65570714192e0815a107d1281e2c0a18f3b8
EBUILD selinux-cachefilesd-2.20180114-r3.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
+EBUILD selinux-cachefilesd-2.20180701-r1.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
MISC metadata.xml 321 BLAKE2B 700dac90fc3d2d192dce2d3c60453e2c75365a64b092b874f8b049b5c6b587292e5d8cb2b409839621b518a6bd93db364ecb49a729a8903c059988770694f06b SHA512 16b6e111c04de229332ccf3c692d634e1f0fd1d832495e580bd0c5371b220fb07aed2c3ce2391c775b839902099d6bc342d3e190b70ae1ac3f07fdf93fb67077
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..99c5f3d0bc6a
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 41466c9964a6..4a7eb880ef6e 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-calamaris-2.20170805-r2.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
-EBUILD selinux-calamaris-2.20170805-r3.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-calamaris-2.20180114-r1.ebuild 288 BLAKE2B aef9467d001fb495a52df303ff85ddf2da57750d8a2add28e1001341a499fa15f5ae4141910bff8d106df978ddac645d56c2a6d6216ffc1a6badcb6db27f8eb1 SHA512 c98a40dd67e9e841572927621bf59b1507f75ffe74e86f8decd5b09268c1603edcb66c40216e33ec23ba80087da95ebe544ff82b534e15104355646b2aaaccf7
EBUILD selinux-calamaris-2.20180114-r2.ebuild 288 BLAKE2B aef9467d001fb495a52df303ff85ddf2da57750d8a2add28e1001341a499fa15f5ae4141910bff8d106df978ddac645d56c2a6d6216ffc1a6badcb6db27f8eb1 SHA512 c98a40dd67e9e841572927621bf59b1507f75ffe74e86f8decd5b09268c1603edcb66c40216e33ec23ba80087da95ebe544ff82b534e15104355646b2aaaccf7
EBUILD selinux-calamaris-2.20180114-r3.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
+EBUILD selinux-calamaris-2.20180701-r1.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
MISC metadata.xml 319 BLAKE2B 1c58cda4753da502bad82f0f9c99b6cfcd96b33f1c9c89e3470503fc0d93e2dd81940cdeff3d3f4951b4d4d14ada408bb343f900a6a974bb5cd85db6c0034cd5 SHA512 edaf87737833fd3c1d0d956adb41875d96d4dbaa0f0c709c5ca8e7645e1eef616871d7e0b20b5cbd8cbbbe3710d5b694c5436cc0b30e21228fd2e3291d201ea1
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..799409419ec1
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index a84c2d75c8ce..d4bac4f7b5c6 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-canna-2.20170805-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170805-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-canna-2.20180114-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
EBUILD selinux-canna-2.20180114-r2.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
EBUILD selinux-canna-2.20180114-r3.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
+EBUILD selinux-canna-2.20180701-r1.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
MISC metadata.xml 315 BLAKE2B 675fbadeb697d9af143ccec9b334e5f7f44effe1a0f6a05e1f05b9a5f6d763e13930c294169a8ff912f324ff463d218a0737a49b36facace2fdb4b8b07f388c5 SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..33f018f5f6ce
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 367bdc12df7d..91513155759c 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ccs-2.20170805-r2.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
-EBUILD selinux-ccs-2.20170805-r3.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ccs-2.20180114-r1.ebuild 276 BLAKE2B e562c570e9702ac268adcedd405b99475f01efb1ad285ef35c1703d86fb7cc16aeceb516df10722d2b23dbd42cb95c53808e1fea1e9b740debeb580e9026d9e0 SHA512 21da52d677cb06fc1b55543634d227b29eb859580ec6ba99f77f44c6d699a5708836d5beccfd2ce388403ab750b779e1ffae560ac7eb981e0ffa57061fb0b57c
EBUILD selinux-ccs-2.20180114-r2.ebuild 276 BLAKE2B e562c570e9702ac268adcedd405b99475f01efb1ad285ef35c1703d86fb7cc16aeceb516df10722d2b23dbd42cb95c53808e1fea1e9b740debeb580e9026d9e0 SHA512 21da52d677cb06fc1b55543634d227b29eb859580ec6ba99f77f44c6d699a5708836d5beccfd2ce388403ab750b779e1ffae560ac7eb981e0ffa57061fb0b57c
EBUILD selinux-ccs-2.20180114-r3.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
+EBUILD selinux-ccs-2.20180701-r1.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
MISC metadata.xml 313 BLAKE2B 97e2ffbb66364d5710045e11689425c4a307ec5f8900bf999db57142d704a302658558d087c03ed499dd40d99138d7d44447614de2ea358373d0582c30676323 SHA512 be700477be516907f457fa88bce00b34cb30c8ba470736e40f8cb180c1c8e19ad8888df8e45d41c0d283dad0396ccea00477026222a5cf2936bc4f82b6261ac6
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..40dac97d118c
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index df02416bac79..b8dfac8e6d64 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cdrecord-2.20170805-r2.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
-EBUILD selinux-cdrecord-2.20170805-r3.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cdrecord-2.20180114-r1.ebuild 286 BLAKE2B a655817ed4d6489efaa650f118ad32585d068d50bddfd2c63456484155cba5412d1995550c2a2228844cd004f20534b504f93a20b12fcb198e032973a3419153 SHA512 54b304b0fd2a688b5a353654411ff69cff5e80609736740e90f2a37e23190d2171def5ec561e2a84e4875399e225856f7730a6058207ed022f6fe72603bf8122
EBUILD selinux-cdrecord-2.20180114-r2.ebuild 286 BLAKE2B a655817ed4d6489efaa650f118ad32585d068d50bddfd2c63456484155cba5412d1995550c2a2228844cd004f20534b504f93a20b12fcb198e032973a3419153 SHA512 54b304b0fd2a688b5a353654411ff69cff5e80609736740e90f2a37e23190d2171def5ec561e2a84e4875399e225856f7730a6058207ed022f6fe72603bf8122
EBUILD selinux-cdrecord-2.20180114-r3.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
+EBUILD selinux-cdrecord-2.20180701-r1.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
MISC metadata.xml 318 BLAKE2B 277095870372899df6eed127113b9efe82a78ffe2d03b8df09e32ef4dd23287d291e573e65f14f903279d931393ebe2f903115228cb0f2f34763c090cfe1af45 SHA512 c2a9030ca10cf81b9eb40957e99c3dd31bef004c7bf94da5bef7013ca32a224e65e21a6ccb93b91db873b5b9b68e3aa482e332c870976920e5939c83266d182a
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a7f9587a269c
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 1812c90ae886..680ba9d7d055 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ceph-2.20170805-r2.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
-EBUILD selinux-ceph-2.20170805-r3.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ceph-2.20180114-r1.ebuild 278 BLAKE2B 1f4b71dd5360e8ad36f0b7783b26c759488ea3759b58c0e2e6e9b89bf03f274c110a5ec762236dce043818560e8af5b2cb5dc81fd9bb7534bc4b161e56a6f9c9 SHA512 04ba5035c523192f8bd3e4ffcc8b632ea4850f27606627773e600c438267530533f5077fe088b708e5930d514f09dbd1ebd77ace14db724a8a1b50481177d29d
EBUILD selinux-ceph-2.20180114-r2.ebuild 278 BLAKE2B 1f4b71dd5360e8ad36f0b7783b26c759488ea3759b58c0e2e6e9b89bf03f274c110a5ec762236dce043818560e8af5b2cb5dc81fd9bb7534bc4b161e56a6f9c9 SHA512 04ba5035c523192f8bd3e4ffcc8b632ea4850f27606627773e600c438267530533f5077fe088b708e5930d514f09dbd1ebd77ace14db724a8a1b50481177d29d
EBUILD selinux-ceph-2.20180114-r3.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
+EBUILD selinux-ceph-2.20180701-r1.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
MISC metadata.xml 314 BLAKE2B 444357eaf7e8b989ecb2a74f717c3f8ded048ad87bc3288008b8beb86bb6ae7d5e5c8a06c1e0e2b927b1b3de2b55876672e8ab55cf01d1bc4c432e47291234c8 SHA512 d3e9c09959bfad3e2f60aa141354eac5cdbdee34df07f06c04a6af6564b1ad8396d2f220eadf6c7c883ee0e33c755537f0adfc2ec1039bb61b0ec90a9d07d282
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..760e26def4d1
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ceph"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ceph"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 405cced45ca3..68eca6541521 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cgmanager-2.20170805-r2.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
-EBUILD selinux-cgmanager-2.20170805-r3.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cgmanager-2.20180114-r1.ebuild 288 BLAKE2B 28806ba59e461f6d2e7da6460d86c42d09b6aced9244fdfd2d11d7082b69d0cf0d571c5820581833dd68a625d3a0dcc08fa4c6d44e06d0355ed5e3472ef86e5d SHA512 972f7abfffd1024c57d6aa10aaccafa473a8758a59af9ebfe29630bf66c8dfd344b82f17f47da90f4f175bfe2c167311e674a04f745ce5c7b127a369988f674f
EBUILD selinux-cgmanager-2.20180114-r2.ebuild 288 BLAKE2B 28806ba59e461f6d2e7da6460d86c42d09b6aced9244fdfd2d11d7082b69d0cf0d571c5820581833dd68a625d3a0dcc08fa4c6d44e06d0355ed5e3472ef86e5d SHA512 972f7abfffd1024c57d6aa10aaccafa473a8758a59af9ebfe29630bf66c8dfd344b82f17f47da90f4f175bfe2c167311e674a04f745ce5c7b127a369988f674f
EBUILD selinux-cgmanager-2.20180114-r3.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
+EBUILD selinux-cgmanager-2.20180701-r1.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
MISC metadata.xml 338 BLAKE2B 5ead11f88099181dfac530eae53a88d027fcd0b989adaef605f55c7a131e83ed4e581ae90ae0c6334c37f7c81fadf4cca50215e2d7321b9204b7b3f9783260bb SHA512 94f4ae40489fd875bd8c5fd8e57c5e103909205e1cc872e706d44192eb045c646b9f8f5225acd74eac0f10cdcf06a8c30a9e0d8305d6913666ecf780e40faeb8
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4e076e8694ad
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index a261056c4acb..da5d7aaaba35 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cgroup-2.20170805-r2.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
-EBUILD selinux-cgroup-2.20170805-r3.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cgroup-2.20180114-r1.ebuild 282 BLAKE2B 6e9dfb1c9edb4126bffeb9cb0810ad2e29639f5cd802c85a9280685a5061d4af8cae9085829dbbd7daa9d6ff3d544833b1070f1ae4933184d0665e0ab3bb84e4 SHA512 b5e64f9e745d4d7def776dd8182b9d05b5d707b553d3c3bc05a4daf5d78e1891e839ec235405eb6fb7dc255fd9c7609bda82a028abb37abc93373fa62e0fc8c1
EBUILD selinux-cgroup-2.20180114-r2.ebuild 282 BLAKE2B 6e9dfb1c9edb4126bffeb9cb0810ad2e29639f5cd802c85a9280685a5061d4af8cae9085829dbbd7daa9d6ff3d544833b1070f1ae4933184d0665e0ab3bb84e4 SHA512 b5e64f9e745d4d7def776dd8182b9d05b5d707b553d3c3bc05a4daf5d78e1891e839ec235405eb6fb7dc255fd9c7609bda82a028abb37abc93373fa62e0fc8c1
EBUILD selinux-cgroup-2.20180114-r3.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
+EBUILD selinux-cgroup-2.20180701-r1.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
MISC metadata.xml 316 BLAKE2B 4ab37a97ff87330a7bfa17880a37f1895b75c1efe830484da145380ada7229f44a7fb5fb58c1018afd66502059ae05ef8b8cd5407cdb107af66da769f96129b5 SHA512 5f6f16a1e6e45cc3483dda299489e6cb5ef903f60d2a9831e234bac9bcff876dcf382a51ba0151905bb876053339ec95802298838f22821bee7c3b3f4cdb1bda
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..885e7b0cb6d5
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 496e5221d36e..b3bc0b6b5879 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-chromium-2.20170805-r2.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
-EBUILD selinux-chromium-2.20170805-r3.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-chromium-2.20180114-r1.ebuild 389 BLAKE2B a20f32218542a567a3867f96930eddfb03f4bd70e71793610be110b46ea1caf58cec992a74bfed51f9798493f2f639512defa8dde5bb30a2965a01444f2beb36 SHA512 a3e1aa5dffd88f5164780c040d4ff922fcb209e2a44e90397f1e42ca0972c14e9ca5c0a2e1b7b778fafed6ad5870555ef2180b85135fd075cd7533ef627f8672
EBUILD selinux-chromium-2.20180114-r2.ebuild 389 BLAKE2B a20f32218542a567a3867f96930eddfb03f4bd70e71793610be110b46ea1caf58cec992a74bfed51f9798493f2f639512defa8dde5bb30a2965a01444f2beb36 SHA512 a3e1aa5dffd88f5164780c040d4ff922fcb209e2a44e90397f1e42ca0972c14e9ca5c0a2e1b7b778fafed6ad5870555ef2180b85135fd075cd7533ef627f8672
EBUILD selinux-chromium-2.20180114-r3.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
+EBUILD selinux-chromium-2.20180701-r1.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
MISC metadata.xml 318 BLAKE2B c7ed04aeaf5f0bdf6fef164f5fbbda80e2479f25fc6abbb505e8ebd1d29f05b505594a4e6ebf3c9662d5d1e5aff01755842ae22a155a1f4e3950fe7257ac781a SHA512 35a3ae361b20adc58424c078918cfb959fb4ed36ec73789d171ae30628b37da1444f9a028138a56aa6d3cb5605ecdaa48695bc8608dc0df54647492c07c88846
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.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"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.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"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1698c89c8ec8
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 70f35dfbe013..0987ce88ed2e 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-chronyd-2.20170805-r2.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
-EBUILD selinux-chronyd-2.20170805-r3.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-chronyd-2.20180114-r1.ebuild 284 BLAKE2B e6069ef348e76b69b567dafca2a8a09a5503cdd8a49c516bbc17065cd63671a2e1f24dd1fff1df61002c868524842b22444d557f438fc91ef400b86f441219e4 SHA512 c94af3b3d93cfe14dcddae87ffcc329439c370f3332a24321c6e5c4b4ce177b767be048858f47f177008eda53452c4301d14d25045dfcca0b13045c240c10148
EBUILD selinux-chronyd-2.20180114-r2.ebuild 284 BLAKE2B e6069ef348e76b69b567dafca2a8a09a5503cdd8a49c516bbc17065cd63671a2e1f24dd1fff1df61002c868524842b22444d557f438fc91ef400b86f441219e4 SHA512 c94af3b3d93cfe14dcddae87ffcc329439c370f3332a24321c6e5c4b4ce177b767be048858f47f177008eda53452c4301d14d25045dfcca0b13045c240c10148
EBUILD selinux-chronyd-2.20180114-r3.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
+EBUILD selinux-chronyd-2.20180701-r1.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
MISC metadata.xml 317 BLAKE2B 76b647d80d58d09d093b0e1f60ad302e332fdd9af4ebb7b6b9a089b49944a88e27f63312ea4bdce1ac753d55d448e8b977eee9e19a4ebb233b158caaff0d7a87 SHA512 567ce0e458597f415e01f706a700f210e033acf7887684adc26a51f57e8587a6b48a74c75cee937d0a69123ad4884a0e1e889a5227989681349564f9d02b4c85
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1d020ca13aec
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index ebaabc92a2e5..51cb39eb8032 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-clamav-2.20170805-r2.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
-EBUILD selinux-clamav-2.20170805-r3.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-clamav-2.20180114-r1.ebuild 282 BLAKE2B e18889feac7dd3529792f26fb755f41da855ca5ca8705dace198026a65934066a1ad13ae939f14959b7add23fefc0fe3a0806e49d3fe218a9fd303001676e7bd SHA512 24fc90e7ffd53cc5cf024d63c6a4c5810fe290bd0643521e44bb8435b8161306a79615c40e48d9ad7f890a0ba985cf6011f73ec9521c732c14e14be7d8772b1a
EBUILD selinux-clamav-2.20180114-r2.ebuild 282 BLAKE2B e18889feac7dd3529792f26fb755f41da855ca5ca8705dace198026a65934066a1ad13ae939f14959b7add23fefc0fe3a0806e49d3fe218a9fd303001676e7bd SHA512 24fc90e7ffd53cc5cf024d63c6a4c5810fe290bd0643521e44bb8435b8161306a79615c40e48d9ad7f890a0ba985cf6011f73ec9521c732c14e14be7d8772b1a
EBUILD selinux-clamav-2.20180114-r3.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
+EBUILD selinux-clamav-2.20180701-r1.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
MISC metadata.xml 316 BLAKE2B 7960e2c8f85fde2ce87b6ec978f64ceca50c7a5135187a01b2c6ead802b564e02d64f458fc12cacf7a848820c0acebe044cf4bdb79f10471391a4c6e4339e0af SHA512 f1979723a6f2267cb7614e961f3af14fb84e05912d27c2a153695abb993c4d406c9558c12a3cc1ea1e44b7592dcbdf28573708fcb27cf5defa0608c58f00fbd7
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e65376ea36cd
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 64356b250791..7c462dd7923c 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-clockspeed-2.20170805-r2.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
-EBUILD selinux-clockspeed-2.20170805-r3.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-clockspeed-2.20180114-r1.ebuild 290 BLAKE2B 3417ae6ca0e663b3e0b16859783f81b005432eb38409898bea8a8271878a859c9b8cc5cd41399566b4e8e2a93f8389a5ca366b845847a495b1bfe365184825c9 SHA512 85519cc204421fe74f05ecb37eeba085c566e9cf6377c51bac7b54db83f3a84f241ec924d7d37eb0924e9b43990a8f8765067e424af930f7aadcd11787541f09
EBUILD selinux-clockspeed-2.20180114-r2.ebuild 290 BLAKE2B 3417ae6ca0e663b3e0b16859783f81b005432eb38409898bea8a8271878a859c9b8cc5cd41399566b4e8e2a93f8389a5ca366b845847a495b1bfe365184825c9 SHA512 85519cc204421fe74f05ecb37eeba085c566e9cf6377c51bac7b54db83f3a84f241ec924d7d37eb0924e9b43990a8f8765067e424af930f7aadcd11787541f09
EBUILD selinux-clockspeed-2.20180114-r3.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
+EBUILD selinux-clockspeed-2.20180701-r1.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
MISC metadata.xml 320 BLAKE2B 760f3041fd82667196780a0ea9491ec8186e56c2e3fb60edab38584cead30b307cae4e8a589ba06096db7dbe259562989e3de8f842ca7d0dba0d7d17ba65c202 SHA512 7bafbbd72540c4ce4cda253f41f30180c5eaad307c5f53b87e0415587e2aa119204daed097e2db7d3ab025d48313ad4b0c9e5af5e1b0d31b640e099fe7ef3254
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d83bc877500c
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 453fdd1492ba..f58ae6f9c285 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-collectd-2.20170805-r2.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
-EBUILD selinux-collectd-2.20170805-r3.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-collectd-2.20180114-r1.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
EBUILD selinux-collectd-2.20180114-r2.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
EBUILD selinux-collectd-2.20180114-r3.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
+EBUILD selinux-collectd-2.20180701-r1.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
MISC metadata.xml 318 BLAKE2B be69d0693525604ac1c29e2fec3384e737f531ad9f94245b9cc65d8d2d5ac3c46079d7206565da1b5d5a89d1aa5be8f78eddc31fa158768dbfdb37f96826561b SHA512 6da5121253ae7018f81cc66a816a364e836e226e2e679f245acd61d6bdbe5fed013032bc4d3f38b917a4372a436ee08b53d0c379b9daa3f8ef6c7797fcd59b54
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..72250ed6c043
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 5e04e67ed0fa..5bfbeb61b874 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-consolekit-2.20170805-r2.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
-EBUILD selinux-consolekit-2.20170805-r3.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-consolekit-2.20180114-r1.ebuild 290 BLAKE2B 244bf65e1b3cca07eee102197915df263bc00de5165adbc287006547681d8830b3181f6e55fbce942ae727d9f1c399925406509ff381c2e06232a744573b1ce5 SHA512 e22897baa22c80a08f5206fea5d2497945fa84788161525f5087902ea9e6857205b5486de35e72f45eebdf00098409655a76fb5dad0a50a2cbc17a8660605d30
EBUILD selinux-consolekit-2.20180114-r2.ebuild 290 BLAKE2B 244bf65e1b3cca07eee102197915df263bc00de5165adbc287006547681d8830b3181f6e55fbce942ae727d9f1c399925406509ff381c2e06232a744573b1ce5 SHA512 e22897baa22c80a08f5206fea5d2497945fa84788161525f5087902ea9e6857205b5486de35e72f45eebdf00098409655a76fb5dad0a50a2cbc17a8660605d30
EBUILD selinux-consolekit-2.20180114-r3.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
+EBUILD selinux-consolekit-2.20180701-r1.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
EBUILD selinux-consolekit-9999.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
MISC metadata.xml 320 BLAKE2B 0726c22f0efb654d222e7ac8915a1bf952c61a99a3cf4c3a316d1b3c1119ef1a930629f1c5ac98f1aacdb0f406eacaf705dac8b1711144b654e9d4ae9c597c81 SHA512 2cec206212671d162d6ae717d104543e9dbc5efa80f01f72d6aa1a7cd1863577b58d80b57cae6259ade3f4a88a12a5a1cbbacc060739f012879468be0ea03e3a
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..084d9430ec27
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 36f8d8312c50..6dc046fed96f 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-corosync-2.20170805-r2.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
-EBUILD selinux-corosync-2.20170805-r3.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-corosync-2.20180114-r1.ebuild 286 BLAKE2B f1ab17a91642010aacc6d085b8121979d25a39e75345e50cfc4e8dd41636f1ba8c3513f08c243c0966d02659a3a1e19e60c4730f2cea19c8294cf28cf33bd3c5 SHA512 4fe08cd0dde9a9704c269cbe2fb0e10a99b347294d4aa3396807451842c6f4682d2d5a9c30a12fefdad4d79ea847db34f89f022f061a5489cdedea78d1220c34
EBUILD selinux-corosync-2.20180114-r2.ebuild 286 BLAKE2B f1ab17a91642010aacc6d085b8121979d25a39e75345e50cfc4e8dd41636f1ba8c3513f08c243c0966d02659a3a1e19e60c4730f2cea19c8294cf28cf33bd3c5 SHA512 4fe08cd0dde9a9704c269cbe2fb0e10a99b347294d4aa3396807451842c6f4682d2d5a9c30a12fefdad4d79ea847db34f89f022f061a5489cdedea78d1220c34
EBUILD selinux-corosync-2.20180114-r3.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
+EBUILD selinux-corosync-2.20180701-r1.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
MISC metadata.xml 318 BLAKE2B 6dba862352dff5eb9f0a33f37c5fdecd6e7beb99b01e47c259398c2dc79adf04dcfd4b376f10190385fa8e510eb7b12603235097b653d58e7da1d915b69206b1 SHA512 13956c6e5e42d77e6588be5abeb1adeda5d425aa0187a430aad4f5c69cf28ff34d5d8afd83c0a2965454ffc2500f3c5f8c3300e8bb4992b9e1de5a501d0497b1
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dd5454d318ad
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index cae6c190d876..433c581bd931 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-couchdb-2.20170805-r2.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
-EBUILD selinux-couchdb-2.20170805-r3.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-couchdb-2.20180114-r1.ebuild 284 BLAKE2B c961197f2487eee27da7aa612f8d673f1b82a38caa9be64a7265915c66661586259c7a448750d329820d3dba4c83afd876e1c14514eb0b666906ba9498f50b1e SHA512 bd3527b8171e02ec2ec7659f56234e4ecd6401af3d182e2a894749c94bae3c071a90b8aae5bb40f3d87bbf5fb036b3c12340af14e2a7102a1cea994ebeb528ae
EBUILD selinux-couchdb-2.20180114-r2.ebuild 284 BLAKE2B c961197f2487eee27da7aa612f8d673f1b82a38caa9be64a7265915c66661586259c7a448750d329820d3dba4c83afd876e1c14514eb0b666906ba9498f50b1e SHA512 bd3527b8171e02ec2ec7659f56234e4ecd6401af3d182e2a894749c94bae3c071a90b8aae5bb40f3d87bbf5fb036b3c12340af14e2a7102a1cea994ebeb528ae
EBUILD selinux-couchdb-2.20180114-r3.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
+EBUILD selinux-couchdb-2.20180701-r1.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
MISC metadata.xml 317 BLAKE2B d943379ea7b56183adf18645a4c3c6352a3d259ad5140789a8a9b5aca17d665fadd8d06618ca93ff92135f4ddba37d9a4b76094eb8e9bad3e048636ed23cb35a SHA512 43fda061c7a92dc5b9602aa01616bd876000263114982314135e8e544c1b209b55438736c3287ea456faba6f7666564d66cac0897ea4c8c29a0211ddd86b7dd9
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..941f36368fcd
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index cd4cb3065740..cc263df626e1 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-courier-2.20170805-r2.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
-EBUILD selinux-courier-2.20170805-r3.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-courier-2.20180114-r1.ebuild 284 BLAKE2B b9ccc575a3bd9da475e82d71c87c893bbd4dd0bf36a46e426dc81195673dcf076d8f47718022a913676296985d2663c689cc6c9a422a4c696dc598663b53854a SHA512 fe1f103f31fec89fbeeb9c3865e2fc243db3d7d897070d1718e43a9f97328f4e4152de2694a5a278ddc98a9e1a32275c4adb39c64de90aa49691c2b4dc45d17b
EBUILD selinux-courier-2.20180114-r2.ebuild 284 BLAKE2B b9ccc575a3bd9da475e82d71c87c893bbd4dd0bf36a46e426dc81195673dcf076d8f47718022a913676296985d2663c689cc6c9a422a4c696dc598663b53854a SHA512 fe1f103f31fec89fbeeb9c3865e2fc243db3d7d897070d1718e43a9f97328f4e4152de2694a5a278ddc98a9e1a32275c4adb39c64de90aa49691c2b4dc45d17b
EBUILD selinux-courier-2.20180114-r3.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
+EBUILD selinux-courier-2.20180701-r1.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
EBUILD selinux-courier-9999.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
MISC metadata.xml 317 BLAKE2B 5b253862e05652fdaf7df04a7c858b9f2ec63b2088225ceacbadd26f4b489bcbe4593c74ec73cc6a50d80955a93537019168de09ebc32e18dc80540eca6d6b44 SHA512 90512d732a7e87c960108c4ab698a7d4205d016bc019a7e90a5776eeee024393354bafcdf07774cba6cbf028ba54003897cd732a48591905407cc32c672085e9
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0bffc4d35084
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 8480fc04c798..83b6e4558355 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cpucontrol-2.20170805-r2.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
-EBUILD selinux-cpucontrol-2.20170805-r3.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cpucontrol-2.20180114-r1.ebuild 290 BLAKE2B 7c1de236d6884928dbc87d4b6eccc568c4f5f64cf30c094a233fb7e4b207b2ec40eb3624b39fec762f893b82df0ad86f9c5ea652f75921eb3e2bb51fdddabb65 SHA512 40aea489ea270feea19ab52eeb9f83f4838d7a9c06755c675188326ae80a59140fcdc7ad7ddda88c23cfe7a5bdc1e374c51f748c66aaa6ed4475b49bee9404c1
EBUILD selinux-cpucontrol-2.20180114-r2.ebuild 290 BLAKE2B 7c1de236d6884928dbc87d4b6eccc568c4f5f64cf30c094a233fb7e4b207b2ec40eb3624b39fec762f893b82df0ad86f9c5ea652f75921eb3e2bb51fdddabb65 SHA512 40aea489ea270feea19ab52eeb9f83f4838d7a9c06755c675188326ae80a59140fcdc7ad7ddda88c23cfe7a5bdc1e374c51f748c66aaa6ed4475b49bee9404c1
EBUILD selinux-cpucontrol-2.20180114-r3.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
+EBUILD selinux-cpucontrol-2.20180701-r1.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
MISC metadata.xml 320 BLAKE2B f9a459ad3ee2c922f96cb0ab568409dea7f25e2b483977e2dbc143af8c2fa9d75e3110f6e8204025ddd9639715235a47863afb7bd67ab0bc39bba1965975f1fd SHA512 f51c895b670b210dfd339f77a0abdaf240d3a85dfda0de494d3128fe21d9e14e28d4b98cee9af199273ac96c58dc66f2344363b7c7d9fd744291c9027825a86d
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5c59da7db4eb
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 93c448d3d2c1..984c0b352264 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cpufreqselector-2.20170805-r2.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
-EBUILD selinux-cpufreqselector-2.20170805-r3.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cpufreqselector-2.20180114-r1.ebuild 300 BLAKE2B 4d75b44eedea359dcd289c328033e5869a29d209e15ef2fd198785273526f001cac58567a022e3b3406f03c5895cfa9291a7d9cb441a45455ff4badcd9523d78 SHA512 f9642a0ddeadc52f48f8e9398ae53fbce350e38729a65aaaf30e8769a6e4bd9afcfa90af7f2c6b097341058af2284648d09c4eeb47da35ac906a63f93ab19778
EBUILD selinux-cpufreqselector-2.20180114-r2.ebuild 300 BLAKE2B 4d75b44eedea359dcd289c328033e5869a29d209e15ef2fd198785273526f001cac58567a022e3b3406f03c5895cfa9291a7d9cb441a45455ff4badcd9523d78 SHA512 f9642a0ddeadc52f48f8e9398ae53fbce350e38729a65aaaf30e8769a6e4bd9afcfa90af7f2c6b097341058af2284648d09c4eeb47da35ac906a63f93ab19778
EBUILD selinux-cpufreqselector-2.20180114-r3.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
+EBUILD selinux-cpufreqselector-2.20180701-r1.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
MISC metadata.xml 325 BLAKE2B 6da93f91708af6a99357f791fe3391ed190761d48455473e903ecb366b3dbff15d6d6a6132cb4638e0b61bb77bdcd03f7deabe8c637fa02c4e0cd40cdd9a9e6e SHA512 0aef2f311fb25142a08caca6f25f0b1a903631e4742c79dc79afda113e0cbfc6be2ea807afd10b2f31acd8aec3810864614e685e89b83f664f9e1955d4e8ea3b
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4644b016b922
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 390b7b1a0541..ee228c5dcc0a 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cups-2.20170805-r2.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
-EBUILD selinux-cups-2.20170805-r3.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cups-2.20180114-r1.ebuild 368 BLAKE2B d36074b86f2ee837ccb5a40bfa987bca28a598ebdad7a3e0d13f864f7696fc4bfed4445202d999c69e2f101af355e2d8d1e88c35464d1ec39555fab11f9d33ad SHA512 237851dc3d4b13069c2683bc257ab4b08be9acb301982279e46444a730844537d27d910acf4b3d85283c653e2a592c873594542be748aefcb280af1bfb780ce1
EBUILD selinux-cups-2.20180114-r2.ebuild 368 BLAKE2B d36074b86f2ee837ccb5a40bfa987bca28a598ebdad7a3e0d13f864f7696fc4bfed4445202d999c69e2f101af355e2d8d1e88c35464d1ec39555fab11f9d33ad SHA512 237851dc3d4b13069c2683bc257ab4b08be9acb301982279e46444a730844537d27d910acf4b3d85283c653e2a592c873594542be748aefcb280af1bfb780ce1
EBUILD selinux-cups-2.20180114-r3.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
+EBUILD selinux-cups-2.20180701-r1.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
MISC metadata.xml 314 BLAKE2B bd165fe274c682223b50a6adcfc385fb4d2853c833c82d3bd1e36ede581a1511bf31d8e8ca3068533f2ff154655446c7e486e543b0576df77e3ae374a5c6564d SHA512 3e3d89bc53170e64971ce9e3effcd321f19a95b2ceaaf97a8a3212121848c3bdc88d6f1d2a1211efd04209165c1cd24e54a2cda9bdc841d9dc3470e3aa7e23a7
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..45dc986ba8b0
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-lpd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-lpd
+"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index e6d2fc762b35..81961e6378dc 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cvs-2.20170805-r2.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
-EBUILD selinux-cvs-2.20170805-r3.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cvs-2.20180114-r1.ebuild 424 BLAKE2B d124ba5ac3e8c6999b4b4dff2099c76cc5664a5d6dadf2e3f27f7fd1fc3ecbb43d10a7f6d0740a4ae027f6342be1be071c7917c003988759dd8fd1648c5ef8cd SHA512 2c78fcaf45548d965f5d494685ce701b1d8714acf18e3be207bf33f41bfd09fcf3d53c9852b457a8c0c8612d02e197aa6213445cc024637aff53ca0818bfb490
EBUILD selinux-cvs-2.20180114-r2.ebuild 424 BLAKE2B d124ba5ac3e8c6999b4b4dff2099c76cc5664a5d6dadf2e3f27f7fd1fc3ecbb43d10a7f6d0740a4ae027f6342be1be071c7917c003988759dd8fd1648c5ef8cd SHA512 2c78fcaf45548d965f5d494685ce701b1d8714acf18e3be207bf33f41bfd09fcf3d53c9852b457a8c0c8612d02e197aa6213445cc024637aff53ca0818bfb490
EBUILD selinux-cvs-2.20180114-r3.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
+EBUILD selinux-cvs-2.20180701-r1.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
MISC metadata.xml 313 BLAKE2B 703f78367a1b094227e5c85a203f9cbd6b5126e619cc81d5910ee71d63096221354fa016fd10cf399348ed62b66d526f4be04b5e73496fbcc29a58179b921eca SHA512 6d7001e06d985c2395e10c6272950a5bc76279c60ad5ca17d54fbe12e449c2b6485fc5d3e88775f4ab2a3d9c5ccbc37f412a783a7841ba54901f34a520f8c5b1
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..582dc0abdc03
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index dcb943189afa..e0445f3050a4 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cyphesis-2.20170805-r2.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
-EBUILD selinux-cyphesis-2.20170805-r3.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-cyphesis-2.20180114-r1.ebuild 286 BLAKE2B af68719283763c2a11b4e6e151c1f434255ebf314d36f8738fbfde446940fc5faa433ab8da8347879820d58f96f4ef16510d007126fd1349d64ebebdf0a7b05c SHA512 c5d72501b795a0d642e60206f9813067742b3ddbb2e8b37a36041c2cf7518fd4968181872486fe2ce54520c0e0e91646db3e65e87a2d53a3290c9ed92f5cb2af
EBUILD selinux-cyphesis-2.20180114-r2.ebuild 286 BLAKE2B af68719283763c2a11b4e6e151c1f434255ebf314d36f8738fbfde446940fc5faa433ab8da8347879820d58f96f4ef16510d007126fd1349d64ebebdf0a7b05c SHA512 c5d72501b795a0d642e60206f9813067742b3ddbb2e8b37a36041c2cf7518fd4968181872486fe2ce54520c0e0e91646db3e65e87a2d53a3290c9ed92f5cb2af
EBUILD selinux-cyphesis-2.20180114-r3.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
+EBUILD selinux-cyphesis-2.20180701-r1.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
MISC metadata.xml 318 BLAKE2B 2570233d3c042ab5a91b4b9c07c99a280cd7c6c1f69e71219b56310917280a26e16463660c4b1922f81d49857acca546db06033e9dcf40846d0a54aaf61a0af6 SHA512 58e70c654d22bceeb06ee1f89577451cdf23871d63bb17427e18da11d7adb5edf7f20264ca4cc934be2b44e471973addaf717e0254f2814217f5a0a25309be2e
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4bbdb67ee7e1
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index de004ea4dcfe..0e1c1a42e602 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-daemontools-2.20170805-r2.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
-EBUILD selinux-daemontools-2.20170805-r3.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-daemontools-2.20180114-r1.ebuild 292 BLAKE2B 1d73cb370683f64f70ca8fb5c451d52b75f1bd597d00ad638c74a65ce7c92ea1b707f6595008d68d6d852edd6f1c11244ce5fdf41973810545fe5b825633a6bd SHA512 caf019eb1b105af4f41820e88b555fdffc5626e7b24939ecb12d93fb9d79400eff7dc7071a18124f5b5878d8b5d88fa6d3ff9681932a4e091128160610939e3c
EBUILD selinux-daemontools-2.20180114-r2.ebuild 292 BLAKE2B 1d73cb370683f64f70ca8fb5c451d52b75f1bd597d00ad638c74a65ce7c92ea1b707f6595008d68d6d852edd6f1c11244ce5fdf41973810545fe5b825633a6bd SHA512 caf019eb1b105af4f41820e88b555fdffc5626e7b24939ecb12d93fb9d79400eff7dc7071a18124f5b5878d8b5d88fa6d3ff9681932a4e091128160610939e3c
EBUILD selinux-daemontools-2.20180114-r3.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
+EBUILD selinux-daemontools-2.20180701-r1.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
MISC metadata.xml 321 BLAKE2B 6d6514d6443844395a0800a3a2d652d4383f1c21aa10f7d00198fdb028be2c6a171c32d0e9af0f84d6da4d8b99ed3a2ce931b43c2d55c1e4e864721ce3d9c3e2 SHA512 2b805bc57fdb8ce67f8628d2ff8e97923ecd5f3ed6502bab2a97fda612f613c5af1964fe33f0b110757d2f60c795ff1b2b94e89c2f4cc4508d148fbfd20c12e1
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3927f59ea456
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 89053d13ddbd..c4d442f40fd1 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dante-2.20170805-r2.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
-EBUILD selinux-dante-2.20170805-r3.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dante-2.20180114-r1.ebuild 280 BLAKE2B f56beb65314a6ff8a9a370e0391b8955ebf257a5d07bdec08c6c472ab6b8f63651b8335794ea40870bfea448fff7678493a2b024ff4db6d852727154f6eec209 SHA512 190a680ef8c9552a12ef11772698d747eaa12f17548aa043772f4743e9b1257d50676f43875a8eb67b3eb74f3dfb0b97ee50f061142b8d2d22e6fedcfbc72e27
EBUILD selinux-dante-2.20180114-r2.ebuild 280 BLAKE2B f56beb65314a6ff8a9a370e0391b8955ebf257a5d07bdec08c6c472ab6b8f63651b8335794ea40870bfea448fff7678493a2b024ff4db6d852727154f6eec209 SHA512 190a680ef8c9552a12ef11772698d747eaa12f17548aa043772f4743e9b1257d50676f43875a8eb67b3eb74f3dfb0b97ee50f061142b8d2d22e6fedcfbc72e27
EBUILD selinux-dante-2.20180114-r3.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
+EBUILD selinux-dante-2.20180701-r1.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
EBUILD selinux-dante-9999.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
MISC metadata.xml 315 BLAKE2B 4a9614e97425dcef15e5f81c7703c071f393a540f4fcd20669e3989ec2f660215121f84b413d88d294a20a4234d208ae6008b2c80cd8857890d2163a100a2916 SHA512 e9a60869542dab4e36aa4a2cdc6bbcbb12a825ba498aefc79d3a3ffbc6b3f22025ec4ab0fce073c983a6a3c4f9d144e2dd9f6019f74e641ec6876c6a3d3ce25b
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4e8f92b6d411
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index d057a8c4a4a4..f1171c339376 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbadm-2.20170805-r2.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
-EBUILD selinux-dbadm-2.20170805-r3.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dbadm-2.20180114-r1.ebuild 280 BLAKE2B 381d99cae9c278ff55999c757fd14b0bee14c456dfe05798d5dfe1d456459ec586757278f982642f468b02a328b46d731eda468bb919d1cd77792572a4c248f1 SHA512 4683f934bcd58636290b2d6dced456cfe5c5cdd6629585454f1ea741deacc27fcecab8b88cf25a56db40ce47fd52da3722ba9b2d1975b1e09e2ef7e02a8262bc
EBUILD selinux-dbadm-2.20180114-r2.ebuild 280 BLAKE2B 381d99cae9c278ff55999c757fd14b0bee14c456dfe05798d5dfe1d456459ec586757278f982642f468b02a328b46d731eda468bb919d1cd77792572a4c248f1 SHA512 4683f934bcd58636290b2d6dced456cfe5c5cdd6629585454f1ea741deacc27fcecab8b88cf25a56db40ce47fd52da3722ba9b2d1975b1e09e2ef7e02a8262bc
EBUILD selinux-dbadm-2.20180114-r3.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
+EBUILD selinux-dbadm-2.20180701-r1.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
MISC metadata.xml 315 BLAKE2B 110047b31921d4401c5cd28fede2d4ea7478c78491d2f2ddd2736400d233813230fac16c929172a71af8bafaaed42bd2b5dcf8b52e698ee0441aceb3b158379a SHA512 c87f64c70f1f825f314d5febb85d0172d528a8e643472d4c47f3b9e0fc28e89fdb62e0f5bd77813bd2239e13b22310d152e34768d69a99f4240d1c2aa43e5bd0
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..862759a2ffb5
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index c4e229c50a3e..4f47c4603dcf 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbskk-2.20170805-r2.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
-EBUILD selinux-dbskk-2.20170805-r3.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dbskk-2.20180114-r1.ebuild 374 BLAKE2B 3199a4ec06202b1d8d6c616ce410c06d1949ca70f9654925043e96dce9b8b1c01bd7dd2813f0caf2e26f9d7310064d2c8bbd4c8a3c2e7deb27190577b553d5ef SHA512 1282386135ffddcc08dd3c05ac80d841ce03115841084684d0322d5cf4280d1e86521055ecdd5c56704f128852cf5615912b19dbbf30004d7dddcd5076ddf724
EBUILD selinux-dbskk-2.20180114-r2.ebuild 374 BLAKE2B 3199a4ec06202b1d8d6c616ce410c06d1949ca70f9654925043e96dce9b8b1c01bd7dd2813f0caf2e26f9d7310064d2c8bbd4c8a3c2e7deb27190577b553d5ef SHA512 1282386135ffddcc08dd3c05ac80d841ce03115841084684d0322d5cf4280d1e86521055ecdd5c56704f128852cf5615912b19dbbf30004d7dddcd5076ddf724
EBUILD selinux-dbskk-2.20180114-r3.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
+EBUILD selinux-dbskk-2.20180701-r1.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
MISC metadata.xml 315 BLAKE2B 6c0f1abd410df11d4316dcb65dc8ca479cddc8c968c1572260cd0903f4e71d02676856a2f7c0fc86143ea1c3589ca46da943e1f0b542729e3819472608adf7a7 SHA512 6343c4ff0f737a41d7651884b4193cb14fa546125723e032c1f9e277a006fc321102a081b8017388c3d7001bebbec12ad4b83c0b2e347e8abdb01ef41a4d5945
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..98edbc85d0ba
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 11432c816337..a5c624dcab35 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbus-2.20170805-r2.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
-EBUILD selinux-dbus-2.20170805-r3.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dbus-2.20180114-r1.ebuild 278 BLAKE2B 2569c69b88347fa2d03f2ba989334985092ef2e0cc0bb5bea747dccd6ca090d3d0666cad6fe026a3886da346f356f0b651e185c0a1b01ca63d0548b24a9a4762 SHA512 5ca9cc85796d7f5a619cb6ca85c041d023dd5772d3fbf57bb2d941e916279ff922335e3cc6621d92d618ec24fa9e7368ba7ec1b74542328210f92eec2c6fea0e
EBUILD selinux-dbus-2.20180114-r2.ebuild 278 BLAKE2B 2569c69b88347fa2d03f2ba989334985092ef2e0cc0bb5bea747dccd6ca090d3d0666cad6fe026a3886da346f356f0b651e185c0a1b01ca63d0548b24a9a4762 SHA512 5ca9cc85796d7f5a619cb6ca85c041d023dd5772d3fbf57bb2d941e916279ff922335e3cc6621d92d618ec24fa9e7368ba7ec1b74542328210f92eec2c6fea0e
EBUILD selinux-dbus-2.20180114-r3.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
+EBUILD selinux-dbus-2.20180701-r1.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
MISC metadata.xml 314 BLAKE2B 4fcd6165b52aa91bc2922a04f61cb4822869918c12752f97fcb9fd5b8d05e8f2136355e9f77d9642c2daf5c7bad71210a93433819405ee7915b11ce18fc90033 SHA512 a92e00860f8191520785ee5e38c2f824330b7d7f625813e3be52cbf1a46262b32e6a110663a8842423dc6f1d27ceffac15142847a8d8da6e6e249d8c69328a92
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c24f8df7469e
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index fa9b6620bdd3..7d59817d731f 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dcc-2.20170805-r2.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
-EBUILD selinux-dcc-2.20170805-r3.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dcc-2.20180114-r1.ebuild 276 BLAKE2B 4eb4cbb74f8dcf11954085be4dc817c31de4c3c2a0edf5d93ed625c5bf2d374f5524a1dcee5a26f0aadc9f811ca002b7663bec3e8786e47449416c747ef1dbcb SHA512 77efe74b398e3082a6a734d74bbf9bbb852826d44c3f17c276e4d992507f533f525c8b90c033256ff8ea99f1e06dee015bd3c4007e6811a5e849e0a632ed8944
EBUILD selinux-dcc-2.20180114-r2.ebuild 276 BLAKE2B 4eb4cbb74f8dcf11954085be4dc817c31de4c3c2a0edf5d93ed625c5bf2d374f5524a1dcee5a26f0aadc9f811ca002b7663bec3e8786e47449416c747ef1dbcb SHA512 77efe74b398e3082a6a734d74bbf9bbb852826d44c3f17c276e4d992507f533f525c8b90c033256ff8ea99f1e06dee015bd3c4007e6811a5e849e0a632ed8944
EBUILD selinux-dcc-2.20180114-r3.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
+EBUILD selinux-dcc-2.20180701-r1.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
MISC metadata.xml 313 BLAKE2B 72b1c9d78d51969f6d03fc534af7b9e32c422df26519a8e208f56b6e0c7a98da72cfd5da986bbb19c600562dd343f25357cf365ec3e4be206d7036b1d813b6c8 SHA512 ef501f3bda02fad46ab6b41261dbab964ddfc5afe9db0717e95e417dc9836858c6b6bec1942ae37e9f8cb9c2c7661acf032e15488aab5442dd072d41ec7e156f
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e6cabc4e2e37
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 6247c690dc67..6dbd1a3051e0 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ddclient-2.20170805-r2.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
-EBUILD selinux-ddclient-2.20170805-r3.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ddclient-2.20180114-r1.ebuild 286 BLAKE2B 338d213dc780376cf5e2aaa61540e84607e943779b2b80c97cc894a5eefc2238b1b317de0088e0215837ee5713d42e157c9209574b951ba849d3eb3e18364586 SHA512 98ddb9d72131d24e1ed8bf9ff8921e2642fb31733bdbdf4ef1b58ed20be335eee78878b07639bb4413f5540829d4f70fde80729dbb8a708c9b4bc4ca5be8b2ab
EBUILD selinux-ddclient-2.20180114-r2.ebuild 286 BLAKE2B 338d213dc780376cf5e2aaa61540e84607e943779b2b80c97cc894a5eefc2238b1b317de0088e0215837ee5713d42e157c9209574b951ba849d3eb3e18364586 SHA512 98ddb9d72131d24e1ed8bf9ff8921e2642fb31733bdbdf4ef1b58ed20be335eee78878b07639bb4413f5540829d4f70fde80729dbb8a708c9b4bc4ca5be8b2ab
EBUILD selinux-ddclient-2.20180114-r3.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
+EBUILD selinux-ddclient-2.20180701-r1.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
MISC metadata.xml 318 BLAKE2B 26ca491ead35c7aa0e490849739e7eb814815cdac8d86980667b69cdb9751a640fe4b3fc50a74c5a1ba897b68b6a9ce57e745bec1f24a0bd7d679597152db4a4 SHA512 e02add998ae60515272a524c40bc4fc3f31d2ea91f1690badb7c8fee19a99f0b84d4909f04c4e0f65af614a295e1177ddad05479dfd5b9f3ab620cc536b7dc40
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4a614ec0441
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 6da6f02d3b8c..1eeb9bc4734f 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ddcprobe-2.20170805-r2.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
-EBUILD selinux-ddcprobe-2.20170805-r3.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ddcprobe-2.20180114-r1.ebuild 286 BLAKE2B bbfab612c0c6368f8aadea60b74a4cf84ea696318a9628b951773efe7ee6c232ae73d317d7d9552b97e106b2d1d7b287e28dddbad8ae905b3b573d6ca8138916 SHA512 65aa9c28d83fcd58e54921821a3377a760ee3ed9b9ce5e32a1a928f9b243c944736906758a1a4c8d585c52f6e72c4814976ea089abac5f6d98cf3eb575bf4b92
EBUILD selinux-ddcprobe-2.20180114-r2.ebuild 286 BLAKE2B bbfab612c0c6368f8aadea60b74a4cf84ea696318a9628b951773efe7ee6c232ae73d317d7d9552b97e106b2d1d7b287e28dddbad8ae905b3b573d6ca8138916 SHA512 65aa9c28d83fcd58e54921821a3377a760ee3ed9b9ce5e32a1a928f9b243c944736906758a1a4c8d585c52f6e72c4814976ea089abac5f6d98cf3eb575bf4b92
EBUILD selinux-ddcprobe-2.20180114-r3.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
+EBUILD selinux-ddcprobe-2.20180701-r1.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
MISC metadata.xml 318 BLAKE2B 8ea59d3e7d74b92ef2e32b967e9606e80fe4ff72bebea772eb272e578c70d9e4562aa31c0efef3288dd584aaca119ad379180256f1f4003d0012e5da3a69af76 SHA512 70b987e8cfc216fc7f312aee7a1b4dea757f886dac76ebfcd6dd367b2454d02ff6dee1b11c16324cf3c5c005fdf6d74a209503d82c74b1472275ac059d99498d
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..7610bd34daae
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index f0638ec8e12f..50bff290aeae 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-denyhosts-2.20170805-r2.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
-EBUILD selinux-denyhosts-2.20170805-r3.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-denyhosts-2.20180114-r1.ebuild 288 BLAKE2B 1094017dd669f3ee74866ddd795cdda48cd23f09c8f7880c84926e9247428a5110330187e3987fe421f5300e5ae108d913d917b2357fc1f54a8ae23af6859fa0 SHA512 dfef3cb1c9e2caef526015f63c4cc3f20deda28b89afd87de2bcd28a41ea2f38ac5291a3a22e42f747c25776fa78c0ecb02719b9b2a24447281a7479a2999030
EBUILD selinux-denyhosts-2.20180114-r2.ebuild 288 BLAKE2B 1094017dd669f3ee74866ddd795cdda48cd23f09c8f7880c84926e9247428a5110330187e3987fe421f5300e5ae108d913d917b2357fc1f54a8ae23af6859fa0 SHA512 dfef3cb1c9e2caef526015f63c4cc3f20deda28b89afd87de2bcd28a41ea2f38ac5291a3a22e42f747c25776fa78c0ecb02719b9b2a24447281a7479a2999030
EBUILD selinux-denyhosts-2.20180114-r3.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
+EBUILD selinux-denyhosts-2.20180701-r1.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
MISC metadata.xml 319 BLAKE2B 43810ff5ba18ac57ea1aeee013566f684ecc5e747cad3b555b4a35991118c03b1022a08684266ee115aa9b5df3f038d24d42f2e23542b1b4446a2549d5b1a904 SHA512 b1f81195c4854d94076bf7a5117c4191ba41a58acc7a8922c0a8aecf5ea7ebed3e870c1dfaee33b4be5906a7c420ca6362c4e782304309b74ca769b56054dc80
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..877366a77e16
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 3e51e0be4c64..720689629416 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-devicekit-2.20170805-r2.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
-EBUILD selinux-devicekit-2.20170805-r3.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-devicekit-2.20180114-r1.ebuild 381 BLAKE2B 7dd3552901f3837fb5f6e240026381fb20dee57bcf7a8689363e098f6e274d8cd845ce7a0ba3533840c5f526ae496b32d82fa578c6deb3e54e9a665a2f2eda6b SHA512 2a6942fc46e05cebec4222d2d23e959a455365ab055fd9f8389baf6a56be2ddd918d7c2dac822b1af1b92fb45380a2001f65a76dcdea4787666a0f661b5cdeda
EBUILD selinux-devicekit-2.20180114-r2.ebuild 381 BLAKE2B 7dd3552901f3837fb5f6e240026381fb20dee57bcf7a8689363e098f6e274d8cd845ce7a0ba3533840c5f526ae496b32d82fa578c6deb3e54e9a665a2f2eda6b SHA512 2a6942fc46e05cebec4222d2d23e959a455365ab055fd9f8389baf6a56be2ddd918d7c2dac822b1af1b92fb45380a2001f65a76dcdea4787666a0f661b5cdeda
EBUILD selinux-devicekit-2.20180114-r3.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
+EBUILD selinux-devicekit-2.20180701-r1.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
MISC metadata.xml 319 BLAKE2B 19df3379053729b3be3174b80bd4df6ab786b63d2314672280e8d05804291099de6305de7a3d48b4f36fb3160f56b7196738387489e23acdaf155bfd4d97dcdc SHA512 050e2d0054e24c19050680c508a5e92d1d452a36ea729cc92fd503a66ea58b0a8a67c002684c8a7ea7a93c0562b518ec5f51df62007f0d1643a335cab86a9275
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.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"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.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"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8635987d27c4
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 06f471788f8d..bca5b7289ce8 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dhcp-2.20170805-r2.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
-EBUILD selinux-dhcp-2.20170805-r3.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dhcp-2.20180114-r1.ebuild 278 BLAKE2B 9f0eda59a11601f44c28594214e410841902567f0bdc76a162b3acfaf1556178eaee4001cd2c75ba8eca431e52991b5240886cc962b42fc028b07bc064d9c24b SHA512 b81c962fd2d9c09e41da581ca69f919735466e7f8c00cf17ebb058a09bd2ebc0717f817641bb56cb08f3127aa062d4e05a9a232dae9fa48019a340b3892cd101
EBUILD selinux-dhcp-2.20180114-r2.ebuild 278 BLAKE2B 9f0eda59a11601f44c28594214e410841902567f0bdc76a162b3acfaf1556178eaee4001cd2c75ba8eca431e52991b5240886cc962b42fc028b07bc064d9c24b SHA512 b81c962fd2d9c09e41da581ca69f919735466e7f8c00cf17ebb058a09bd2ebc0717f817641bb56cb08f3127aa062d4e05a9a232dae9fa48019a340b3892cd101
EBUILD selinux-dhcp-2.20180114-r3.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
+EBUILD selinux-dhcp-2.20180701-r1.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
MISC metadata.xml 314 BLAKE2B 7c9ade7ecfc9dff591107acbc0173d499c623147232bbd1d813d54e8d416fad826015c68c0796deba6bcf57f14af972c9c25af14d85d639a37f4abf50d4dacfc SHA512 40ea84ff6d5136b2da274d6a300e6c3daa1fdcbc7df92538895e071c37c2cbb6520949c4cf42ff9056dff84ff773e042748e6b8fc07d9253cb8ef5542001931b
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..75aea97a567e
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index fc04f176eee5..8b3bcfa7c474 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dictd-2.20170805-r2.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
-EBUILD selinux-dictd-2.20170805-r3.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dictd-2.20180114-r1.ebuild 280 BLAKE2B 2086dc6befd36106b3ee1c642e27f744f4d1d1d69e98d4a876a50daadb113492504268dd8b2cba3a61d4a8e8a1e1d47beee9e025e159d23bf106a87b74f7a856 SHA512 c427e4a692bb22dcc7329933ac94c4c4742d2c706fcd5025b00aae9f50439a2b826cf1f9f6f1cf430260ffded055dc2a7181fe8028611be8f83160d56d68a3f2
EBUILD selinux-dictd-2.20180114-r2.ebuild 280 BLAKE2B 2086dc6befd36106b3ee1c642e27f744f4d1d1d69e98d4a876a50daadb113492504268dd8b2cba3a61d4a8e8a1e1d47beee9e025e159d23bf106a87b74f7a856 SHA512 c427e4a692bb22dcc7329933ac94c4c4742d2c706fcd5025b00aae9f50439a2b826cf1f9f6f1cf430260ffded055dc2a7181fe8028611be8f83160d56d68a3f2
EBUILD selinux-dictd-2.20180114-r3.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
+EBUILD selinux-dictd-2.20180701-r1.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
MISC metadata.xml 315 BLAKE2B 6c3cb785d70993fdc4d2adaf234fb780b86279256a852cf5102134d51db57eebecedb3dc09e05bf527f80287ce40656a0c6c05885ad0f8e80e4fa139f51ddc4b SHA512 02c4865816cef6be48361eae1ae305c74b1c0808a4f56b5eb8d2ac31526eed898d6b4d506ed7c649d387c0cb10f4915289a218dfe40b78a3ca14f613a39f4157
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2d32bb503a41
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index 49bc0049e7f3..daafaed750db 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,9 +1,12 @@
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dirmngr-2.20180114-r1.ebuild 284 BLAKE2B 6ee47587b4ae99a401207a275a669b11bab2017c4fc35ed7b34945453f5230ff7f9d7a172b017f327ce62daab5f2bd318771c98a7c30f88083ea9b7279d1f328 SHA512 5854039cd68edafe1f88ea317a9e26907e80275cbfdfbabf1a016d95b4a32f4cc9ba000f8d1c595485a8f826ae442b796adc69bea56bb02d3fc5079b1dc5bbfe
EBUILD selinux-dirmngr-2.20180114-r2.ebuild 284 BLAKE2B 6ee47587b4ae99a401207a275a669b11bab2017c4fc35ed7b34945453f5230ff7f9d7a172b017f327ce62daab5f2bd318771c98a7c30f88083ea9b7279d1f328 SHA512 5854039cd68edafe1f88ea317a9e26907e80275cbfdfbabf1a016d95b4a32f4cc9ba000f8d1c595485a8f826ae442b796adc69bea56bb02d3fc5079b1dc5bbfe
EBUILD selinux-dirmngr-2.20180114-r3.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
+EBUILD selinux-dirmngr-2.20180701-r1.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
MISC metadata.xml 317 BLAKE2B 797c5e5f1c668c0528e160b2c254f8253f6e09bfa6e7ab92187d9d980c20eea9d8bc55744137f6e0ee3b3fee3625ed36edb12a61bc9e6df1bf4619f351800f59 SHA512 059adc0970cb771c2025a010952755316b64d534921fa68acfd93534db445e44abee7e29554471e2d17d3b7eb7c8cea8603358812e3875f66633938f6b5ba553
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0416233eb076
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirmngr"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirmngr"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 264fd1b1a574..1c458733b098 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dirsrv-2.20170805-r2.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
-EBUILD selinux-dirsrv-2.20170805-r3.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dirsrv-2.20180114-r1.ebuild 282 BLAKE2B b28d95175d198b46784aaff8ca5ce09f222db8056e5cf5cfa0d0d10aa63cf7fea3c0b5d9ee429725edb44845856769d4a6eb107d65da9a1786ccc3f797fc97ff SHA512 817e44ba301c2b96a01fa072f0ca867f3b7ed0fea29b0f139c2ac32b0f8169dd77573d309a2cb510b7372e4e81ed7665c114f062bb010a196086da3609de7140
EBUILD selinux-dirsrv-2.20180114-r2.ebuild 282 BLAKE2B b28d95175d198b46784aaff8ca5ce09f222db8056e5cf5cfa0d0d10aa63cf7fea3c0b5d9ee429725edb44845856769d4a6eb107d65da9a1786ccc3f797fc97ff SHA512 817e44ba301c2b96a01fa072f0ca867f3b7ed0fea29b0f139c2ac32b0f8169dd77573d309a2cb510b7372e4e81ed7665c114f062bb010a196086da3609de7140
EBUILD selinux-dirsrv-2.20180114-r3.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
+EBUILD selinux-dirsrv-2.20180701-r1.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
MISC metadata.xml 316 BLAKE2B d5958060111e46d47e53c36a8465a3fcdc63cfb433b2236c7d7b60aea0f72c9a33a72f5fedd8f418f20fbd3be4080ae1252cba9968ce142d9385cdf13bb458c8 SHA512 9392b125315ce8aaeac508910a071d09007a8cf56fbeaf82a935af65958599622d3eeef89eef93c72e2cac81582a4d1dc5ddace14e255764db5df80d9553cb50
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a55356877e2a
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 93f396a60be5..ba3dbd883a29 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-distcc-2.20170805-r2.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
-EBUILD selinux-distcc-2.20170805-r3.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-distcc-2.20180114-r1.ebuild 282 BLAKE2B 10da4486447142b592fdf68ed059c1cab8408cedeef5cda795d1f03a80cef4e6323e81275790570efe92ca1502f266e586faadf307766f2eb17e55965dfa3b79 SHA512 13151cec63fb66c6e1b5f4c8103d0ce654fdb368dfb24e63f83b4b6dc097b8be779b303e1c5a8a51b9f7753480e112fa57e3e7ca29f20442507d81306dd57871
EBUILD selinux-distcc-2.20180114-r2.ebuild 282 BLAKE2B 10da4486447142b592fdf68ed059c1cab8408cedeef5cda795d1f03a80cef4e6323e81275790570efe92ca1502f266e586faadf307766f2eb17e55965dfa3b79 SHA512 13151cec63fb66c6e1b5f4c8103d0ce654fdb368dfb24e63f83b4b6dc097b8be779b303e1c5a8a51b9f7753480e112fa57e3e7ca29f20442507d81306dd57871
EBUILD selinux-distcc-2.20180114-r3.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
+EBUILD selinux-distcc-2.20180701-r1.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
MISC metadata.xml 316 BLAKE2B 8f0a143701ede64165bd298ad78e39d6aa50d3dcc078928ded40470022d1a88ba72f685acccba96f7d14f2e8514d29e06d22639bd7f88da33f19338b05376f69 SHA512 d11cb8bc6cf54e4c1ba0e2e00ef18db5c5a91e3138347156c04b2e4bc9cd002220c5406d19020993746fa41014b85e80d779a82a80c2db01b8bae02aea6d1fa4
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..111905d35fc6
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index b3db17cb0f71..40485b93bae2 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-djbdns-2.20170805-r2.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
-EBUILD selinux-djbdns-2.20170805-r3.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-djbdns-2.20180114-r1.ebuild 446 BLAKE2B a81b22789f7e9d4f19d52a0923ca0c1ee5996bf94ab6d3b8dce8254f1e0598ce1b7e811f74106e037b581d8214c0efe0de594f8ba7ca6b6cc711b89d86a49272 SHA512 e4a10530455eac44c2b4be280477c4f1af4d64170e4650656574e8a297bdd97bd3028dffed0ed26794f77d6e44542f8e794a872f2691b383f0aff40209525abb
EBUILD selinux-djbdns-2.20180114-r2.ebuild 446 BLAKE2B a81b22789f7e9d4f19d52a0923ca0c1ee5996bf94ab6d3b8dce8254f1e0598ce1b7e811f74106e037b581d8214c0efe0de594f8ba7ca6b6cc711b89d86a49272 SHA512 e4a10530455eac44c2b4be280477c4f1af4d64170e4650656574e8a297bdd97bd3028dffed0ed26794f77d6e44542f8e794a872f2691b383f0aff40209525abb
EBUILD selinux-djbdns-2.20180114-r3.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
+EBUILD selinux-djbdns-2.20180701-r1.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
MISC metadata.xml 316 BLAKE2B 94ad6fd295fcdec5d40784cb276b30d35ce1c9a4aa3dd4840b80b7ec51077b72d1c1e886219ef76040617bedf30f875823d3b89ac2a467205b53770788c35f82 SHA512 7431b1e50c034acffe00d3aabdf88c497390908543c1e4b13ae47532d5b9519bd8c5a4b3062c8df790c218a5880a06ca425f8cb1b114f62cad5038b54f8e2587
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-daemontools
- sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-daemontools
- sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-daemontools
- sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-daemontools
- sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6d03e0a05302
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-daemontools
+ sec-policy/selinux-ucspitcp
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-daemontools
+ sec-policy/selinux-ucspitcp
+"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index b0a8c2286273..c43cb97a2a86 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dkim-2.20170805-r2.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
-EBUILD selinux-dkim-2.20170805-r3.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dkim-2.20180114-r1.ebuild 375 BLAKE2B ecd0fdc5ce40ad8f72c7bbd56bd696b3e59fc075dc8395ae8008717f9e84a174320d0fa19e96450a92c7aaacb3cdaf0142533843ebe9cb24b0094b149026ff76 SHA512 6faf0f19e9546e49c4be38e526048b836afd94420002ada5c7b091864907b0798e0882ec869ac78ea4e281f16fa9e035a54693d6b9741b8041aa942b589bf1f7
EBUILD selinux-dkim-2.20180114-r2.ebuild 375 BLAKE2B ecd0fdc5ce40ad8f72c7bbd56bd696b3e59fc075dc8395ae8008717f9e84a174320d0fa19e96450a92c7aaacb3cdaf0142533843ebe9cb24b0094b149026ff76 SHA512 6faf0f19e9546e49c4be38e526048b836afd94420002ada5c7b091864907b0798e0882ec869ac78ea4e281f16fa9e035a54693d6b9741b8041aa942b589bf1f7
EBUILD selinux-dkim-2.20180114-r3.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
+EBUILD selinux-dkim-2.20180701-r1.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
MISC metadata.xml 314 BLAKE2B 52a2ee591bb7e3d3377433b75e6b94fd6fe583fa6325fc79d111bd08f8164d275fdd7d2251e633777df699d78c2af7fd52cd7c0c2500a0354692430c0cd8e312 SHA512 a38550fb1e03f39702b4f45f068d6726aea262a480a35360e055b2ab98accf4f83395ff3f566babce8a75d3b654eb5b2cc729fcdac5441426494750b6eb59120
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.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"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.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"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..725721271283
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-milter
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-milter
+"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 3749fbd91af3..e9c367894151 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dmidecode-2.20170805-r2.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
-EBUILD selinux-dmidecode-2.20170805-r3.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dmidecode-2.20180114-r1.ebuild 288 BLAKE2B 95a04055c2b5a4229d1fd106c5fd14d0268ee0704bcb449b7a8e9142c5b6022aa56d2a2922dc3deb5013072f10c84b5467e634f9812b8814a5838fead38c46a0 SHA512 519b459cfaaf5e6118c2ce33bc5013c536b67c955038abcfa9726d3befabaac1f18e13edf9cadbf1e7ea3a8e176151cdfc06f5712dad70dee005917f8de27de8
EBUILD selinux-dmidecode-2.20180114-r2.ebuild 288 BLAKE2B 95a04055c2b5a4229d1fd106c5fd14d0268ee0704bcb449b7a8e9142c5b6022aa56d2a2922dc3deb5013072f10c84b5467e634f9812b8814a5838fead38c46a0 SHA512 519b459cfaaf5e6118c2ce33bc5013c536b67c955038abcfa9726d3befabaac1f18e13edf9cadbf1e7ea3a8e176151cdfc06f5712dad70dee005917f8de27de8
EBUILD selinux-dmidecode-2.20180114-r3.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
+EBUILD selinux-dmidecode-2.20180701-r1.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
MISC metadata.xml 319 BLAKE2B a91428c1e8c58f2901df33a3bfecaa09414f9a4a7cb2cea6350a7795c5c0a8e87f95139807d2025cf0fd725404bef1b5bc56880d7a44b4264ee5e5d6adcbecf1 SHA512 d866eeed95bad62f746cb0576f592abc6f0728661fa06563d55146ccacddcc50e9154d0c7bb0b673acae16ef0f80dd80b70763a810d829920cc6e0483b7830ec
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8e615d71505e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 26ee5266e421..e383c43fb96d 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dnsmasq-2.20170805-r2.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
-EBUILD selinux-dnsmasq-2.20170805-r3.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dnsmasq-2.20180114-r1.ebuild 284 BLAKE2B b67c2202f0ecca890cf7e8df0d68ff9163162d4e720e93b1acddaf08f824fd2ef1629ceee3a2d47dcc78f0f50253aabc2d16a27e867b519cfaf2bc12eeec8748 SHA512 fb06be5bae2aba1706f29527014428301db798cf062db79d5a071e117af62c17ebd75d175a785508be3e9e39a797c356c24ad032778777e92524f0b39cdd8ce2
EBUILD selinux-dnsmasq-2.20180114-r2.ebuild 284 BLAKE2B b67c2202f0ecca890cf7e8df0d68ff9163162d4e720e93b1acddaf08f824fd2ef1629ceee3a2d47dcc78f0f50253aabc2d16a27e867b519cfaf2bc12eeec8748 SHA512 fb06be5bae2aba1706f29527014428301db798cf062db79d5a071e117af62c17ebd75d175a785508be3e9e39a797c356c24ad032778777e92524f0b39cdd8ce2
EBUILD selinux-dnsmasq-2.20180114-r3.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
+EBUILD selinux-dnsmasq-2.20180701-r1.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
MISC metadata.xml 317 BLAKE2B 2c180da5a4bb38b80679465ea103b0cfdd396830b4ab9f22de8bb2134f603e840a7225661d575ca48fc378cf5790c3026ca6c9ec1a2c4de08264292db1813b26 SHA512 badb018cf0e4f48bf7394d4c8b882cae63fbd47755668c58159f23f2ae6b5ff18d15f17790eb6721f2585cdb307e37f3430c9616641581dab70ef3b866157464
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e12df6ce58f6
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index ccf45fa31427..6be9a085e9f4 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dovecot-2.20170805-r2.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
-EBUILD selinux-dovecot-2.20170805-r3.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dovecot-2.20180114-r1.ebuild 284 BLAKE2B d51c8bdd38720f3b0ab23a9b438546dd18de60b64444ba704b198e71e505f00aa4d952bf66eda7ec19cd39423284cd039d263f29999674ca45f463b06b7e9c27 SHA512 d237e2b8a4cd65501450c2c9f1306047555ec922260b056587a1cf6531fbda7313983e1c6809b93d0494755abede9af3652825f121a07accb65677738623da56
EBUILD selinux-dovecot-2.20180114-r2.ebuild 284 BLAKE2B d51c8bdd38720f3b0ab23a9b438546dd18de60b64444ba704b198e71e505f00aa4d952bf66eda7ec19cd39423284cd039d263f29999674ca45f463b06b7e9c27 SHA512 d237e2b8a4cd65501450c2c9f1306047555ec922260b056587a1cf6531fbda7313983e1c6809b93d0494755abede9af3652825f121a07accb65677738623da56
EBUILD selinux-dovecot-2.20180114-r3.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
+EBUILD selinux-dovecot-2.20180701-r1.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
MISC metadata.xml 317 BLAKE2B bd378647bd4b9d38fda7a04f6baf817da4cfb58ae8acf6b1ebb1fc4e088d4e71a99700562d2ac08e8ccaab094c1d446ffeb8aa5bcec9b85333808fa9f225bd88 SHA512 c48caae167d778fc011c650d92060756d568ec1b57957f7b581d93acd0ceed15f2da615c9cdc4571765935e9f62b073211e90c79cc19727aee2b0fcc13a23510
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3f4f764487e3
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index be63dfabcb18..3aa15a3cba55 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dpkg-2.20170805-r2.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
-EBUILD selinux-dpkg-2.20170805-r3.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dpkg-2.20180114-r1.ebuild 278 BLAKE2B 849b6751f721c931481c3aa2d0504b005ace0534223a1ad5dd34108e7bdd3fdf6a1cf75d50bf7a6fb69b89fcf5f0300b6e39fa0e4c3e4bcdcba7f9b2486ee9eb SHA512 316f118ad7b635c8d0a3ad615b87459f9a21273d8a0f104565f05d551b0b78fcf8b5f070e59a9e0fa41114ce5bf9f3bab938a94f1cf07d865d49707ff096590c
EBUILD selinux-dpkg-2.20180114-r2.ebuild 278 BLAKE2B 849b6751f721c931481c3aa2d0504b005ace0534223a1ad5dd34108e7bdd3fdf6a1cf75d50bf7a6fb69b89fcf5f0300b6e39fa0e4c3e4bcdcba7f9b2486ee9eb SHA512 316f118ad7b635c8d0a3ad615b87459f9a21273d8a0f104565f05d551b0b78fcf8b5f070e59a9e0fa41114ce5bf9f3bab938a94f1cf07d865d49707ff096590c
EBUILD selinux-dpkg-2.20180114-r3.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
+EBUILD selinux-dpkg-2.20180701-r1.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
MISC metadata.xml 314 BLAKE2B 3723d66dcaeb3e3276c7dc99b11debed63f9d2a34cc34f3bde1007c2015d024afac6081b3b07a0890aeedec7c869f4635d8f0249c7578f06b96c8ab3ca876c7f SHA512 4dc73eaa9a7604687d8a74bac77bd1f595a1e5f10916589fcee39af23db6afec167d30a3f7851eebcc1c942684ce71651fbbbe98d2dae98d8a2d892b314896b3
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0458ecafbca5
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 8d3178566186..d0fb55113b34 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dracut-2.20170805-r2.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
-EBUILD selinux-dracut-2.20170805-r3.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dracut-2.20180114-r1.ebuild 282 BLAKE2B e538f9acf5e994ce641f0fb572862a512c5285b1215f7c34e44b808b9665b90571f0a3f8de686b694d6052f1123b461675f55f628e23a2c0f6b973e3815853dc SHA512 9cc2e17ac780ce9454543ef604c756f09191438505b352840117f02074140d994ea658a1b721d8bc5771df18d38180e4fdedc4cb6362f38f0a3c58d5725af734
EBUILD selinux-dracut-2.20180114-r2.ebuild 282 BLAKE2B e538f9acf5e994ce641f0fb572862a512c5285b1215f7c34e44b808b9665b90571f0a3f8de686b694d6052f1123b461675f55f628e23a2c0f6b973e3815853dc SHA512 9cc2e17ac780ce9454543ef604c756f09191438505b352840117f02074140d994ea658a1b721d8bc5771df18d38180e4fdedc4cb6362f38f0a3c58d5725af734
EBUILD selinux-dracut-2.20180114-r3.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
+EBUILD selinux-dracut-2.20180701-r1.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
MISC metadata.xml 316 BLAKE2B 29c2809e3a45df49908273931adf865e193d059333270de4b37f86cad3c83dff9636ae3f96f6fa841d27716f4e4591b152ac581f997c0fdb103cee4e8a050d68 SHA512 ba6cf5bed2367c69a18d097224989ea7c5208b718f670d040634afad0a017f15ff370bfe7012bc71880b2e234fbb85a0831976c77bc4ed46328607724dd0bfe3
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ab4f4e3bd132
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 2afeeab1fe8b..2b780652de2a 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dropbox-2.20170805-r2.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
-EBUILD selinux-dropbox-2.20170805-r3.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-dropbox-2.20180114-r1.ebuild 432 BLAKE2B 371840718b25972f5d42cdada825c929a95e3b13adc2f3164caba91baff00e3ca61171d1df5fbd551d5a15ecc9c5cb63d90dded16cc4375e67d982b6374a4255 SHA512 5f5d68126da1d6b6a93f686e91aa985575baa1222f038a7cc473dd9d6aac3825d2edf34a52b152baa7a68f1d75135cc4d471ce3e344516182ba06a9f2f2df66c
EBUILD selinux-dropbox-2.20180114-r2.ebuild 432 BLAKE2B 371840718b25972f5d42cdada825c929a95e3b13adc2f3164caba91baff00e3ca61171d1df5fbd551d5a15ecc9c5cb63d90dded16cc4375e67d982b6374a4255 SHA512 5f5d68126da1d6b6a93f686e91aa985575baa1222f038a7cc473dd9d6aac3825d2edf34a52b152baa7a68f1d75135cc4d471ce3e344516182ba06a9f2f2df66c
EBUILD selinux-dropbox-2.20180114-r3.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
+EBUILD selinux-dropbox-2.20180701-r1.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
MISC metadata.xml 317 BLAKE2B 7db5d1a4e812a844ab0528bf724b389ab91a0c5eec2edc2086c64cff779f210f5e4dc852731d976b88f407c6efa61551a823f1834b6eed8fef136d18f58008d8 SHA512 9f232635f6084134360a64b5f1fcf84580b5df46feff6d897d4a53651329ca930ca23b15ae40316748a2914cddff3358b49bdb15bf7312973d6a9ada604dc717
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d25d2723627f
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 243bad952680..f9f11589f237 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-entropyd-2.20170805-r2.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
-EBUILD selinux-entropyd-2.20170805-r3.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-entropyd-2.20180114-r1.ebuild 286 BLAKE2B d91ec84be9f08f769dc8837fb585c853b08e8f319f3a575607f5132b0af2d08970cd2ba261c1ae986ef653dc8a1c25023ed79a3b1de95af7313155c03e55878d SHA512 503f1eadde311785402cc3e02ac177b975d92a6352f555d80397093c1210aff06196864fc7307c8e445a63934a7b241d6a7318e5a9440be1dc20680c46c087dd
EBUILD selinux-entropyd-2.20180114-r2.ebuild 286 BLAKE2B d91ec84be9f08f769dc8837fb585c853b08e8f319f3a575607f5132b0af2d08970cd2ba261c1ae986ef653dc8a1c25023ed79a3b1de95af7313155c03e55878d SHA512 503f1eadde311785402cc3e02ac177b975d92a6352f555d80397093c1210aff06196864fc7307c8e445a63934a7b241d6a7318e5a9440be1dc20680c46c087dd
EBUILD selinux-entropyd-2.20180114-r3.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
+EBUILD selinux-entropyd-2.20180701-r1.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
MISC metadata.xml 333 BLAKE2B 413e0582ad11233747036b6669533af49c9c6f43954d104bdfd062efb891c36bdfe526b0eac7317c5c7a350c480ce7e903f7b87b9eaf776d21c7a84576627d9d SHA512 0d80f8560f5d0dd12ac9913f52a7d6ce5f96567b727fd68c7f66ee96edb25dd5adc168bf2618c6992d56d96c049ac44240621ae576b46b536f4851dad9c049cf
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d58341e4fc36
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 537d0258b068..7237dc170c1c 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-evolution-2.20170805-r2.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
-EBUILD selinux-evolution-2.20170805-r3.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-evolution-2.20180114-r1.ebuild 386 BLAKE2B 45bd407a0bc5c8ed37390fc133a5af2b7f4226b70afffebbbc1979da4057f69c1698ccc5265c036e4c02aed566497ab05399ca45e1ee3af366aa21c3f939c3fd SHA512 cfa6b12d75ff108e4d4f7603503bfb8f125f5787d48c3710877611f269a1fb7d31fdf38a19a6e85d5665391fdec2e62c200c1f1b9a6724f0aaac97b225a8c8d6
EBUILD selinux-evolution-2.20180114-r2.ebuild 386 BLAKE2B 45bd407a0bc5c8ed37390fc133a5af2b7f4226b70afffebbbc1979da4057f69c1698ccc5265c036e4c02aed566497ab05399ca45e1ee3af366aa21c3f939c3fd SHA512 cfa6b12d75ff108e4d4f7603503bfb8f125f5787d48c3710877611f269a1fb7d31fdf38a19a6e85d5665391fdec2e62c200c1f1b9a6724f0aaac97b225a8c8d6
EBUILD selinux-evolution-2.20180114-r3.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
+EBUILD selinux-evolution-2.20180701-r1.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
MISC metadata.xml 319 BLAKE2B 827cd797e5422e54ce6d813dfe5c600dabb778ac4d9f099202b206abae98931807176d07aeb0020fa41a3d62e4aeaeef0b98b33f18b9f827bd5a85f691b7630a SHA512 5fd8bf75b73ea55686dc7d253d26fd4fb43cd89e46e141ee4fcb4da6b4ea9056aafb499f0bdc5e7d3cf15fb286497e05402a282d21f93ae6d18bd6b2cef0f0b4
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c5fb02648452
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 32aa9c5788e3..31fde21223bd 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-exim-2.20170805-r2.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
-EBUILD selinux-exim-2.20170805-r3.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-exim-2.20180114-r1.ebuild 278 BLAKE2B d35a8243d349eb44902771a5ed881ae61baabfa15fa72dc21623bea235a4231926254b4b2067a375e1dde272ef84a31814c73dbd9f9e094b4499aaf71fc87fe4 SHA512 7e6dfee86ca8d1eee1703cbdf48c1fdd6770bbf6042fa980a9d9d4d11518f078d50ace9d596be5c4447c97878876c43000b2a5cbca1ed64edeff3b4b0ee1b6cb
EBUILD selinux-exim-2.20180114-r2.ebuild 278 BLAKE2B d35a8243d349eb44902771a5ed881ae61baabfa15fa72dc21623bea235a4231926254b4b2067a375e1dde272ef84a31814c73dbd9f9e094b4499aaf71fc87fe4 SHA512 7e6dfee86ca8d1eee1703cbdf48c1fdd6770bbf6042fa980a9d9d4d11518f078d50ace9d596be5c4447c97878876c43000b2a5cbca1ed64edeff3b4b0ee1b6cb
EBUILD selinux-exim-2.20180114-r3.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
+EBUILD selinux-exim-2.20180701-r1.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
MISC metadata.xml 314 BLAKE2B c2415733accb4920f1d02a77d2af6b2c4ec0ad8e90fb9e6a8d501dd19ae8036470b1280d075b2ed0cfdd90110a650566d9ae68a953318dfdfa41bf5b5251a46d SHA512 219657ec49c7edd6b2f78c3edcd2f06a9a5e12324988bb3dba22f3da68903ea42f9cdbd48ddd95a21abe6b59b27244e6c654869dee7db1a653ab7bc89fd36b1a
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..73ffc301d15c
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 78df5ab51feb..25b1ee69de51 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fail2ban-2.20170805-r2.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
-EBUILD selinux-fail2ban-2.20170805-r3.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-fail2ban-2.20180114-r1.ebuild 286 BLAKE2B 18de2881e70cd43bcd40c02a2e44314166c601e213efb7f065da26bb71b3f1aa431dc3460619ae1272f6077ed5b7a2e6033771b994c44e10ab6604a5257128c1 SHA512 c8c047312f7a5972a676f62013756afbe8897f6f2d3861af44036b62eab966e7271cfec99c555c70a3d3d19efbc114b6b015332a3f59cef8a1498c10a4ce7488
EBUILD selinux-fail2ban-2.20180114-r2.ebuild 286 BLAKE2B 18de2881e70cd43bcd40c02a2e44314166c601e213efb7f065da26bb71b3f1aa431dc3460619ae1272f6077ed5b7a2e6033771b994c44e10ab6604a5257128c1 SHA512 c8c047312f7a5972a676f62013756afbe8897f6f2d3861af44036b62eab966e7271cfec99c555c70a3d3d19efbc114b6b015332a3f59cef8a1498c10a4ce7488
EBUILD selinux-fail2ban-2.20180114-r3.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
+EBUILD selinux-fail2ban-2.20180701-r1.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
MISC metadata.xml 318 BLAKE2B e95df98e6f8f3f9e88df4a93bb326b51d7ca228e96eb7eae30654ab441bbd9930478e22755a1988dac5142d546c905be0acd1baa888a635a5ed8173fda53b4ca SHA512 e3d5af97c4cc7917dd015904de3badbecf54cf8fd3c10c294d33d3bee38b5b7b0b82888ebfac3afbc7d9b53b15e876bd16be1ba5a6567e7736a30bb1c1995349
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2135a7bb5fb7
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 712138a5aff3..4308fc1cc3c4 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fetchmail-2.20170805-r2.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
-EBUILD selinux-fetchmail-2.20170805-r3.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-fetchmail-2.20180114-r1.ebuild 288 BLAKE2B b44657971263ce459cdb732684efa8571f820bd967a696af02c2ef0fa699010ce45ddc0880564d9465755b43feb32ede01aadc1547cf4a264bd29be34e74720b SHA512 04ff3bc24d3faa9e97ca821343728583cec3d6e87a3eec742222c89f81b85993e6886f01f37799d17f3b4fe6125b5b0d3126c7f74b83c651da37c1036e8b2cf9
EBUILD selinux-fetchmail-2.20180114-r2.ebuild 288 BLAKE2B b44657971263ce459cdb732684efa8571f820bd967a696af02c2ef0fa699010ce45ddc0880564d9465755b43feb32ede01aadc1547cf4a264bd29be34e74720b SHA512 04ff3bc24d3faa9e97ca821343728583cec3d6e87a3eec742222c89f81b85993e6886f01f37799d17f3b4fe6125b5b0d3126c7f74b83c651da37c1036e8b2cf9
EBUILD selinux-fetchmail-2.20180114-r3.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
+EBUILD selinux-fetchmail-2.20180701-r1.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
MISC metadata.xml 319 BLAKE2B e073dc2b6ff305b6eada410f65d501d465ee269aaece755ae147580c52b4487bd805947f5bcce1f80cfda5dc0995caec87f6cb73ff393837b7877462b1f3296e SHA512 7e8e5cc8a4d87c86538ce4d507c43763e77be4819715c302c6c616fd6d84c010c109fba0ee147ed4dee2398f5d924e28561b4d9fb4b8c7f99acb8861ac05b472
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1c4c778ba5af
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index c1abf62ac44a..0467627a98eb 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-finger-2.20170805-r2.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
-EBUILD selinux-finger-2.20170805-r3.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-finger-2.20180114-r1.ebuild 377 BLAKE2B cb8e2b93da9c49c82941aeb2797349f04eaa26ac80ad0fa85f8e70a12fb2706d5c1afb956ecc7b0e83209d5716651eb03776ba1e7c717d2554d2a72650899876 SHA512 650e792126aad2ac4fdacfbc6dc0e9649bc4fcc1c77a8561e8d35f54cc5c7c163972ef61c456b3fa451863b448836956929fce6fb6a4b6d41327a78b7924dc9d
EBUILD selinux-finger-2.20180114-r2.ebuild 377 BLAKE2B cb8e2b93da9c49c82941aeb2797349f04eaa26ac80ad0fa85f8e70a12fb2706d5c1afb956ecc7b0e83209d5716651eb03776ba1e7c717d2554d2a72650899876 SHA512 650e792126aad2ac4fdacfbc6dc0e9649bc4fcc1c77a8561e8d35f54cc5c7c163972ef61c456b3fa451863b448836956929fce6fb6a4b6d41327a78b7924dc9d
EBUILD selinux-finger-2.20180114-r3.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
+EBUILD selinux-finger-2.20180701-r1.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
EBUILD selinux-finger-9999.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
MISC metadata.xml 316 BLAKE2B 4616dff4829030f8809d5bfd76c5b3ba9efa72963c9e758418b06bd85a1538125526b60d1fe6fd282dbe9cc04a9139f85f8a134751be0ba47b157d8e5d62d9a1 SHA512 52daa0a0cca3fc954aafb579561bbd1c68d17cb2b1ab8f03b0de5be5a6d0c02dcdd1c1384a6b55dfe83e41ebf62da5dd3cb39bc11e03eacab82b18ce198ab8a7
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.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"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.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"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..04668c6ca0b6
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 8055566b0bd1..05ccde90f9ab 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-flash-2.20170805-r2.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
-EBUILD selinux-flash-2.20170805-r3.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-flash-2.20180114-r1.ebuild 280 BLAKE2B 053fa938e689a0ec43a8d940c5024d63b8cdbeba5dc448f8ac2b2f7fb47768f8d06d3950f4c0227075499a640f76f537b42f9dcf2edb12ccccedc85090c520e4 SHA512 263956232acec65293b38252b4bdbfbdb34a27b6e11e42a517a9d17c98c8ea5c59f3b9897f324519a8b479a69fd2cc3fbccc544b7ed1318175c960917c317151
EBUILD selinux-flash-2.20180114-r2.ebuild 280 BLAKE2B 053fa938e689a0ec43a8d940c5024d63b8cdbeba5dc448f8ac2b2f7fb47768f8d06d3950f4c0227075499a640f76f537b42f9dcf2edb12ccccedc85090c520e4 SHA512 263956232acec65293b38252b4bdbfbdb34a27b6e11e42a517a9d17c98c8ea5c59f3b9897f324519a8b479a69fd2cc3fbccc544b7ed1318175c960917c317151
EBUILD selinux-flash-2.20180114-r3.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
+EBUILD selinux-flash-2.20180701-r1.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
MISC metadata.xml 326 BLAKE2B 7bf48ddd76caa0a0e6ffa9ac59dbe33b521498795ec20b8da4a155ff8c7c729e5c8904569ce4793780c78abb5ad92b2292af23be21fca3c1b1eda793ef375757 SHA512 0534363003255e27ff839750cb0a7363afe38894d5ffda86dca467dcc0c25cd0de3c186ae856391d3466602eedde24599fee66c2a2786bb662da5abb646a9d50
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..09267ae8a349
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index d498f67d5bf0..991e2afe7ff6 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fprintd-2.20170805-r2.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
-EBUILD selinux-fprintd-2.20170805-r3.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-fprintd-2.20180114-r1.ebuild 376 BLAKE2B b0b06f790bb6eefb2441e6e96e9b69c599eb8eaed3db9b0a6f1aeb28276cf19c2baf1bdc87b9e2af4b69b9139dd00b2ddc43849fb2a05bd187be510b77555d93 SHA512 e8b9bb62cd7e3aaad9767728c0fb256339f04e8a3961b6b96e9af52fbd579627cd8ce520e100f95881dcdb1775c899853236720766ff3ff22e141782c05498bf
EBUILD selinux-fprintd-2.20180114-r2.ebuild 376 BLAKE2B b0b06f790bb6eefb2441e6e96e9b69c599eb8eaed3db9b0a6f1aeb28276cf19c2baf1bdc87b9e2af4b69b9139dd00b2ddc43849fb2a05bd187be510b77555d93 SHA512 e8b9bb62cd7e3aaad9767728c0fb256339f04e8a3961b6b96e9af52fbd579627cd8ce520e100f95881dcdb1775c899853236720766ff3ff22e141782c05498bf
EBUILD selinux-fprintd-2.20180114-r3.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
+EBUILD selinux-fprintd-2.20180701-r1.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
MISC metadata.xml 317 BLAKE2B 9f9ccfabc8cfba6051f77a746c06cd1a0752fc436b99969b9a08ec19cb2c4bfa810570df992eb9477ae043661184d7752435a8b32b063ed0c5eae9bf02c04d33 SHA512 b81abea30f23855ef1ab888e412acae6e66013ed0805219a09cdf6b89dfb06bb76f009aa4adb2caf880b4db26193af2fd90d4d95b74e94568438687dbc578d19
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0e40c0e7a66c
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 5b0e67057778..a4112f09e11a 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ftp-2.20170805-r2.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
-EBUILD selinux-ftp-2.20170805-r3.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ftp-2.20180114-r1.ebuild 276 BLAKE2B 9bdb6a9b7cb1ef72481eb81b6888ecffabcd4efe06105a4478d9dcc25c242a2e510ff1a3b8164d42c05e6811e28c22caf82be2f5bdddbffc71ceb9da2125976a SHA512 d91002e2bbf29abb24ddf3ed0f12c9d7d06b2f6eb6bd974fabf8c39adba4c37b28b174e61afa0cd46af2d9dc3103e31ac1de4104def8c54b3d157d58edb30cca
EBUILD selinux-ftp-2.20180114-r2.ebuild 276 BLAKE2B 9bdb6a9b7cb1ef72481eb81b6888ecffabcd4efe06105a4478d9dcc25c242a2e510ff1a3b8164d42c05e6811e28c22caf82be2f5bdddbffc71ceb9da2125976a SHA512 d91002e2bbf29abb24ddf3ed0f12c9d7d06b2f6eb6bd974fabf8c39adba4c37b28b174e61afa0cd46af2d9dc3103e31ac1de4104def8c54b3d157d58edb30cca
EBUILD selinux-ftp-2.20180114-r3.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
+EBUILD selinux-ftp-2.20180701-r1.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
MISC metadata.xml 313 BLAKE2B 517baf67e6834fdc3d1442c7c372f23a739c737068e2e13c33def26402837b2e3697cf39240bca81fe68180f8e509dc0e2d3c19f10780aa5a4a6a9ad0351ee72 SHA512 766f08c10b53ad30173f64f9ca3306cc2441442a6dfb3fd48d485bd0c3c2bb95896e447f6e1d94db1b6808c111489e2e5c2f40c64b1642303d801c99d1fe8c57
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6353d9496e45
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index ffbf8afd9a54..cf29405893e6 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-games-2.20170805-r2.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
-EBUILD selinux-games-2.20170805-r3.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-games-2.20180114-r1.ebuild 280 BLAKE2B d2dbf9504ad2fae821a010e88388f014d7fa4ed093f57cfef8461eb3a5bbc4ef91ddb02d30e5c566033f168c454694d8144dc54500d3f1c1aa97483ba511aa66 SHA512 8579f3d952fd9742975ba40b511e893fa54eb19af9170e52e6b9418f70dee592ee07c0b59511ed21624f801a25670a3ff45b98cf455db45c47dfef1f9e525ccc
EBUILD selinux-games-2.20180114-r2.ebuild 280 BLAKE2B d2dbf9504ad2fae821a010e88388f014d7fa4ed093f57cfef8461eb3a5bbc4ef91ddb02d30e5c566033f168c454694d8144dc54500d3f1c1aa97483ba511aa66 SHA512 8579f3d952fd9742975ba40b511e893fa54eb19af9170e52e6b9418f70dee592ee07c0b59511ed21624f801a25670a3ff45b98cf455db45c47dfef1f9e525ccc
EBUILD selinux-games-2.20180114-r3.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
+EBUILD selinux-games-2.20180701-r1.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
EBUILD selinux-games-9999.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
MISC metadata.xml 315 BLAKE2B 1232c932d995c55e4fccd0caf1b2b1d352878d82747b3a8c6eb52098afd11ba83aabb33b483293c7eaf1caf81add060c2cb0ad03f6339404fea29ce65f851c9a SHA512 056daa36a74927c8200145591e5fbabc9404fea497de85f944ab497c9b75507a34c7f40696829dbdb5d7d7edb8a74e8bc4fce97acba3ec84bbdf8000a106544b
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4057d0081474
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index bea1575c63d3..bd899990ba57 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gatekeeper-2.20170805-r2.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
-EBUILD selinux-gatekeeper-2.20170805-r3.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gatekeeper-2.20180114-r1.ebuild 290 BLAKE2B 6b0ee589fd681020df5bfb6b529553a08516632ac4319d64bcec52ed1efd4406b690cfe5f94d7e029f25b59fa25879dd11be03103efb9ed0bc1f345b90f608c1 SHA512 2aae8002cd3e3735e3e082c14e6e7c7f4ba9fac233743a6c2efa444c6b10f6285958f5b8b684b8b6e723a11e0ad7d18127e324f5844bd1905fb9d337ac45a1c5
EBUILD selinux-gatekeeper-2.20180114-r2.ebuild 290 BLAKE2B 6b0ee589fd681020df5bfb6b529553a08516632ac4319d64bcec52ed1efd4406b690cfe5f94d7e029f25b59fa25879dd11be03103efb9ed0bc1f345b90f608c1 SHA512 2aae8002cd3e3735e3e082c14e6e7c7f4ba9fac233743a6c2efa444c6b10f6285958f5b8b684b8b6e723a11e0ad7d18127e324f5844bd1905fb9d337ac45a1c5
EBUILD selinux-gatekeeper-2.20180114-r3.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
+EBUILD selinux-gatekeeper-2.20180701-r1.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
MISC metadata.xml 320 BLAKE2B d91c149118f412ba61feff679a92152bee2bc3be1cd62c5ba9e3caa0a0fc94a0161c5f70595c7e2616f93359693e05037e181f26cd334955b90e7ce0e967d69b SHA512 d03bbe8a36c743c5a8ec79df643d4075e1edb314f2d37b6579e155acd141e3d1c08d8c070f0690c899b166fa469e2774a546132f19353c81a541f831087aa55b
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c10d2e7e7c9f
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index d75d536fb999..3e829a960bb0 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-git-2.20170805-r2.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
-EBUILD selinux-git-2.20170805-r3.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-git-2.20180114-r1.ebuild 372 BLAKE2B f18cebe3b7e6d07178a70ad20065f934c256dcb7878a3f86a6ee2071a11336e3e72b5979f7de256c0402a19a67baea6429b4c62600c4667e9906df5592706094 SHA512 bee9100fde860491d73906929a81833357b292b6bd19df089fbf403ce35ba88ec7df2c88c67087691f5eee22a98f630a7a57f88bce047942c71b489e2a2f8286
EBUILD selinux-git-2.20180114-r2.ebuild 372 BLAKE2B f18cebe3b7e6d07178a70ad20065f934c256dcb7878a3f86a6ee2071a11336e3e72b5979f7de256c0402a19a67baea6429b4c62600c4667e9906df5592706094 SHA512 bee9100fde860491d73906929a81833357b292b6bd19df089fbf403ce35ba88ec7df2c88c67087691f5eee22a98f630a7a57f88bce047942c71b489e2a2f8286
EBUILD selinux-git-2.20180114-r3.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
+EBUILD selinux-git-2.20180701-r1.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
EBUILD selinux-git-9999.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
MISC metadata.xml 313 BLAKE2B effb568bf70e783215963ed3cbabecdbdf7bf8246a47791737925a4198f3daa55c471e223d89b83d58e3d3c2eaec75cc7d2a127a781b1bf1410cb346c28d3505 SHA512 907a80ca3d13826b0ddf500695e9d568cc90a3708a4fa87d442a9b32b93f94795d8d5bb8cfb191a95fc1eae4173c4bdba8192e427606ce6c74b00aa8d25239b6
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r2.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"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r3.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"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c88c3cfb5859
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="git"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for git"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 088926c15640..ed37676e3357 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gitosis-2.20170805-r2.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
-EBUILD selinux-gitosis-2.20170805-r3.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gitosis-2.20180114-r1.ebuild 284 BLAKE2B e2c3faf80ecbed4275cef356e96777576abca75d1c82f137825228f78ab5b835fb8e072da43d272c736038a42d167cff74c7e7a1a5b7af625efd6e1ff96edb9a SHA512 394bbd7995f8bb52846c8cf075472d78244aaaa921209442e1ff9dc2c3cd6de92ddd89e70363a9bbcd61a8d2c0c820034f4912b2d0719737184cf14ad2fb7408
EBUILD selinux-gitosis-2.20180114-r2.ebuild 284 BLAKE2B e2c3faf80ecbed4275cef356e96777576abca75d1c82f137825228f78ab5b835fb8e072da43d272c736038a42d167cff74c7e7a1a5b7af625efd6e1ff96edb9a SHA512 394bbd7995f8bb52846c8cf075472d78244aaaa921209442e1ff9dc2c3cd6de92ddd89e70363a9bbcd61a8d2c0c820034f4912b2d0719737184cf14ad2fb7408
EBUILD selinux-gitosis-2.20180114-r3.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
+EBUILD selinux-gitosis-2.20180701-r1.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
MISC metadata.xml 317 BLAKE2B 2783356823beb4808b1b3cc33c32ff6791ce87dc8f0ee675a1f115b085ecb6514a324846b3f495822f0682fc45f7287e3380ece31d4231412bfd101f628fbdeb SHA512 aaf3e9dc008475b8fa3eea3471cc12fbac3ff7473303649cc8d4189513657f0dbf7ddb9b9cce659220ef4100a4560d551547886923c7cf43e12316c6bde03d17
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0f2fb118b3e1
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 4ee238df81e3..51961d34d6f4 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gnome-2.20170805-r2.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
-EBUILD selinux-gnome-2.20170805-r3.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gnome-2.20180114-r1.ebuild 280 BLAKE2B 56c25071d6c04a7463516bccd17ebbc574a085d422965abd5a58516bc7798725697b2ac5fc469092a3b92f57d5bde8436e03e46a9f19320fc29c5fe2d342dd2f SHA512 dcba23c72712d6b0f262c3b46998eb18d113c06fd24d4ba40a4b64fb8649dde6e0a95b3bba08f3e87bfb550acd89ca9d3aff67a5c404c508f842b164e021d483
EBUILD selinux-gnome-2.20180114-r2.ebuild 280 BLAKE2B 56c25071d6c04a7463516bccd17ebbc574a085d422965abd5a58516bc7798725697b2ac5fc469092a3b92f57d5bde8436e03e46a9f19320fc29c5fe2d342dd2f SHA512 dcba23c72712d6b0f262c3b46998eb18d113c06fd24d4ba40a4b64fb8649dde6e0a95b3bba08f3e87bfb550acd89ca9d3aff67a5c404c508f842b164e021d483
EBUILD selinux-gnome-2.20180114-r3.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
+EBUILD selinux-gnome-2.20180701-r1.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
MISC metadata.xml 315 BLAKE2B 1932f9fe6969fec43c46097b2085ca52cd1127fc78f06a4447166ec95c342c7fb04dad5d35f6f38506e94f5cb099e500085fbe692c7949a5dcca1ac423988b2d SHA512 31d6b3a85661d1b7438e748deb4b92fb4908ace1ee215381d47953c265a75f171b58138d775e9bc1c55aeeb1e375e0ebbc6f6d98e9292fcb27a83e79975f54f3
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0038031ba9d5
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 0ce0f4ec85fa..89b06e199883 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-googletalk-2.20170805-r2.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
-EBUILD selinux-googletalk-2.20170805-r3.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-googletalk-2.20180114-r1.ebuild 294 BLAKE2B 7e9eb49026cde11de107c3adf05e096ef9829246d270ce76aa4c7728d5a14b5f5f2ba5e9b7c5db717868db81f5f94d6f5ea0b89a0a76cee0a119c04a9e842389 SHA512 fd377f68c3cc8b10747fbe1d579ff788ab3b120adfa4648a5dca853986f5a258e6c4b78fc86a0c4d3091520e059e8ad7edaac19ba0c52ef1659e1c18ab3e9338
EBUILD selinux-googletalk-2.20180114-r2.ebuild 294 BLAKE2B 7e9eb49026cde11de107c3adf05e096ef9829246d270ce76aa4c7728d5a14b5f5f2ba5e9b7c5db717868db81f5f94d6f5ea0b89a0a76cee0a119c04a9e842389 SHA512 fd377f68c3cc8b10747fbe1d579ff788ab3b120adfa4648a5dca853986f5a258e6c4b78fc86a0c4d3091520e059e8ad7edaac19ba0c52ef1659e1c18ab3e9338
EBUILD selinux-googletalk-2.20180114-r3.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
+EBUILD selinux-googletalk-2.20180701-r1.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
MISC metadata.xml 321 BLAKE2B 2d10b65fda50b9f62a890a562f6c972873d80f356cdb3d73cb7f88f4481dc780c2a5031064b71371758b9ec8a34b277b33c433286bb82ae05c7f675ed0746927 SHA512 e09997299b9a7ed78be623f1158549b24d507e8393f47da561094dc216cfbd5f715ab169875c3faa42025da80972d825c55fac9335392731d7a181f78c41286b
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..715779dd67c1
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index daca9dacd159..9c38d56dbc6c 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gorg-2.20170805-r2.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
-EBUILD selinux-gorg-2.20170805-r3.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gorg-2.20180114-r1.ebuild 278 BLAKE2B 8fe4d5379f2c72bdd11bd548bf796f0311729cc76be80ef51b3da033a543e63b4a45415c5c9a1c4f79befe363382de2112d4c00cc8c0718c59c6149c287c6666 SHA512 c09443eac98ed28ea7c402c29d8761a892949e3869eb5243e8c54c9494ef9353311e1f35047ed7f36fba3865d6245393487a54782a051c2af65293511c1eac60
EBUILD selinux-gorg-2.20180114-r2.ebuild 278 BLAKE2B 8fe4d5379f2c72bdd11bd548bf796f0311729cc76be80ef51b3da033a543e63b4a45415c5c9a1c4f79befe363382de2112d4c00cc8c0718c59c6149c287c6666 SHA512 c09443eac98ed28ea7c402c29d8761a892949e3869eb5243e8c54c9494ef9353311e1f35047ed7f36fba3865d6245393487a54782a051c2af65293511c1eac60
EBUILD selinux-gorg-2.20180114-r3.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
+EBUILD selinux-gorg-2.20180701-r1.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
MISC metadata.xml 314 BLAKE2B c5f46fdd3046a5e9ca0fe3a6a518f39329090fe38761a84e147868e126a108d1d04d29de16cd7d7e4bab04672cd77d2ca594c0f29b7593e05ec1dac3d54a1fd7 SHA512 bbbf21e449ca7c6bc287093a5c8f42db23f0f41f41316b7b5f08e7a1bcbcdd3e54c2e79bbeec9533ef78c2a8ef5e6c029ffad2f02eee7532e219fef42b0f99b8
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1538462400a9
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index dbba1786db7c..b00ff3b46948 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpg-2.20170805-r2.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
-EBUILD selinux-gpg-2.20170805-r3.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gpg-2.20180114-r1.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
EBUILD selinux-gpg-2.20180114-r2.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
EBUILD selinux-gpg-2.20180114-r3.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
+EBUILD selinux-gpg-2.20180701-r1.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
MISC metadata.xml 315 BLAKE2B f1ad4327dbf000875d21f426a15d4e8acd3f1f6c0a4934697f805d5a3f9a304ddfac85e5563119d39f40ce78adb9869208ef0e54f580a34e7649c7a1c8edeba3 SHA512 5d35232f8849235b089f2f8b7e4eb1b1692e805a196605e51d78ac960613ba9116b25ddeb4bc3141a043af41454ad653bd4cd44ab8bf386c0d89075b75028f35
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..34f5b61061ad
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dirmngr
+"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index e77dc8a5fd2a..a7bac54c5d22 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpm-2.20170805-r2.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
-EBUILD selinux-gpm-2.20170805-r3.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gpm-2.20180114-r1.ebuild 276 BLAKE2B fe19eac7a2a7bbdbfa83496d1584e9c6f21f10d0be87455bd13a906b11afa5ffcc6a4c93e0acf71880a71467e96c24042ecbeb02dc821f6aaabccebf041c45a9 SHA512 a5ee0c98a6c6e12ab64959016d43556fd2a6031dcb73e5ab4257f115bb38c21810b61ff98e486773dc69d4b08a63a838e07438e73fb91ff2169624bab4e7ee53
EBUILD selinux-gpm-2.20180114-r2.ebuild 276 BLAKE2B fe19eac7a2a7bbdbfa83496d1584e9c6f21f10d0be87455bd13a906b11afa5ffcc6a4c93e0acf71880a71467e96c24042ecbeb02dc821f6aaabccebf041c45a9 SHA512 a5ee0c98a6c6e12ab64959016d43556fd2a6031dcb73e5ab4257f115bb38c21810b61ff98e486773dc69d4b08a63a838e07438e73fb91ff2169624bab4e7ee53
EBUILD selinux-gpm-2.20180114-r3.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
+EBUILD selinux-gpm-2.20180701-r1.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
MISC metadata.xml 313 BLAKE2B 0156d87c7a5dfa2fcb253ff1cb51bf894ad4aee416fc5f8fa1bbe5db086b73b9bfd28b07fa715284d3526e6724a4f52a852a6b274b14afbd3ed86de0be3375d4 SHA512 c51b135cecad18c17f0597b098d2c0e0d60fcc4a51c70534bb7b4d39e85374cdfc6b793734f514c62194d603b6a0bde889c6772b2438e01bc3632842e1a3c1d7
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9a99c34dc431
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 0cc42387e2a8..6bda3929a5d1 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpsd-2.20170805-r2.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
-EBUILD selinux-gpsd-2.20170805-r3.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gpsd-2.20180114-r1.ebuild 278 BLAKE2B 4111994d1fb16ea92326a3f52945bfec5072eb11eccd1276e996f18057fe8fff84c3bc30f418153e879aa89403bc052840fa1dca036ec58ba507f62b16eb39cd SHA512 b21b6808c534f0035b0c33110060dc8888a454227193219f86ef4d59e2996708a4535850ce52dc28c75fa474e5f112eadf8e1acbb0627e7257cf3c0c6f5e76c2
EBUILD selinux-gpsd-2.20180114-r2.ebuild 278 BLAKE2B 4111994d1fb16ea92326a3f52945bfec5072eb11eccd1276e996f18057fe8fff84c3bc30f418153e879aa89403bc052840fa1dca036ec58ba507f62b16eb39cd SHA512 b21b6808c534f0035b0c33110060dc8888a454227193219f86ef4d59e2996708a4535850ce52dc28c75fa474e5f112eadf8e1acbb0627e7257cf3c0c6f5e76c2
EBUILD selinux-gpsd-2.20180114-r3.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
+EBUILD selinux-gpsd-2.20180701-r1.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
MISC metadata.xml 314 BLAKE2B 3ff140fdf0bff20956c6daf624624ae51a6002199bc2e5c68c65a13882ca1a983595bee054bb0f417ec42293e177535f2abf923073825caade7da39db1ebad65 SHA512 15038df07a6a26d2e27fcefb00f460d3dce414f5fa30ff7e40a818d27c25747afd61caa1888f3c7b7a4f4030aa0b6f34187e2b36d7ba549a65ad084378043027
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bf438a7ffa19
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index d70bc62e2cce..26e401fb2e9e 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,12 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gssproxy-2.20170805-r3.ebuild 286 BLAKE2B 15f7642f886571f21c5ceeaea4e0059c6947dbc5252d83bb6aafe592fbc6f3739f51d115536c0d87da674b0bd4c3e3f690296483f9dca7716a504666498f15dd SHA512 364e1c2a368ac2de0c65b385fb3e27cdd34a3ddf3f159cb108b718208a347fd9ceb02183daa812673cc45230ee5ebde7c331375674af547ee6528a31b333f5e2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-gssproxy-2.20180114-r1.ebuild 286 BLAKE2B 5bb8c83d1742e6e5bef300d8a0cce83ed766c06dcd3abc6d3d816cd39ae480875b7b50aff9d177323b7b429e553d555ccb8babf012decae78485c17b36337a57 SHA512 298d589cc6d81e103505328a2198b29e2506cb7d6f641e02a74b99d50fcebf21e32bb1fac7d98af4f1fe821a7141c518004f2e2ca3d2ba23222b7f27611fb025
EBUILD selinux-gssproxy-2.20180114-r2.ebuild 286 BLAKE2B 5bb8c83d1742e6e5bef300d8a0cce83ed766c06dcd3abc6d3d816cd39ae480875b7b50aff9d177323b7b429e553d555ccb8babf012decae78485c17b36337a57 SHA512 298d589cc6d81e103505328a2198b29e2506cb7d6f641e02a74b99d50fcebf21e32bb1fac7d98af4f1fe821a7141c518004f2e2ca3d2ba23222b7f27611fb025
EBUILD selinux-gssproxy-2.20180114-r3.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
+EBUILD selinux-gssproxy-2.20180701-r1.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
MISC metadata.xml 318 BLAKE2B 4ac0a5cf3a0f05bbca7dc3c68462a83d55ecf1b463620627a3ee500eca9d1f9e5319eff72f76bd38a935c8f1379122ddd750c4c9003688afd0bf9d9a4238ea9a SHA512 172d47914a3c198f958c1f796e949cf65948ecea9d3c5e1228ff10070bdbaddab3ec63ce9d1d47ea727f57d7574233f8149beec0f52a4de00f3027f97d9452d8
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
deleted file mode 100644
index 0a3cb07df42d..000000000000
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gssproxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gssproxy"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5ec1fa45c248
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gssproxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gssproxy"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 21216ef5462b..ada1ff607967 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-hddtemp-2.20170805-r2.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
-EBUILD selinux-hddtemp-2.20170805-r3.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-hddtemp-2.20180114-r1.ebuild 284 BLAKE2B ec9771533e66050cbc9c2de0424e748ec988345f3e6bc81bc3bf9b6fbe07a669bc841089e3a81adb341490be3593904268ee57fd8013df7dc3f29dd41466948a SHA512 43cf238ba699b7fed624f9469757872de6329b40c6d8db7bb6aa6b9c0f9a161f411c9972246768509daa2e5d57f74388208cd1c96193f30e4454979b136ae240
EBUILD selinux-hddtemp-2.20180114-r2.ebuild 284 BLAKE2B ec9771533e66050cbc9c2de0424e748ec988345f3e6bc81bc3bf9b6fbe07a669bc841089e3a81adb341490be3593904268ee57fd8013df7dc3f29dd41466948a SHA512 43cf238ba699b7fed624f9469757872de6329b40c6d8db7bb6aa6b9c0f9a161f411c9972246768509daa2e5d57f74388208cd1c96193f30e4454979b136ae240
EBUILD selinux-hddtemp-2.20180114-r3.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
+EBUILD selinux-hddtemp-2.20180701-r1.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
MISC metadata.xml 317 BLAKE2B a8f2c2d734a44304ef1c2f8640e9c12d3901d39fa71a72bdc51861bf595de88f574a450f5cb0bb8e4dc6cccb100b5067aad3c9f9b0f6741dedbe7c78ccde5b9d SHA512 2be1948142bfe89c0091371632d7a8bc662cc2f65e7e07bc2635602decc6bf3557191d3989d285a4428cc05d950a815a1b7a6938d1bfc86594e755a25fc3df71
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9cadc59e8777
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index d0470aa217fe..eb90b67113af 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-howl-2.20170805-r2.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
-EBUILD selinux-howl-2.20170805-r3.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-howl-2.20180114-r1.ebuild 278 BLAKE2B 83d478db36f8618284ec6f2006dd70976d0eb824d10cd104a3475ac20217e1ee75ab663400380fa82c394a66fef48a65b4d80e64fd2f1790fa26a0bc161876ae SHA512 57b9c8edef72d9f932e1982331183101a66757342d7f9a180cc0a754dd0fec25483842122e853dc8a8256e32431c0dbc2287c051b77c146abb7f3d265cd19090
EBUILD selinux-howl-2.20180114-r2.ebuild 278 BLAKE2B 83d478db36f8618284ec6f2006dd70976d0eb824d10cd104a3475ac20217e1ee75ab663400380fa82c394a66fef48a65b4d80e64fd2f1790fa26a0bc161876ae SHA512 57b9c8edef72d9f932e1982331183101a66757342d7f9a180cc0a754dd0fec25483842122e853dc8a8256e32431c0dbc2287c051b77c146abb7f3d265cd19090
EBUILD selinux-howl-2.20180114-r3.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
+EBUILD selinux-howl-2.20180701-r1.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
EBUILD selinux-howl-9999.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
MISC metadata.xml 314 BLAKE2B ab9f8685632c6231f1b32f125e499723048e8edec178166a9caf7c8a6630218af7737802dfbb5c3777d26990bc559da1dee145d4794d9663d4b744405de9a3ee SHA512 f983d404a2995149e5399efa664d1f81398b2fa9bea2e071cb1a8b54e6efd0d43cd42ac4d2bd7ff9d0586158ead91b8bf67169cc7761815073469498396c4da9
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ce74d9396b95
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index fa8f7107195d..ba16f188e00e 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-icecast-2.20170805-r2.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
-EBUILD selinux-icecast-2.20170805-r3.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-icecast-2.20180114-r1.ebuild 284 BLAKE2B 00cc4ff5633578f8342272212592eaf2bf35f9e11d1ae736e9df5b7cc47a501eeb2dd4ab0d33712b3e049d71c8d42c8702a76b4c0d5c552e79344fb6ec22b8a3 SHA512 31f93dafc1617482cc30d9927b17f9532b8121f48e0ccfb55369d8e849e49584779a067fcc3f71b89b7b433f56d6b4ea53c7f56d92db7fe6f825eaa30b4d3b84
EBUILD selinux-icecast-2.20180114-r2.ebuild 284 BLAKE2B 00cc4ff5633578f8342272212592eaf2bf35f9e11d1ae736e9df5b7cc47a501eeb2dd4ab0d33712b3e049d71c8d42c8702a76b4c0d5c552e79344fb6ec22b8a3 SHA512 31f93dafc1617482cc30d9927b17f9532b8121f48e0ccfb55369d8e849e49584779a067fcc3f71b89b7b433f56d6b4ea53c7f56d92db7fe6f825eaa30b4d3b84
EBUILD selinux-icecast-2.20180114-r3.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
+EBUILD selinux-icecast-2.20180701-r1.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
MISC metadata.xml 317 BLAKE2B 5c15c4fe74c3663381d1f85a850ebd86baa744f8649459c741e90fa9126b4b653edea9ea15a07e106dbb9f5d18ef5795a221f4e9eb15708915c651f1b4a72830 SHA512 db55ad061f07883e2a62e74ebeabb5d05c9595fd74b0719068cb54da1ffea47738112c8287242c38b1499a1a9b7bddc1f71edfab4b4a4b1f1262c50791395f21
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..738fc05228ae
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 07c669736b34..0f4d837134cf 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ifplugd-2.20170805-r2.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
-EBUILD selinux-ifplugd-2.20170805-r3.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ifplugd-2.20180114-r1.ebuild 284 BLAKE2B 84169e52841df2ddb979fe8235d398a2fff7f20bcc9b914af366956613f28d2a381d0316434b5575be1b0e837ad636392cec07a96b73e31464c0b5857df55103 SHA512 3e6afcc7dcc14fd0477349a425668b17290c489d23bfae263d3c9d7009ec8bcbd027290152dcbb5d4d7be3645d41c573e216f90a18530828890a776d287d280a
EBUILD selinux-ifplugd-2.20180114-r2.ebuild 284 BLAKE2B 84169e52841df2ddb979fe8235d398a2fff7f20bcc9b914af366956613f28d2a381d0316434b5575be1b0e837ad636392cec07a96b73e31464c0b5857df55103 SHA512 3e6afcc7dcc14fd0477349a425668b17290c489d23bfae263d3c9d7009ec8bcbd027290152dcbb5d4d7be3645d41c573e216f90a18530828890a776d287d280a
EBUILD selinux-ifplugd-2.20180114-r3.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
+EBUILD selinux-ifplugd-2.20180701-r1.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
MISC metadata.xml 317 BLAKE2B 21371e37cc40f9799d708dc4d68da349bab8757b0d733326ce75f2f97833c528417135f784b29e4bb1ceed7d20e27dad7b15f2c4496f8ab812a5c8b083236052 SHA512 8905d0861d320d44fff344d2208982c611ac72402a9355a23a8b2f43fdf4f13aef9f8b504c1bcb12357852ad51f4f74d1a11b3a71e53fb43ac2ac3d57e268f3a
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..41ac6475c514
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index b543e9a456e1..5ca132c8a1af 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-imaze-2.20170805-r2.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
-EBUILD selinux-imaze-2.20170805-r3.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-imaze-2.20180114-r1.ebuild 280 BLAKE2B ea387bfd3ba1e46675eb5e146b28b8356adc6c2b00fc8606e10758b3037f4605f4f77cee269ded467bf85c0d02c389316d7af75ecde94c474eac242ce6295f62 SHA512 354f401b8b62cb6663c8f34422d0376946e8319561eec33c53ca4bc4c216fce435e2ce0da5ad233d6914d6913a3585b86c91d081940367a35e6f029384190d05
EBUILD selinux-imaze-2.20180114-r2.ebuild 280 BLAKE2B ea387bfd3ba1e46675eb5e146b28b8356adc6c2b00fc8606e10758b3037f4605f4f77cee269ded467bf85c0d02c389316d7af75ecde94c474eac242ce6295f62 SHA512 354f401b8b62cb6663c8f34422d0376946e8319561eec33c53ca4bc4c216fce435e2ce0da5ad233d6914d6913a3585b86c91d081940367a35e6f029384190d05
EBUILD selinux-imaze-2.20180114-r3.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
+EBUILD selinux-imaze-2.20180701-r1.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
MISC metadata.xml 315 BLAKE2B d844e1ef27a53d646a98320bdfc18a7ac7e8876a01d70f404546c1a2ef2c5a173e4e636bc234bb262a3dbf729747ca9104444d4ae30e4d9acca632ca56d98090 SHA512 8c12773bd2c0c5009639149ff2c80024af96995b148e4e164ccf7ecc44e12333adeb109b245676703f6ff18f13b0b7caa7907b45fe06f688b7c56b71958696ea
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..934faa978982
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index e537450447b2..cdca7893bbd1 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-inetd-2.20170805-r2.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
-EBUILD selinux-inetd-2.20170805-r3.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-inetd-2.20180114-r1.ebuild 280 BLAKE2B 2a4eb321f08a2d87412610ba8812293e8f7046e98598bf791a6f5b95e77f2f5da39a7e8caaa2b58ff8a908b69b3068e4a25723b2881e97c32b08b47e2565b593 SHA512 3f7fbdb218db805e87f65ee36ac742f48f8017e1a65c2678a7de4b263084a1d3ff7c957188e6fbdc6a1f34364c79a06384842d35faedf56024a1f00fe9c3b189
EBUILD selinux-inetd-2.20180114-r2.ebuild 280 BLAKE2B 2a4eb321f08a2d87412610ba8812293e8f7046e98598bf791a6f5b95e77f2f5da39a7e8caaa2b58ff8a908b69b3068e4a25723b2881e97c32b08b47e2565b593 SHA512 3f7fbdb218db805e87f65ee36ac742f48f8017e1a65c2678a7de4b263084a1d3ff7c957188e6fbdc6a1f34364c79a06384842d35faedf56024a1f00fe9c3b189
EBUILD selinux-inetd-2.20180114-r3.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
+EBUILD selinux-inetd-2.20180701-r1.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
MISC metadata.xml 315 BLAKE2B a9eb3c49b5be3317c1de43cd686a7d9e28c5139ca87a9113f88ff3021fb996165890da6fb7bd0caa41eda11038b47dd534e593218520634f2d2a512ecae7617e SHA512 438620bab81d97f74d43168aac08340ab265551b7865d8ce2613fe7ac0885903abaf0d43be01861fb2736cbe047e56c6ff89a8665aacdd05b48c1df86616a358
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9330c3d1d3ae
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 6f3a8ab670d5..d274d48bad10 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-inn-2.20170805-r2.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
-EBUILD selinux-inn-2.20170805-r3.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-inn-2.20180114-r1.ebuild 276 BLAKE2B 64c57f88ce9b650e58d03d5d87fa0a6a7f837abdf120fd125d2dee85e039cedb27120cdc7dea8b8becd1278a44a5dd0e415550e9f730ceced9c62180ab074978 SHA512 d9084823cfb674736e48ed416eb9ac2605cddd9c8953d8e15bb2fbdbf7447a6b9717c0de54549f1a4dc9d053113db03d4e9153ab4fdfaf309ed0538478841c49
EBUILD selinux-inn-2.20180114-r2.ebuild 276 BLAKE2B 64c57f88ce9b650e58d03d5d87fa0a6a7f837abdf120fd125d2dee85e039cedb27120cdc7dea8b8becd1278a44a5dd0e415550e9f730ceced9c62180ab074978 SHA512 d9084823cfb674736e48ed416eb9ac2605cddd9c8953d8e15bb2fbdbf7447a6b9717c0de54549f1a4dc9d053113db03d4e9153ab4fdfaf309ed0538478841c49
EBUILD selinux-inn-2.20180114-r3.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
+EBUILD selinux-inn-2.20180701-r1.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
EBUILD selinux-inn-9999.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
MISC metadata.xml 313 BLAKE2B bb0ed4879acef51b74bbee0cb44c07dcade072dac9bf86f147f50e0042b3376f3a082515f320ba73aa30146ff961fa2a098c9debd81f248c98453b6857eb18da SHA512 697ce85e544cbd0e530b6aa1408ec7cb391c832327ac4012f0bc7b844af03632c3593550bcbb6fc717821b29b68f42ce48d594274240de164ef490c95ed6b5f6
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2f668dd26f26
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index ed56ed9e55de..e009dbf57dfc 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ipsec-2.20170805-r2.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
-EBUILD selinux-ipsec-2.20170805-r3.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ipsec-2.20180114-r1.ebuild 280 BLAKE2B 00b755f93f4f65344087591efb89019fd89754083d6089de4c4c568dd93bf5630a9a83da601dee73f89a48c5c7dd490ab0f8508cb61ad3cd3cffff7d1c97685f SHA512 db1aeb018b6386cef146cebeae32e75e991b7d9c17b07e71a02defb849f6d106343882a9fa13903d764de01b9e47b34ee8417b3a16f40d0c9501e59c5f9e0dcc
EBUILD selinux-ipsec-2.20180114-r2.ebuild 280 BLAKE2B 00b755f93f4f65344087591efb89019fd89754083d6089de4c4c568dd93bf5630a9a83da601dee73f89a48c5c7dd490ab0f8508cb61ad3cd3cffff7d1c97685f SHA512 db1aeb018b6386cef146cebeae32e75e991b7d9c17b07e71a02defb849f6d106343882a9fa13903d764de01b9e47b34ee8417b3a16f40d0c9501e59c5f9e0dcc
EBUILD selinux-ipsec-2.20180114-r3.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
+EBUILD selinux-ipsec-2.20180701-r1.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
MISC metadata.xml 315 BLAKE2B b8e6cfb46c3e1d84e5f32bc51b17606599cdc025a88dc452bd6c12784845b627819e6c974c710020d41536bd38835f77801a47e0d0a75af26776f112a231139d SHA512 602a740c62ae3a51f2d1d21912b9a1ec5a910a8062813ef0101f4ed0e80c54c78c8595dce19be2cff521a92b251702aa6768c05e4b6fe2301c8cd3e266bd8948
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..afe4efc9a73b
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index c8f3bc4dea9f..d50e58ea09ea 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-irc-2.20170805-r2.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
-EBUILD selinux-irc-2.20170805-r3.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-irc-2.20180114-r1.ebuild 276 BLAKE2B ec1dbc760cabe2147927372c8ed012ce58315fe90dd75853e810fc7df7912f23435b8df68ebd7a7e8474cbb529e142906ef7c12451166a29a697600530ec6f4d SHA512 ed269d2d2f417cac1519c6667ed7808eb3edbbf2fcb8a72b314985474dde79ff00e43c81b25ce5ba4ffd7c7aa77a935b6a698f17d0be210e917906efb7aee2a7
EBUILD selinux-irc-2.20180114-r2.ebuild 276 BLAKE2B ec1dbc760cabe2147927372c8ed012ce58315fe90dd75853e810fc7df7912f23435b8df68ebd7a7e8474cbb529e142906ef7c12451166a29a697600530ec6f4d SHA512 ed269d2d2f417cac1519c6667ed7808eb3edbbf2fcb8a72b314985474dde79ff00e43c81b25ce5ba4ffd7c7aa77a935b6a698f17d0be210e917906efb7aee2a7
EBUILD selinux-irc-2.20180114-r3.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
+EBUILD selinux-irc-2.20180701-r1.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
EBUILD selinux-irc-9999.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
MISC metadata.xml 313 BLAKE2B f75266dc159e6b7855968a1226cd33e813b387b09cfe8f810b7f828fca40fb0f5f5b16100b4225b6f89a45d8a9233834c8daa802e1d9c08e8f0d046cf7d3d51c SHA512 79d10315a82d308f9417e6d0b331363b33a8022f0e5366412c0452f614e98243e946cccc605b55cb71cb7f5361a2aa3ae45fd5cbad9d4664cac406930734ea58
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..248af928b807
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 4c2288555a13..4d53c98b2601 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ircd-2.20170805-r2.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
-EBUILD selinux-ircd-2.20170805-r3.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ircd-2.20180114-r1.ebuild 278 BLAKE2B a3b620a0f8d99c72dc3e258c2b2eea18788ef00712f1e2428f1e9076be3298bd9b380cf5f6355d6505230327574316a1e886233024c404b4b84b7e8f2c4665c5 SHA512 074ff5c9061afe585579f19cf0ceb9f67d1d9abeb10a2f0c781d72ecec71678afd6200b757c1e107185bdf04bc4178d87be45b1891b4ada70b0308dc378b0497
EBUILD selinux-ircd-2.20180114-r2.ebuild 278 BLAKE2B a3b620a0f8d99c72dc3e258c2b2eea18788ef00712f1e2428f1e9076be3298bd9b380cf5f6355d6505230327574316a1e886233024c404b4b84b7e8f2c4665c5 SHA512 074ff5c9061afe585579f19cf0ceb9f67d1d9abeb10a2f0c781d72ecec71678afd6200b757c1e107185bdf04bc4178d87be45b1891b4ada70b0308dc378b0497
EBUILD selinux-ircd-2.20180114-r3.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
+EBUILD selinux-ircd-2.20180701-r1.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
MISC metadata.xml 314 BLAKE2B ad8986a6f937d46dcb66254f589a49979a9bae8a019f0c104c89f20b523416f1204683984038c76be066ab0c80797435a18f74f48356ee4b5520b9573b90e493 SHA512 8832769974dbfe7244583d60b35e9fab3a73eac269a237895979ea704098a00d92089ad4efe9c1a110b71fd2da271518b5f80212815f9b2097f7c6438f607ce6
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1b5dc73ec5b9
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index c3cf0270af67..f49da3659435 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-irqbalance-2.20170805-r2.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
-EBUILD selinux-irqbalance-2.20170805-r3.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-irqbalance-2.20180114-r1.ebuild 290 BLAKE2B 1a3b3b284304b2a3d4791cd49b942837758e6c114c70beb4e1985b97d0a29537f4ef2f8070ac056b8d1b9e189e680cfaaea4fe96b963b4511aef2527a0059ab8 SHA512 78342d57561b61059885ae9cb7311d68295a9022a6c1eddb9164f33cce81e44a47e30637b8748172c027c98257cb8632590ab3f6dac77286003d895b6a1bafe2
EBUILD selinux-irqbalance-2.20180114-r2.ebuild 290 BLAKE2B 1a3b3b284304b2a3d4791cd49b942837758e6c114c70beb4e1985b97d0a29537f4ef2f8070ac056b8d1b9e189e680cfaaea4fe96b963b4511aef2527a0059ab8 SHA512 78342d57561b61059885ae9cb7311d68295a9022a6c1eddb9164f33cce81e44a47e30637b8748172c027c98257cb8632590ab3f6dac77286003d895b6a1bafe2
EBUILD selinux-irqbalance-2.20180114-r3.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
+EBUILD selinux-irqbalance-2.20180701-r1.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
MISC metadata.xml 320 BLAKE2B 5fa14aca6d178a397ce0a1874d8be6f9c104276635636b4c0126bb3ff84a73a0672560ff3e176d54acfde446915dce87fe15fbcc3ecec5622b7e1f939dc43d31 SHA512 e2e7fb33bdd96b5dfa7f0278225c5696da53693800ed86b6ea7e9a7f5685ce6dda87bb3775752068a20f9232fe1638d6b553859f8fa1707b0f36dcc493ef1bc9
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4d7b25864b7e
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index ec97a6953a5f..ebc81a993930 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-jabber-2.20170805-r2.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
-EBUILD selinux-jabber-2.20170805-r3.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-jabber-2.20180114-r1.ebuild 282 BLAKE2B cda9eff6fbac5773386a0534b0035d0bd8ed38a1a55bd8a64d37632fb01cf2ceb443791f628d0b316c571a10d8fdeff329bcf1fdc7550f442f1e2a8f4bbba6e2 SHA512 c2b1c424a1f2fc9878e134bf0150af8c4529f50fa4f6d8874fa3dcbd63e35f433d2193dbe6db7672bfa3f034dd90d6d24e53da064ebff85c15c0c7a33f3ef16b
EBUILD selinux-jabber-2.20180114-r2.ebuild 282 BLAKE2B cda9eff6fbac5773386a0534b0035d0bd8ed38a1a55bd8a64d37632fb01cf2ceb443791f628d0b316c571a10d8fdeff329bcf1fdc7550f442f1e2a8f4bbba6e2 SHA512 c2b1c424a1f2fc9878e134bf0150af8c4529f50fa4f6d8874fa3dcbd63e35f433d2193dbe6db7672bfa3f034dd90d6d24e53da064ebff85c15c0c7a33f3ef16b
EBUILD selinux-jabber-2.20180114-r3.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
+EBUILD selinux-jabber-2.20180701-r1.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
MISC metadata.xml 316 BLAKE2B 263c8405f8376db80cdc680d1452a5a64465a8040fb2ccf2b0a74213173a1858e3aeba5310fbdd2079c2ef7bbf7815da4f14b813cd8d0a5ab0a8639648d4467f SHA512 269cb023c313456e0ff91148007509ef5cdaea6c33ceb42ba3bf57674fc4c709d719824a3e95f3171773c4979d03be50873ac62fdb2f8bea86e5904703dd76bc
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5cda0ea5f16b
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 2ccc8ff71a0f..ab566a2d17ed 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-java-2.20170805-r2.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
-EBUILD selinux-java-2.20170805-r3.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-java-2.20180114-r1.ebuild 282 BLAKE2B 203d52667b2744b47168528eb53a78722294a267775738db026f2993b458657e404ed781c6cb03b9c6a8b6621e6c3c416901f20099d8d232677388f47e6f300e SHA512 62891f2a4e9045a531e1149a9148adc7c798d43915d839a1021fbb99c8bbefe5c0cc9bb0e5554ce773b0cc3d9c13ebc0764b559ee75288d6c4e6076bc1348cb0
EBUILD selinux-java-2.20180114-r2.ebuild 282 BLAKE2B 203d52667b2744b47168528eb53a78722294a267775738db026f2993b458657e404ed781c6cb03b9c6a8b6621e6c3c416901f20099d8d232677388f47e6f300e SHA512 62891f2a4e9045a531e1149a9148adc7c798d43915d839a1021fbb99c8bbefe5c0cc9bb0e5554ce773b0cc3d9c13ebc0764b559ee75288d6c4e6076bc1348cb0
EBUILD selinux-java-2.20180114-r3.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
+EBUILD selinux-java-2.20180701-r1.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
EBUILD selinux-java-9999.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
MISC metadata.xml 314 BLAKE2B 88ef45c4d4dd356bb361916a45ae25046b69e40bd24a963f0460e54cfb0f5e273ec5dc418b208b10d57c5dd0cf0d50984b055a8614677bf5887118274f55250f SHA512 6abe4c867275288d443678ad009b88232db9ae9a9565a0bf4bf5a07dd424d28ee1be71351e74f3aef0c7c4e236125089f10ca13f2799004c6eca3a7081326b57
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d9242ad11ef6
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index d18bbaf26b4d..955382e3f71f 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kdeconnect-2.20170805-r2.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
-EBUILD selinux-kdeconnect-2.20170805-r3.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kdeconnect-2.20180114-r1.ebuild 290 BLAKE2B 522cfeaf30af854f6b620151ddb899d13e1b99c31185f7fbfd6ac44d6ad12fb44d827021e079c17a495c11dd835a50f845980d96712c2b1e32dff5287f0d10ef SHA512 367360ed7ac03c07ac03212fc3ae131af5248fc1207c50e3e5e43c9df9eeaee8edd654b847769c27635574d6af8504c0b6b0f159755fe86c7042ead787a95836
EBUILD selinux-kdeconnect-2.20180114-r2.ebuild 290 BLAKE2B 522cfeaf30af854f6b620151ddb899d13e1b99c31185f7fbfd6ac44d6ad12fb44d827021e079c17a495c11dd835a50f845980d96712c2b1e32dff5287f0d10ef SHA512 367360ed7ac03c07ac03212fc3ae131af5248fc1207c50e3e5e43c9df9eeaee8edd654b847769c27635574d6af8504c0b6b0f159755fe86c7042ead787a95836
EBUILD selinux-kdeconnect-2.20180114-r3.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
+EBUILD selinux-kdeconnect-2.20180701-r1.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
MISC metadata.xml 320 BLAKE2B 43e71bffab415a3c2f7d13cf88852fbb2887efc0c53b8a60df96bed740bdb0fd5b31b59987c96648e43e680de654b94b99f3de77dab601a28aa0d0cc187f04f4 SHA512 ab0e14cd212f45bc18bd3fd8c63b5c1f28b71f9c8ffbbf7c3dc913b1c5dadd8a082d362e0cc9f5b16faf16f7eecff743f45186161cc002f9b4011b39866dc0a3
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d0153053b417
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdeconnect"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdeconnect"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index d83764a4054a..2fafb4af81c1 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kdump-2.20170805-r2.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
-EBUILD selinux-kdump-2.20170805-r3.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kdump-2.20180114-r1.ebuild 280 BLAKE2B 08f383ede40fc74440f7a1a04b37a24876b76edf1187f436dd182bd9768e1b78e5a157df7bc1a2befd5e798d71d066c6fb0f94e5857937f0ea744ed100fd2315 SHA512 99c6812e319001d3dc402548333e4f982a30ede70952e88425b515906013d41e3c827b807791903697fe90b25dab72c1d55a7319d5c8543014deec0b13b6e153
EBUILD selinux-kdump-2.20180114-r2.ebuild 280 BLAKE2B 08f383ede40fc74440f7a1a04b37a24876b76edf1187f436dd182bd9768e1b78e5a157df7bc1a2befd5e798d71d066c6fb0f94e5857937f0ea744ed100fd2315 SHA512 99c6812e319001d3dc402548333e4f982a30ede70952e88425b515906013d41e3c827b807791903697fe90b25dab72c1d55a7319d5c8543014deec0b13b6e153
EBUILD selinux-kdump-2.20180114-r3.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
+EBUILD selinux-kdump-2.20180701-r1.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
MISC metadata.xml 315 BLAKE2B 5a90634892dcd621a33900cf7dee3e544bf0557b468310f08707bf599139660f213ff38182b21c55cf3d02cdb71880f26016529ce770ff3b42fadf60eaa56258 SHA512 9676f97f6e2e5fd7d8578c1c11662630f5ddc156a3adca855ba145e146531ca54a8f969c689e0c5e233531b9b8ca05a94a03802ab8a3cc18015bce1a0d3b3980
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..658c34f327a3
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index c6278bbf1bd4..811639024775 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kerberos-2.20170805-r2.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
-EBUILD selinux-kerberos-2.20170805-r3.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kerberos-2.20180114-r1.ebuild 286 BLAKE2B d65e18d8059502b1dbc10b9d6299cc472a1ffb1d1d9bd4150b68c82b63d2462b3b4ce47bd6d3921ca50a9cf850a16d793045da98adbd637b2b63964f29c0245b SHA512 7cb01ba1430849b65fdbab2c4fc159c22dd8388649d9085dbbd397f18a24972a98700c97b1678249282c8cfbdcb386d97c80bbaadedb2bae4c68735d6e92b005
EBUILD selinux-kerberos-2.20180114-r2.ebuild 286 BLAKE2B d65e18d8059502b1dbc10b9d6299cc472a1ffb1d1d9bd4150b68c82b63d2462b3b4ce47bd6d3921ca50a9cf850a16d793045da98adbd637b2b63964f29c0245b SHA512 7cb01ba1430849b65fdbab2c4fc159c22dd8388649d9085dbbd397f18a24972a98700c97b1678249282c8cfbdcb386d97c80bbaadedb2bae4c68735d6e92b005
EBUILD selinux-kerberos-2.20180114-r3.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
+EBUILD selinux-kerberos-2.20180701-r1.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
MISC metadata.xml 318 BLAKE2B e6059f2ad603ee10e5f075ccf2c32b901923e09e6ae0e64b9605ab411ac21e6b1ec0d1928ae7dfb2564f72fe5031dd86813e20fc417ab37b9bd91333aed1721e SHA512 7c5a7eeb9d6dbfd9ff85af7392e3b522d558726d72dada332dd3df088c5b8bb52cdc9cbd707ba1da49b6a36a0fce9bdbdbd58830bb411d99d0f75fe29adfa27c
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3c70dba4223c
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 0597fae8cee0..7126e66f5a4d 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kerneloops-2.20170805-r2.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
-EBUILD selinux-kerneloops-2.20170805-r3.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kerneloops-2.20180114-r1.ebuild 290 BLAKE2B 4e8b772c2a65060140c319efa05459d1f902a7a6ab1bead2923ec5d34d6bc67aacf0f71b21ac3df5f6b39f24d7fd7079f987f3c151179542c3181ae35e98977c SHA512 705bfcaea97c6f5d93bca5b3c75f73b035ca43d7d470c808676556c33fd1bed5510897d01bd0e310595f88c1c077a1eac0dd93e2d4e9ef4e8655ab237f1a9cbd
EBUILD selinux-kerneloops-2.20180114-r2.ebuild 290 BLAKE2B 4e8b772c2a65060140c319efa05459d1f902a7a6ab1bead2923ec5d34d6bc67aacf0f71b21ac3df5f6b39f24d7fd7079f987f3c151179542c3181ae35e98977c SHA512 705bfcaea97c6f5d93bca5b3c75f73b035ca43d7d470c808676556c33fd1bed5510897d01bd0e310595f88c1c077a1eac0dd93e2d4e9ef4e8655ab237f1a9cbd
EBUILD selinux-kerneloops-2.20180114-r3.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
+EBUILD selinux-kerneloops-2.20180701-r1.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
MISC metadata.xml 320 BLAKE2B b414c390eb4c160312b7c9a4d393bc9f05bc036397ed1b4663aafc2d72418f09fa650e7b88dd40f147d8da88f3e83b9055138a53f92f0d653837d751a9544cd2 SHA512 84353674a6bc581ee9d8e25410b630574201701a8ccf025f6789e488b045fae7ea6662ebd17aa92273d2ea5b61c0c0d7218919449ec60a4f69c88d12fd1e5c69
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ce419430b0ed
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index b938aa2a8462..a43179f32eb4 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kismet-2.20170805-r2.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
-EBUILD selinux-kismet-2.20170805-r3.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kismet-2.20180114-r1.ebuild 282 BLAKE2B ea8a57163fe730c7ee78c202569a2e28a7843e1fab8782e7c47c00f970410dda67a2f1a65eb2f65b4b6ff06b8e88ca1fd3d00c9d90c98a459e24afe26f937aed SHA512 b4716d3dec21a6b3e878095584bb4441cf4d8e989e3d325696275b5fb316808adbb72170b3056cb6e11d30d42a047ad4001d487f07114f89af59327941f2a5b1
EBUILD selinux-kismet-2.20180114-r2.ebuild 282 BLAKE2B ea8a57163fe730c7ee78c202569a2e28a7843e1fab8782e7c47c00f970410dda67a2f1a65eb2f65b4b6ff06b8e88ca1fd3d00c9d90c98a459e24afe26f937aed SHA512 b4716d3dec21a6b3e878095584bb4441cf4d8e989e3d325696275b5fb316808adbb72170b3056cb6e11d30d42a047ad4001d487f07114f89af59327941f2a5b1
EBUILD selinux-kismet-2.20180114-r3.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
+EBUILD selinux-kismet-2.20180701-r1.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
MISC metadata.xml 316 BLAKE2B 7c41f7092fe7ab9ca102e311c97b9f680b91cb29db60863f231f850f6bf47d38f5b15b3f6cd62e8f737b379f5bff9701529eebe078c7d95dcbfa7cb08b3a19d7 SHA512 48f0a31367966ccbb1564017c9329ee4d4990333904312f9b2b59f1b8b213974c3861d59ba49ed2f94f6eea1948556bdfcad0d3308c5ca70341316220ec44fc7
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9de91d19d567
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index beba223fc16d..6bddcddfb283 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ksmtuned-2.20170805-r2.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
-EBUILD selinux-ksmtuned-2.20170805-r3.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ksmtuned-2.20180114-r1.ebuild 286 BLAKE2B d74481fdba74c67e32fc7776e5a2d56afb4622fc7a70844b2080b3940fbbd5489325ab821da7661bd3466bf65aa085b67aa02c40ff9de87af28647e2a2a34997 SHA512 c8d65198f2a05443deef3525532fc1bdc43be02dfe05a1dd260f8413439e1625edd8d5fbbdc5841d58595475beb71494ea79379933a80d62078c109687cd53fe
EBUILD selinux-ksmtuned-2.20180114-r2.ebuild 286 BLAKE2B d74481fdba74c67e32fc7776e5a2d56afb4622fc7a70844b2080b3940fbbd5489325ab821da7661bd3466bf65aa085b67aa02c40ff9de87af28647e2a2a34997 SHA512 c8d65198f2a05443deef3525532fc1bdc43be02dfe05a1dd260f8413439e1625edd8d5fbbdc5841d58595475beb71494ea79379933a80d62078c109687cd53fe
EBUILD selinux-ksmtuned-2.20180114-r3.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
+EBUILD selinux-ksmtuned-2.20180701-r1.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
MISC metadata.xml 318 BLAKE2B 0e008ad609d3c3233bbb182c1fc0f9c68644dc549ea061c606b4091d351da404d79839b7fc6cee020fb1fe3ed5220415ded3b80e0df22baffffd5498af3a613e SHA512 2c5d3c14cd6464c30370575797fa54c5b897dfa28b05198324d5b79eb65d9b75a23282469ebc112137274a5ffcd5340e7a688cd9cf1b1f9195d87d6e4e12ae9c
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..acb143010d43
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 1cbae1848a9b..bd3e0f981c3b 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kudzu-2.20170805-r2.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
-EBUILD selinux-kudzu-2.20170805-r3.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-kudzu-2.20180114-r1.ebuild 280 BLAKE2B 1c9fc8582ce2058bac91c4bb8bd965aee867c6f4a3bdff07f781b7f636e48718935dfaf9fc97a6cee6cd8596a016c8c6496a94c64f60b46a373c521c483ea540 SHA512 1af4c756ca0377df000594d7738eec35dfd87b3db7dfbb6da8ed5cc71493666a6a8e907d0891bca3188d0e72961c7fd827a6c204c0454258f76cced84f1c8f20
EBUILD selinux-kudzu-2.20180114-r2.ebuild 280 BLAKE2B 1c9fc8582ce2058bac91c4bb8bd965aee867c6f4a3bdff07f781b7f636e48718935dfaf9fc97a6cee6cd8596a016c8c6496a94c64f60b46a373c521c483ea540 SHA512 1af4c756ca0377df000594d7738eec35dfd87b3db7dfbb6da8ed5cc71493666a6a8e907d0891bca3188d0e72961c7fd827a6c204c0454258f76cced84f1c8f20
EBUILD selinux-kudzu-2.20180114-r3.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
+EBUILD selinux-kudzu-2.20180701-r1.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
MISC metadata.xml 315 BLAKE2B 5266f866f1e292ed61b8e9e3c6b1b18c16054f7bb54919adec9b4f38613b75e0bbe2fac08f1632403bdf00a55c370e91cef0a5e4b87b6d00485784e433fd6a21 SHA512 bd0badbc4aa7c515fd361c07c690377e11b17befbc0062be81ea8208ae445ca7f716f2613227e9b16426d12ef6714cf26803dad9d9b524811c8425bfcaa10cc5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..45827dff4600
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 6c41172783be..4f235485b252 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ldap-2.20170805-r2.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
-EBUILD selinux-ldap-2.20170805-r3.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ldap-2.20180114-r1.ebuild 278 BLAKE2B 59ab9bb8a94d9eb852c9318d71c09d87882217cdd77f12b52f8ea386b6df317c2e15e7d8e94ecf79341b1d4d727c8b759336087dafe48e9b176b0d2bde9e4b8b SHA512 d3f54fc3d7be1632aed0e22ed51d49b3e4e8b9d6384067f051e4bf4aed73597bfbad529fe0e7d8537e7712c7ca329e09c01a1f86f609d8d0e568ad6bcb49ea43
EBUILD selinux-ldap-2.20180114-r2.ebuild 278 BLAKE2B 59ab9bb8a94d9eb852c9318d71c09d87882217cdd77f12b52f8ea386b6df317c2e15e7d8e94ecf79341b1d4d727c8b759336087dafe48e9b176b0d2bde9e4b8b SHA512 d3f54fc3d7be1632aed0e22ed51d49b3e4e8b9d6384067f051e4bf4aed73597bfbad529fe0e7d8537e7712c7ca329e09c01a1f86f609d8d0e568ad6bcb49ea43
EBUILD selinux-ldap-2.20180114-r3.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
+EBUILD selinux-ldap-2.20180701-r1.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
MISC metadata.xml 318 BLAKE2B fb1d3d5b87f8aac5d5d49e186c63bb171983f260a97a621b88c4047f1ea79a463ca3b88a047a5d1e9932a03fb6fa569429ba86cb830e782f8d383a9e80344f37 SHA512 636c91232655cac886c240aa32b8280ea47601e5c55eeb7d7a202caad891e0d149e895406b414302d733868182896f9a7ff68a09a2a406689de7b8ad018771d0
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..df0d6e69d5b3
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index bab2711153cd..d57fe6d87336 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-links-2.20170805-r2.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
-EBUILD selinux-links-2.20170805-r3.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-links-2.20180114-r1.ebuild 280 BLAKE2B 1694b38695ac8f4f103b99e3f011a5ba9c77a5db354648929cae1d30a9b052e63055588f6e3963bed658a4e805f20c9d0020611c804effcf9f2c5790bdb42c48 SHA512 6aff064d0f303f4dc7d4754f084ccacb80e5d853499f76a0765566b047bc9f5f4eb34a3e2f4316dbdc8bc302d94abe0bac83958519d56df762bf1f4283c65c40
EBUILD selinux-links-2.20180114-r2.ebuild 280 BLAKE2B 1694b38695ac8f4f103b99e3f011a5ba9c77a5db354648929cae1d30a9b052e63055588f6e3963bed658a4e805f20c9d0020611c804effcf9f2c5790bdb42c48 SHA512 6aff064d0f303f4dc7d4754f084ccacb80e5d853499f76a0765566b047bc9f5f4eb34a3e2f4316dbdc8bc302d94abe0bac83958519d56df762bf1f4283c65c40
EBUILD selinux-links-2.20180114-r3.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
+EBUILD selinux-links-2.20180701-r1.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
EBUILD selinux-links-9999.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
MISC metadata.xml 315 BLAKE2B b5fcf7545c331d474867d047a6293eb1b4316723c51728ee5e392a817a0c2f52313d062ed0b53973875b1fe84b4991cf2f4ef9f49a8980ba36c196a1938384bf SHA512 7424e06fb28587f673f2e510b5b15f3d88bcfe6502870fb295219069950c4496254f40d8124f4e49029ea3a52c7864ec3c8623de21c6e845940f22cdf5f71e8a
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..12a9b9d2e1a6
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index cbfd14790afe..569a2fdb00df 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lircd-2.20170805-r2.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
-EBUILD selinux-lircd-2.20170805-r3.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-lircd-2.20180114-r1.ebuild 280 BLAKE2B 0ec17efa4d31eafec47df1a76e0921737bc066834faf2091d9807cc88c44b7f38505f08fa12f1977b280270ca1fd726a38cee90b8a9c3b52c29bcce5d7fc650c SHA512 ed93f261b092600e6e78bd684fc5d67d7494528e282119b17f111b1c4f20b28b76e728ca647573f6b753b4ac961dc4c4800c9d5a24bc87735c40509fd5e19d10
EBUILD selinux-lircd-2.20180114-r2.ebuild 280 BLAKE2B 0ec17efa4d31eafec47df1a76e0921737bc066834faf2091d9807cc88c44b7f38505f08fa12f1977b280270ca1fd726a38cee90b8a9c3b52c29bcce5d7fc650c SHA512 ed93f261b092600e6e78bd684fc5d67d7494528e282119b17f111b1c4f20b28b76e728ca647573f6b753b4ac961dc4c4800c9d5a24bc87735c40509fd5e19d10
EBUILD selinux-lircd-2.20180114-r3.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
+EBUILD selinux-lircd-2.20180701-r1.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
MISC metadata.xml 315 BLAKE2B c7de893548597a8afca883e27ef053856c01df653834bb48b428c970e90e6d0f62454ca7b06763228164046ff198c7520827d9b8c77fbe5015318307c082a790 SHA512 9d04fdc81f5f216b29dd4b7c1a1a88f0b112bb1eb713b75b67b33db0ebfbc82c71572515347febcb2c71bf843e8422100c5f1da33b836b4612900231459719e7
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b4d38f9204f1
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index a1ee05151087..ad5683c6ba25 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-loadkeys-2.20170805-r2.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
-EBUILD selinux-loadkeys-2.20170805-r3.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-loadkeys-2.20180114-r1.ebuild 286 BLAKE2B f36b5a0536d3100922525b6e24c92fd7d0c311798ac27011b8ba55f477510ffa669dc737ab79a664a4db433fa7404fd8f07f362de4c7eb430c5da116b7ffb079 SHA512 20e1534d13ef86595a6ffc0d8889c78d06576a553472ccb89040f3203317a2647fcd88539defb9c770f472fcabb37676df602e5fe82b1340c3dc7f07ae102cad
EBUILD selinux-loadkeys-2.20180114-r2.ebuild 286 BLAKE2B f36b5a0536d3100922525b6e24c92fd7d0c311798ac27011b8ba55f477510ffa669dc737ab79a664a4db433fa7404fd8f07f362de4c7eb430c5da116b7ffb079 SHA512 20e1534d13ef86595a6ffc0d8889c78d06576a553472ccb89040f3203317a2647fcd88539defb9c770f472fcabb37676df602e5fe82b1340c3dc7f07ae102cad
EBUILD selinux-loadkeys-2.20180114-r3.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
+EBUILD selinux-loadkeys-2.20180701-r1.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
MISC metadata.xml 318 BLAKE2B 18f6edce47c51b76593e30d7aa65c9fb96b9437f4bfb3c42a63209f0ead735ce8e3376d16c600b21ced48514eb7b98e1c0d676f60971502078901d80cb6bd08f SHA512 439186e025dfd23a3d5d0906647428b694742a73493a57ec1d4b63e4c4f81e8cf0329336afb890f3089051a791296765ad9916af15bbea20215bb6698ea22f4d
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f47cbc382bd5
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index c02e4f7f5e6c..ac2ed760e8e1 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lockdev-2.20170805-r2.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
-EBUILD selinux-lockdev-2.20170805-r3.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-lockdev-2.20180114-r1.ebuild 284 BLAKE2B 6509d66dd88f5b00dc2b5ed3a04fb08e1da9d6e6d4df604545f8cd3ea17c676c9f7ef1a4411cab73fe09761d50a88f4e60a7ea2477f4656f26032fc56b607399 SHA512 8fa66f28df93482e6259a6d05b2865c24b27beebbab37bbd25b33ff9b54eb7586871ecefb297e1072aab0ad5ee0385499e2ff9e077be3901b623375956e9d8a9
EBUILD selinux-lockdev-2.20180114-r2.ebuild 284 BLAKE2B 6509d66dd88f5b00dc2b5ed3a04fb08e1da9d6e6d4df604545f8cd3ea17c676c9f7ef1a4411cab73fe09761d50a88f4e60a7ea2477f4656f26032fc56b607399 SHA512 8fa66f28df93482e6259a6d05b2865c24b27beebbab37bbd25b33ff9b54eb7586871ecefb297e1072aab0ad5ee0385499e2ff9e077be3901b623375956e9d8a9
EBUILD selinux-lockdev-2.20180114-r3.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
+EBUILD selinux-lockdev-2.20180701-r1.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
MISC metadata.xml 317 BLAKE2B 08130a25336c5ec4393ead62f4e28f20101014d346088fcdfb454a12c510e5c86140990efc8761c92833558f9bed3ee4b13a8be2345ffb6fe65fc0387dab481a SHA512 03fda7bf63650835f954517ae6277944215299e0d44567b59c7235a5790ff74391e021b86954e77f9af6fe3edf9552bf553b75e34b772c93d75f1f3a52d26d2d
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..09c1bb019c76
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index e65d1dc0e1f6..4307a66f1647 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logrotate-2.20170805-r2.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
-EBUILD selinux-logrotate-2.20170805-r3.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-logrotate-2.20180114-r1.ebuild 288 BLAKE2B c2c022b7e3a0c0a00f5f1a0a9ebf337bb06532f949415e840afa4689b01f0c368a704a3512efcd216a7dfaf8b93f1beab9e9c2d9073ac1688b7f102b0d947199 SHA512 c54c6e2335362651a807de5d7616170f584b80372d9336780c8016d656df5918096542eb362887379845ba5005d579493fbd7dc755a2e2c03eb70b77db7813e7
EBUILD selinux-logrotate-2.20180114-r2.ebuild 288 BLAKE2B c2c022b7e3a0c0a00f5f1a0a9ebf337bb06532f949415e840afa4689b01f0c368a704a3512efcd216a7dfaf8b93f1beab9e9c2d9073ac1688b7f102b0d947199 SHA512 c54c6e2335362651a807de5d7616170f584b80372d9336780c8016d656df5918096542eb362887379845ba5005d579493fbd7dc755a2e2c03eb70b77db7813e7
EBUILD selinux-logrotate-2.20180114-r3.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
+EBUILD selinux-logrotate-2.20180701-r1.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
MISC metadata.xml 319 BLAKE2B b23741f933d94eb0e498321a6c389a74c95a0aa5c7a2e3ebd05f5835e1b9f77b3946f0cae556d310ed5f1c86d66158b498f57bd4cda3aad105de606fd4d923b5 SHA512 cb02bc8a888c83776ca20c832c91c72ad8c72fae6e498d75442c516e71fd3a8c1620b885974e8d3a34815cb624bef74f357d90593d4d4dfc0a35113401e28048
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..844b28f1c301
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index c24fa962b7c8..c343feb55c1b 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logsentry-2.20170805-r2.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
-EBUILD selinux-logsentry-2.20170805-r3.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-logsentry-2.20180114-r1.ebuild 288 BLAKE2B 580845bed16396e6757c4e05a57830314391b30eb92129c67c9989c627371e3d752bd538f10215927007d2b0fff0b24596501fc116f2c1ee236470428c1c58b8 SHA512 d5d176c92462d00e5ea994687aa10b1c06f879b8548b8acb4ae4be8d0276f15f0c332f35001866f31ec9cdefa337aff989245b11f376071d0ec1b487240a48be
EBUILD selinux-logsentry-2.20180114-r2.ebuild 288 BLAKE2B 580845bed16396e6757c4e05a57830314391b30eb92129c67c9989c627371e3d752bd538f10215927007d2b0fff0b24596501fc116f2c1ee236470428c1c58b8 SHA512 d5d176c92462d00e5ea994687aa10b1c06f879b8548b8acb4ae4be8d0276f15f0c332f35001866f31ec9cdefa337aff989245b11f376071d0ec1b487240a48be
EBUILD selinux-logsentry-2.20180114-r3.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
+EBUILD selinux-logsentry-2.20180701-r1.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
MISC metadata.xml 319 BLAKE2B 56ac266d2b53e0d67f40dbf9dc8cc67131ef2df1850f1101a531ff8e5bf8099212cb024811b87c2ac726f9118350739f9cf139804c7e30d4e80923796362b87f SHA512 8f566c30ab3450fd5f24a28bff2f948e13efb047005069b4954266a6442182332f74294edf4964064ed41ce973d58b63f6c0216c57380b47853321a2b797e1a2
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b4593b5031c6
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 5c5af3146c44..67e590e588b9 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logwatch-2.20170805-r2.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
-EBUILD selinux-logwatch-2.20170805-r3.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-logwatch-2.20180114-r1.ebuild 286 BLAKE2B 1affb24e23c79d10433d7a3b475b9482d0fb99d8c31ba4ce8f7223e46bfe32b121977767837db1539e3013d941b06951a9d42442baea29e7c397a19ff858b35d SHA512 3d011e2a73dd7af367bd274fe54ff2ef0704789d9cb8cb393afc3b20d7564b36d390354c7cc38e14a37bdb8cff07c6c7b55476adfa5ace64c7bebe9d6879c657
EBUILD selinux-logwatch-2.20180114-r2.ebuild 286 BLAKE2B 1affb24e23c79d10433d7a3b475b9482d0fb99d8c31ba4ce8f7223e46bfe32b121977767837db1539e3013d941b06951a9d42442baea29e7c397a19ff858b35d SHA512 3d011e2a73dd7af367bd274fe54ff2ef0704789d9cb8cb393afc3b20d7564b36d390354c7cc38e14a37bdb8cff07c6c7b55476adfa5ace64c7bebe9d6879c657
EBUILD selinux-logwatch-2.20180114-r3.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
+EBUILD selinux-logwatch-2.20180701-r1.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
MISC metadata.xml 318 BLAKE2B 376d0452a036c9a51c1aa405e531f58d00e19802c57a8ff64c5548a96b583220dfaab02b7d89bb9d686109cf0bbebfbe7a0a3c906dedfd4e8c3a8fec170ec511 SHA512 4a7407a0137f66d16b507fc695b45b9e21f4ebfab64d4cb0a755a5c961e1cb2deb84807209b2039f1de6867319091236b4eaa37647c8107db2f9e04caf6383bd
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5e3afa99aab0
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index adb065653e8e..7e189978ea19 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lpd-2.20170805-r2.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
-EBUILD selinux-lpd-2.20170805-r3.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-lpd-2.20180114-r1.ebuild 276 BLAKE2B 6bb1cee38b563650deac14c6cebeb1ebffdaba5e1cff151d6a4679ac5d13ad46dd83e156952ade05600b599bea9375dd0c169cb1916c1a361ffe447ed6ae963e SHA512 9d423e65370573d452177b332f33a0e92df99116e1bcf230bb41ab0fb2549e7ca06b300ffd5e018b89cd31bfd888eacdc67468117f6b3bca99ad55ee58653c04
EBUILD selinux-lpd-2.20180114-r2.ebuild 276 BLAKE2B 6bb1cee38b563650deac14c6cebeb1ebffdaba5e1cff151d6a4679ac5d13ad46dd83e156952ade05600b599bea9375dd0c169cb1916c1a361ffe447ed6ae963e SHA512 9d423e65370573d452177b332f33a0e92df99116e1bcf230bb41ab0fb2549e7ca06b300ffd5e018b89cd31bfd888eacdc67468117f6b3bca99ad55ee58653c04
EBUILD selinux-lpd-2.20180114-r3.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
+EBUILD selinux-lpd-2.20180701-r1.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
MISC metadata.xml 313 BLAKE2B 296a070541acd47ca37a948cd1df1ec41bbdcb4c3f254f1af346d434a48c68a4cb9d607ef7b939b544b319f28166e26e6052abe3d1610fe35ec504b5e5d19ba1 SHA512 03d93808ba7e8db5cc04b91fc47ec9975edc36e1586851e16bde078f0d37c7560a4c33ee00c865332ffca409c8cb07f9a9d3427e160528c111e64f51ad46ff77
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c0511bb2d938
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 3af6f8d995e4..9c1ed6c26ae5 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mailman-2.20170805-r2.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
-EBUILD selinux-mailman-2.20170805-r3.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mailman-2.20180114-r1.ebuild 284 BLAKE2B 61251a5c7148f50ff283ffe07157eb0dbff38ee17022f8564355ae968153b0f89ef287588258aeb5b1bf2fd589ed993fe466c5a0f43920e16a1cdbc1b731fb6f SHA512 8b0361b09fb8c9aa7d0bb9af6f6f22aaef5a4c750f5c80acf62063cc384c749031456a79fcc205642738f9c238c90b492d67ebeb4820809fcd13a1f60b6d799e
EBUILD selinux-mailman-2.20180114-r2.ebuild 284 BLAKE2B 61251a5c7148f50ff283ffe07157eb0dbff38ee17022f8564355ae968153b0f89ef287588258aeb5b1bf2fd589ed993fe466c5a0f43920e16a1cdbc1b731fb6f SHA512 8b0361b09fb8c9aa7d0bb9af6f6f22aaef5a4c750f5c80acf62063cc384c749031456a79fcc205642738f9c238c90b492d67ebeb4820809fcd13a1f60b6d799e
EBUILD selinux-mailman-2.20180114-r3.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
+EBUILD selinux-mailman-2.20180701-r1.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
MISC metadata.xml 317 BLAKE2B 5ade8770d43e7f5003060d64c8716fecce914f0123e695a57c83afed3099b491f4161605ae6d4dcc0a22a9317726121eac9a67b50ebfa11bba5654c3ea4c966f SHA512 2c542b0d9cf5698b68e2fb6052480e3e3e0c28f2b06cca88016cb67cc8930ca81bf4c8958124bc447571a8527ece7834e47d7f8f8f1e49a52d308b04e9378b09
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..984440327ed0
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 300ec4f73664..ac7fb7737113 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-makewhatis-2.20170805-r2.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
-EBUILD selinux-makewhatis-2.20170805-r3.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-makewhatis-2.20180114-r1.ebuild 290 BLAKE2B ad579193ba62f00ecb9e678ac5a959c763adaa3bb0806654b2d3976cfc1d501191a89d02c42ca516db337a2a01bcf7d00ff1a2b58023e865b556b33928429ff8 SHA512 7c4a73b3f722edb2e81b134b6311a352e0dc8b9fc4f41aabda8d339094e6d22c37e7c579aa9512242312173aec12b262e1503fffc8ad1511b3cb3aa23b990957
EBUILD selinux-makewhatis-2.20180114-r2.ebuild 290 BLAKE2B ad579193ba62f00ecb9e678ac5a959c763adaa3bb0806654b2d3976cfc1d501191a89d02c42ca516db337a2a01bcf7d00ff1a2b58023e865b556b33928429ff8 SHA512 7c4a73b3f722edb2e81b134b6311a352e0dc8b9fc4f41aabda8d339094e6d22c37e7c579aa9512242312173aec12b262e1503fffc8ad1511b3cb3aa23b990957
EBUILD selinux-makewhatis-2.20180114-r3.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
+EBUILD selinux-makewhatis-2.20180701-r1.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
MISC metadata.xml 320 BLAKE2B a265a990113bf8db09888651333afc37c1211d09dbd681c28df733462fe35caa192770a298c5595e11abb4ef907756c4506451f67be96d8932fda325b1175e5f SHA512 bc95b01949705d19d1f46eb6d0281381fec137ca312fa6d1ee1ecdbd7cd4b79ec2cefa93032f8ac4e33039b299455f0dc0806b06754066f5134dd0d025beb417
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cc05d1066e42
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index c94d4664210a..0893b419a78a 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mandb-2.20170805-r2.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
-EBUILD selinux-mandb-2.20170805-r3.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mandb-2.20180114-r1.ebuild 280 BLAKE2B 76f427ba513dda98294b86b455f67aec0b5351b67f64699b10899cf6999fb1f2c83c559cf15710d532e99fe99d0788d0b94af80e480181a95e09b04a6d7e98bc SHA512 8ee309232d4acae6fbd50f4f0f7a1371da4704a5660e03652f80653862c263aa1c3188f081d53b4504e182f2436169a372d69dfc139e6b9be4bc8e51a99c495c
EBUILD selinux-mandb-2.20180114-r2.ebuild 280 BLAKE2B 76f427ba513dda98294b86b455f67aec0b5351b67f64699b10899cf6999fb1f2c83c559cf15710d532e99fe99d0788d0b94af80e480181a95e09b04a6d7e98bc SHA512 8ee309232d4acae6fbd50f4f0f7a1371da4704a5660e03652f80653862c263aa1c3188f081d53b4504e182f2436169a372d69dfc139e6b9be4bc8e51a99c495c
EBUILD selinux-mandb-2.20180114-r3.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
+EBUILD selinux-mandb-2.20180701-r1.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
MISC metadata.xml 315 BLAKE2B 95d3f83b404b3156ccaab92641107d67fd67c9b8d953695d57e531ef27e9a842dc89147e671a3cd25f9e95cbb8bf4826bd47b655714a793b5991c8d670e643d3 SHA512 d7b487c06c8e54342d58e1905e552b7879b76963c9dfa6ff0203e1c29f2268604a9aef7f9d02992fda0f61b8315afab6709cd2708c99f4c00ce1ce3971bb536c
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c8db292f4e56
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 83f5f34f3a19..954f78c6128b 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mcelog-2.20170805-r2.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
-EBUILD selinux-mcelog-2.20170805-r3.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mcelog-2.20180114-r1.ebuild 282 BLAKE2B 2b325e7a12ab360373abeeb2233cd024b1da57556951a35a6f49054bd787e2d878ee5b2e4d5f4cb124bb629c44094f8e076b80aedbdcd42d0cd1a78b7ad338e5 SHA512 1f04e00039e026d198eb39514f86c3046c3192bc7945d62bc8d7304a330f274d859b4940083c603cd7bad1ebcb692904bde0b9313b58e7aeafcd77b389b3817e
EBUILD selinux-mcelog-2.20180114-r2.ebuild 282 BLAKE2B 2b325e7a12ab360373abeeb2233cd024b1da57556951a35a6f49054bd787e2d878ee5b2e4d5f4cb124bb629c44094f8e076b80aedbdcd42d0cd1a78b7ad338e5 SHA512 1f04e00039e026d198eb39514f86c3046c3192bc7945d62bc8d7304a330f274d859b4940083c603cd7bad1ebcb692904bde0b9313b58e7aeafcd77b389b3817e
EBUILD selinux-mcelog-2.20180114-r3.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
+EBUILD selinux-mcelog-2.20180701-r1.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
MISC metadata.xml 316 BLAKE2B be4ad3832b18bd9e26aa46ccf572100dc64879ad860c75e6f6135a928f9ceaca16d8aae6f04bf7ea5ee26cb0008ff927b330e3d8c6f484e9cf4ccc879545de20 SHA512 8d61276e7343ddf65a6874ea736d342da652068bd08a0806888afb2adc9245490f4e1cff4f63788752f18ccc2e1afe3f4aad0db3932d3af76fe1e12f0ec48b35
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8ad129985e68
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index e71d802ac11f..7f2902d7f3fe 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-memcached-2.20170805-r2.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
-EBUILD selinux-memcached-2.20170805-r3.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-memcached-2.20180114-r1.ebuild 288 BLAKE2B c3318a48abd28b8d803f58f31a022d0efa0d5e30b0c27bf0405921ba7c3620f721ad8bd7d73a5f83534fb066e733b4193d57842c3c1529ba6744065026f055d7 SHA512 6b45b9629aaa229f4869352c08076bd0b74e05b6caa0362d628e9f1a7b9d8e0b5ffbd8a3e3d9d1234bd5614cbd2fb4886f57c551d3c3fc0fdd592aa6e2b9feb1
EBUILD selinux-memcached-2.20180114-r2.ebuild 288 BLAKE2B c3318a48abd28b8d803f58f31a022d0efa0d5e30b0c27bf0405921ba7c3620f721ad8bd7d73a5f83534fb066e733b4193d57842c3c1529ba6744065026f055d7 SHA512 6b45b9629aaa229f4869352c08076bd0b74e05b6caa0362d628e9f1a7b9d8e0b5ffbd8a3e3d9d1234bd5614cbd2fb4886f57c551d3c3fc0fdd592aa6e2b9feb1
EBUILD selinux-memcached-2.20180114-r3.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
+EBUILD selinux-memcached-2.20180701-r1.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
MISC metadata.xml 319 BLAKE2B c34d581f6b79142497f663b8b9023a750f845e460d724694efd5c495c27e3c01b2df9b3be085260ab6f3529b42bd4a8343e39a13ead394a46222dca4cf40ff4e SHA512 7a186901e5cade308e538d8f4fbd4afa50af93c4d046978a385ca0c83f3e481da51c70586b8d803f690030d8ca6b9e6c9b73436c5eee63237de86c6c3edf78b0
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a835ef04fc2d
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 12a237dd6875..32dd167db0ed 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-milter-2.20170805-r2.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
-EBUILD selinux-milter-2.20170805-r3.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-milter-2.20180114-r1.ebuild 282 BLAKE2B d55903d85b334715243a7af90edb560fd0606085fcdcdd6f0d76fc084f42e849f91e3d309c73daf4b4ca667f571295c080ecf1d2825972c9052a4dc1b3ba8666 SHA512 123204b48a3ac9a122007fb55ee8853e772e4c68c5f9cc1e7101984bdd74baabc24420b8a3d7bd468314e4b3f414e94211f74240c377902eca183766e6bc9e5f
EBUILD selinux-milter-2.20180114-r2.ebuild 282 BLAKE2B d55903d85b334715243a7af90edb560fd0606085fcdcdd6f0d76fc084f42e849f91e3d309c73daf4b4ca667f571295c080ecf1d2825972c9052a4dc1b3ba8666 SHA512 123204b48a3ac9a122007fb55ee8853e772e4c68c5f9cc1e7101984bdd74baabc24420b8a3d7bd468314e4b3f414e94211f74240c377902eca183766e6bc9e5f
EBUILD selinux-milter-2.20180114-r3.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
+EBUILD selinux-milter-2.20180701-r1.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
MISC metadata.xml 316 BLAKE2B d0482a4d41556c4c8177df2842603bb3fc7f296f5bef7b721de2e3e12b1e9286953614bfa6e18e9caaa00ddf15e85c1b7e4be7f567c6417e8c70f663062836f8 SHA512 d3f36e28dd8e18aec87946218c34d88ed23720dab347f459ed95fa746b205432509c2e2c45497945d8d7e8683bee0d0b3bbfefe2d7e2ff6220a41815a2381e8e
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..415133d64542
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 40bdc820c20b..c8a45a8cbc7e 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-modemmanager-2.20170805-r2.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
-EBUILD selinux-modemmanager-2.20170805-r3.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-modemmanager-2.20180114-r1.ebuild 386 BLAKE2B 2b97e0c24770ba95db3bd2568348289a6f021855c1aa05b93eaa925a4ac155d2089b0d341ca5c9b9408616782d33d8813933efa120589392555e359a985ade75 SHA512 49a5ac4ce984fb3d966e08471bb29dd728d1168e1765995092e8f5a0f2b37420242ccd6282dc98bd028922fbfab9df82ade9922a560d9970c046f776d4ffcb19
EBUILD selinux-modemmanager-2.20180114-r2.ebuild 386 BLAKE2B 2b97e0c24770ba95db3bd2568348289a6f021855c1aa05b93eaa925a4ac155d2089b0d341ca5c9b9408616782d33d8813933efa120589392555e359a985ade75 SHA512 49a5ac4ce984fb3d966e08471bb29dd728d1168e1765995092e8f5a0f2b37420242ccd6282dc98bd028922fbfab9df82ade9922a560d9970c046f776d4ffcb19
EBUILD selinux-modemmanager-2.20180114-r3.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
+EBUILD selinux-modemmanager-2.20180701-r1.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
MISC metadata.xml 322 BLAKE2B 8aec0e42986a81957e9e2bae812e952567b59c3c041922f2ea8222fc1acf4b41608f30d0f03d9671e1bc5a3fc7247796ca38e9c47fa9701fca6ec3a7e194f93c SHA512 830ca621d92823ba149cdec9e44812c2f84ec451de1616c7147cd8640d4620ba9bc91dc95584ec081bb9b31de180f4b568d8cb8988077442c98259a2e9bbd399
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bcd8127f743d
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 673813f9b369..02f5191caa35 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mono-2.20170805-r2.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
-EBUILD selinux-mono-2.20170805-r3.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mono-2.20180114-r1.ebuild 278 BLAKE2B 2b12ad2922c5eb0182ceebf51485b05d2927c32924c914de722f64b1865b1895536aa60ccc603cb82667c1aa1541c9f88da8fa2e6c62ef364c4dadc2278fa639 SHA512 fc99b59307b1ca5b8fa2f9d83fb07c7d4de412250da671968dade9241b1754570b22b33858684e0ef5a45a0bc4efc7f36da1ff8e9885e1515820199ef2dc4ec1
EBUILD selinux-mono-2.20180114-r2.ebuild 278 BLAKE2B 2b12ad2922c5eb0182ceebf51485b05d2927c32924c914de722f64b1865b1895536aa60ccc603cb82667c1aa1541c9f88da8fa2e6c62ef364c4dadc2278fa639 SHA512 fc99b59307b1ca5b8fa2f9d83fb07c7d4de412250da671968dade9241b1754570b22b33858684e0ef5a45a0bc4efc7f36da1ff8e9885e1515820199ef2dc4ec1
EBUILD selinux-mono-2.20180114-r3.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
+EBUILD selinux-mono-2.20180701-r1.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
MISC metadata.xml 314 BLAKE2B 57962d2d2ce159f638a1c086cbf3b5ffce2cdce728ea5cd7b8850431f728120a0b2fa04e68e0cf32fc27e301fea58be5b04dc0778757afb8d5d82a09efa10bcd SHA512 8c8beb605d3c5f0bc763dca943cc89871bd50eb086d2c18dac03402a13a0dd584073b8c2f4dbfa0bdeda14e4b795395a0806f3d622cce4108593860ce26d08a7
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1f2dc9e10a6b
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 27bad195cc76..0215f45002cc 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mozilla-2.20170805-r2.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
-EBUILD selinux-mozilla-2.20170805-r3.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mozilla-2.20180114-r1.ebuild 386 BLAKE2B ed99526b9913e0cf44c4760accc90594cc44673cc47a7d9ee7a9c4b854ae8660aef8b7280a5f0649619b30e0d0603e45ef47cc7772fd1efd9bdcf7a3e1a35057 SHA512 70d2e826e60878f17c78a3c23c9599e60c8cad6898833d79dc4b11cd98adc1779ed211e81485841873a2a8c2f0afd6b7f44385a1614aa6963111bfc3ffdd2c04
EBUILD selinux-mozilla-2.20180114-r2.ebuild 386 BLAKE2B ed99526b9913e0cf44c4760accc90594cc44673cc47a7d9ee7a9c4b854ae8660aef8b7280a5f0649619b30e0d0603e45ef47cc7772fd1efd9bdcf7a3e1a35057 SHA512 70d2e826e60878f17c78a3c23c9599e60c8cad6898833d79dc4b11cd98adc1779ed211e81485841873a2a8c2f0afd6b7f44385a1614aa6963111bfc3ffdd2c04
EBUILD selinux-mozilla-2.20180114-r3.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
+EBUILD selinux-mozilla-2.20180701-r1.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
MISC metadata.xml 317 BLAKE2B ad2ade96838b5a417ba33a4bd8bc29759e7722ccc57be5c2a8f1c4a5ecf164ca9cf5f5bd9e45176dfd60e83e37269a2ea3aedda6fd4a96769c02c87d7fdceb85 SHA512 de84d7a15921be8c58ffe8bb4cbb4cb890853bf3450a7622bc86dc63d8937dac59a0c683616781ce084b59a2121e118ed0d7fcec73cb9b6a2ef57fea8aaa2167
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e2e9e97b72b5
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index d0b06502eb0e..f1389f730511 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mpd-2.20170805-r2.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
-EBUILD selinux-mpd-2.20170805-r3.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mpd-2.20180114-r1.ebuild 276 BLAKE2B ebc2c472622718536454e93bd53fa0a3cdeaa955c598d965ccd980d9a2a765e624ef08d1b314569da9c92db3b8878630a70993de391d89c9847d31dd6f966d01 SHA512 6dd9361120854f1f88a64c364de16aca00df8887e12d409e884c3d92e6ba059fcebad2ad8ef0e5b8ef8f3647920428be4c9795b629f7c2aa0956b5be39ba35ed
EBUILD selinux-mpd-2.20180114-r2.ebuild 276 BLAKE2B ebc2c472622718536454e93bd53fa0a3cdeaa955c598d965ccd980d9a2a765e624ef08d1b314569da9c92db3b8878630a70993de391d89c9847d31dd6f966d01 SHA512 6dd9361120854f1f88a64c364de16aca00df8887e12d409e884c3d92e6ba059fcebad2ad8ef0e5b8ef8f3647920428be4c9795b629f7c2aa0956b5be39ba35ed
EBUILD selinux-mpd-2.20180114-r3.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
+EBUILD selinux-mpd-2.20180701-r1.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
MISC metadata.xml 313 BLAKE2B 56c3875a7e1c3bde39af4122fc4cc48590656c6fa7bb4e4cb36c92045afbcf7d891e49bae22d40b400c2deed09ebe68ae164cebf6307e7aeb24fda0db5fb842a SHA512 6b549fa3968053908625a20d90fffebc16b8b3e4e9b35cf6fd5af36eedc7283512b43e7b40fd42791d41b4dff2c030313bea318bfcd513f7e9a447a2a58d4f43
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..304f5af1016c
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index e7f2437f21f0..a297b6815e56 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mplayer-2.20170805-r2.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
-EBUILD selinux-mplayer-2.20170805-r3.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mplayer-2.20180114-r1.ebuild 288 BLAKE2B c1fe750537a400b18d81dac3ac548163bb1a576c06e5122dea18aa2485aee7d21535b1d8cc1421c0502092ec36a9c3ad790293474237b409ef991e6bb46e6e68 SHA512 4ab227a345e8027d13252588f846b8766fb350da886eab45e0c629b7ce259453c7888eb6f0b1222652d2caa54e80ec0fd5201a1dcf3d42cba630c14c8895b859
EBUILD selinux-mplayer-2.20180114-r2.ebuild 288 BLAKE2B c1fe750537a400b18d81dac3ac548163bb1a576c06e5122dea18aa2485aee7d21535b1d8cc1421c0502092ec36a9c3ad790293474237b409ef991e6bb46e6e68 SHA512 4ab227a345e8027d13252588f846b8766fb350da886eab45e0c629b7ce259453c7888eb6f0b1222652d2caa54e80ec0fd5201a1dcf3d42cba630c14c8895b859
EBUILD selinux-mplayer-2.20180114-r3.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
+EBUILD selinux-mplayer-2.20180701-r1.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
MISC metadata.xml 317 BLAKE2B 86b31fb450909c4a3131419b92f8046aeb53575d0053424a06be4936a4f2e21d2cb7278db928d66e801e5569efc249380d94ecb6698602283b9f5cb4f8968ab5 SHA512 57f431a7e6dbf14548477b092ae19d706f17aa579ff51c6fafc87ce00690a365027449aff1e6eadfbdd6e071421c4e8173a912feb6670947551a30354f76c764
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fbc2e02fe8a6
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 9997669a11f0..b364dbabbd02 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mrtg-2.20170805-r2.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
-EBUILD selinux-mrtg-2.20170805-r3.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mrtg-2.20180114-r1.ebuild 278 BLAKE2B 28b5083c7616898794afd68e497effa237883572c58d065f6b631b3064522c3a6a82ef5c8ac20d91c4aff8ef747d2e544bfdbf669a1c0934238c68a4e8440d4e SHA512 1511e5d9a8a64e58c923b913363e57ede18261a54d3484566b96aefb2fd682c1115e09b0e0c436b8c8a98ab27b18231204fbce645575f583afdf22b0f8e820b2
EBUILD selinux-mrtg-2.20180114-r2.ebuild 278 BLAKE2B 28b5083c7616898794afd68e497effa237883572c58d065f6b631b3064522c3a6a82ef5c8ac20d91c4aff8ef747d2e544bfdbf669a1c0934238c68a4e8440d4e SHA512 1511e5d9a8a64e58c923b913363e57ede18261a54d3484566b96aefb2fd682c1115e09b0e0c436b8c8a98ab27b18231204fbce645575f583afdf22b0f8e820b2
EBUILD selinux-mrtg-2.20180114-r3.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
+EBUILD selinux-mrtg-2.20180701-r1.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
MISC metadata.xml 314 BLAKE2B 9869ea3f73a19aceef604cc504383d7fb45c1e011ee4839dcc946f9d15c50e57d23e3643f49613a321da719ee7ecd2ef775efddbe7e2bd7850dca89a0a7f31a7 SHA512 5e0e1440238a7083dbb60b7174c389296846c3a4a96e2f0136e197ecc47cd7c03ff6a59b9b30c92c5ec78ca046c021eb6af38575a8360a619e1ccb95fc85bed3
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5a3b8257ed47
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 3b993a32a4a6..b51aed1495da 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-munin-2.20170805-r2.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
-EBUILD selinux-munin-2.20170805-r3.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-munin-2.20180114-r1.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
EBUILD selinux-munin-2.20180114-r2.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
EBUILD selinux-munin-2.20180114-r3.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
+EBUILD selinux-munin-2.20180701-r1.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
MISC metadata.xml 315 BLAKE2B 5b0a30d9351d16aa2e63f73393208384826c5124f4da01c7f9b30ad696ce81f2cc2bf311986266f4138de5cc1b12b6dad882952948aa60d65616a7b03588d40e SHA512 e8b021d51d8fe289205ff90c3b3a955bb6445d492aae83b48d269e0b5773b813f9ef4a54776588f4c0135dde15d59560f558cc1d11a4d0d62f4720d656557c55
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fd86c50e8c82
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 6337c6ee51f9..f5f25501b0eb 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mutt-2.20170805-r2.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
-EBUILD selinux-mutt-2.20170805-r3.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mutt-2.20180114-r1.ebuild 278 BLAKE2B 52fa750ef826ffe4e48fdca095b41a62b4dbd2a60cfd5be49527404732cbd756fdc27b74da6f2314792f4a95b819a0d9f51ee05600d36c1b2fb3ccec71e580ea SHA512 7471e159b7603e7b096d4a6013507f46e2704813ea16eac89be1a859ecf155663b233380f88cfcec983dd1d8b9aa8e70d097d9b991d00c5bf8b3a003d5a0ce53
EBUILD selinux-mutt-2.20180114-r2.ebuild 278 BLAKE2B 52fa750ef826ffe4e48fdca095b41a62b4dbd2a60cfd5be49527404732cbd756fdc27b74da6f2314792f4a95b819a0d9f51ee05600d36c1b2fb3ccec71e580ea SHA512 7471e159b7603e7b096d4a6013507f46e2704813ea16eac89be1a859ecf155663b233380f88cfcec983dd1d8b9aa8e70d097d9b991d00c5bf8b3a003d5a0ce53
EBUILD selinux-mutt-2.20180114-r3.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
+EBUILD selinux-mutt-2.20180701-r1.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
MISC metadata.xml 314 BLAKE2B 14db2b3469abab7da356b04aae1da84b6edcd11ad35130d2f1c1f2f4d287acf97e205539450052fab29c5b9fc9276626e1594096b8ae251ed06abc918e686b47 SHA512 87a3948b2f9708c5516bb4141e5673d45390ed2b0bc3e49ebc8298c7177abb1c3a99442d60d22d99fcc13d08251fef29efd9bda3ea14eb588164209eab2c4c4c
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2f811eb9e42e
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 6995168101c7..b8fa237479ba 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mysql-2.20170805-r2.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
-EBUILD selinux-mysql-2.20170805-r3.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-mysql-2.20180114-r1.ebuild 280 BLAKE2B 27edb8a2dcd31a47fff86745180f162f21281f7953cc7b509f5291dbfff1372c0a134cedde4d13ea5d0d3a00e0de2f681787ddb5cd9468203ff0c762651ac81b SHA512 8acdda96c3df4169e81260ab48fb7f5168e130bd90d99c874fb1bdc28fcf25a3473645dd27f4a4b6ecd55f2ed2e5693bbdc55f82ccfbc8e82d2abb3a71e46b23
EBUILD selinux-mysql-2.20180114-r2.ebuild 280 BLAKE2B 27edb8a2dcd31a47fff86745180f162f21281f7953cc7b509f5291dbfff1372c0a134cedde4d13ea5d0d3a00e0de2f681787ddb5cd9468203ff0c762651ac81b SHA512 8acdda96c3df4169e81260ab48fb7f5168e130bd90d99c874fb1bdc28fcf25a3473645dd27f4a4b6ecd55f2ed2e5693bbdc55f82ccfbc8e82d2abb3a71e46b23
EBUILD selinux-mysql-2.20180114-r3.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
+EBUILD selinux-mysql-2.20180701-r1.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
MISC metadata.xml 315 BLAKE2B dd4dc39a65cad0c1af7fa9d63bed6b0b4be0672149b9992dacb6b348e171bd857b53040ff3ce253c76104016ac41ede91956b4ff0f2962e4874eaf0ef870ea26 SHA512 aafeb5465f6e05bf143959c7964e5539bea915238572612d6b6cd118a30ea57fca14735e70d4a39fee37a5203cd160988c830653fb2cd751cf4e14acc6f78508
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..367f1ee95c27
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index b8acf7deb1b6..4fa011d98a57 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nagios-2.20170805-r2.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
-EBUILD selinux-nagios-2.20170805-r3.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nagios-2.20180114-r1.ebuild 378 BLAKE2B 32ad3d8cdef590cb43a54ef3137932ba1a61a1a614944fe6c99beeadb2be608f50c3c8d3d67a14d7fe6aebedfb59cae2916258ad2c121187e374737358601a9e SHA512 e7566bfcb434de97cdc577f82920296859c8e2e1ac9d173e1b1c226e0638faf95cf82ba9c2c2f2fe01c06bd94d91b89aa7626fb6b753a30ef5b52d4ccb0af411
EBUILD selinux-nagios-2.20180114-r2.ebuild 378 BLAKE2B 32ad3d8cdef590cb43a54ef3137932ba1a61a1a614944fe6c99beeadb2be608f50c3c8d3d67a14d7fe6aebedfb59cae2916258ad2c121187e374737358601a9e SHA512 e7566bfcb434de97cdc577f82920296859c8e2e1ac9d173e1b1c226e0638faf95cf82ba9c2c2f2fe01c06bd94d91b89aa7626fb6b753a30ef5b52d4ccb0af411
EBUILD selinux-nagios-2.20180114-r3.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
+EBUILD selinux-nagios-2.20180701-r1.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
MISC metadata.xml 316 BLAKE2B 73f32348443cb66f5d8274a05c1993b656d2be9d4c10ede6269793703d156ecf50259c73ff79b11af06aabd9c16c6d69ad875c38dab97c55072301748f8c6d61 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5bf419cc42d4
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index cc5675ec3744..5cda5aab8fcc 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ncftool-2.20170805-r2.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
-EBUILD selinux-ncftool-2.20170805-r3.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ncftool-2.20180114-r1.ebuild 284 BLAKE2B 0d284f1fadabba54c50d1f1d6cbbcba94e45e53b98a38b27e24398caf6fbcfaa278417f76a2ad5cb39a0c4afceec474acd5db76aba4355af3e39dd416a36d9ab SHA512 d8240aa1818324ab80e184f523c91ad07bd0b31c222a3adbb69cd5f87bdc9672f3d1e583625e363a25301a702d4c5e7970d38d8d5dbdecf7729f9c5b7a82dc5a
EBUILD selinux-ncftool-2.20180114-r2.ebuild 284 BLAKE2B 0d284f1fadabba54c50d1f1d6cbbcba94e45e53b98a38b27e24398caf6fbcfaa278417f76a2ad5cb39a0c4afceec474acd5db76aba4355af3e39dd416a36d9ab SHA512 d8240aa1818324ab80e184f523c91ad07bd0b31c222a3adbb69cd5f87bdc9672f3d1e583625e363a25301a702d4c5e7970d38d8d5dbdecf7729f9c5b7a82dc5a
EBUILD selinux-ncftool-2.20180114-r3.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
+EBUILD selinux-ncftool-2.20180701-r1.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
MISC metadata.xml 317 BLAKE2B 65121da87d0f50d6b1309c953c5e8c3afb350072b70d71f7f25363e8286da650d8c4be29f2fd11056ecec3d2441838d6046cbc89e5e12fe6ca60e24f02cfecf8 SHA512 672a4431cf13c8b31c165ef0a1cb0020b1e5ce4106169661f9f55374178fa961c960096d4d4f4a628d8c15789ea1f0b693ac5872f46765e2f7526dc11f8ad30c
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a941042f000e
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index eba99557bc22..6c6a0d18c28a 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nessus-2.20170805-r2.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
-EBUILD selinux-nessus-2.20170805-r3.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nessus-2.20180114-r1.ebuild 282 BLAKE2B d18284f3594c77a5d22e4cce61c2450f4d64db624e106732a0875f4138981742907719fed65d8156a2deecec9d86e7e255b141abd108fbd592fc10bb83b6a52a SHA512 b9cfffa3f5b5a67d35ff8c5f04ab65034d80afe5304591a48232129b1e5bbc51a605a8bbe58f73f9453219df8e770c5384fa715b2257d4f9e910717329283310
EBUILD selinux-nessus-2.20180114-r2.ebuild 282 BLAKE2B d18284f3594c77a5d22e4cce61c2450f4d64db624e106732a0875f4138981742907719fed65d8156a2deecec9d86e7e255b141abd108fbd592fc10bb83b6a52a SHA512 b9cfffa3f5b5a67d35ff8c5f04ab65034d80afe5304591a48232129b1e5bbc51a605a8bbe58f73f9453219df8e770c5384fa715b2257d4f9e910717329283310
EBUILD selinux-nessus-2.20180114-r3.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
+EBUILD selinux-nessus-2.20180701-r1.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
EBUILD selinux-nessus-9999.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
MISC metadata.xml 316 BLAKE2B 7bb5aceefc53184451f08c1277171170110d3b9e82ce9785c14cca1c007e4e0dbd28e6904147119c14ddec710f804f95f28875da90422153aa1eb59c8f6ae4fd SHA512 b7f0c0e49c6a43610f87535899fb40b6b9fc73b3f4e4aaaa405764ee2268a3fad518d4fd696b57b505c3729460298eed3a9eb454dbeb8d4f9814ee2ff53438b4
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e3e8e63caa48
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index e53e440038e4..2c101589c3d7 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-networkmanager-2.20170805-r2.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
-EBUILD selinux-networkmanager-2.20170805-r3.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-networkmanager-2.20180114-r1.ebuild 298 BLAKE2B e735f37707ddfca78370dadfe6f3b8852124e9916175c29ee4533045d20c71e3da8d798ca84f92858308e7053698b60b7308642b22f17d6a1b96136aa88891e4 SHA512 812f52848f4f2bbb936955fc9dec7d1ce0601b6ab57f0c5a41b2fdb5a2fdcd633faac666255d03797fa4b02eb97db0eebccc50731d6dbf62d16d9eaec2edb053
EBUILD selinux-networkmanager-2.20180114-r2.ebuild 298 BLAKE2B e735f37707ddfca78370dadfe6f3b8852124e9916175c29ee4533045d20c71e3da8d798ca84f92858308e7053698b60b7308642b22f17d6a1b96136aa88891e4 SHA512 812f52848f4f2bbb936955fc9dec7d1ce0601b6ab57f0c5a41b2fdb5a2fdcd633faac666255d03797fa4b02eb97db0eebccc50731d6dbf62d16d9eaec2edb053
EBUILD selinux-networkmanager-2.20180114-r3.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
+EBUILD selinux-networkmanager-2.20180701-r1.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
MISC metadata.xml 324 BLAKE2B 11f974ba31e403c660eee09c59b4c8489665237b205e4a7e5a919293046575b69d76ce1bbea199342160f6c5c0d39698eba27a2c08ced09e7e9ca814b382cf34 SHA512 310ecd0be68aece22be60ec8d52fcf6fab187d9bb70300e9e7ebab713a0191f770b1fabd836d4f7af6ce351d7a8e6d03ef9cf8dde07afcbfbe86d1dae1fdcd5a
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a6052e7f0e44
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index a22326455f02..a3f9a028f5fc 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nginx-2.20170805-r2.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
-EBUILD selinux-nginx-2.20170805-r3.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nginx-2.20180114-r1.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
EBUILD selinux-nginx-2.20180114-r2.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
EBUILD selinux-nginx-2.20180114-r3.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
+EBUILD selinux-nginx-2.20180701-r1.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
MISC metadata.xml 315 BLAKE2B 19c860410de694561fa09b50d87c5ea3290bb66c7b9b587c3a28e245d858519d10ac0e303b1038e1f9a3b9f9401425876d59f286289ffa657d06449f7cd7054a SHA512 3728836b5b16fc9d04bb74db4e7f0f9ab5418e3831c54ff56af4c65b7d3cfda5c1e710b5ed79766e08e0a978b744b0fe658644fb66e88776886a44296ea70f02
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..250ecf0ab249
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index e15e427f2ebf..b1b3a8254c10 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nslcd-2.20170805-r2.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
-EBUILD selinux-nslcd-2.20170805-r3.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nslcd-2.20180114-r1.ebuild 280 BLAKE2B dc966dc0edcd24aa8a1b93d2f4880b7ceb55ac54b97b54ee4ac8b149e50af619dac7478d525f47be3474ec6b2fadf25f8f61c9d1e136a643ca6ad08d6b41f99e SHA512 20a1a923ff9b473310462201f8bc646803885fd6032c7ba435075545dada24d33a0be8c40c34f37f79d14c0d52eef0baa72438d68ef4e5e81f864c735d827e07
EBUILD selinux-nslcd-2.20180114-r2.ebuild 280 BLAKE2B dc966dc0edcd24aa8a1b93d2f4880b7ceb55ac54b97b54ee4ac8b149e50af619dac7478d525f47be3474ec6b2fadf25f8f61c9d1e136a643ca6ad08d6b41f99e SHA512 20a1a923ff9b473310462201f8bc646803885fd6032c7ba435075545dada24d33a0be8c40c34f37f79d14c0d52eef0baa72438d68ef4e5e81f864c735d827e07
EBUILD selinux-nslcd-2.20180114-r3.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
+EBUILD selinux-nslcd-2.20180701-r1.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
MISC metadata.xml 315 BLAKE2B ce1a4e8077f570bc9e064e31bb38711eaa068f8d94c20de64c1b631ec94979b5a9075c59599cc14692c26c0985c4dd5b15081a640aab5bc887f2faab694e1090 SHA512 c347218b8973a5e113fd27cbfdbc3f7b0f19938714ea7ac0896f1d3755aebee20409a94ecd8ada8131e7e4bee1e3286f81bd1129bdb4d27cbf10cd88fbefba78
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..32a1b1cd1c32
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 5437911f49b2..9ff897708f58 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ntop-2.20170805-r2.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
-EBUILD selinux-ntop-2.20170805-r3.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ntop-2.20180114-r1.ebuild 278 BLAKE2B 2284810124a60ecfbd65c57ae9ef848432d214048f0e1ee7435aec669fd6b92fa93bc581c814810ca1218a99bd0b46a2abdbb8b8ebc94cb2da6d0ad359bf89e0 SHA512 4391a137f0d4741e1ca81473056883831ac93d53be6b1d034329250942e3710f315c4db8ae18c68de90f1fbd8f2cd814ec7dac2c0abe39b2f1ab0b3fd18b4591
EBUILD selinux-ntop-2.20180114-r2.ebuild 278 BLAKE2B 2284810124a60ecfbd65c57ae9ef848432d214048f0e1ee7435aec669fd6b92fa93bc581c814810ca1218a99bd0b46a2abdbb8b8ebc94cb2da6d0ad359bf89e0 SHA512 4391a137f0d4741e1ca81473056883831ac93d53be6b1d034329250942e3710f315c4db8ae18c68de90f1fbd8f2cd814ec7dac2c0abe39b2f1ab0b3fd18b4591
EBUILD selinux-ntop-2.20180114-r3.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
+EBUILD selinux-ntop-2.20180701-r1.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
MISC metadata.xml 314 BLAKE2B 566f04094da0302734856467282a2e4471d3602732a35368e8a92520919ce926c51f8c6c0e86cecce5914b40a4d885e67d365430bfa73fd0c0ca94799908f6d5 SHA512 c8b7f3a30b340a90da32b188b2ea37ea243e11843aa69310c49e2b2f7e69556c77f96e5f2f9355dca5d46d3c3fa6899f1732e14ff43e6173413aa06fe974333f
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..818cd6a734df
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index b0f3481cf2a1..cff8031170eb 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ntp-2.20170805-r2.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
-EBUILD selinux-ntp-2.20170805-r3.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ntp-2.20180114-r1.ebuild 276 BLAKE2B 86125d84d17c72949e87aec6f08ab49e587b795fc9ad4ff7c70ef210976625d70e186b43dea9c3599ff058336712b0a6eb0a0d5358d94e011c6f938d36915f3e SHA512 61c8efdaa233baa76e4cf639d6d3acc33dfe98b84da6c83525b0e2ea5526f28adcd582fa98a89873b2eb0aa202b351b97ce1311d60868033d1f09dea79622f3e
EBUILD selinux-ntp-2.20180114-r2.ebuild 276 BLAKE2B 86125d84d17c72949e87aec6f08ab49e587b795fc9ad4ff7c70ef210976625d70e186b43dea9c3599ff058336712b0a6eb0a0d5358d94e011c6f938d36915f3e SHA512 61c8efdaa233baa76e4cf639d6d3acc33dfe98b84da6c83525b0e2ea5526f28adcd582fa98a89873b2eb0aa202b351b97ce1311d60868033d1f09dea79622f3e
EBUILD selinux-ntp-2.20180114-r3.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
+EBUILD selinux-ntp-2.20180701-r1.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
MISC metadata.xml 313 BLAKE2B abe800009008c7147fadad7c39286afcf0227560fa37c8b4f362db3227209c5ec6686d3328cc5eea5f8699b74b18a08cfe562dba47d26025e8887a76c8f794ee SHA512 a8e07dfa0336b16ca67328dc4a299930348e725477f9cb37026e8d73a50635294ea9f1ab9174e3de396211596adfdc156e71e897cd177c7d590da460d6e19b41
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..430225fcdc26
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 9d3b11a2ed47..9163f5a2ce62 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nut-2.20170805-r2.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
-EBUILD selinux-nut-2.20170805-r3.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nut-2.20180114-r1.ebuild 372 BLAKE2B 3062809e821f4a5ef60570ec9d702993fd37f0e63384570d3e6cab7c6b187a608a48018915188bcf1b663247e46191a07eeb519ebfbce502091b59c0844fe69f SHA512 4c41faf56960a4173a2eb3db5af12d28eeb0217df532ed2ad7f753f1b09fa14c206cc40d6fd93a67f38f31fcbd6eb9f1795a473e705b2d25853d16e379ff49c5
EBUILD selinux-nut-2.20180114-r2.ebuild 372 BLAKE2B 3062809e821f4a5ef60570ec9d702993fd37f0e63384570d3e6cab7c6b187a608a48018915188bcf1b663247e46191a07eeb519ebfbce502091b59c0844fe69f SHA512 4c41faf56960a4173a2eb3db5af12d28eeb0217df532ed2ad7f753f1b09fa14c206cc40d6fd93a67f38f31fcbd6eb9f1795a473e705b2d25853d16e379ff49c5
EBUILD selinux-nut-2.20180114-r3.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
+EBUILD selinux-nut-2.20180701-r1.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
MISC metadata.xml 313 BLAKE2B 9b567dc3e05486c4bd208301cee25627046f3b9c5c097a4ace7ee30649e70fb90f99243009f57d9a61156a20a505a230f6f4b514007b358573d496a5ba1c886a SHA512 27ce423f0771c0420170fe4a345d4c16186376a787202bdb57dc770889295602d15574c95e916c6e50edb4877ff6216d7032893c601dc9f5f4c614452b5b6b1f
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4fb8098acf4
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index c7a752ef07be..b1c0637ec112 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nx-2.20170805-r2.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
-EBUILD selinux-nx-2.20170805-r3.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-nx-2.20180114-r1.ebuild 274 BLAKE2B 05108e4746f6bfb1e79ca102e95072406f1116c41c5e48f6b527e106a2007fc809b92238864429b4a9291ef929cfea57560544518ac32161b3eff770ac4bd5e3 SHA512 7c9bcf23657d8b2900f0aa196953bd1ab252d1e8713ea192dcec9fb4293172c48e99fc21af00bb53dbea87df244284a1f061d582155cde5dc0a6a412856c84ef
EBUILD selinux-nx-2.20180114-r2.ebuild 274 BLAKE2B 05108e4746f6bfb1e79ca102e95072406f1116c41c5e48f6b527e106a2007fc809b92238864429b4a9291ef929cfea57560544518ac32161b3eff770ac4bd5e3 SHA512 7c9bcf23657d8b2900f0aa196953bd1ab252d1e8713ea192dcec9fb4293172c48e99fc21af00bb53dbea87df244284a1f061d582155cde5dc0a6a412856c84ef
EBUILD selinux-nx-2.20180114-r3.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
+EBUILD selinux-nx-2.20180701-r1.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
MISC metadata.xml 312 BLAKE2B ce5b19a15c4c2255a16c90631f486f3e19e2568f021c6c12d5ade7c23c663a4d8f3eea86bb2ff43f38b7d973c56f720625e576a00879660b9c5da103e116826f SHA512 2974c5cf4c601110b07cdb7dbc5a246002de84c2c3f440b4b7ba80e1f325c34449d39ea026d63fa2a8a347d6025c5c487ce80429f8889b0b89f11c8cc2a5ab15
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..eaae5499cf3a
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index f2a2aff5e105..c79b9094760c 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-oddjob-2.20170805-r2.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
-EBUILD selinux-oddjob-2.20170805-r3.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-oddjob-2.20180114-r1.ebuild 282 BLAKE2B 4a379431b7d6bd3a881bb4e0b47be7f8fcb4a1448a2a305a48f27f17ba0095f1861a8f1b558d7b628b21c38e9e0c6cfd5d439190f5b1abd3839cd1e99242cc94 SHA512 c91237411c3096b0a04e7cef34b98b7901fb896171fb0e3c7540ffdce6a6ac8cd34d68e9a6163cca1b1032adbd24ab0ef94d82022afb1b400101550c74c731a6
EBUILD selinux-oddjob-2.20180114-r2.ebuild 282 BLAKE2B 4a379431b7d6bd3a881bb4e0b47be7f8fcb4a1448a2a305a48f27f17ba0095f1861a8f1b558d7b628b21c38e9e0c6cfd5d439190f5b1abd3839cd1e99242cc94 SHA512 c91237411c3096b0a04e7cef34b98b7901fb896171fb0e3c7540ffdce6a6ac8cd34d68e9a6163cca1b1032adbd24ab0ef94d82022afb1b400101550c74c731a6
EBUILD selinux-oddjob-2.20180114-r3.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
+EBUILD selinux-oddjob-2.20180701-r1.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
MISC metadata.xml 334 BLAKE2B ad589091646cdb6c4b3e272d47f0cb5131ffcc65b198b4cd9e18ad651dfb96b148956fd414a77951fb58a4a1b3499ef0f8366e9bd5c3135d3d7303427059ea3b SHA512 488d945f4cfc2c9a101c66ededd0280dc4fc9a83d3a0aa2496de1c5fbc756092cd1540526d499729432e325c03f1cb5a893773df3162b3d80dfcda2a07eabe93
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6cf65e47af84
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index d57bc305019d..4312f56361aa 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-oident-2.20170805-r2.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
-EBUILD selinux-oident-2.20170805-r3.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-oident-2.20180114-r1.ebuild 282 BLAKE2B caa2aff586d36d303b7be2b4ac0fb72cc7cfe455d1e79bc47b347b1c71888aceeca20e2904e873c6a4412bba998e50ec02fe22be50eb64a4208e8639861fd028 SHA512 3314ac956ecbc9ed0278308bab37773bfb44ad79aeacffd8cbe5fbdbf980b3d2830a3f3b53091c450b802683cb629c2e62f20b37dd3547da5f2f466ef0c365ff
EBUILD selinux-oident-2.20180114-r2.ebuild 282 BLAKE2B caa2aff586d36d303b7be2b4ac0fb72cc7cfe455d1e79bc47b347b1c71888aceeca20e2904e873c6a4412bba998e50ec02fe22be50eb64a4208e8639861fd028 SHA512 3314ac956ecbc9ed0278308bab37773bfb44ad79aeacffd8cbe5fbdbf980b3d2830a3f3b53091c450b802683cb629c2e62f20b37dd3547da5f2f466ef0c365ff
EBUILD selinux-oident-2.20180114-r3.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
+EBUILD selinux-oident-2.20180701-r1.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
MISC metadata.xml 316 BLAKE2B fdea156e5b038e408170545c6323f7de20b6b9c30fda9ee7c001fec9b0e1557c58a652cb2e0e61821600e2e8e6c36614e256b79aa6f2a072377152b8c113f8cd SHA512 bf1249529ca86fa8714111c62b51db48ba0239663e4192968a7717958d67c3c36f9ad03d0bc43a7baf04d2026bafeb409bcb9b7dffad2711c2a2349204041ed2
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..931c5f14889c
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index f825f9af32cd..519f93ce2549 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openct-2.20170805-r2.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
-EBUILD selinux-openct-2.20170805-r3.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-openct-2.20180114-r1.ebuild 282 BLAKE2B 41552c3fce6ebcb670c349724a74819e86450825ba8ef016c4adbb605ab86fd7cfbfbafcb44bd67b70234e53964769e96569425641f87df1f4a46a6c0364b9e3 SHA512 2be34004ae3bfbb7a27c4ac7efeaec1a748f1ab2ffc3fef925b43ebf8b4965b73deb41baaf251dcb0603b88509aa2327c09d720240e9fa5b6fcc18f390204910
EBUILD selinux-openct-2.20180114-r2.ebuild 282 BLAKE2B 41552c3fce6ebcb670c349724a74819e86450825ba8ef016c4adbb605ab86fd7cfbfbafcb44bd67b70234e53964769e96569425641f87df1f4a46a6c0364b9e3 SHA512 2be34004ae3bfbb7a27c4ac7efeaec1a748f1ab2ffc3fef925b43ebf8b4965b73deb41baaf251dcb0603b88509aa2327c09d720240e9fa5b6fcc18f390204910
EBUILD selinux-openct-2.20180114-r3.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
+EBUILD selinux-openct-2.20180701-r1.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
EBUILD selinux-openct-9999.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
MISC metadata.xml 316 BLAKE2B 5a71ac1fdc33e227acfaf2db6d5db8b3bde2ac47c9e00b8bf350f128d552ff12964dd04c6ae4e36143307bde27f3bf6af20966f8c118fbf45c042d4f1a7185b4 SHA512 2f34a907f602c48245d3b5bce00bc178b2c8d58d28ee6992438179375e116ec2beb5d9422cf7897af985910402fce75c9d9b50a2d372e59bcbaa59dedb7490bc
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..accd8f695a5d
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 564a96d9a3ca..e6a37b644c4b 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openrc-2.20170805-r2.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
-EBUILD selinux-openrc-2.20170805-r3.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-openrc-2.20180114-r1.ebuild 282 BLAKE2B 29e21d8a671ea178c9271ebf4eaab28778d7f5187d248f97900c9a9f0a26359240f8607b496bcba2d301587894062e34aee880c90f94ac106f5f7f62b0976dd6 SHA512 7a26eb020d4c2718faccc0b6077bfb8c8913f4b8b0abd909f7afd16bc6c470526b67db1016356a5e5a7275837c049c3b10035b7b02f3b7dbe5fe0076c4e0a29d
EBUILD selinux-openrc-2.20180114-r2.ebuild 282 BLAKE2B 29e21d8a671ea178c9271ebf4eaab28778d7f5187d248f97900c9a9f0a26359240f8607b496bcba2d301587894062e34aee880c90f94ac106f5f7f62b0976dd6 SHA512 7a26eb020d4c2718faccc0b6077bfb8c8913f4b8b0abd909f7afd16bc6c470526b67db1016356a5e5a7275837c049c3b10035b7b02f3b7dbe5fe0076c4e0a29d
EBUILD selinux-openrc-2.20180114-r3.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
+EBUILD selinux-openrc-2.20180701-r1.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
MISC metadata.xml 316 BLAKE2B ef625d3f5e926917f4433d9edcb72b4ba245ae29561833f4878f7169643a36da79209de521951749d8a2f0184452d2055c97c581bf8136594da02ce172597395 SHA512 0cf24e90730fd2dbe20f789319b4a5f5e8a0f17613a0ae5bd75fecf9b9f4575c3980fc51680b279b82e91fbdb0f2ba01009f025afd6c5216d538a7c37a6b91d7
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f7967faa52e1
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 75d752f60160..3b19155ed387 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openvpn-2.20170805-r2.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
-EBUILD selinux-openvpn-2.20170805-r3.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-openvpn-2.20180114-r1.ebuild 284 BLAKE2B 50b509b2fa573ed2e8b6e35478174642483d4fa9050bcd5bbaf5596a94f3bdc0c3ed1615b318184e38999162f573a80bf4c94e66e4afcb110628de68f0ec0550 SHA512 249a145290294dc7b49c948adfae2831b018b8d2097bf7791b8e1d96eef52310bd49427e4df4d7219028a916b389ff94b1648c0e1c771cbfcb259e3a90070305
EBUILD selinux-openvpn-2.20180114-r2.ebuild 284 BLAKE2B 50b509b2fa573ed2e8b6e35478174642483d4fa9050bcd5bbaf5596a94f3bdc0c3ed1615b318184e38999162f573a80bf4c94e66e4afcb110628de68f0ec0550 SHA512 249a145290294dc7b49c948adfae2831b018b8d2097bf7791b8e1d96eef52310bd49427e4df4d7219028a916b389ff94b1648c0e1c771cbfcb259e3a90070305
EBUILD selinux-openvpn-2.20180114-r3.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
+EBUILD selinux-openvpn-2.20180701-r1.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
MISC metadata.xml 317 BLAKE2B dd336bd2ceb38396b70383f3d53ed8d39c14641e3e5b3f95c9c7e032bcbd9de96de4d364a8465fa8a55b9bebe80fbb926b69c7a494077d764f5331698e86a4dc SHA512 404052219f5f8e5b95dc2e34baef116609b40581aa99d5e93861807d28fbc1eb23a4368e2e01ee6dd6c4cec76294fe567bf860bb4c0db36bf34b1972d3ca1dab
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5814dd787ebf
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 442f2ebddc3d..ddb6994f629e 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pan-2.20170805-r2.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
-EBUILD selinux-pan-2.20170805-r3.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pan-2.20180114-r1.ebuild 374 BLAKE2B ce75258541c84d8854a4255280705dde69a63b5fba71ae9568b025aa708ca8850f0f200441decc857e441f0cc30a1f9bd248e4892f31887325ba970a0766c0d3 SHA512 7dfdd0dfe599875db62de637693bada6b714e263dfe23aac538c6971513981fc15563d1a60f8218fd43cdd7be3565cde636c4fc6dfd99ba92146747a717befa5
EBUILD selinux-pan-2.20180114-r2.ebuild 374 BLAKE2B ce75258541c84d8854a4255280705dde69a63b5fba71ae9568b025aa708ca8850f0f200441decc857e441f0cc30a1f9bd248e4892f31887325ba970a0766c0d3 SHA512 7dfdd0dfe599875db62de637693bada6b714e263dfe23aac538c6971513981fc15563d1a60f8218fd43cdd7be3565cde636c4fc6dfd99ba92146747a717befa5
EBUILD selinux-pan-2.20180114-r3.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
+EBUILD selinux-pan-2.20180701-r1.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
MISC metadata.xml 313 BLAKE2B 00b319beed1e12194de64ce3825134a40dd1a48666aed759d136ed77b52dece7d4ea81752e443c0eb2fd3a41ed038b814bf56f7591e6430bd2b0cff4f1523d08 SHA512 c7b7a83c7cbe58b4294977429326fd22b59391fd3c670e4a4083687c4eff871665af17d9ee4cdd14efac69f630d97d38eaf1e5bc37a7ff538cd847c993408a1a
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c9aa8c17ed05
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index cc8e961064a6..4f03ef8d56dc 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pcmcia-2.20170805-r2.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
-EBUILD selinux-pcmcia-2.20170805-r3.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pcmcia-2.20180114-r1.ebuild 282 BLAKE2B 24430e64f73c7e4f5a1344a01f0892729c7eca0c6f21b91cbf56b308e36bd87a69dbd85bdf0e8d4c0a4d39f4485c7cfc0606d310c3de59c53246930e453a8462 SHA512 39938301b80534c5d4af5a2c5decf7a265295797904ca57fb9cf38d1e1ed79d9a88db0185973368027d4c9612731f902e6175397b2badfff80fd4efb41781fc0
EBUILD selinux-pcmcia-2.20180114-r2.ebuild 282 BLAKE2B 24430e64f73c7e4f5a1344a01f0892729c7eca0c6f21b91cbf56b308e36bd87a69dbd85bdf0e8d4c0a4d39f4485c7cfc0606d310c3de59c53246930e453a8462 SHA512 39938301b80534c5d4af5a2c5decf7a265295797904ca57fb9cf38d1e1ed79d9a88db0185973368027d4c9612731f902e6175397b2badfff80fd4efb41781fc0
EBUILD selinux-pcmcia-2.20180114-r3.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
+EBUILD selinux-pcmcia-2.20180701-r1.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
MISC metadata.xml 316 BLAKE2B cc90a9ff7d7b6e65a1f4559b90413d7b6460fa82c4afb91ba3c1f02e551431c9e797f5126c997c9c9a8bb2a1348faa744bed3a116cb98bf73c8b6ffbf755a064 SHA512 644a200cefcb82931e5c53f504228299b407d25c41b933af09a705755fe7c6c017da62e70162fe83221d534d33be77c82235c39bade584af62249e97a963abd3
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f79f167b79a6
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index 124ca873f4a5..f7066d1bd052 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pcscd-2.20170805-r2.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
-EBUILD selinux-pcscd-2.20170805-r3.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pcscd-2.20180114-r1.ebuild 280 BLAKE2B 3a6384e0ccc0e6425bd4829f6a17694d6bf8d6a94b0f1963989b0896ad17c3e26f3defaeddd28c3b5918e45e1eba2e64469cec3beeeb3e60482b17972d022a92 SHA512 e7463b34072f589a8d7910620dbad82a958ee6c4c85752883f2a4d201857bd912918c3da156f176e6cd7d6b9da5814e97016d0fbfbba3e1cf65ba93f15a690e4
EBUILD selinux-pcscd-2.20180114-r2.ebuild 280 BLAKE2B 3a6384e0ccc0e6425bd4829f6a17694d6bf8d6a94b0f1963989b0896ad17c3e26f3defaeddd28c3b5918e45e1eba2e64469cec3beeeb3e60482b17972d022a92 SHA512 e7463b34072f589a8d7910620dbad82a958ee6c4c85752883f2a4d201857bd912918c3da156f176e6cd7d6b9da5814e97016d0fbfbba3e1cf65ba93f15a690e4
EBUILD selinux-pcscd-2.20180114-r3.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
+EBUILD selinux-pcscd-2.20180701-r1.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
MISC metadata.xml 315 BLAKE2B ecff7b2e5046a9d47a71a286d57f8cfae05d578c284f0a93508b2ac6e36695123b1ec98836fc1daee2020976f7163a3651be97ef6453347c11e4ce6733648195 SHA512 07d74c79dedc7fa7d45e23d019551a2358b69c08b1ff86a22bd8b41068c33a951520e21563844bf75f9fa0b9e966c41d91ad834a6ecbdc2293f210fc45091566
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..989d82a295c7
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 6f39d69f74d6..0610f120be31 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-perdition-2.20170805-r2.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
-EBUILD selinux-perdition-2.20170805-r3.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-perdition-2.20180114-r1.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
EBUILD selinux-perdition-2.20180114-r2.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
EBUILD selinux-perdition-2.20180114-r3.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
+EBUILD selinux-perdition-2.20180701-r1.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
EBUILD selinux-perdition-9999.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
MISC metadata.xml 319 BLAKE2B 5f81c14cad4ee37a46611e0955e94fdf96b7f908006816cc7c7416aedd4cc9e9ee5b15c7f25a0ed355d5797d57f7a7d50ce9512417c9c5ce9056f81ef77f53b6 SHA512 7857badc182ef47415327b8560a32dcf20284532b2c1123cf4b0ce6d4cc3f2d2dfda7b03f6125694d709160ff4a7e54398c381fb49e2215340e419ee360ae605
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d84c6e5b0da8
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index e60954bea2cc..b1d07069b169 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-phpfpm-2.20170805-r2.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
-EBUILD selinux-phpfpm-2.20170805-r3.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-phpfpm-2.20180114-r1.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
EBUILD selinux-phpfpm-2.20180114-r2.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
EBUILD selinux-phpfpm-2.20180114-r3.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
+EBUILD selinux-phpfpm-2.20180701-r1.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
MISC metadata.xml 316 BLAKE2B 491ffb7eba4985bada61e934b968c15e8eaa6bb358065a9eaa02e9d637c9f6fa5db6cbac130b5c00cc16ebd9d867082c7d734923f932132a9e6ac6c015f452df SHA512 9e18c465be0429fc172b0f8636488175749a69d8066deca7c00bd7d456b12ba9beb1c115fc1468add61c4d34863aa617d1710372a4c75f0f3ba66e3e9265e242
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..34cea65b1a0c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index f1f880389d22..acd34fe07264 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-plymouthd-2.20170805-r2.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
-EBUILD selinux-plymouthd-2.20170805-r3.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-plymouthd-2.20180114-r1.ebuild 288 BLAKE2B fcaf7da46081233346a42a7e428800594a1b0e89552cca0410ebafa7e5a5a8d0be271d078792a1077e6acdf629cb5cb97117b20fea03e94188c2a141d3d05c67 SHA512 fca637f699222b6c88ea53e6c062061ec82c68aa4a0a88449dd2b489fc7cc48739dc5ccdedec3af5f20e9707d45ea6f66be8adae55d066fc896f7c1b2632851b
EBUILD selinux-plymouthd-2.20180114-r2.ebuild 288 BLAKE2B fcaf7da46081233346a42a7e428800594a1b0e89552cca0410ebafa7e5a5a8d0be271d078792a1077e6acdf629cb5cb97117b20fea03e94188c2a141d3d05c67 SHA512 fca637f699222b6c88ea53e6c062061ec82c68aa4a0a88449dd2b489fc7cc48739dc5ccdedec3af5f20e9707d45ea6f66be8adae55d066fc896f7c1b2632851b
EBUILD selinux-plymouthd-2.20180114-r3.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
+EBUILD selinux-plymouthd-2.20180701-r1.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
MISC metadata.xml 319 BLAKE2B c640f4703f9a4a02cb667d7bf67ebc0806f4c50d5f0dff51bd02af057b475fd2f795f06682fdcbbc8aafc3216b7a2c649f19dc6e5f3182bb8bd1c87df6ee1c9b SHA512 ec3d23e23f563f0ed5979e38b0809c54b5ac69e831934a5078cf9c8ca6dd4fd88570f53be750f1e0330d917129dce6b636dd6d3f17c23daa42e08b4a1e1979a0
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..241f5416f25e
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index ad48ed0e1132..a209e89a9997 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-podsleuth-2.20170805-r2.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
-EBUILD selinux-podsleuth-2.20170805-r3.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-podsleuth-2.20180114-r1.ebuild 288 BLAKE2B 1aa8898a2804f83c8bd4867e508c9f5a3dc26deac8f378498fa544c1d6c1a6b65fddf6996e0f5379137f7afacc3e5ed29072fed6393844eff2e2f308cdcbb021 SHA512 6dd6e1e064d366886d78a8042f4c0a17e4ae56cbbdb5014b4847943b752067c9b4002f7639222653b934589b1c015e58224c8f6ba32ee8d0a27f6ff9d89221ca
EBUILD selinux-podsleuth-2.20180114-r2.ebuild 288 BLAKE2B 1aa8898a2804f83c8bd4867e508c9f5a3dc26deac8f378498fa544c1d6c1a6b65fddf6996e0f5379137f7afacc3e5ed29072fed6393844eff2e2f308cdcbb021 SHA512 6dd6e1e064d366886d78a8042f4c0a17e4ae56cbbdb5014b4847943b752067c9b4002f7639222653b934589b1c015e58224c8f6ba32ee8d0a27f6ff9d89221ca
EBUILD selinux-podsleuth-2.20180114-r3.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
+EBUILD selinux-podsleuth-2.20180701-r1.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
MISC metadata.xml 319 BLAKE2B 6b1ef1db3cd6c566b2c7197e1372c95ac3cb61b1e051337532db604bc38458eff42cbb5c2e1056fd7e2d260682559e6deeae7b4f8949a0fb0d0142a35d0596a4 SHA512 1f97d533c42cf5a869d2ab25691faee9f3b08b2eccedaf36b14e1e3097dee240dc689bacc980f3d6dec3366041bbb83aa0a23c9c33be132334b8f3262868e7db
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f17b187cb320
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 07b3db12f72a..a445fb8605c3 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-policykit-2.20170805-r2.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
-EBUILD selinux-policykit-2.20170805-r3.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-policykit-2.20180114-r1.ebuild 288 BLAKE2B 1509b2dcc7deaef6f2f4bbe679090f871203b89a994b1e2480ff7ca66e232b46ce298638e206c0a787c9ce83144e2ace9642771e098eeaf0da9d59ceb4ca8125 SHA512 9546c4362a4bd4e23c717f929df5a25d7cc2aeebb8ac7eaee4116c1c5ded9951e4985469b3a4a451751cd03cad9a3a16b1b47e84491f72df744b9f176c241c75
EBUILD selinux-policykit-2.20180114-r2.ebuild 288 BLAKE2B 1509b2dcc7deaef6f2f4bbe679090f871203b89a994b1e2480ff7ca66e232b46ce298638e206c0a787c9ce83144e2ace9642771e098eeaf0da9d59ceb4ca8125 SHA512 9546c4362a4bd4e23c717f929df5a25d7cc2aeebb8ac7eaee4116c1c5ded9951e4985469b3a4a451751cd03cad9a3a16b1b47e84491f72df744b9f176c241c75
EBUILD selinux-policykit-2.20180114-r3.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
+EBUILD selinux-policykit-2.20180701-r1.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
MISC metadata.xml 319 BLAKE2B 61b04c742d6106be38db5c1f5abed362c49c2aeb7bfeb97d3a7b0fe14fefb576a931c44baec61d0f97861554697f9b6d712e68b6c5cd77d1adf4816dd4f443dd SHA512 f12d584c6a1bb11eac0e6e282989f90b0ce0e660afa5097cc667f7a3686378a16030f1dc1adb62ff3035df60f53e3c8c49167ada253688c5d7198a3cddb9ae55
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..63984df43a0b
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 967ce6bc345b..e65232623e5a 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-portmap-2.20170805-r2.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
-EBUILD selinux-portmap-2.20170805-r3.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-portmap-2.20180114-r1.ebuild 284 BLAKE2B b23b637cfb66946667c0238663ff7390482ccaad551fd0fa289a3277ec6a75502e730a411b1c5fc66723ab0a4b11062d4fe44f8d49cab777b50fe820f5bebba8 SHA512 f549f8f54445325229f2b8443366aa1ff7eb2ae8a1b331bba7e0213a323a7d5ad0bdc9ce832f29c4cbd86459decbc3047eae38f5e8282e0ca2689456aaed616a
EBUILD selinux-portmap-2.20180114-r2.ebuild 284 BLAKE2B b23b637cfb66946667c0238663ff7390482ccaad551fd0fa289a3277ec6a75502e730a411b1c5fc66723ab0a4b11062d4fe44f8d49cab777b50fe820f5bebba8 SHA512 f549f8f54445325229f2b8443366aa1ff7eb2ae8a1b331bba7e0213a323a7d5ad0bdc9ce832f29c4cbd86459decbc3047eae38f5e8282e0ca2689456aaed616a
EBUILD selinux-portmap-2.20180114-r3.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
+EBUILD selinux-portmap-2.20180701-r1.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
MISC metadata.xml 317 BLAKE2B 019b066f537fe5be713e1ce41f21856ff7b00dbfb3c4b9b11b964921c18ef8cd5be215641e0bf48b063444df71fdc9323a645f528bba61e7a093a086711e5558 SHA512 6d0fb959a90af947b760a5e5ab8895ba2e19538e516bff45e9f83625a405b442c04773c1c8e738b0af9f7c7dab257627bae490426861a70170fbaf47c1761526
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a62eeb9cf4c3
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 8b53d850b293..596945df0d4a 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postfix-2.20170805-r2.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
-EBUILD selinux-postfix-2.20170805-r3.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-postfix-2.20180114-r1.ebuild 284 BLAKE2B 60125d89fd0832e53535e6c80a41028cc7fa53157342f834859ded531d7302545dd39d769b0c346f51ddf72432311a3ecbccb5e3d61f364543d5e19cb4b912e7 SHA512 34cefe47bbce4daf87c3b56f9e72d1b743b8fc6fe3a86aa45969fffcf7020aa89b8d644a60ed6a41685419428cef18ab6a8d5a70b837bf6b82452eea37fa6199
EBUILD selinux-postfix-2.20180114-r2.ebuild 284 BLAKE2B 60125d89fd0832e53535e6c80a41028cc7fa53157342f834859ded531d7302545dd39d769b0c346f51ddf72432311a3ecbccb5e3d61f364543d5e19cb4b912e7 SHA512 34cefe47bbce4daf87c3b56f9e72d1b743b8fc6fe3a86aa45969fffcf7020aa89b8d644a60ed6a41685419428cef18ab6a8d5a70b837bf6b82452eea37fa6199
EBUILD selinux-postfix-2.20180114-r3.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
+EBUILD selinux-postfix-2.20180701-r1.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
MISC metadata.xml 317 BLAKE2B bc62377144bd61efc49ad850d68d9b3a178767b8f5e3732a9269370980615ccc3c17432b8b241c44cabafb9d9e92122b4be11146df128bc244226b8c53ed5b37 SHA512 7109989e6380231647aaf248be3bf2fd619859ae42bf0e271ef1de45b9b663e804988c03993b18502110d86d58d35bc265c3a59e03bd3484cffe6d8f29a3e9c1
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c921b4c1e505
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 740eb1e02065..e8995487675f 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postgresql-2.20170805-r2.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
-EBUILD selinux-postgresql-2.20170805-r3.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-postgresql-2.20180114-r1.ebuild 290 BLAKE2B 3851635b36293bb26057a8280274b36d55474273db35502d8b6eb56c05d63cbd9bf195b528d57a3615d6b015c7ce4071f21847d5f4566c98d2c08c65166c59cd SHA512 a25b7b88126fd9449db2998bbfc39fa9609922671b61a60c5f086923afe674a55275420704375143c2098b8b7e963e6e9576f5e2fef6785fca7ea819dafa990e
EBUILD selinux-postgresql-2.20180114-r2.ebuild 290 BLAKE2B 3851635b36293bb26057a8280274b36d55474273db35502d8b6eb56c05d63cbd9bf195b528d57a3615d6b015c7ce4071f21847d5f4566c98d2c08c65166c59cd SHA512 a25b7b88126fd9449db2998bbfc39fa9609922671b61a60c5f086923afe674a55275420704375143c2098b8b7e963e6e9576f5e2fef6785fca7ea819dafa990e
EBUILD selinux-postgresql-2.20180114-r3.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
+EBUILD selinux-postgresql-2.20180701-r1.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
MISC metadata.xml 320 BLAKE2B ef4a728b52983625b81115b7a19880b1f54d4144f46f06761620fa76e0c93c307b877c6d43322c91ed826ef5455b63e2e8a723fa5fb026695dbc3c5240c56b12 SHA512 00365c82e7ac0b2cc9cfeeb766acd22e5000f1146cee207bd7df897b560590c9a7ddfde7f4ce0d4f5f535125a29137355cdd2415ad6fd4def67535e112990853
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ccdfdb169305
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index da6b904b3365..560e22e75bff 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postgrey-2.20170805-r2.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
-EBUILD selinux-postgrey-2.20170805-r3.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-postgrey-2.20180114-r1.ebuild 286 BLAKE2B ab43a8a24b72280e42015afbaa403c32991bf7a455b971102c501f66879e0cd1f5c53fb32b7d27a33f49e09d08cd931303f115e3a75245d3e23e262bced1bce1 SHA512 cf183d6cb3dd9db3ca43dbcbb2a159a39c9bb29e21ed656545d6db6a5b3495ead33b395309d0184c1eb5b559f29afd2f393bada6dad76fcb4677f05e32b078b7
EBUILD selinux-postgrey-2.20180114-r2.ebuild 286 BLAKE2B ab43a8a24b72280e42015afbaa403c32991bf7a455b971102c501f66879e0cd1f5c53fb32b7d27a33f49e09d08cd931303f115e3a75245d3e23e262bced1bce1 SHA512 cf183d6cb3dd9db3ca43dbcbb2a159a39c9bb29e21ed656545d6db6a5b3495ead33b395309d0184c1eb5b559f29afd2f393bada6dad76fcb4677f05e32b078b7
EBUILD selinux-postgrey-2.20180114-r3.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
+EBUILD selinux-postgrey-2.20180701-r1.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
MISC metadata.xml 318 BLAKE2B c3c0c371099e41034efe77018016eac5506cf25b5cb3b03f5f5bf171186a73df923b9641df09c55bbf178227a95ef4dd3ba6b3beef2eaf4cbce93eb4f033192f SHA512 03a6f16ebf3c2f2cfe4c417434cc56007ca5df669d76ca93aacfe30a74b6bb8e6d269ef0b9eb4e96b85d638b266b5839c8713ef1be4e8925417a5004ed0d7c19
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a5da0c400ac3
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index bba0a83d400d..509d2fc6c156 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ppp-2.20170805-r2.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
-EBUILD selinux-ppp-2.20170805-r3.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ppp-2.20180114-r1.ebuild 276 BLAKE2B 930b7453921d0d5b5fbce985736f7738281f16f8421fed10e6c00ddeb79970a6857d75f96d97c246ff0774801d780febc4a15eeff04ec8908b6d98a27c4bc623 SHA512 faed7e4c4e7876fa45d7528b80cf3b189fdb739f34549a181ba75669e1f7558d5176bf6b10b26b2261197323682f2bac832889fa7a993021dbc547170ee0bd2b
EBUILD selinux-ppp-2.20180114-r2.ebuild 276 BLAKE2B 930b7453921d0d5b5fbce985736f7738281f16f8421fed10e6c00ddeb79970a6857d75f96d97c246ff0774801d780febc4a15eeff04ec8908b6d98a27c4bc623 SHA512 faed7e4c4e7876fa45d7528b80cf3b189fdb739f34549a181ba75669e1f7558d5176bf6b10b26b2261197323682f2bac832889fa7a993021dbc547170ee0bd2b
EBUILD selinux-ppp-2.20180114-r3.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
+EBUILD selinux-ppp-2.20180701-r1.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
MISC metadata.xml 313 BLAKE2B 8dce03a7e86358b04a98c6f42367961c2fe621b0d8dd89551378a205218eec627d875c25b5ed2064813ca6012c608b077ab163acea43ed64e832839f553f3205 SHA512 f7b9c2a6b0c8aca070e0dbdd25fc506aa957b0a033f9cf3bef165f0c51a8d03c2c05e98a7c0712f27671c688b0e95aea4360e7313b4f9379852483d0afcbc3aa
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5deee503f6f2
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 816ce296ec6e..d76dcdeb0c94 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-prelink-2.20170805-r2.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
-EBUILD selinux-prelink-2.20170805-r3.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-prelink-2.20180114-r1.ebuild 284 BLAKE2B ae8839f864d62249f8769eed890e7ac0ec83a3723b58a7aacaf4d565093a4fd2962284d6af3ae4e22f15dc2b85ac590accf57cdbb5e836f97db738b626519246 SHA512 44ce8cc56110c03a7420b32ef7fe3aa3ed27b88616bbc89bcc3bfdad3cf77dcd8fcd8648ae8dcb6e7823ca56e59384ee213abeaf40ad457500542e3971ef1cbb
EBUILD selinux-prelink-2.20180114-r2.ebuild 284 BLAKE2B ae8839f864d62249f8769eed890e7ac0ec83a3723b58a7aacaf4d565093a4fd2962284d6af3ae4e22f15dc2b85ac590accf57cdbb5e836f97db738b626519246 SHA512 44ce8cc56110c03a7420b32ef7fe3aa3ed27b88616bbc89bcc3bfdad3cf77dcd8fcd8648ae8dcb6e7823ca56e59384ee213abeaf40ad457500542e3971ef1cbb
EBUILD selinux-prelink-2.20180114-r3.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
+EBUILD selinux-prelink-2.20180701-r1.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
MISC metadata.xml 317 BLAKE2B 13304bdab3d7cf89c48d3feb1b7893a4c4014cd799a40eecf6e07adf2fd31320a75c7e4e6555f01b23148992ebceadf2da32623b2918a5885ae2a61c3ba44e31 SHA512 858d2c01c7dfe3f73a2293cb15ff34bcaeb3f92c5736a09da4eaaedb341a52e32289525a07cbac480add98386016d07b1b705aead1b9992a7541d5bdd3126c42
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8dc9cf31cd90
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 1fc95c388424..1f452f279da6 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-prelude-2.20170805-r2.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
-EBUILD selinux-prelude-2.20170805-r3.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-prelude-2.20180114-r1.ebuild 380 BLAKE2B 73b0198f04357b5e457be1371a846bb775c209700ffc9d27fc86adf51572be1529d3304a9ed00e5a7262e0cb895b5139fa30fa38ba60e781472014d715657f1c SHA512 1424a8dd172868c88635e565b9f8cb7c5ff21b45fde3e4afe0e35ec42963020383934fe57fa850eec696325ee4ac8143c9ec501cdddf4e9371b66cfac6bfc65d
EBUILD selinux-prelude-2.20180114-r2.ebuild 380 BLAKE2B 73b0198f04357b5e457be1371a846bb775c209700ffc9d27fc86adf51572be1529d3304a9ed00e5a7262e0cb895b5139fa30fa38ba60e781472014d715657f1c SHA512 1424a8dd172868c88635e565b9f8cb7c5ff21b45fde3e4afe0e35ec42963020383934fe57fa850eec696325ee4ac8143c9ec501cdddf4e9371b66cfac6bfc65d
EBUILD selinux-prelude-2.20180114-r3.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
+EBUILD selinux-prelude-2.20180701-r1.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
MISC metadata.xml 317 BLAKE2B 52ee6446cb2b505c719ee40919082eaea9dd76287b2994a0027c697e73f574584152ca522fe34c42f864b44a746006292e75af3f4511c3157f5c6b3a9f7306b3 SHA512 08ccae1fc36026c405d62f24cf756d27253247e7a29cc0fc8bbb09c9a44c071875caf81bf5fe428da00bc7d876ce69bbcee65ea8289efee6ab14a6ad797ec198
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..346eb876da5d
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 2eb686b485ef..91792785002f 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-privoxy-2.20170805-r2.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
-EBUILD selinux-privoxy-2.20170805-r3.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-privoxy-2.20180114-r1.ebuild 284 BLAKE2B a6254c3465327128b8e07f9566b39702171a7f4be9eadd736a9c9e17ba794f13a63034bd119386ddbb90f28dbf7d07e6ffc23a227aed3ad85471ee3fb42ed78e SHA512 222de7ddaa07de03b37b1471f13fe28adc0fb226c5d7cfbb5ee7f8285a91fe44acf90094de25d3edfbfd3a5ac155934f51f2f65086983fa035083040523467a5
EBUILD selinux-privoxy-2.20180114-r2.ebuild 284 BLAKE2B a6254c3465327128b8e07f9566b39702171a7f4be9eadd736a9c9e17ba794f13a63034bd119386ddbb90f28dbf7d07e6ffc23a227aed3ad85471ee3fb42ed78e SHA512 222de7ddaa07de03b37b1471f13fe28adc0fb226c5d7cfbb5ee7f8285a91fe44acf90094de25d3edfbfd3a5ac155934f51f2f65086983fa035083040523467a5
EBUILD selinux-privoxy-2.20180114-r3.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
+EBUILD selinux-privoxy-2.20180701-r1.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
MISC metadata.xml 317 BLAKE2B 9f2053b7554c349b575079a4eaa2bebacce6461c82a4834db9db952ca79e89f8835c60012fb88d05036b24bfaaf494786919fd3f33fa5a909c1cac3d1ff402c6 SHA512 3c9b547563afda91854884e1933b0957390dcbdd3259ee8944a20af10f12dc987f24428de06250172299fa92d274680f86bfdbd2c2c95d8aa675bf519238470b
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..37dbabe24a88
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 21a7f1a1b076..ae44e2af8d0c 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-procmail-2.20170805-r2.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
-EBUILD selinux-procmail-2.20170805-r3.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-procmail-2.20180114-r1.ebuild 286 BLAKE2B f079428bf7a6d003b38c3906064a9e13a2a15ba2140c4b1794597bd8c8c5de96e59538026771c4d14e8980900afba2fcea80d30eb0e489846fbe4fd90e57bae5 SHA512 ed7a02f3bb1f5ef2e88394a76ca94cdf700e08bfd880dd66d2ef680232e499b555612c5cecb7c5255432230a5c38a07013e4466dc6483eea35ebfa679dc2b91f
EBUILD selinux-procmail-2.20180114-r2.ebuild 286 BLAKE2B f079428bf7a6d003b38c3906064a9e13a2a15ba2140c4b1794597bd8c8c5de96e59538026771c4d14e8980900afba2fcea80d30eb0e489846fbe4fd90e57bae5 SHA512 ed7a02f3bb1f5ef2e88394a76ca94cdf700e08bfd880dd66d2ef680232e499b555612c5cecb7c5255432230a5c38a07013e4466dc6483eea35ebfa679dc2b91f
EBUILD selinux-procmail-2.20180114-r3.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
+EBUILD selinux-procmail-2.20180701-r1.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
MISC metadata.xml 318 BLAKE2B fd09708c49ff5681ba2609ceb19c7001a62077d505bd71159ceb4824f2a86fa8d865ab5a9c023ae9c088c7e531bf55986058fa79dd6e008191c6e66eeda622a9 SHA512 9d12c3604c6dbf96afab2541fbce6d92206273a42f21a3c3643a15fb3569faf2d7f7818eb69078ff8ec4431b744dac805d378c2816064128709f392bc59ba3ac
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a898ad1b5e30
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index bddb8ad9d4b6..ad5e036fce04 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-psad-2.20170805-r2.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
-EBUILD selinux-psad-2.20170805-r3.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-psad-2.20180114-r1.ebuild 278 BLAKE2B c4d583e0ca99074fc3b869f19cd158f7c25a2add6b43865cfbfe55e62490a7e61053a01cf88ecae65170a7a27af19a9f9805deea7a1a7cdf2dd7f4cf73bdd7cf SHA512 9d87b0c3f2bd7760d2e602d9baf6d14ed53e0fa9713255a270e6c08408240f60c090dad64717a20ba19dd0745dd68b9947d83befe987ed57fa7877cc907d9f59
EBUILD selinux-psad-2.20180114-r2.ebuild 278 BLAKE2B c4d583e0ca99074fc3b869f19cd158f7c25a2add6b43865cfbfe55e62490a7e61053a01cf88ecae65170a7a27af19a9f9805deea7a1a7cdf2dd7f4cf73bdd7cf SHA512 9d87b0c3f2bd7760d2e602d9baf6d14ed53e0fa9713255a270e6c08408240f60c090dad64717a20ba19dd0745dd68b9947d83befe987ed57fa7877cc907d9f59
EBUILD selinux-psad-2.20180114-r3.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
+EBUILD selinux-psad-2.20180701-r1.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
EBUILD selinux-psad-9999.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
MISC metadata.xml 314 BLAKE2B 7290c16148ae3d6277bf1e9887b2874b110f7b1d580857d41befc01f97986b12b77e1ffed75660be88650cc3b27840f3c8d40c278577ae6ce77bc3ce187fcde9 SHA512 bee35dcd491d4c557ffbc36f6940fa5e903fa41e373553964f995fc7c14609e50b013fb4aa78193f33a9fb39c0c7c8fbf26d1da17c8c4e648bce921296496a05
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a0c481b2f48b
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 09feda84e09e..8de98463dd6a 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-publicfile-2.20170805-r2.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
-EBUILD selinux-publicfile-2.20170805-r3.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-publicfile-2.20180114-r1.ebuild 290 BLAKE2B e1ec439af7bc22da312c8e9cb7cf1b67625301211854412a3cb31cc84bd09f1f6ca872aa848c972d7648b70a6f904c7de50801927ce3ea05fd9967bdaf8fa61a SHA512 2e18b5e96a03ed37e88ecbbeba2210852e7cfedae05033fa6c1dff9ca1fe1d8fe72548d4c3d2b2ae848d8cea454c2469c335672eac1c654df6fc8b9bb57cf8ec
EBUILD selinux-publicfile-2.20180114-r2.ebuild 290 BLAKE2B e1ec439af7bc22da312c8e9cb7cf1b67625301211854412a3cb31cc84bd09f1f6ca872aa848c972d7648b70a6f904c7de50801927ce3ea05fd9967bdaf8fa61a SHA512 2e18b5e96a03ed37e88ecbbeba2210852e7cfedae05033fa6c1dff9ca1fe1d8fe72548d4c3d2b2ae848d8cea454c2469c335672eac1c654df6fc8b9bb57cf8ec
EBUILD selinux-publicfile-2.20180114-r3.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
+EBUILD selinux-publicfile-2.20180701-r1.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
MISC metadata.xml 320 BLAKE2B 4cabac23d0424c4dc69d8c154e5d7cfe999ea5b132dfa8773168e781baabaa9145d225ddff271bcac1c9bb267e3c5c6da1cd35516f263f18dee398edf870f830 SHA512 44842cde8be2b2955172671bc0fb969c2eea4382d286d3833cef9099708f67a9c878c33245ccf85b781864921283490c821444cc6a4cdcbf477f00ab5a272420
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1c14791a6816
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index f80a2bafb29f..0afe09b74874 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pulseaudio-2.20170805-r2.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
-EBUILD selinux-pulseaudio-2.20170805-r3.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pulseaudio-2.20180114-r1.ebuild 290 BLAKE2B b7a97302b874592274875a76945d1778945ff493ee169c95ff5c27c967c6e941904d540a91134d15a563afc46463c62395a649fd21588ad754b82b640a45ad21 SHA512 71c67046a9fc51a297d78e0bab88f3124bce3b1e9aec1e1b9a31167b4b27e16ef73c95ebdef43a8fcd006d1571aab4bf1cec456897440e746c146c1b65757c56
EBUILD selinux-pulseaudio-2.20180114-r2.ebuild 290 BLAKE2B b7a97302b874592274875a76945d1778945ff493ee169c95ff5c27c967c6e941904d540a91134d15a563afc46463c62395a649fd21588ad754b82b640a45ad21 SHA512 71c67046a9fc51a297d78e0bab88f3124bce3b1e9aec1e1b9a31167b4b27e16ef73c95ebdef43a8fcd006d1571aab4bf1cec456897440e746c146c1b65757c56
EBUILD selinux-pulseaudio-2.20180114-r3.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
+EBUILD selinux-pulseaudio-2.20180701-r1.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
MISC metadata.xml 320 BLAKE2B 793c0ea0809ffaf2c30fa0089b9a9630cb625e510e96ba6b5a5b2689b1ca6e1fb810053f0a1458c92b337e5a98c74124384e52d9e39e9706f879c23860bc326a SHA512 49ed7fee8050b230c333264e6289d297cf3b4106b773446231dfcec9ce84121b39668e15304edb422ebb9477a3c03695cf8b35744f60fd81de5ac269b45a30ac
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..21591c2d56ee
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index fbf6db798811..01235dd68c24 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-puppet-2.20170805-r2.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
-EBUILD selinux-puppet-2.20170805-r3.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-puppet-2.20180114-r1.ebuild 282 BLAKE2B e8ced202640e5728b041fdb85cdb109f19155837b0ff68ccc2179fadd54de9a4c7c42114c1f4a4826155276a014291f29bf9949620197ee91c0e9b79fc930f35 SHA512 0488b42ec219f0d4d7749d57900eec1f6fdcc4be571d68fbfc18858d8a9ecea9de55959bbfa55c91ba622a817cba2c6b6f8be9b353447e7cc17c4190531d8598
EBUILD selinux-puppet-2.20180114-r2.ebuild 282 BLAKE2B e8ced202640e5728b041fdb85cdb109f19155837b0ff68ccc2179fadd54de9a4c7c42114c1f4a4826155276a014291f29bf9949620197ee91c0e9b79fc930f35 SHA512 0488b42ec219f0d4d7749d57900eec1f6fdcc4be571d68fbfc18858d8a9ecea9de55959bbfa55c91ba622a817cba2c6b6f8be9b353447e7cc17c4190531d8598
EBUILD selinux-puppet-2.20180114-r3.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
+EBUILD selinux-puppet-2.20180701-r1.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
MISC metadata.xml 316 BLAKE2B 41b7d803407b6b7274b78d8ac231ccb2e4042733f1fefea6b3ca488f4e0c9e8e18abe121c5d7b9779f41fd28d046d8172e6882c43c1af470de3c893b03a6e081 SHA512 075a815fc9424250d8d6a37af0aac045f22851a10053e21da5e507989bd5e98a708c3969301b3f935eb8b6b16e6823eeed9a72003e924de052289d8400518a31
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5f3399e38f63
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 2638bc69be43..e2b5c7469343 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pyicqt-2.20170805-r2.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
-EBUILD selinux-pyicqt-2.20170805-r3.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pyicqt-2.20180114-r1.ebuild 282 BLAKE2B 30ce516978b424711498f00c0af7f5eb0ca3dc7fc8d057aaee1c8013d351ee344bf3ff9a039a6a3cca2ae31a8237940d09098ee3b2f357232e065fdbd6169ee1 SHA512 8b79ec9d92a2c203824be59933bd164e987cbe3040b312cd0c2229012820252911dab20a0a20a66cb354c4c7a032ff66b191ffa5cc09170f02abc522a49e01f8
EBUILD selinux-pyicqt-2.20180114-r2.ebuild 282 BLAKE2B 30ce516978b424711498f00c0af7f5eb0ca3dc7fc8d057aaee1c8013d351ee344bf3ff9a039a6a3cca2ae31a8237940d09098ee3b2f357232e065fdbd6169ee1 SHA512 8b79ec9d92a2c203824be59933bd164e987cbe3040b312cd0c2229012820252911dab20a0a20a66cb354c4c7a032ff66b191ffa5cc09170f02abc522a49e01f8
EBUILD selinux-pyicqt-2.20180114-r3.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
+EBUILD selinux-pyicqt-2.20180701-r1.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
MISC metadata.xml 316 BLAKE2B f3ecd392817e5dcc1ef59a12822299ce751eeeada34370ec54492984863020c5d829c1c43d551993567fed5c46db1aad949acd8a75c8c58ad0dd5d4311149dbc SHA512 639389768b8e94cabcef99bf8f0362d37f0711a2c9280e5b29cc5e39fa5ebc088f8048065109eba81387301cd4a4f878f2115a71ecf110bb56d3ae7483548dea
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ff7315fd87f
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 758fdad31da8..fae328c9f7ae 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pyzor-2.20170805-r2.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
-EBUILD selinux-pyzor-2.20170805-r3.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-pyzor-2.20180114-r1.ebuild 280 BLAKE2B 2f6d29e6cd31faefe5ac042e48811454f0f5712d1b7f7b29f7ee349422e8de9ace8e254bd1143aed63baa899ea749a40a6699383b8d12d8564f9ffabacba531c SHA512 fc7330631185e255e8e48a30407caf107e5879f64c4cfa785ea7e6c99c96ef815abebe21a1f0c3f2bce1d204b88f1e85ee6f33abd445f4053fc68afd5ee0d125
EBUILD selinux-pyzor-2.20180114-r2.ebuild 280 BLAKE2B 2f6d29e6cd31faefe5ac042e48811454f0f5712d1b7f7b29f7ee349422e8de9ace8e254bd1143aed63baa899ea749a40a6699383b8d12d8564f9ffabacba531c SHA512 fc7330631185e255e8e48a30407caf107e5879f64c4cfa785ea7e6c99c96ef815abebe21a1f0c3f2bce1d204b88f1e85ee6f33abd445f4053fc68afd5ee0d125
EBUILD selinux-pyzor-2.20180114-r3.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
+EBUILD selinux-pyzor-2.20180701-r1.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
MISC metadata.xml 315 BLAKE2B b1a3009ebe5927bf782f39e1371ddfdeafb03b69be332d51e790524a69ac9a8a259f515bb6a017533a26f7efeba3af41ce489b3900271de33b7f54b453c5711a SHA512 6a068357d8420fe2434228757a54cbd193f5a0ad645902603261d512f78853a45573143d522cee139d97e9ccbed8af8562325442aa0c89f6feb9760cb2924029
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ec7ec7e951f3
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 929fb51660fc..14396208d7c9 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-qemu-2.20170805-r2.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
-EBUILD selinux-qemu-2.20170805-r3.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-qemu-2.20180114-r1.ebuild 370 BLAKE2B 5151e057bc53bc9ac0032f9f0e71f8021c92d9d01aaab1017e75180de64d7ddedffbefb958af56d230cc99f931aa248156bb5d661bde0851392759edab229ea9 SHA512 2fa89efad15389b44834a93e6ad6fe0b4cf7cefd196def543fa7504262e35c4841518a114347da5caaeec0cf612b29a8e62f4471b913f1b13011d93ba39b53da
EBUILD selinux-qemu-2.20180114-r2.ebuild 370 BLAKE2B 5151e057bc53bc9ac0032f9f0e71f8021c92d9d01aaab1017e75180de64d7ddedffbefb958af56d230cc99f931aa248156bb5d661bde0851392759edab229ea9 SHA512 2fa89efad15389b44834a93e6ad6fe0b4cf7cefd196def543fa7504262e35c4841518a114347da5caaeec0cf612b29a8e62f4471b913f1b13011d93ba39b53da
EBUILD selinux-qemu-2.20180114-r3.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
+EBUILD selinux-qemu-2.20180701-r1.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
MISC metadata.xml 314 BLAKE2B 0eab470121ac7e8afbc955da96c9fd85273bed160b7da7347d4176a5176aba2356ca42f82fbbdb79bebf3a53468280a20e4af2cfdabb4a5cfbb4face95de69ce SHA512 ce815f5d3ee896942198504d8b1156c2508978f6de36773b816b2d132a045889caa740a033a517b5447bd24414a97bad2950a4b43b8a4c762facffe983ff020a
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ac8c85d7ff8
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-virt
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-virt
+"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index ac0c5422cb07..528af457e78a 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-qmail-2.20170805-r2.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
-EBUILD selinux-qmail-2.20170805-r3.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-qmail-2.20180114-r1.ebuild 280 BLAKE2B f7ff4df29f076637641b6e617ed2704899f0e4751e069862fe0d798891a2ff994d4d5ac98434d43640b0db1777957f9badfae0003552146d94cbf25bf16778d8 SHA512 645b65efb1e48350af05f27d4382350901ac90c255aa4839832b3870cdbdf7c8ce3694cfe679cdfe1c98b7b43666938b8dabd3b755117d732beb853dba036ba9
EBUILD selinux-qmail-2.20180114-r2.ebuild 280 BLAKE2B f7ff4df29f076637641b6e617ed2704899f0e4751e069862fe0d798891a2ff994d4d5ac98434d43640b0db1777957f9badfae0003552146d94cbf25bf16778d8 SHA512 645b65efb1e48350af05f27d4382350901ac90c255aa4839832b3870cdbdf7c8ce3694cfe679cdfe1c98b7b43666938b8dabd3b755117d732beb853dba036ba9
EBUILD selinux-qmail-2.20180114-r3.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
+EBUILD selinux-qmail-2.20180701-r1.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
MISC metadata.xml 315 BLAKE2B 5d47ed9edc375f1f288563eaea7d28a90fc69cdc0250cd6d5c99aa9f422b87218d0a4428335bf6f450e82fd23874d58c680656f461a948786920b6ddf00a229d SHA512 b37ef0a329dedd9fb843e7d8f10d3153afab24b82336fdfd2dc03c713ce36cbf90a1506837ffefaed140d839af1a0f38e479a3f1ee6829c4d33cfef3cc8f5f95
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..91f8c6d5ea57
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index c38a80e15b2f..df2c3cd4e0a6 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-quota-2.20170805-r2.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
-EBUILD selinux-quota-2.20170805-r3.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-quota-2.20180114-r1.ebuild 280 BLAKE2B a0ef52eadaa28918d4f749b0996da5d5f992c3055285bf78302d9a387f6c44eb68ba59af9bdf38eadc60a7c72ff1095ddd2f22455dea08e3326305335c618b36 SHA512 8f49edbaf0a628a9d836260c87444c092711a8ab3330ae06860acdfb1f1478250bdf84413449b660d3b931f121e6124f44421ff8c2965c128a5a89b6279f83d6
EBUILD selinux-quota-2.20180114-r2.ebuild 280 BLAKE2B a0ef52eadaa28918d4f749b0996da5d5f992c3055285bf78302d9a387f6c44eb68ba59af9bdf38eadc60a7c72ff1095ddd2f22455dea08e3326305335c618b36 SHA512 8f49edbaf0a628a9d836260c87444c092711a8ab3330ae06860acdfb1f1478250bdf84413449b660d3b931f121e6124f44421ff8c2965c128a5a89b6279f83d6
EBUILD selinux-quota-2.20180114-r3.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
+EBUILD selinux-quota-2.20180701-r1.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
MISC metadata.xml 315 BLAKE2B 736a4f87fa9901b4056fbc68ffdbbf3c91b8945d6e8ef2c8f54bdcfaf21ca8193dcd40dee2efc20cd2a8e504ba93c7e88aabab28e20b808f4c3d63abf5915870 SHA512 af9939539d2e2846f01e42e77ca895260ac530e9071407dcef52b80069bd4bed814d0405bcc8dd41715ef0528c222d1dd96a138633efec2173e98ad44c0790af
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..36e2461e5a20
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 6d2a73592551..2909a837e936 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-radius-2.20170805-r2.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
-EBUILD selinux-radius-2.20170805-r3.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-radius-2.20180114-r1.ebuild 282 BLAKE2B 5402f1c6dc257cf845c2e6fb067479279c36d372477137ae9bda32ea0d0767e242d5df767209fd2b916d36af2ba2cf4adfa76eea8f7d7ceb642b0d4e29540e4b SHA512 89dab49c0d70ce81d439d61a873a2fad910c64788408da27bab21c66daf716b80eb1ba2c88e6064e804cc260677457aace649a1f3f019887e7b176fd3319f1ed
EBUILD selinux-radius-2.20180114-r2.ebuild 282 BLAKE2B 5402f1c6dc257cf845c2e6fb067479279c36d372477137ae9bda32ea0d0767e242d5df767209fd2b916d36af2ba2cf4adfa76eea8f7d7ceb642b0d4e29540e4b SHA512 89dab49c0d70ce81d439d61a873a2fad910c64788408da27bab21c66daf716b80eb1ba2c88e6064e804cc260677457aace649a1f3f019887e7b176fd3319f1ed
EBUILD selinux-radius-2.20180114-r3.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
+EBUILD selinux-radius-2.20180701-r1.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
MISC metadata.xml 316 BLAKE2B 7e4f0c89d1b0fac60267001131b4935d92686292be9f60fcfca7ed3612aaad76c3c5d1c1e110ead346c0220ada5750c763e2fb9b6016d36b2d018898cbea76b6 SHA512 0500b19ec7cff97e422e1a5e89bfd8c6574ab2c4fc03fada1abbbb1ab62bed170be38b5c70b6a515d57cfc65dbaf0d0c365e859b8533c9afa92f78d7df9c5731
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5d61679de48d
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index f586ed295c51..261a1e51c70d 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-radvd-2.20170805-r2.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
-EBUILD selinux-radvd-2.20170805-r3.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-radvd-2.20180114-r1.ebuild 280 BLAKE2B f71308fa83d6b9fc56302107e2caa3ec3450cc263660013fb54bb6ef4f4a30f3f6ab597bdffca489b1c7844adc16d6a050548dd3158911ad6c689a6dab4c935d SHA512 d3ed889c36dff973be855941a54d3efb5f8e804d3bbad4e880219bd5e24b0376d5f16c8d3b3d1444d52a9d2adf7dff9acc96e4834c1a367306e2a20f0852a7fc
EBUILD selinux-radvd-2.20180114-r2.ebuild 280 BLAKE2B f71308fa83d6b9fc56302107e2caa3ec3450cc263660013fb54bb6ef4f4a30f3f6ab597bdffca489b1c7844adc16d6a050548dd3158911ad6c689a6dab4c935d SHA512 d3ed889c36dff973be855941a54d3efb5f8e804d3bbad4e880219bd5e24b0376d5f16c8d3b3d1444d52a9d2adf7dff9acc96e4834c1a367306e2a20f0852a7fc
EBUILD selinux-radvd-2.20180114-r3.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
+EBUILD selinux-radvd-2.20180701-r1.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
MISC metadata.xml 315 BLAKE2B ddd9d0af6e1fe07ddb8ff4a619ffab1fd862ac54a95bbb1f9bb771a73fc0d288e330090f7c0e60abbba681062cd1246a83dc5b0ca1c4c39f592e71b726d003f2 SHA512 be9c80d6e07a38b69d9f9c50cc93bbdc8851ec45b578f22cc4335960ca0f55a2835987e304cb9d40fc01eaa473cc9c7c6136c6b051ca92fa42e38543cacddf92
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b92e3d1ca215
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 257ddc1e9055..86d86ae92467 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-razor-2.20170805-r2.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
-EBUILD selinux-razor-2.20170805-r3.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-razor-2.20180114-r1.ebuild 280 BLAKE2B 7f6346c177b76b6d3e23a9f898b3062090f09e144f09dcdcca7a58600c966f8307c9f2f2a3141dc6392e2310b803b571938d89b9fb281c331fe767260c0e303e SHA512 d7a4421b7aa4e187c6c7642606eff61bb99196ddb8336cb65a8b9ff7ef0175c3b31888a6a6b6dac75ed1e763dee135902f0b8eb761c4e752611a6216024a146a
EBUILD selinux-razor-2.20180114-r2.ebuild 280 BLAKE2B 7f6346c177b76b6d3e23a9f898b3062090f09e144f09dcdcca7a58600c966f8307c9f2f2a3141dc6392e2310b803b571938d89b9fb281c331fe767260c0e303e SHA512 d7a4421b7aa4e187c6c7642606eff61bb99196ddb8336cb65a8b9ff7ef0175c3b31888a6a6b6dac75ed1e763dee135902f0b8eb761c4e752611a6216024a146a
EBUILD selinux-razor-2.20180114-r3.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
+EBUILD selinux-razor-2.20180701-r1.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
EBUILD selinux-razor-9999.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
MISC metadata.xml 315 BLAKE2B dec27f37b99c6e66ed79661ee687e9d564e6ed45010165318e550e7ffb53d61c8101a732ced96ec84dd787ceb9ff6d09352be44962c1dbcc02b80325fbe9ab5c SHA512 fb1fbe7d5d8a99d86dce5d79e90fa849a94cbccc66a972e92084f1dbd4c459c42920f6591918151b22cb16e0db43ffd3dd738cc8dd4cc020db25286009d82d56
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1d3b49748dc1
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index 17df5a6c8892..9da00b169fa4 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -1,7 +1,10 @@
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-redis-2.20180114-r2.ebuild 280 BLAKE2B 760c27d50bd70853c27ffea597c09170d3577e4d96a33d5cd1215aa6b458fc544f40cfa28d9f7ab03bdd197bb9a1605f5217d22976c84a71842d739a89a357a3 SHA512 d95fb8564985ccf633b443ca4e42e06ea23ec6fc5849293da9b0ace6963b8b43601361101351208f21842cd11ac5dc2ef4cbcba6ad519d33048568da4ff33f76
EBUILD selinux-redis-2.20180114-r3.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
+EBUILD selinux-redis-2.20180701-r1.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
EBUILD selinux-redis-9999.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
MISC metadata.xml 315 BLAKE2B f694245feccb9ef96f0afc7f912bfb60ee4ce97085b0626f57006b8532c3f9a5c6fe43aa1029f28f057fad5801a420c2d2b0da5aa25f9028e16f62b7c985fecf SHA512 3f104b8866ca3c24c8c9f37727b63245f6bf536bbe70f564abc07ba7f68f22f45170269a18db552e4681d042545dfd09eb694010c9f629e85dda4e5def3db919
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf01a8f45bcb
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index d9536475c9d5..e54a37f4d33a 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-remotelogin-2.20170805-r2.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
-EBUILD selinux-remotelogin-2.20170805-r3.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-remotelogin-2.20180114-r1.ebuild 292 BLAKE2B 136a3487949999cf8bdfe55e2f8cdde27247e0386de45f0758ed9c1dff4c51a5e2626f849217c6121163d724a78f50b1d29ffc1836e897c0877d9adcb9ef7e2d SHA512 30b725494525381393609420108e0a5caf5754d7a299b8e888731d93cf7c934c71745ba1b6f38778aeeb51f064116c94fc38e5ad1bb5f5a43a70b94ddd4c8d61
EBUILD selinux-remotelogin-2.20180114-r2.ebuild 292 BLAKE2B 136a3487949999cf8bdfe55e2f8cdde27247e0386de45f0758ed9c1dff4c51a5e2626f849217c6121163d724a78f50b1d29ffc1836e897c0877d9adcb9ef7e2d SHA512 30b725494525381393609420108e0a5caf5754d7a299b8e888731d93cf7c934c71745ba1b6f38778aeeb51f064116c94fc38e5ad1bb5f5a43a70b94ddd4c8d61
EBUILD selinux-remotelogin-2.20180114-r3.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
+EBUILD selinux-remotelogin-2.20180701-r1.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
MISC metadata.xml 321 BLAKE2B 941ee41d833475aa740383a6686ff0d464ccec0550daf105b1bad6b065d19ec7ccd63b30857f34ed5b29d87a251914cb8905aea6aadfa8682f903fca1f6735d3 SHA512 de35cd8293d68562e772d0163377341a118b1d25957533ade5621dd4d1c5d34ab0269ddc27aaef0bce6826393ad12da5e185aa9761cccaecd7668b03078a5a0b
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8b28c4fbe3c5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 15bae889c275..48f6f6206caa 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-resolvconf-2.20170805-r2.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
-EBUILD selinux-resolvconf-2.20170805-r3.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-resolvconf-2.20180114-r1.ebuild 290 BLAKE2B c79ad531030fcbfc49ee64b30f29e7ba942aa87f41331577701b97b9519bb9d3dd3419cb9488b8fcac157198487e1129c155c1c7cfeaf921070e84fe73cc6e4c SHA512 d6fc316a1808285e0a8d96d29020c8a876f8da462043e74e3bd63168c25520e436624a1e3c1b5dc4ff792ad44306984cb6e514884f1ea7ac5b44aa3238d33093
EBUILD selinux-resolvconf-2.20180114-r2.ebuild 290 BLAKE2B c79ad531030fcbfc49ee64b30f29e7ba942aa87f41331577701b97b9519bb9d3dd3419cb9488b8fcac157198487e1129c155c1c7cfeaf921070e84fe73cc6e4c SHA512 d6fc316a1808285e0a8d96d29020c8a876f8da462043e74e3bd63168c25520e436624a1e3c1b5dc4ff792ad44306984cb6e514884f1ea7ac5b44aa3238d33093
EBUILD selinux-resolvconf-2.20180114-r3.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
+EBUILD selinux-resolvconf-2.20180701-r1.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
MISC metadata.xml 320 BLAKE2B fb1910a5f3e88fdfd7a95e0bf6e495eb2f2671a37a77f3fc2f804e8dc5b82f1626e0d0ac53020d83467bbca29d563efc54e119cbc3da8d760c7959827034c30f SHA512 a0886fd0602510911aa320748175141f3c30f31361994fd86a8a3923962252dfda9ec6d08a07502b514d8366fc4b7ecc0311fad268620b8eddd1be6af4f86183
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e1fbd450a3b6
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index fc076f091422..593c35430ed5 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rgmanager-2.20170805-r2.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
-EBUILD selinux-rgmanager-2.20170805-r3.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rgmanager-2.20180114-r1.ebuild 288 BLAKE2B fa53326d8f2a77f4dac1c37e7787292f0e3fe65c2a8f712ada83e90f1dd0272af22c3ca7e553747b14398f61feac41856ab4d7c4cc61a26c69106d31e8ca4655 SHA512 4266859112acaba909ae5178f6a287762d9c4d48c8db22e333b70143a8efc71e8cadc19274ba50b8b9e4511538b0557ea70fce3613bd310485b155ac3e30f19a
EBUILD selinux-rgmanager-2.20180114-r2.ebuild 288 BLAKE2B fa53326d8f2a77f4dac1c37e7787292f0e3fe65c2a8f712ada83e90f1dd0272af22c3ca7e553747b14398f61feac41856ab4d7c4cc61a26c69106d31e8ca4655 SHA512 4266859112acaba909ae5178f6a287762d9c4d48c8db22e333b70143a8efc71e8cadc19274ba50b8b9e4511538b0557ea70fce3613bd310485b155ac3e30f19a
EBUILD selinux-rgmanager-2.20180114-r3.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
+EBUILD selinux-rgmanager-2.20180701-r1.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
MISC metadata.xml 319 BLAKE2B ca194dfa68c48ec29894ecf75ddfd81e61911888fa10274f2a979f094403a6677ef3578e5b61274ad77eb51f7523d27a43df5ada162d6b475c6170ad0f409222 SHA512 3fe6e00bc4ff66fa281731582d5713081be180c8340ecd2c28501629018dac75c731d6a154cb84dc587af87e85bd787937ff64a16f9180400d0ed4894871df61
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c3ff16e532a0
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 9f0c0fdfa58e..34f41465f3e3 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rngd-2.20170805-r2.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
-EBUILD selinux-rngd-2.20170805-r3.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rngd-2.20180114-r1.ebuild 278 BLAKE2B 0bee59ed11f29fb240283ba55e96f3b26b8b1cda9dccf16285d9a760cce14011982400f2c71ccc838827ce44ff2711b6490acb464dfd7913d150e55b0e6cd03e SHA512 75a2f755d889d76b9355deab8e09a0835a5696c5c59c8f789970d3b927a2df9e392cec256bcf56f2864c111407fd0185560152263426660314a7619427333e14
EBUILD selinux-rngd-2.20180114-r2.ebuild 278 BLAKE2B 0bee59ed11f29fb240283ba55e96f3b26b8b1cda9dccf16285d9a760cce14011982400f2c71ccc838827ce44ff2711b6490acb464dfd7913d150e55b0e6cd03e SHA512 75a2f755d889d76b9355deab8e09a0835a5696c5c59c8f789970d3b927a2df9e392cec256bcf56f2864c111407fd0185560152263426660314a7619427333e14
EBUILD selinux-rngd-2.20180114-r3.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
+EBUILD selinux-rngd-2.20180701-r1.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
MISC metadata.xml 314 BLAKE2B 513d7e06f59b864334350fbefb1a4baedca21f57aaec2505f2e76681dd04dc179e3371ac97006e533f1ecc445cd97790b10b3258b2086ee282455ad308766695 SHA512 fd3229d5a3c38e74a5ac713c58882697f0effec4f4c64a0fa6649f6b068934a9669a56c05eceff23970d884094b3336532ef36c48acbf27904a8628bdce677fc
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf9dea3431e6
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index d71bc41ddf8c..c13150a09727 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-roundup-2.20170805-r2.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
-EBUILD selinux-roundup-2.20170805-r3.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-roundup-2.20180114-r1.ebuild 284 BLAKE2B aad4498fc5fc0275ee5c58d3076e4435c0ed0cd2db2e8bd082ffc059674c1a49acefd46353a337defc5fbbc3b47f5a6f3414b236d8659bc1ce5112a57c13a5d7 SHA512 04ea35c7852a1b54da3a720a581105c909072f8718c852f35982b7dbe9aaeb91048a4025f3232df130a7d0a6fd54747b62a30f6e25b2e23aeaf78f87736917a8
EBUILD selinux-roundup-2.20180114-r2.ebuild 284 BLAKE2B aad4498fc5fc0275ee5c58d3076e4435c0ed0cd2db2e8bd082ffc059674c1a49acefd46353a337defc5fbbc3b47f5a6f3414b236d8659bc1ce5112a57c13a5d7 SHA512 04ea35c7852a1b54da3a720a581105c909072f8718c852f35982b7dbe9aaeb91048a4025f3232df130a7d0a6fd54747b62a30f6e25b2e23aeaf78f87736917a8
EBUILD selinux-roundup-2.20180114-r3.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
+EBUILD selinux-roundup-2.20180701-r1.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
MISC metadata.xml 317 BLAKE2B 48aeb72f67904490c071c0de906f946a2c576225495c4e3613b6b7d1c7549536dcc94d76c59d478f2b350a24f293aef611bb2bbad618f294d61ede0eb73cecad SHA512 d52f384e061b6b658c8b1e0a692c37698e8054e4e3dcd48de402a15b76551befaedee464bd8fca9afddc11550ad735ee5f5857801eaf79579939000e4d4f5f22
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2a695a0dcd64
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 90b09fe082fb..e910d7205ddb 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpc-2.20170805-r2.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
-EBUILD selinux-rpc-2.20170805-r3.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rpc-2.20180114-r1.ebuild 276 BLAKE2B 800277ef62e11d41ad679f6e512c11e44ef5da7ec52f91d735da3d407b65510aad93f787cb3cedf248a1e8321956421485f563eb3d31d3e17c196377b3208429 SHA512 31750b63182112745a6d3ed6728fa74dbac6792fcf91e71480567a823af33b4253c2a144c192a8035a053a6b75d80d46b7911a4ab46b264337a3e6b9d708c1cd
EBUILD selinux-rpc-2.20180114-r2.ebuild 276 BLAKE2B 800277ef62e11d41ad679f6e512c11e44ef5da7ec52f91d735da3d407b65510aad93f787cb3cedf248a1e8321956421485f563eb3d31d3e17c196377b3208429 SHA512 31750b63182112745a6d3ed6728fa74dbac6792fcf91e71480567a823af33b4253c2a144c192a8035a053a6b75d80d46b7911a4ab46b264337a3e6b9d708c1cd
EBUILD selinux-rpc-2.20180114-r3.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
+EBUILD selinux-rpc-2.20180701-r1.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
MISC metadata.xml 313 BLAKE2B 7d496dd5e180419c17a712b92c464695df58b5ef3da31834e791390ff031afbd5c4e12920424aa87d34c6fe32bbeab0257335c4c2133ba7b1bd936879ae7b1ba SHA512 ddb7d0ea7dabca0eae92354cf6f8b6a8d488a7b483fe87bcbf8ad17e6d9641531e93ab999f8e4f5b7257eee469adc400dbf00a7854538e44a58b5a718586d937
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dd191f5c475e
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 2b7caa5a7a96..b2ab67f24037 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpcbind-2.20170805-r2.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
-EBUILD selinux-rpcbind-2.20170805-r3.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rpcbind-2.20180114-r1.ebuild 284 BLAKE2B d9dbaec85bf96aae9b8f7989bfaa0d16da52c2c9f26b145881be4b509b1d47b86d68278d50975b80512d750f6dbffd37a305c0d328c94af3700b3bd5d21ac0df SHA512 e075f0d6a19b54e909a872cf83b9d625625f3a890b93421e521dca633056e82e1787617e4a5ea1b23aa360f2ef096724cfb406034a11c89e2282e426931daa5f
EBUILD selinux-rpcbind-2.20180114-r2.ebuild 284 BLAKE2B d9dbaec85bf96aae9b8f7989bfaa0d16da52c2c9f26b145881be4b509b1d47b86d68278d50975b80512d750f6dbffd37a305c0d328c94af3700b3bd5d21ac0df SHA512 e075f0d6a19b54e909a872cf83b9d625625f3a890b93421e521dca633056e82e1787617e4a5ea1b23aa360f2ef096724cfb406034a11c89e2282e426931daa5f
EBUILD selinux-rpcbind-2.20180114-r3.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
+EBUILD selinux-rpcbind-2.20180701-r1.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
MISC metadata.xml 317 BLAKE2B 8ea56a9585ed24600649e412272989d00dde035ede35ff4fe79008920db09576c9a5eaf6b7f826f050de0edc995db3ae88de9a743fb8b97012d38115a0dc4a44 SHA512 903ca4b03b1d626137474588ce532951d7ce861ccd800b63e65bb662b79e61faf5439e323a329f0870c8718ca4f38e466979f6bd78b0a4564c342e6ced8734a3
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..16c4589f6924
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 3d8fe3ad4a4c..62b2e017deb6 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpm-2.20170805-r2.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
-EBUILD selinux-rpm-2.20170805-r3.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rpm-2.20180114-r1.ebuild 276 BLAKE2B 387831059d418204789e9af654b5d5e8e35fb937d17907ef5cc34299ed129e0b79639d53860fcc02c2cf43255f2ef9437190ca6cba48c3ee452fe53366d885ee SHA512 46aa5f078d6162981fb267af6a670a6efa16f14ff67b47585e05fffb1dead64a09e06f0640d059e355df67640ad61e3f86d2cdbcc6f9f8c8afd1890d0582913b
EBUILD selinux-rpm-2.20180114-r2.ebuild 276 BLAKE2B 387831059d418204789e9af654b5d5e8e35fb937d17907ef5cc34299ed129e0b79639d53860fcc02c2cf43255f2ef9437190ca6cba48c3ee452fe53366d885ee SHA512 46aa5f078d6162981fb267af6a670a6efa16f14ff67b47585e05fffb1dead64a09e06f0640d059e355df67640ad61e3f86d2cdbcc6f9f8c8afd1890d0582913b
EBUILD selinux-rpm-2.20180114-r3.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
+EBUILD selinux-rpm-2.20180701-r1.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
MISC metadata.xml 313 BLAKE2B 0ab90c03f0fcaf067a288f97269c036a325cf51d9c11664e48764d5b2f54fd4a25d6bfa76c0808375ce331598a1c67a0ed8c83dd0cfbf14265b5f94fad5a3d61 SHA512 d242612261b4697fef46c087a118c428fcbb6e3a462a9dd1ed7ec95edc4405fe35ce6ab9fe05fd74d68ca0922dfb2749fd77677a123c6e452505679c8e3eec38
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9b767ab57db8
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 3cdaf455461e..2c616ac1e507 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rssh-2.20170805-r2.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
-EBUILD selinux-rssh-2.20170805-r3.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rssh-2.20180114-r1.ebuild 278 BLAKE2B 0dff0649e4ebcbc7725c7f949fc999c8f93e1bd8ad0de1b1da2ba2b99d54cc88642f460ceb13e6164bd2f1c988bae721e0c4969e45b8111e8e5deefe663bbba0 SHA512 c3ee8e3e5e5a4f9f9f9f76db6ac2fa88d9802d436f76a2d5938cfe1e0eb10d16936e19be88631d32b99af784daced28fb87b11a9a9af06eed0f6f49abd38220c
EBUILD selinux-rssh-2.20180114-r2.ebuild 278 BLAKE2B 0dff0649e4ebcbc7725c7f949fc999c8f93e1bd8ad0de1b1da2ba2b99d54cc88642f460ceb13e6164bd2f1c988bae721e0c4969e45b8111e8e5deefe663bbba0 SHA512 c3ee8e3e5e5a4f9f9f9f76db6ac2fa88d9802d436f76a2d5938cfe1e0eb10d16936e19be88631d32b99af784daced28fb87b11a9a9af06eed0f6f49abd38220c
EBUILD selinux-rssh-2.20180114-r3.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
+EBUILD selinux-rssh-2.20180701-r1.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
MISC metadata.xml 314 BLAKE2B 6c1539b4a9e4db6f0c2727a5b007880cdb7d094a45cfa1ee30ad86b3265d23b7f141b8aa6516a3158a400f0b71ea080bad9be868379d88ad985c0b87d3a81812 SHA512 ace4b64738699a4322654bba904e10a682ffbbff7b2e7e1f28551aae8bf81188ecfe12a3400b8adbc110f6559d5b4d5820f49910a85dc0bd791cb3a73e07234d
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..802637b63464
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index f9a0f2c30e84..d693b5c89b39 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rtkit-2.20170805-r2.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
-EBUILD selinux-rtkit-2.20170805-r3.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rtkit-2.20180114-r1.ebuild 372 BLAKE2B 7d556364b3ec8b8324a93a6bb960df605e907b99ae9cf778461bce53bd951082a047526264a143f8bd3d20b5ba73b5879ea01fd7fa32def77a59ed8d997746b5 SHA512 78b55ca8bf1f6aa87629c92148ea3c9172f0d3f9195da8b24123751e4f91735269ee7ed864db79dd1d409f06e18e6a93d26910f5db546a9e0a145e9a94de9164
EBUILD selinux-rtkit-2.20180114-r2.ebuild 372 BLAKE2B 7d556364b3ec8b8324a93a6bb960df605e907b99ae9cf778461bce53bd951082a047526264a143f8bd3d20b5ba73b5879ea01fd7fa32def77a59ed8d997746b5 SHA512 78b55ca8bf1f6aa87629c92148ea3c9172f0d3f9195da8b24123751e4f91735269ee7ed864db79dd1d409f06e18e6a93d26910f5db546a9e0a145e9a94de9164
EBUILD selinux-rtkit-2.20180114-r3.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
+EBUILD selinux-rtkit-2.20180701-r1.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
MISC metadata.xml 315 BLAKE2B 35a8407fb69824482900b61bd80d8d7861a23b5a4b6f0c314cf92debba2290da83dfa0733428a35bbee6e108cc49f95275e6b6e28b7a307da07329f49ede626c SHA512 d3c120cce40e5aa7af88aa6603cf1389c5691023d21b0f9ead865c1cd1305008c286d7433f1364387360bbf0820ee32be67d820fc070c32ac89a6919382261a2
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e3c7a6ffeeca
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 419aae7398e9..b9d9f8988880 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rtorrent-2.20170805-r2.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
-EBUILD selinux-rtorrent-2.20170805-r3.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-rtorrent-2.20180114-r1.ebuild 286 BLAKE2B fa17f9d900967bfc3f3e323b8a9e6ece938a20547989e64d8a608020465e93a61563149755830e0bba627b6a900c260539819807c93b3bd3d26afaced1d500cb SHA512 871f9aa8f5410aa3c986a0cd4e5f0d7b0587d9818985f14a73066132afb14fe34b948b3c271118ea7e9dc33ed8e675c4e4291a2e34c934de98f3e9ce7e53ebc0
EBUILD selinux-rtorrent-2.20180114-r2.ebuild 286 BLAKE2B fa17f9d900967bfc3f3e323b8a9e6ece938a20547989e64d8a608020465e93a61563149755830e0bba627b6a900c260539819807c93b3bd3d26afaced1d500cb SHA512 871f9aa8f5410aa3c986a0cd4e5f0d7b0587d9818985f14a73066132afb14fe34b948b3c271118ea7e9dc33ed8e675c4e4291a2e34c934de98f3e9ce7e53ebc0
EBUILD selinux-rtorrent-2.20180114-r3.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
+EBUILD selinux-rtorrent-2.20180701-r1.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
MISC metadata.xml 318 BLAKE2B 55d670e11602395b801aa1f7794353c9418326e4d11c4488fb14695ccc288ae364e9e1625321948295e72d6e9e710767af35566161e75eb74ae4e09c831317d7 SHA512 a16d37c7a1c742c24f0b87f126157efaf9a62929d891cb93a3abfe0937f71b56eaec201f9f648f20697347c5628f330114a6e1c2132f5364d828c1c68936c3bb
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3b601d633ec8
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 995acaba516e..e64b3a65005c 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-salt-2.20170805-r2.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
-EBUILD selinux-salt-2.20170805-r3.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-salt-2.20180114-r1.ebuild 278 BLAKE2B 53bcdf785a5fd09a2fa1c58cebd408145513a710bb0a703136f28a3d6d340281488009073eb90dedfb34a4326fd94e8331958a042d724213ace4fd67a8ee6a21 SHA512 7b9c581c011abb9d5579adc6784a381ba8bdad5644f40282f25738fd0598b2f64aee9b6b10d24982fb8e10aa7a81be227fee92cf20c5059ce540e724e502361e
EBUILD selinux-salt-2.20180114-r2.ebuild 278 BLAKE2B 53bcdf785a5fd09a2fa1c58cebd408145513a710bb0a703136f28a3d6d340281488009073eb90dedfb34a4326fd94e8331958a042d724213ace4fd67a8ee6a21 SHA512 7b9c581c011abb9d5579adc6784a381ba8bdad5644f40282f25738fd0598b2f64aee9b6b10d24982fb8e10aa7a81be227fee92cf20c5059ce540e724e502361e
EBUILD selinux-salt-2.20180114-r3.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
+EBUILD selinux-salt-2.20180701-r1.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
MISC metadata.xml 314 BLAKE2B 2350a13155f12cb04aed75e030971f0ebb9cc7151b177bfd98c2d64dfbe6b1df79ec8fc09df61a2f5cc2ee6d641d3d1910259e6661d4522b3dfef554776bb5a0 SHA512 634ec5b038d166c8b654784e899ef50e4ffb87a855cc5fc54230276b89a84a1d879e84b52af6165edd1c4533eb37085443073d56d9f8f95e29b52945c0b6767a
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bc84b0e7d7ea
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="salt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for salt"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 0497d13778bd..97976557413c 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-samba-2.20170805-r2.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
-EBUILD selinux-samba-2.20170805-r3.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-samba-2.20180114-r1.ebuild 280 BLAKE2B 8106d5ffb67ceaedf752686fce0e46974697cb85dc1aa37953088857de51bb786dd7412e30b7d88125d66d2bbd05003d4a0cbac9e6177e5dab845f035822d231 SHA512 dd11d9cdfaa246dbbe28d3f1955cb793ab4ac2a9bb319ba7bf48a0d2521662fb3321b12d77bb88bb54a3ea9ab671fd9b63719a9974d11a260295aa9030976860
EBUILD selinux-samba-2.20180114-r2.ebuild 280 BLAKE2B 8106d5ffb67ceaedf752686fce0e46974697cb85dc1aa37953088857de51bb786dd7412e30b7d88125d66d2bbd05003d4a0cbac9e6177e5dab845f035822d231 SHA512 dd11d9cdfaa246dbbe28d3f1955cb793ab4ac2a9bb319ba7bf48a0d2521662fb3321b12d77bb88bb54a3ea9ab671fd9b63719a9974d11a260295aa9030976860
EBUILD selinux-samba-2.20180114-r3.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
+EBUILD selinux-samba-2.20180701-r1.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
MISC metadata.xml 315 BLAKE2B 08646bda187b856809d9bbdb57448783486da0b00f51c6e5b81ab65e54d86e3fa78934fb2774aa4f47d5a7b4328ccebe4132174d96953d33a3040afbcc6a8b59 SHA512 be5d21037154c9faad9ee42bb7337dde65086d188d3703a85e0557003efa33456dc3229ec6c3f36520ba5601d6af2c33825c0fdfa9b6611e4ba67aefe58e2224
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ab5f4c3c662
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 93c294aeb378..788fc30b6206 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sasl-2.20170805-r2.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
-EBUILD selinux-sasl-2.20170805-r3.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sasl-2.20180114-r1.ebuild 278 BLAKE2B de1e42f981db6b0861ca06c5ee03dd1dd6bd6e3da980bfd63900d768e912e8ab05859e62584eca5c37da1a0d95f69eba8765badba54a6d07810d5d753ac3b98e SHA512 238ee634adbdd088ceccca41b9b2e642154ef191bfe9d8b62f2d5e45b1672841be92651a0046c77d1be0078ca6d4f43e24a1b3601afa43260d57585103559f02
EBUILD selinux-sasl-2.20180114-r2.ebuild 278 BLAKE2B de1e42f981db6b0861ca06c5ee03dd1dd6bd6e3da980bfd63900d768e912e8ab05859e62584eca5c37da1a0d95f69eba8765badba54a6d07810d5d753ac3b98e SHA512 238ee634adbdd088ceccca41b9b2e642154ef191bfe9d8b62f2d5e45b1672841be92651a0046c77d1be0078ca6d4f43e24a1b3601afa43260d57585103559f02
EBUILD selinux-sasl-2.20180114-r3.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
+EBUILD selinux-sasl-2.20180701-r1.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
MISC metadata.xml 314 BLAKE2B 353081e43c3d5accea023efca05e8127596b4eb0156cd37f425f298b2fac17610a8519ca0490666e77270c9bdf100bf950753652a21b4b54bf4b48e166cab84d SHA512 45edaf69b73c11c1ed1b7f7fc2b97aadeb3d11b51e2b4c8e388c556efc79441bf70d1f0c835980626e3bdb8cc8bb315204f680a6dd64402035220606449e1960
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5798ce3dd1bd
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 0471ddd4c851..1a8b37c47a97 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-screen-2.20170805-r2.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
-EBUILD selinux-screen-2.20170805-r3.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-screen-2.20180114-r1.ebuild 282 BLAKE2B b72341581d9eedb0946df773f447411657732b759bb2ef7379f98a54e81f00f23fc30721b74bdee8b5317a49870f7fb428e66f54dcdd4b670d6c22a349e3e815 SHA512 7fc84811b4b7eb90794312f65fdff8301f546edf6ccce6b19d74028edf892a4449a48ed5534bc44f778ca94c9fc107a62d594c4d1977dea81b1ce2d3e32d3978
EBUILD selinux-screen-2.20180114-r2.ebuild 282 BLAKE2B b72341581d9eedb0946df773f447411657732b759bb2ef7379f98a54e81f00f23fc30721b74bdee8b5317a49870f7fb428e66f54dcdd4b670d6c22a349e3e815 SHA512 7fc84811b4b7eb90794312f65fdff8301f546edf6ccce6b19d74028edf892a4449a48ed5534bc44f778ca94c9fc107a62d594c4d1977dea81b1ce2d3e32d3978
EBUILD selinux-screen-2.20180114-r3.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
+EBUILD selinux-screen-2.20180701-r1.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
MISC metadata.xml 316 BLAKE2B 197be4a73afaa6ab290a9589ba55be1aaa09881838010414216330577d2d785eecb1a47e1054c3824c24658e7377cb2982ac8d0f146ee11ed6beee02fb20823d SHA512 4fe7d61f85ea2a1a24235cb5d571e9c0ff213b44d985f33d2d72858e7e429992ad6e779cc641eb2712f4abc089dab74203ed2b5111c627efce0a45c0da25bd5a
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..943274f4a0a3
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 7ac4f799d509..81e8347acc04 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sendmail-2.20170805-r2.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
-EBUILD selinux-sendmail-2.20170805-r3.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sendmail-2.20180114-r1.ebuild 286 BLAKE2B 775fb96c91cabcb2070b37f5e6e38596534136083e691a0a9836ee644047d419c45ec7fbc3a1d246f49b57f2e6a4fe10abd56e4cb7701dba3aef1eeca0bb78b9 SHA512 72d9d4c1663b192127f031ad6a7a047442257e99b9792722790d7511ce9e774412afbd411663575489ee1becb421789e458e7a8c16d3c726ecfd34a82e030687
EBUILD selinux-sendmail-2.20180114-r2.ebuild 286 BLAKE2B 775fb96c91cabcb2070b37f5e6e38596534136083e691a0a9836ee644047d419c45ec7fbc3a1d246f49b57f2e6a4fe10abd56e4cb7701dba3aef1eeca0bb78b9 SHA512 72d9d4c1663b192127f031ad6a7a047442257e99b9792722790d7511ce9e774412afbd411663575489ee1becb421789e458e7a8c16d3c726ecfd34a82e030687
EBUILD selinux-sendmail-2.20180114-r3.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
+EBUILD selinux-sendmail-2.20180701-r1.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
MISC metadata.xml 318 BLAKE2B d2c93df153de9789f247d6fb548f65a2d69493673af0b806b3dd40b0101cecdd27a9a3e681bd49e9fa210b250cc17468706c4c73009b7c8fb1d3bf24180a902a SHA512 32cedde0f34cdc0e2dce0599332364e3a2b7feafaec1dab8e96c34b4ebd1274c53ea4051d555ff3fc48cf86df7c45ce929c938c3f7e914e47012a8ba8b6fbcaf
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b94c5bf9764c
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 6c903fcab131..ee68a0a8ee67 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sensord-2.20170805-r2.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
-EBUILD selinux-sensord-2.20170805-r3.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sensord-2.20180114-r1.ebuild 284 BLAKE2B 10d77950f9cdc680e3ea389381f00175524caa51784a79f4dea11b3d4065b93dfb6918919df9a5056ddb26146ed36abaf5129535cd5f94744a5b0435996ba5b2 SHA512 099f4b968552181f1039cc07902a40b662445689bdaf21196214924e92943cc00f962f27c396545713ac9401baadd94535c11e4c49c5a82d197b73a269b18c4f
EBUILD selinux-sensord-2.20180114-r2.ebuild 284 BLAKE2B 10d77950f9cdc680e3ea389381f00175524caa51784a79f4dea11b3d4065b93dfb6918919df9a5056ddb26146ed36abaf5129535cd5f94744a5b0435996ba5b2 SHA512 099f4b968552181f1039cc07902a40b662445689bdaf21196214924e92943cc00f962f27c396545713ac9401baadd94535c11e4c49c5a82d197b73a269b18c4f
EBUILD selinux-sensord-2.20180114-r3.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
+EBUILD selinux-sensord-2.20180701-r1.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
MISC metadata.xml 317 BLAKE2B 7a98bdcdf553ecde53aa9469cbe665f14eacca0b14774c2f59d8c7a74580c0a9b28c81aadb9b43dd807452dbb42b42a383f14e7fc536caec35292cdfdb884ca1 SHA512 efb7c659fad7bca559bbac9b5abe6fff6b82c69a6557a167327d569be61c75a51deb7a3f2785bac38a2b000cf1bec227423906a1ea678229aba158a8227dd6d3
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4247b25372f9
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 87fd5c5ba61d..9c1918e369d3 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-shorewall-2.20170805-r2.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
-EBUILD selinux-shorewall-2.20170805-r3.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-shorewall-2.20180114-r1.ebuild 288 BLAKE2B 108a586ae38b988c5c358af60a4464524798f7db79e0afb5458d4cbdf8951c0c7a249e8be02922ba0d2d7771258656c186a88da0b2469e37e9906f8ab84642fe SHA512 7543c73dbeac5bd8023af10c118b510a3e6ea6a3811df7eedcb4c60517595446f953cd9b9e3d6b68ab5cf80c40fd14f4f05e4f48c5322793be30e802c0165ece
EBUILD selinux-shorewall-2.20180114-r2.ebuild 288 BLAKE2B 108a586ae38b988c5c358af60a4464524798f7db79e0afb5458d4cbdf8951c0c7a249e8be02922ba0d2d7771258656c186a88da0b2469e37e9906f8ab84642fe SHA512 7543c73dbeac5bd8023af10c118b510a3e6ea6a3811df7eedcb4c60517595446f953cd9b9e3d6b68ab5cf80c40fd14f4f05e4f48c5322793be30e802c0165ece
EBUILD selinux-shorewall-2.20180114-r3.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
+EBUILD selinux-shorewall-2.20180701-r1.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
MISC metadata.xml 319 BLAKE2B 770bef5667ce36c3e531cd9bb5160ec813134ebd648c97e51f9fd98b413d322d69e00058e2e91bd8755fcf08e4ba7a7ccf7e36e13ad8503a6408c221dac2cad3 SHA512 fdad724a2c1f0baf476b7a23debedd76f6966f06ed68f1f8a09d4f3fc6288879ba290ba82f625e98542799b54f82cf348f6d99b9e8b4389cffc861f50c55d4b1
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dfd988330a21
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index fafb4b7a8742..f46c5c812c29 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-shutdown-2.20170805-r2.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
-EBUILD selinux-shutdown-2.20170805-r3.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-shutdown-2.20180114-r1.ebuild 286 BLAKE2B aa6ca83034db161ef08a1b540574e395dd4189aeeaa421dbe083151518eb03b1139bfe83d2376906e84350e6cd48d325670b6a48f6c4ebf2940a53981696a188 SHA512 63b2e22bb50aa994dd6d71a382c20dc301b903570ca110ad2ee880db410f2c76755851fa4929b38ee7ac73ec18512299a54959483ca39f785787bd3acb6891aa
EBUILD selinux-shutdown-2.20180114-r2.ebuild 286 BLAKE2B aa6ca83034db161ef08a1b540574e395dd4189aeeaa421dbe083151518eb03b1139bfe83d2376906e84350e6cd48d325670b6a48f6c4ebf2940a53981696a188 SHA512 63b2e22bb50aa994dd6d71a382c20dc301b903570ca110ad2ee880db410f2c76755851fa4929b38ee7ac73ec18512299a54959483ca39f785787bd3acb6891aa
EBUILD selinux-shutdown-2.20180114-r3.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
+EBUILD selinux-shutdown-2.20180701-r1.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
MISC metadata.xml 318 BLAKE2B aa7bb6373d464eeb3bb0fd6f1cde62da5e0d49891c361a555194e6e30223d5130620888282020e14afafcdacbf95db797264fed49d1027c2b6b0df99fec7e2bc SHA512 4fa45f9cb30c10064cb7c91c5331d4ca91a05cb1f74403feb9dbeadd943a0741c1849371bd444432c3ed7c0ae84e09e4742cb9e12ba9c8b8f40413a56f002767
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a1ee5c0570e9
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 06d7a422586f..85bbcc496145 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-skype-2.20170805-r2.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
-EBUILD selinux-skype-2.20170805-r3.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-skype-2.20180114-r1.ebuild 382 BLAKE2B 985fa9b9b714917b516a82c0489632ffc2c634737baf35a454a2c00f9cd99d19af0f1e63e447d40a156d04ac7e54984456014cb8fd931d881931dbe83973b5cd SHA512 25518b95a19fb6ffc0e38633bebdd44df6aac130278b8d11498d1681e9f93c984e4052dc4e52873d0b6cecac3daa06c6e8647de71aee439344d45827ff331db8
EBUILD selinux-skype-2.20180114-r2.ebuild 382 BLAKE2B 985fa9b9b714917b516a82c0489632ffc2c634737baf35a454a2c00f9cd99d19af0f1e63e447d40a156d04ac7e54984456014cb8fd931d881931dbe83973b5cd SHA512 25518b95a19fb6ffc0e38633bebdd44df6aac130278b8d11498d1681e9f93c984e4052dc4e52873d0b6cecac3daa06c6e8647de71aee439344d45827ff331db8
EBUILD selinux-skype-2.20180114-r3.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
+EBUILD selinux-skype-2.20180701-r1.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
MISC metadata.xml 315 BLAKE2B 03028ab251445c2df09ebe2861996a9ec8006d4b044543401f97c05775f88d5789002c403876e2cff79bb6629003c1607ad289670ea18c4e913f2b4edc88ead0 SHA512 1a924ae849c1f4c698f1e30e99a612fd88ef66371170814f4e51a3940fbd463345b80156f2ed35b5aab70e808f42cd2c1a100b018659a182f96660b501fd85ba
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0ae995509331
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index f47203efbf92..9897a06f08f2 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-slocate-2.20170805-r2.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
-EBUILD selinux-slocate-2.20170805-r3.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-slocate-2.20180114-r1.ebuild 284 BLAKE2B 809d3525988975bf1c8392274d7ff2f7a31f8ecfda4047808a2d839c6b7faedd62c5c711754a66d99ffb782cf94c34b54e21ef77eafb02c45a7982859d92024a SHA512 bd7d16e44585daeb9bd3486374e2c989d3f24732aa35d37171c6b3fc1c38b6eff1cde075bf98881b07e98e6c20bd4c76e65c0197b01b790e083e828c24a87749
EBUILD selinux-slocate-2.20180114-r2.ebuild 284 BLAKE2B 809d3525988975bf1c8392274d7ff2f7a31f8ecfda4047808a2d839c6b7faedd62c5c711754a66d99ffb782cf94c34b54e21ef77eafb02c45a7982859d92024a SHA512 bd7d16e44585daeb9bd3486374e2c989d3f24732aa35d37171c6b3fc1c38b6eff1cde075bf98881b07e98e6c20bd4c76e65c0197b01b790e083e828c24a87749
EBUILD selinux-slocate-2.20180114-r3.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
+EBUILD selinux-slocate-2.20180701-r1.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
MISC metadata.xml 317 BLAKE2B 5ce4f43bcfb01aee90580b7011699ba0623f846297d542b2f565474b8ead543e8f1a131595bf13e7b51916b10c337303535c6e41e92bd7670b9c12dc683adee7 SHA512 644efe6833d658d1f9e1181652ef2d10b13a45e8c5896235efe04a4f7f1dc9676145f501f2682a5763836038d16e3f9f0e9aad3138880b0ee77d4b3b22de66fe
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8393ac0bfd57
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 5fe39ef2ad38..491bdc118543 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-slrnpull-2.20170805-r2.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
-EBUILD selinux-slrnpull-2.20170805-r3.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-slrnpull-2.20180114-r1.ebuild 286 BLAKE2B f3a6aaccf23d823ba6b25c378097bd25df6edd2e07196e811a71b36d64f9ab9e3c5070e2f1f7a8f8a3df648ca671ae98c22311875545e38103b492693adc4210 SHA512 270fa2d6e74eccfe589fe49a4f444821925a153635b6a6ec7f8cea4963724c82fe432e34b45a12482c58f5511057cfee25bd83f0d8458d458849dbaa8a20e93c
EBUILD selinux-slrnpull-2.20180114-r2.ebuild 286 BLAKE2B f3a6aaccf23d823ba6b25c378097bd25df6edd2e07196e811a71b36d64f9ab9e3c5070e2f1f7a8f8a3df648ca671ae98c22311875545e38103b492693adc4210 SHA512 270fa2d6e74eccfe589fe49a4f444821925a153635b6a6ec7f8cea4963724c82fe432e34b45a12482c58f5511057cfee25bd83f0d8458d458849dbaa8a20e93c
EBUILD selinux-slrnpull-2.20180114-r3.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
+EBUILD selinux-slrnpull-2.20180701-r1.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
MISC metadata.xml 318 BLAKE2B 7ce08160f820c186fefe0d8fd4c286425f48c130f7b604b996e503662486e0ed5176340b744dfe54824ac00248afa95ed10f607e0a537a2dd56bf1dee3d9179e SHA512 d44cf9551886870def9addeb8e1cccfb4d79dae34507f43d45539e331e8120c6e2d49692e2aa6c3eacc86b3a57d83956298da1c4e7b12da2718fb15d812cced1
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3602a91bf185
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index b6f81b799ec8..b56ba4b1fe9e 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-smartmon-2.20170805-r2.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
-EBUILD selinux-smartmon-2.20170805-r3.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-smartmon-2.20180114-r1.ebuild 286 BLAKE2B 5d5c2bd964bb8446e16ff837f374431093bceaed809a131b0ee29328a92c9b2b1600e548092cb3edd0c0fe969dfa80da8ce531557678eca71856248a5e8ec16c SHA512 4f6bd806f0e4300166bdb7c42b09c679d0a7d5c85b85f79a4b41bec5920cdb06043390963d323e6097ec0c025ea56d6c9fd8b406f47717c516237be00dd15f69
EBUILD selinux-smartmon-2.20180114-r2.ebuild 286 BLAKE2B 5d5c2bd964bb8446e16ff837f374431093bceaed809a131b0ee29328a92c9b2b1600e548092cb3edd0c0fe969dfa80da8ce531557678eca71856248a5e8ec16c SHA512 4f6bd806f0e4300166bdb7c42b09c679d0a7d5c85b85f79a4b41bec5920cdb06043390963d323e6097ec0c025ea56d6c9fd8b406f47717c516237be00dd15f69
EBUILD selinux-smartmon-2.20180114-r3.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
+EBUILD selinux-smartmon-2.20180701-r1.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
MISC metadata.xml 318 BLAKE2B f431a7c8290a07e455ec0be6e5b1e8d7427fefd7d0eaefc226ac899288d71e4d39023f912b3260ea398c2e4fa6e03f6b789129568403dbed8dd8a3ebdcbf6d66 SHA512 918ce5bfdccbef2cdb0580bd1e60fa164dfe2b64d08ae080b48b311f777d2b4c14c6a5b19e826789a07febd52820bb4cfc42927317770b766908ae347e6ed71f
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bda18992ab22
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index eb98a5aa2f9b..dc5f20d565a7 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-smokeping-2.20170805-r2.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
-EBUILD selinux-smokeping-2.20170805-r3.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-smokeping-2.20180114-r1.ebuild 384 BLAKE2B e8af79ac9fc79c49f837d28777518be4861fd1415a96705fc8d4e1a6384a1dc89eed3870e36388ea7871308ee9f036a4d34c26d25b9787951279e6fedb170936 SHA512 7d728f25328bc23b7f0a0ba25466a824df1d9f57c05ffc2f4480bef7ef417dbea7d9f0cf3b24362942e639747d146cf76cf55891c0b8b21b27e68fc45469f8a7
EBUILD selinux-smokeping-2.20180114-r2.ebuild 384 BLAKE2B e8af79ac9fc79c49f837d28777518be4861fd1415a96705fc8d4e1a6384a1dc89eed3870e36388ea7871308ee9f036a4d34c26d25b9787951279e6fedb170936 SHA512 7d728f25328bc23b7f0a0ba25466a824df1d9f57c05ffc2f4480bef7ef417dbea7d9f0cf3b24362942e639747d146cf76cf55891c0b8b21b27e68fc45469f8a7
EBUILD selinux-smokeping-2.20180114-r3.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
+EBUILD selinux-smokeping-2.20180701-r1.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
MISC metadata.xml 319 BLAKE2B f64021cb4ab298dc7a704b55c81ac1bd119aebd97cd69e38444773e06ce510e318cc6f5a513f4f63d0f79fefd956a83c6b005cbf2c1727c6d9c77e113995a63c SHA512 d4db53e2c965a838139c9aafbc227a9b9378c674d074392ff08e2dea5247e7bb7fa912312f12a14cf534faf48e27b182f477694a5ad2d96f5322f2ed2404e83f
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..764fbe3b4119
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 82526f117dd6..e99620d67221 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-snmp-2.20170805-r2.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
-EBUILD selinux-snmp-2.20170805-r3.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-snmp-2.20180114-r1.ebuild 278 BLAKE2B d200a6507021fd775b95621973149028e4af6f2ef8d3e791acc56ee1de9fdec579a3e2adc95ee275052990f52ba17873f48e7b5efa25fefa268966fa74e325e8 SHA512 3bd3b80bc471f2c94f4d4013ce81d3dee33f644c5351cd55aeeb1ef10405253c8362b5cefa54cd1d41719c1e5250b6e8905051c3c5660440740fbbd261525869
EBUILD selinux-snmp-2.20180114-r2.ebuild 278 BLAKE2B d200a6507021fd775b95621973149028e4af6f2ef8d3e791acc56ee1de9fdec579a3e2adc95ee275052990f52ba17873f48e7b5efa25fefa268966fa74e325e8 SHA512 3bd3b80bc471f2c94f4d4013ce81d3dee33f644c5351cd55aeeb1ef10405253c8362b5cefa54cd1d41719c1e5250b6e8905051c3c5660440740fbbd261525869
EBUILD selinux-snmp-2.20180114-r3.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
+EBUILD selinux-snmp-2.20180701-r1.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
MISC metadata.xml 314 BLAKE2B e3dedb894a12e1456e6e7de952e75ebbaa721995b7dd46320002488595c2bc26f4155184ad83b8c127a2f74859cf925107143fa53c362740228e9483dda9b0d2 SHA512 59b89808ea75eb3191a556a44d3be23f5d2f884cb0a195e3626bd11d03f0972d7a53bd15a509c8fb426f89a09e72a5485c6c12938dfe173a1f2e05dc999baee2
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..432be580324f
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index ca105eebce40..f1ab3cfd53a6 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-snort-2.20170805-r2.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
-EBUILD selinux-snort-2.20170805-r3.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-snort-2.20180114-r1.ebuild 280 BLAKE2B 9db715c0582bbff42aea446a5269e6fe35d710c0f55f0d9ba25956c75ae09749e873f0d0c45ff968149ed275e159229a7ca4bab6c66dea5702dc050f753ec5fb SHA512 bac1d40c6f096ee528f191b5b6a4314e8f4d1f4a334fd11fa3293f0496b363c6f16727cfa6bf2c8bb461f15915e744b4d6a433c24ef73e80498b564e9a1c5bab
EBUILD selinux-snort-2.20180114-r2.ebuild 280 BLAKE2B 9db715c0582bbff42aea446a5269e6fe35d710c0f55f0d9ba25956c75ae09749e873f0d0c45ff968149ed275e159229a7ca4bab6c66dea5702dc050f753ec5fb SHA512 bac1d40c6f096ee528f191b5b6a4314e8f4d1f4a334fd11fa3293f0496b363c6f16727cfa6bf2c8bb461f15915e744b4d6a433c24ef73e80498b564e9a1c5bab
EBUILD selinux-snort-2.20180114-r3.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
+EBUILD selinux-snort-2.20180701-r1.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
EBUILD selinux-snort-9999.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
MISC metadata.xml 315 BLAKE2B f39f4978caccc6f70806683fe33bf2383e5e523a5041adc7e63b07059ab7e41e5b442fedf617772030989d5f12bad5abba537ec0ae002bc9e0f8124bb63ce083 SHA512 84eaf9d6b3a721099ebb825ffb0efb1d5bb4b17b5e8181cdd6bd59028047f6458b3444c5fd2ec970f848de4b6c5d03b8242cadf3d7c99918bb1f09babbdfcdc8
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2a79291258ea
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 8e3d835ac44a..b339d0b5926d 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-soundserver-2.20170805-r2.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
-EBUILD selinux-soundserver-2.20170805-r3.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-soundserver-2.20180114-r1.ebuild 292 BLAKE2B bf9ba45689e490182a562f85137590fa8b67beb44872af0f626a2b3587bf0021e3bea653cb6915c576eb35bfeb37c3ea2a2e8dd8aa9498abea02f7e745709f9d SHA512 6bb3c7d1e7d28e63927a6f92f8a2bac369312fc8de6a46660ac0a35292c4be8ccc5d733d91dae62794737f1d1233dd79da79a35db2bf2f61209e862f03fece17
EBUILD selinux-soundserver-2.20180114-r2.ebuild 292 BLAKE2B bf9ba45689e490182a562f85137590fa8b67beb44872af0f626a2b3587bf0021e3bea653cb6915c576eb35bfeb37c3ea2a2e8dd8aa9498abea02f7e745709f9d SHA512 6bb3c7d1e7d28e63927a6f92f8a2bac369312fc8de6a46660ac0a35292c4be8ccc5d733d91dae62794737f1d1233dd79da79a35db2bf2f61209e862f03fece17
EBUILD selinux-soundserver-2.20180114-r3.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
+EBUILD selinux-soundserver-2.20180701-r1.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
MISC metadata.xml 321 BLAKE2B 9bfdd274709d25944554b345f60312535acea154d2aba88c784c9c974f7e2a752b2f828b4a8cbadc95f569d09beb6846d669e8cfb3bb4d992dee2f4fcb15c7f0 SHA512 b9da9a501ff24e1b78750de04a1611143d7ef73e228018cd676cbc2d92624191acbe8b97fe640111184dd5460b7944f4f690994b8aceb64cb6ded5e418d87da7
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2ff6085dc186
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index fd10cfd5a0b2..c0537124f8d9 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-spamassassin-2.20170805-r2.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
-EBUILD selinux-spamassassin-2.20170805-r3.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-spamassassin-2.20180114-r1.ebuild 294 BLAKE2B 50c51c85763893ec673adb9ec074767830d4563b174cd3bba6bcfba06662d211f1c77ecb4a94d4caf9b465e0069f50d9b7c0fc2d5a31c4d86217d016970b2641 SHA512 be97ccc40035e67ad39be6f218139e344f90e0f665a714f83e681a86da969dc53f3777a8ebefeceba897c2c35edaf633d76e121ee841c8a0054d0ab39cc84a8a
EBUILD selinux-spamassassin-2.20180114-r2.ebuild 294 BLAKE2B 50c51c85763893ec673adb9ec074767830d4563b174cd3bba6bcfba06662d211f1c77ecb4a94d4caf9b465e0069f50d9b7c0fc2d5a31c4d86217d016970b2641 SHA512 be97ccc40035e67ad39be6f218139e344f90e0f665a714f83e681a86da969dc53f3777a8ebefeceba897c2c35edaf633d76e121ee841c8a0054d0ab39cc84a8a
EBUILD selinux-spamassassin-2.20180114-r3.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
+EBUILD selinux-spamassassin-2.20180701-r1.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
MISC metadata.xml 322 BLAKE2B 3b45dfb6f0b204b42d1854faefd6a817d4f6433d5ce76b10838ad703dbc4ea86af21a23bbbaffdb61bffd7c41c8c1031afeb6315b3c3e06c155554fbe43d7389 SHA512 345132094265e24dad21ecc976e75750a363d6773ef83fd63c53ea744b8d3afcd9504d1e63f6758ed54e85cb8e3461e65dfb72bc67f5a63c21c50d9e71dc90ef
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..909e42792205
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 4bc069c988d1..5f2418d36bc2 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-speedtouch-2.20170805-r2.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
-EBUILD selinux-speedtouch-2.20170805-r3.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-speedtouch-2.20180114-r1.ebuild 290 BLAKE2B 41812b000437cb50d45f86a05bfe43f251c9493304c1ec59557afbc4c0b4ee97e1c75b2bd7a50c92a851e32bbb7537416489cbe067757c96abe02866170cfc10 SHA512 6250e84a640e4cc3042ef42f9b5436ea8e5f0e29c084daacd85cc5f41acf2be4e2bd25b355a07a01c0243cb6aeb097108aeb37d213418329838c5864f2f84cac
EBUILD selinux-speedtouch-2.20180114-r2.ebuild 290 BLAKE2B 41812b000437cb50d45f86a05bfe43f251c9493304c1ec59557afbc4c0b4ee97e1c75b2bd7a50c92a851e32bbb7537416489cbe067757c96abe02866170cfc10 SHA512 6250e84a640e4cc3042ef42f9b5436ea8e5f0e29c084daacd85cc5f41acf2be4e2bd25b355a07a01c0243cb6aeb097108aeb37d213418329838c5864f2f84cac
EBUILD selinux-speedtouch-2.20180114-r3.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
+EBUILD selinux-speedtouch-2.20180701-r1.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
MISC metadata.xml 320 BLAKE2B 34a59dc2b37e67afb4cab2ad95cf3319232f1857e85aae35ce641a22e5ec62cadea9e07725445f9185cc78e90d36b98cd864240f739372d6051bfb54bcb90094 SHA512 ef55a786bf5aa65e1bba7df8f14e019fb4f18ae58eddc64b46bdf9b0cf39ba4fde9171ee436fb5264556038d3ae464df4adbd65ca3c3213fb3925dd8e5635c96
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c9c31f9b77ac
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index e0fa01592a54..ca04dce5fc7a 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-squid-2.20170805-r2.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
-EBUILD selinux-squid-2.20170805-r3.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-squid-2.20180114-r1.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
EBUILD selinux-squid-2.20180114-r2.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
EBUILD selinux-squid-2.20180114-r3.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
+EBUILD selinux-squid-2.20180701-r1.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
MISC metadata.xml 315 BLAKE2B 73d453753c413703df9d5b137710f031f520258d26efcdf9076ae128573efae6fc54210fb815a446015c1046c454b485476bfe912c8fbdec163965ecb22f6796 SHA512 0742eacb66c8dcaa556ca6bdc0d55789c28d5f776b065340d6f72eea41ddbd1ac34fa4d5257a11cd970e23c42b4ed36b556838d619b70b8fa78d854bfc82396d
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..21f8d9686c17
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index d5c6f8ff4272..df93a9e000ca 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sssd-2.20170805-r2.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
-EBUILD selinux-sssd-2.20170805-r3.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sssd-2.20180114-r1.ebuild 278 BLAKE2B c92e17b1905a1fbeaa97c1f4024ee7a762111f7c128abfd9c79da42ec84eaf8d7d35f19b46ac84f82f596e8347d4202fba98c001d2605cbc3e2df9908a029ce9 SHA512 71f83205f2d49cd43518397eb0182b79837c416a8160ef3abb1d9df46bfd89a231bc537e0d59e860fffafea4b85f42b5a91e1d7cb306d62981dd417d42d0d2bf
EBUILD selinux-sssd-2.20180114-r2.ebuild 278 BLAKE2B c92e17b1905a1fbeaa97c1f4024ee7a762111f7c128abfd9c79da42ec84eaf8d7d35f19b46ac84f82f596e8347d4202fba98c001d2605cbc3e2df9908a029ce9 SHA512 71f83205f2d49cd43518397eb0182b79837c416a8160ef3abb1d9df46bfd89a231bc537e0d59e860fffafea4b85f42b5a91e1d7cb306d62981dd417d42d0d2bf
EBUILD selinux-sssd-2.20180114-r3.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
+EBUILD selinux-sssd-2.20180701-r1.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
MISC metadata.xml 314 BLAKE2B 0ce46de60572d5bc06a9c52cefaccd4bae559c48cbbf48237c71b59812367913916fd358730e0c9d18f39dacc9d7984d8adc69f5fa7c289229a12ea8d664ff0e SHA512 850856c4a38b6056377fffad65b5987f74586928976b767366f7fa8380ee67eb24c176defc0b4936b7a346256fc2575e938a689f972a6adbcad85be2900ff6d4
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ba214289acee
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index e7bde4c6f858..d5f094ee156f 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-stunnel-2.20170805-r2.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
-EBUILD selinux-stunnel-2.20170805-r3.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-stunnel-2.20180114-r1.ebuild 284 BLAKE2B e1e106eb2afa0565f6ef00f3449b01c5ed0d3cd0510a5bacdc51414e1b79509a37333b97d29e766a2cb653616855aa83e8a3e0e0d65218c2c8db3791c664fb01 SHA512 ce2b9a4b4b19ebf96fd26246e3bda2bb2cf905f4bfd7e847d9572e96f392ec2a9042244e84e945c3f40970efbe44621d70a4b8b203626a06d9847cf2229502d0
EBUILD selinux-stunnel-2.20180114-r2.ebuild 284 BLAKE2B e1e106eb2afa0565f6ef00f3449b01c5ed0d3cd0510a5bacdc51414e1b79509a37333b97d29e766a2cb653616855aa83e8a3e0e0d65218c2c8db3791c664fb01 SHA512 ce2b9a4b4b19ebf96fd26246e3bda2bb2cf905f4bfd7e847d9572e96f392ec2a9042244e84e945c3f40970efbe44621d70a4b8b203626a06d9847cf2229502d0
EBUILD selinux-stunnel-2.20180114-r3.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
+EBUILD selinux-stunnel-2.20180701-r1.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
MISC metadata.xml 317 BLAKE2B bf5e87f13017b76af0fba2e7cdc4723cc79907a563915448a9d079deadd4afec709dcb5700c9712298da4b912ed01440b19963eacfe053344865058a4640d463 SHA512 d9d1705ea1176d67de1ab424d18da867f135c5c385baea034322103ec6590bf34d38fc248205bde9aed697e367e2b4d529c039ca967663ddd0f30a3ed603a00e
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6d44c6fdbaad
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index fa1af221cc4d..67bda46c9a54 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-subsonic-2.20170805-r2.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
-EBUILD selinux-subsonic-2.20170805-r3.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-subsonic-2.20180114-r1.ebuild 286 BLAKE2B abf73054c1ac88e12d03c830627607be5f867789d636d3f285c8bc76d6af75dd5774c8ab98ee469b2c91104de6f19d4701ab7afbfaf657bb77a00a9e3fd556e3 SHA512 6a7cdcd7d9da7c44491186ae7e9b9d24e9f42e7990e7a09c793f472d8771154b083ec62dfbfb2c43657855951849eac0a1c64da33ba2d44147af51e5e67e08d8
EBUILD selinux-subsonic-2.20180114-r2.ebuild 286 BLAKE2B abf73054c1ac88e12d03c830627607be5f867789d636d3f285c8bc76d6af75dd5774c8ab98ee469b2c91104de6f19d4701ab7afbfaf657bb77a00a9e3fd556e3 SHA512 6a7cdcd7d9da7c44491186ae7e9b9d24e9f42e7990e7a09c793f472d8771154b083ec62dfbfb2c43657855951849eac0a1c64da33ba2d44147af51e5e67e08d8
EBUILD selinux-subsonic-2.20180114-r3.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
+EBUILD selinux-subsonic-2.20180701-r1.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
MISC metadata.xml 341 BLAKE2B 0a0fc876104016c1f6126056bab70ff8354571b39ef2defbcff7c7ff651abbd48244ba2ea7d40bf5f76aa550ae4873ee75adff58f7f379f73d86c70450b922ae SHA512 aea1601d2968cd582294b37bebb44b891131f4d4834a67c0f3adc8706a5fb4df4ba8d287db981896a1a0602c92ddfea4e76c001b2604f462de98433921dd4f09
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..452f4a422fcd
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for subsonic"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index f57cf795becb..e62801f77f60 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sudo-2.20170805-r2.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
-EBUILD selinux-sudo-2.20170805-r3.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sudo-2.20180114-r1.ebuild 278 BLAKE2B 2b79ed822c01117b8574eb4fc381cb059a4d0bf56c5bff08056f90e7a4e301a8d9ce16781a8791a2a277da856bcfdc68bf1c2a6d0550cf977b618437dfc2790d SHA512 00c9d4e8f0cbf1980e69a3a803b56a39af20f69540dfdc30c0494e4af2ea289db28b70ba2000ac0c61e7b26e476fb316ff98e43aec8f6110370f10edb3e01356
EBUILD selinux-sudo-2.20180114-r2.ebuild 278 BLAKE2B 2b79ed822c01117b8574eb4fc381cb059a4d0bf56c5bff08056f90e7a4e301a8d9ce16781a8791a2a277da856bcfdc68bf1c2a6d0550cf977b618437dfc2790d SHA512 00c9d4e8f0cbf1980e69a3a803b56a39af20f69540dfdc30c0494e4af2ea289db28b70ba2000ac0c61e7b26e476fb316ff98e43aec8f6110370f10edb3e01356
EBUILD selinux-sudo-2.20180114-r3.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
+EBUILD selinux-sudo-2.20180701-r1.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
MISC metadata.xml 314 BLAKE2B fa0d65ec12bf3e67b5f44eb7fcd861f83118a6546369b277d169262f48af9654c9da7f95b597eb84552a52bd049c9e18e44f65ce216e4305ddacf68e52045f18 SHA512 444deb961f20c878bf6c95a7bcdb8195b05616a6387d817f627920eeea4a982eb671990e9acf7fe8c4b2bb2d7f36a6d46ea5fde70a78fd5fcd9efe47d23f33a0
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f170453419a4
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 6fa7122524ac..f79aa2e8c1e6 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sxid-2.20170805-r2.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
-EBUILD selinux-sxid-2.20170805-r3.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sxid-2.20180114-r1.ebuild 278 BLAKE2B eda95377b8be5421b9605eb7a32957a1faf2cd0a213b59883106b72ac6a48160dd89248259d828ccc39f5e85e4e86aa84736a957b6c6f6aed16cf04c507dad49 SHA512 4b959ffc16ebe567ce574bbc0ab0a63a94131bf49f14b06d19e2ba52143841535fd999711c0b0d856c5fa9f080238c04dc34e34ac6dd80eaa0fc85ac4c127d66
EBUILD selinux-sxid-2.20180114-r2.ebuild 278 BLAKE2B eda95377b8be5421b9605eb7a32957a1faf2cd0a213b59883106b72ac6a48160dd89248259d828ccc39f5e85e4e86aa84736a957b6c6f6aed16cf04c507dad49 SHA512 4b959ffc16ebe567ce574bbc0ab0a63a94131bf49f14b06d19e2ba52143841535fd999711c0b0d856c5fa9f080238c04dc34e34ac6dd80eaa0fc85ac4c127d66
EBUILD selinux-sxid-2.20180114-r3.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
+EBUILD selinux-sxid-2.20180701-r1.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
MISC metadata.xml 314 BLAKE2B 8d371c34b9d307154ebaf04b4cd15173c06c8efbbd6565f40b8f78157f4e584485cf140199eec6b3a08e83c830aea67d97c3d0e191914c4cca3c5c7188b56dce SHA512 0baa2e4f8b229b455faa8ca4a17e2f4eb9479cf4ed41c21d835bdd43fba5cb3bea22d80c8f6ac5c1518d40ea4e5208fbeda1d7236c612507410d8609a9c919e0
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..73566a466c1a
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 2e0c773e8e81..9a85a5f627a6 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-syncthing-2.20170805-r2.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
-EBUILD selinux-syncthing-2.20170805-r3.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-syncthing-2.20180114-r1.ebuild 288 BLAKE2B 0de40e791e960bcee9af7aebe3fdf8d3762ee3710f11902f51b7edf0c2978291a99b6e155b068522401d5d76b22a49172f2a76ab3d4a703e0c739c8bf11f9324 SHA512 af59492d90e8f44a03884024e2fb2146a76b2ca406c9e0b629f5d8c06bee406fd426e42e51d9d47c9590511019cfa572adb1b04da03d74d41655f497a6a102a7
EBUILD selinux-syncthing-2.20180114-r2.ebuild 288 BLAKE2B 0de40e791e960bcee9af7aebe3fdf8d3762ee3710f11902f51b7edf0c2978291a99b6e155b068522401d5d76b22a49172f2a76ab3d4a703e0c739c8bf11f9324 SHA512 af59492d90e8f44a03884024e2fb2146a76b2ca406c9e0b629f5d8c06bee406fd426e42e51d9d47c9590511019cfa572adb1b04da03d74d41655f497a6a102a7
EBUILD selinux-syncthing-2.20180114-r3.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
+EBUILD selinux-syncthing-2.20180701-r1.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
MISC metadata.xml 319 BLAKE2B 880cc6e865a46e68115698fade5b2af342b717eec3fe5989a823456a5ff63f430106d7d783027b2a15df37e00067f782d40c650fa2af8f55883b01a5df3409e8 SHA512 0ae48ef15966fa6b5b11a0b5e067061a5385c22c78b016caaa29a77457d5f48522abe1303c870cc1117d3a1a67d8b7f47ad8da9e9703ec13d05656d86b2168fa
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fb45ab18b9ca
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="syncthing"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for syncthing"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 0f3cdf6679fa..131e9537c1eb 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sysstat-2.20170805-r2.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
-EBUILD selinux-sysstat-2.20170805-r3.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-sysstat-2.20180114-r1.ebuild 284 BLAKE2B bc712b68c9d939820e1a4dfc30fa528181bdfb4781a41c3db9d0c03c2a2f269d0e9bf7bc62f280b916c5f6c98531116462e8ae09d2048df7b94ec76bad1a16cd SHA512 2dead4902b274a9f2d38cc8ed914d66237598b76440ce7e1da3e437d55fac9818497c6ce39cce22222db700507f359c3f9bca202806dc93192552b3b636086d9
EBUILD selinux-sysstat-2.20180114-r2.ebuild 284 BLAKE2B bc712b68c9d939820e1a4dfc30fa528181bdfb4781a41c3db9d0c03c2a2f269d0e9bf7bc62f280b916c5f6c98531116462e8ae09d2048df7b94ec76bad1a16cd SHA512 2dead4902b274a9f2d38cc8ed914d66237598b76440ce7e1da3e437d55fac9818497c6ce39cce22222db700507f359c3f9bca202806dc93192552b3b636086d9
EBUILD selinux-sysstat-2.20180114-r3.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
+EBUILD selinux-sysstat-2.20180701-r1.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
MISC metadata.xml 317 BLAKE2B 96d9b10ff7d8b6b058c4bdc14ed41cbd12f5088469b1f43e8f21f15d0416c24ec54fdf7f1c5a8b40bf1956361eba6f5057e932f68b01b15cfc67103b39f7d1e6 SHA512 dab3ab7e1b48828952a50e5b936336fa179a5e7d852e82061dd2c0d2caed0ce4c52dd06c6610ab0b19c6441a927eb826eaabd84100edff7271e73be4165f35d5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1551a51a365a
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index d1c4d9d9f700..66d12f988f22 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tboot-2.20170805-r2.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
-EBUILD selinux-tboot-2.20170805-r3.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tboot-2.20180114-r1.ebuild 280 BLAKE2B a54c20f8acae990c7736b4753c9dd67198d3041370e2728f200713fc5d47de1d8b96793828e1351eb7b2e9ce787957cf1e821b23991ffa0a7b550e2aea03a06b SHA512 da43c84bff2331210493343c95fb8bfc32b9cf40e9e689915c07f4d7aae02eda62457cefc1f715c23cead234c5ea373a18bf271d7ffe2725773b8b92aefe8a54
EBUILD selinux-tboot-2.20180114-r2.ebuild 280 BLAKE2B a54c20f8acae990c7736b4753c9dd67198d3041370e2728f200713fc5d47de1d8b96793828e1351eb7b2e9ce787957cf1e821b23991ffa0a7b550e2aea03a06b SHA512 da43c84bff2331210493343c95fb8bfc32b9cf40e9e689915c07f4d7aae02eda62457cefc1f715c23cead234c5ea373a18bf271d7ffe2725773b8b92aefe8a54
EBUILD selinux-tboot-2.20180114-r3.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
+EBUILD selinux-tboot-2.20180701-r1.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
MISC metadata.xml 335 BLAKE2B 24e218a7e26eabb17fd01eb43a960921e4b3bc7dd936db2bc76cdcb15c29b4766052a18bbd2d1a0af659746a2eadc124175ac8d68e8a918a1be7077bbf133eb8 SHA512 893b7c0695b5811aa706cbdee4a48d90de09b9e6e24305b5dd73f51d4a0f06c3ea32911e0e800b5fde6d2f5024095d501fedd600bc542ca14e83809696b3d028
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..71edee22c6c5
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tboot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tboot"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 557cc6c8c6ed..b631159a4635 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tcpd-2.20170805-r2.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
-EBUILD selinux-tcpd-2.20170805-r3.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tcpd-2.20180114-r1.ebuild 372 BLAKE2B e9c28b78dee5e030df7f4a960389a74aa91b4cdbb5cc2ab832910b2bdf75e755171fe86e735cd4a0ba327fe008f5e2a774dcd1b85c1fc0afed298f44ddaa5041 SHA512 e6f39d36d622704e21fafe2d58b1346d65cce3c0e3b66f4cb7448e4a66db705193683b96cfe1aa280f23e174de68d03e2f4199d1d00dac91f2dd79178bee47a3
EBUILD selinux-tcpd-2.20180114-r2.ebuild 372 BLAKE2B e9c28b78dee5e030df7f4a960389a74aa91b4cdbb5cc2ab832910b2bdf75e755171fe86e735cd4a0ba327fe008f5e2a774dcd1b85c1fc0afed298f44ddaa5041 SHA512 e6f39d36d622704e21fafe2d58b1346d65cce3c0e3b66f4cb7448e4a66db705193683b96cfe1aa280f23e174de68d03e2f4199d1d00dac91f2dd79178bee47a3
EBUILD selinux-tcpd-2.20180114-r3.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
+EBUILD selinux-tcpd-2.20180701-r1.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
MISC metadata.xml 314 BLAKE2B 7275643a566403529d2075c82da3d4dbeb78ba6cdf5d87a704952f0c19ad36913fe9e1a248809b156ffd7c3e25162df7b8f37aee6ac80ef6ed5667d36d487537 SHA512 5fe5784f0e2a678a0202842e256c029ca34fcf992151a05f0f015ba8abaaa0b71729ffb3e9400c9dbedbb90830efd17d363ac60a4a042d24ecdee368341483ce
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dbaebf94c9a4
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 45521af025c1..c4c1750c7e69 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tcsd-2.20170805-r2.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
-EBUILD selinux-tcsd-2.20170805-r3.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tcsd-2.20180114-r1.ebuild 278 BLAKE2B 429caa4b92fe6dcdd5784100462c903ae37de24e89d269066b2db481477fec24ac46fc06c8fdc26e68cdf51b74bdde7954527a831a19c6e706b504795f31efc9 SHA512 5f07cf19475dc6f83f60d487ddf7458656b1ec239b15da7a5d6e2032cf17171fdd123dd721fb7acaa8cf767e39e47a26ecb1ceb8957ff5f153c89b35becb412f
EBUILD selinux-tcsd-2.20180114-r2.ebuild 278 BLAKE2B 429caa4b92fe6dcdd5784100462c903ae37de24e89d269066b2db481477fec24ac46fc06c8fdc26e68cdf51b74bdde7954527a831a19c6e706b504795f31efc9 SHA512 5f07cf19475dc6f83f60d487ddf7458656b1ec239b15da7a5d6e2032cf17171fdd123dd721fb7acaa8cf767e39e47a26ecb1ceb8957ff5f153c89b35becb412f
EBUILD selinux-tcsd-2.20180114-r3.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
+EBUILD selinux-tcsd-2.20180701-r1.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
MISC metadata.xml 314 BLAKE2B 97c20c7e1bafbb77a72b6cf1571a100bb9d8eb89d58fa9d74994758111b73748f57066b97fe2357f146ccf628e96da1c3c3d1331fd760f31c9ec346f0b90dcf2 SHA512 12aed2a47c90c7da82be53abc650160c5b012b358dea0b609ed3c2761ba49cf7113901b4f82121972af204b582aeed230d74f18fbd8c5469dedf5c5fc642cc74
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..adc49785ec0a
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index a3a0538cf2d2..566305b3883d 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-telnet-2.20170805-r2.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
-EBUILD selinux-telnet-2.20170805-r3.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-telnet-2.20180114-r1.ebuild 388 BLAKE2B 958ed0039723dbd68de431e348095418b53837c0ead1b27ad475810d3e64fdd9568c6d4d0a71fbc51b26b1c25cff2b99da808381352da29f309b600314af7bad SHA512 b2645ef75943d569e070a629965d2088f50584d08793b45b9a9bd1816280ce823b759bb8cc99c7d322861c40c2a168666afcfdc531d3553a8ffcfac9c5f683cb
EBUILD selinux-telnet-2.20180114-r2.ebuild 388 BLAKE2B 958ed0039723dbd68de431e348095418b53837c0ead1b27ad475810d3e64fdd9568c6d4d0a71fbc51b26b1c25cff2b99da808381352da29f309b600314af7bad SHA512 b2645ef75943d569e070a629965d2088f50584d08793b45b9a9bd1816280ce823b759bb8cc99c7d322861c40c2a168666afcfdc531d3553a8ffcfac9c5f683cb
EBUILD selinux-telnet-2.20180114-r3.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
+EBUILD selinux-telnet-2.20180701-r1.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
MISC metadata.xml 316 BLAKE2B f9dacecead9d85c43146f0521bba36ef38ec49370642a692230d46fb5154f911a507a3a18fcb53444170d1708dd317e43f40266d3919c4dc88f2c42c417d7b21 SHA512 09fc5cf80795fa3e4565a9102ee44138f0c8e4f14a308634bd55b9cb1a6e2dadfc8afa7f6ff1993b1e2d9ee738c8de4c91aeb34e3974695ad9165815bff49222
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ed9362153891
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-remotelogin
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-remotelogin
+"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 730ad5bc491c..675a970d13e2 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tftp-2.20170805-r2.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
-EBUILD selinux-tftp-2.20170805-r3.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tftp-2.20180114-r1.ebuild 278 BLAKE2B c2f349d617e46484844cf04bee0d3ef22ceb78ac87ac92d7900b7ee62e9161ce4e523fdf920e453dd550e48dc7651b1e90df80fee45a8e48591520816cf3371b SHA512 686ee13b563b0c1e8e3c98de8d26acfeeddd67ab48bc358d7fd6391832aa103e7b093cc0864f43f1349f94c6c77bdc55cdb36d1cf71e7ebad86f63c0cca40dc7
EBUILD selinux-tftp-2.20180114-r2.ebuild 278 BLAKE2B c2f349d617e46484844cf04bee0d3ef22ceb78ac87ac92d7900b7ee62e9161ce4e523fdf920e453dd550e48dc7651b1e90df80fee45a8e48591520816cf3371b SHA512 686ee13b563b0c1e8e3c98de8d26acfeeddd67ab48bc358d7fd6391832aa103e7b093cc0864f43f1349f94c6c77bdc55cdb36d1cf71e7ebad86f63c0cca40dc7
EBUILD selinux-tftp-2.20180114-r3.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
+EBUILD selinux-tftp-2.20180701-r1.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
MISC metadata.xml 314 BLAKE2B 036c95216e3d91689bb297ee53e07038b3a26723ed4ea4dd2cf87972e22c1ae71c7e587e43bbf4c204ea8cdf43ecab6523a484e61c98cbb6abb4813d82407b58 SHA512 697206bf11d8ea4c4935fff9751b8abe279f21d513d288e61b1d4a485c64236452bf37e7a3940a8b2c151c0981b6feda30c7985b32069a0647adc7ad8c70aea1
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6a14788e1b36
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 35691ae31192..6edca0a8ffa4 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tgtd-2.20170805-r2.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
-EBUILD selinux-tgtd-2.20170805-r3.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tgtd-2.20180114-r1.ebuild 278 BLAKE2B 5cec03fb728eed3bc64cdc8eff4c5bdef14c4d5749ee8aa7d3c06256fd894b1ebf9b06879f6d96da9a95c179cca78646070cfa7c1431ad57246aa094e68124e3 SHA512 bf143364a8343d5fb8012092fb0b605b714b7d7a0de27851b2ef38b081bdad9d3835c47ed52aa77b5ebe2e703cf1ea6c4d8b327a2357dfe5bb2059e064330194
EBUILD selinux-tgtd-2.20180114-r2.ebuild 278 BLAKE2B 5cec03fb728eed3bc64cdc8eff4c5bdef14c4d5749ee8aa7d3c06256fd894b1ebf9b06879f6d96da9a95c179cca78646070cfa7c1431ad57246aa094e68124e3 SHA512 bf143364a8343d5fb8012092fb0b605b714b7d7a0de27851b2ef38b081bdad9d3835c47ed52aa77b5ebe2e703cf1ea6c4d8b327a2357dfe5bb2059e064330194
EBUILD selinux-tgtd-2.20180114-r3.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
+EBUILD selinux-tgtd-2.20180701-r1.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
MISC metadata.xml 314 BLAKE2B fb88f2b1f35ccd416cb3580c0d9ef2607a0be750c0690a1697ef180bfc93fd20ee6c4675be91421f73041cedd56454dae3acd432b495fad491e3e8c55a75d3c0 SHA512 7ff6b603403c8ab2e2832738a2078a20d56226a35f70d61b9d067044d7a71d160965a93e76bf705456f8a61b268324d910d43d4dab11d84efc0455eb247db5a4
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6df710db4630
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index d4836d06a994..63d5184bcdcb 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-thunderbird-2.20170805-r2.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
-EBUILD selinux-thunderbird-2.20170805-r3.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-thunderbird-2.20180114-r1.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
EBUILD selinux-thunderbird-2.20180114-r2.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
EBUILD selinux-thunderbird-2.20180114-r3.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
+EBUILD selinux-thunderbird-2.20180701-r1.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
MISC metadata.xml 321 BLAKE2B 803c387bb4a8c829e856e92c76897b4af3d810ca56a257d12b08d29adcb779add9821927c6c20fc14adeb3c3638042b043cf58630635f6f3ee8aa906c3aea8c4 SHA512 883b02eb500849986493b7ef57241788991bbb266076583b5d5436b31c841ca789eda0d04e74e3ff7b1bff87270a409352f077d62d4b8bf280c12f36da01856e
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fe691d8cd407
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 4ea30d9c6b58..9df60343e418 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-timidity-2.20170805-r2.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
-EBUILD selinux-timidity-2.20170805-r3.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-timidity-2.20180114-r1.ebuild 286 BLAKE2B d50cdfb1074490a66e7bdefb29906a0e4c7a9eb3a8917c484a05450f4f4976802074210ea7edac20b52a4555bf8261597217cafdcdaefcf78279747de0120e07 SHA512 95fee436cc9588f1e5ac0e7c60c5e2e0224d5bf42b28e1309539d122f1de9fc3e0ae9866e994aa3ef995a17ff3e8bbdc350438a710d055f9ae356fe1b50e9c94
EBUILD selinux-timidity-2.20180114-r2.ebuild 286 BLAKE2B d50cdfb1074490a66e7bdefb29906a0e4c7a9eb3a8917c484a05450f4f4976802074210ea7edac20b52a4555bf8261597217cafdcdaefcf78279747de0120e07 SHA512 95fee436cc9588f1e5ac0e7c60c5e2e0224d5bf42b28e1309539d122f1de9fc3e0ae9866e994aa3ef995a17ff3e8bbdc350438a710d055f9ae356fe1b50e9c94
EBUILD selinux-timidity-2.20180114-r3.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
+EBUILD selinux-timidity-2.20180701-r1.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
MISC metadata.xml 318 BLAKE2B 1b053789156ce3b2dbd11a7c0640cb00539bd706d6f69ceffcc71c3c0449b75c37d2ad4eeda684df5ae541044d43495ce6e362df89c25f73eb5c85755ef5f34c SHA512 60ed41e8c07067ddc123bcf078ffa3448facf9eb0bdd79f59031bc75ad1f46ee6fdd512a542f5240752bd3ce548e1dd782c027fa9e3f42375cff6e89fa46dc8b
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4be6efafc96c
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 3488846e84f7..f514a607203b 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tmpreaper-2.20170805-r2.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
-EBUILD selinux-tmpreaper-2.20170805-r3.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tmpreaper-2.20180114-r1.ebuild 288 BLAKE2B 26116c16c3217215d50c831e8d89536b99647d499d08f7824a2e2272a867eeb9022673c92aabbf92d4e5909179691c095736ef9bce9a047da7d1ef847f7d3981 SHA512 97e4941595414d6903cc63ce4c4668ab12f553ecc31c8cee38340ef55f120240766b07ed1096a1809a916bf4193477ced144583460cefb9a4f0169ed40fdd4be
EBUILD selinux-tmpreaper-2.20180114-r2.ebuild 288 BLAKE2B 26116c16c3217215d50c831e8d89536b99647d499d08f7824a2e2272a867eeb9022673c92aabbf92d4e5909179691c095736ef9bce9a047da7d1ef847f7d3981 SHA512 97e4941595414d6903cc63ce4c4668ab12f553ecc31c8cee38340ef55f120240766b07ed1096a1809a916bf4193477ced144583460cefb9a4f0169ed40fdd4be
EBUILD selinux-tmpreaper-2.20180114-r3.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
+EBUILD selinux-tmpreaper-2.20180701-r1.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
MISC metadata.xml 319 BLAKE2B ea0ed6217581afe0a106bb750288395d119c9b49aff567208af66f8eec7ea9a9b33aab1f8e267ea7a06b47cdbbed49e8c5718f6f342784c7fac7068785655416 SHA512 1968fd2f682e983d15fb072d2dab31a3aa7e7a25a6fc29d0e66639719c4de662d664864541e5533dc968d7a34551658db31a485a291e3c7dc7f59d649b1f7c34
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..49add2559ade
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index b92ceef493b4..1df2486a3dfb 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tor-2.20170805-r2.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
-EBUILD selinux-tor-2.20170805-r3.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tor-2.20180114-r1.ebuild 276 BLAKE2B d2ce311c09328d953af9560aa97943188c13e8bd6bfc809f390c8a03a1b574e2a6e1e2fd66ba0e4ac1b54ce3221919bd4bef1c4e10e87b86161c6fb19fd1e78d SHA512 db5af08c64c0a0fa846341fa61a59ddddae8b5ede19297a1d96a14f4bebb2c4079075f134d298e2058261a564531efc18bb13ccf8a0c79fee12d44012f6d2cc1
EBUILD selinux-tor-2.20180114-r2.ebuild 276 BLAKE2B d2ce311c09328d953af9560aa97943188c13e8bd6bfc809f390c8a03a1b574e2a6e1e2fd66ba0e4ac1b54ce3221919bd4bef1c4e10e87b86161c6fb19fd1e78d SHA512 db5af08c64c0a0fa846341fa61a59ddddae8b5ede19297a1d96a14f4bebb2c4079075f134d298e2058261a564531efc18bb13ccf8a0c79fee12d44012f6d2cc1
EBUILD selinux-tor-2.20180114-r3.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
+EBUILD selinux-tor-2.20180701-r1.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
EBUILD selinux-tor-9999.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
MISC metadata.xml 313 BLAKE2B 15b3197ed234755ff54a8faef2fc30b62a520e485d33eb6848a86ec7204409a69791313d94fada955ead14545009f5a8f15f8caafa4e6326e096d3dc53ce77d8 SHA512 812fc17e450c14ed18f79425f4db05719e57e9baa896dde3775434e6e59c93148b95ca466b4aa8113066c442a577bc526ef52037adbf2c54468645c4055c87be
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5aa55ea732f0
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index f3ac88fef2e5..99669bbff080 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tripwire-2.20170805-r2.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
-EBUILD selinux-tripwire-2.20170805-r3.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-tripwire-2.20180114-r1.ebuild 286 BLAKE2B 07652a857c30bb9dca904f31c7875ea9b7c8ae53cddc2c812b10dc06f28e95ede803533a22237fba9d117f2dc9d8bf5d3035fa0cdc2ee35c26c0a2cb71360646 SHA512 7fd1e64afeec50861992eba325a9fcdd8162def157ffdcec212ad2b24112cb038ae722757d4dbceb2e7035492eb7f9770daea90ba26035ac84b23574478a7eab
EBUILD selinux-tripwire-2.20180114-r2.ebuild 286 BLAKE2B 07652a857c30bb9dca904f31c7875ea9b7c8ae53cddc2c812b10dc06f28e95ede803533a22237fba9d117f2dc9d8bf5d3035fa0cdc2ee35c26c0a2cb71360646 SHA512 7fd1e64afeec50861992eba325a9fcdd8162def157ffdcec212ad2b24112cb038ae722757d4dbceb2e7035492eb7f9770daea90ba26035ac84b23574478a7eab
EBUILD selinux-tripwire-2.20180114-r3.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
+EBUILD selinux-tripwire-2.20180701-r1.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
MISC metadata.xml 318 BLAKE2B 744c496ac8614aaa78beda534dc43782a35574148fd25e41bb49fcba13438d0f0ab15b7d579d055f2e18cc3f950e808e87ee91c5310c7631778c0f6943da2da4 SHA512 10c01fcc08c2dbc4367fb8e5f2e5c336794d5d15fef2511047d12e45c2fc88c3456d57022aecc5a131d7d267841e9123a84dcd6d06c87f2967cdc52651d9dd2c
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..748273d6d53f
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 2ac75f0fe298..9a17f344df4a 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ucspitcp-2.20170805-r2.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
-EBUILD selinux-ucspitcp-2.20170805-r3.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ucspitcp-2.20180114-r1.ebuild 286 BLAKE2B 9e02eebf767e31a069a3c7c80a48b89e332a402482d79639e99e4962555e73a79860e9bdddc7b35cd85ac0e008198b0041e4090255c06f692657d79c03c18c63 SHA512 b189955b5d84f2da72f90fbf3c8ffe7ad6245bacdd25c46d977c05fde4d9524acb6b42721f097ec975b0b0aada795515e3fcb5d21250a0d33f494b251f37dfa5
EBUILD selinux-ucspitcp-2.20180114-r2.ebuild 286 BLAKE2B 9e02eebf767e31a069a3c7c80a48b89e332a402482d79639e99e4962555e73a79860e9bdddc7b35cd85ac0e008198b0041e4090255c06f692657d79c03c18c63 SHA512 b189955b5d84f2da72f90fbf3c8ffe7ad6245bacdd25c46d977c05fde4d9524acb6b42721f097ec975b0b0aada795515e3fcb5d21250a0d33f494b251f37dfa5
EBUILD selinux-ucspitcp-2.20180114-r3.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
+EBUILD selinux-ucspitcp-2.20180701-r1.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
MISC metadata.xml 318 BLAKE2B 03d0271ee0ea320497095125a6b94d19a79b952375d2514b3fa3cdfeebf88cc1d1c5b0927f4f3fa30216005a6a7b3c53e14b30f5d40d0287e380c10ecdb555e4 SHA512 bc88dff90d9f7ef337ce73f739422a0a0463980c87836abcd07beff56a122d7c9a7503007fe8bfd9a93cc86d61ee27a766c3d72b5562e7d7d52599c12228c41a
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a8d12b4fad56
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index a1e18b535cf6..85b1e91e6b76 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ulogd-2.20170805-r2.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
-EBUILD selinux-ulogd-2.20170805-r3.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-ulogd-2.20180114-r1.ebuild 280 BLAKE2B 5b9b0db1fd19a4b65bf0a58316352719907f06787be1dc306b4c1a2aa4f6f0c31f1d62fb37a321f2a95ead31c0ed478eadada0dec7a76dbabd922a2ceff4a03a SHA512 f8d4f17fde015bffd696615295c2f19c0798c9413b8e1fb20400b98ff8b83f489d6c1b21a69795e6d4e69c5d5bbb0a3253342f9c0b73fa5380504d80ef730c7a
EBUILD selinux-ulogd-2.20180114-r2.ebuild 280 BLAKE2B 5b9b0db1fd19a4b65bf0a58316352719907f06787be1dc306b4c1a2aa4f6f0c31f1d62fb37a321f2a95ead31c0ed478eadada0dec7a76dbabd922a2ceff4a03a SHA512 f8d4f17fde015bffd696615295c2f19c0798c9413b8e1fb20400b98ff8b83f489d6c1b21a69795e6d4e69c5d5bbb0a3253342f9c0b73fa5380504d80ef730c7a
EBUILD selinux-ulogd-2.20180114-r3.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
+EBUILD selinux-ulogd-2.20180701-r1.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
MISC metadata.xml 315 BLAKE2B 67250dc62189c5174385ab19a3bc5d680e3d30aa2e0189fcfa9368489024c9feacb2a2bae5da5e9ef87b54a4b2804481604e773dcd6a1207206489f2300a5f4f SHA512 43d0ad46433208b51b68ed06a3529a2895e9cc835f233f69b38034ddb07addf44c66da5054c0cb87289aee78af243494af13cd6eeda89dc122baddb1bf0f2cc5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8dd9622e1527
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index c4e35c92b31c..7de1e172479c 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uml-2.20170805-r2.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
-EBUILD selinux-uml-2.20170805-r3.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-uml-2.20180114-r1.ebuild 276 BLAKE2B 74b27f2336c0d22a542f59ee583d829eac82184f2099981f91353efcdccaaf0a90bfb27b6760f60bc14369de34b4574714075fb6c2a1c8bc24b7c33cc61e086f SHA512 9a22161b350d341f258623d2c85b5f7fe5d096c5f33b6099d07d996fced3cf4fec021248ec9a725e40a0afd85aabb842ea950c1a40b0cfe5e089329fdfe3a5f7
EBUILD selinux-uml-2.20180114-r2.ebuild 276 BLAKE2B 74b27f2336c0d22a542f59ee583d829eac82184f2099981f91353efcdccaaf0a90bfb27b6760f60bc14369de34b4574714075fb6c2a1c8bc24b7c33cc61e086f SHA512 9a22161b350d341f258623d2c85b5f7fe5d096c5f33b6099d07d996fced3cf4fec021248ec9a725e40a0afd85aabb842ea950c1a40b0cfe5e089329fdfe3a5f7
EBUILD selinux-uml-2.20180114-r3.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
+EBUILD selinux-uml-2.20180701-r1.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
EBUILD selinux-uml-9999.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
MISC metadata.xml 313 BLAKE2B 5cfff015c6be184861283a7428c346b62c890bbbc860ab8dfef6cdbca1483b380167530a5d40bf3873c10499d6c889e883621f51f835947e1af61d14b271b763 SHA512 8baf21630b68613adafb49e007574ff1f62067c7f77ddacbf7bce11289e02b9a6c22fc89430ffac207615fbe28efb4384bd29abc36d10616b08c427a2cbd61db
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..64e52e582f92
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 5bf144f2782e..1c9676ba25ae 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-unconfined-2.20170805-r2.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
-EBUILD selinux-unconfined-2.20170805-r3.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-unconfined-2.20180114-r1.ebuild 290 BLAKE2B 8f2d50a8b216647271f45dbd2df2afaa9ab26362a110703a1964ecb377b3eaf5b26aa0d298dd1ff5a16b2524a518ea37b3738be1177c4c22b42141bf75708af7 SHA512 af02d7f63bbd4eb8316f597e7c5b55e9f6a04345853a115a8c76d6399a587bebf9cf036734328985a044e55e745432540c38fbc4456e0aa2baafdc2e24b210fb
EBUILD selinux-unconfined-2.20180114-r2.ebuild 290 BLAKE2B 8f2d50a8b216647271f45dbd2df2afaa9ab26362a110703a1964ecb377b3eaf5b26aa0d298dd1ff5a16b2524a518ea37b3738be1177c4c22b42141bf75708af7 SHA512 af02d7f63bbd4eb8316f597e7c5b55e9f6a04345853a115a8c76d6399a587bebf9cf036734328985a044e55e745432540c38fbc4456e0aa2baafdc2e24b210fb
EBUILD selinux-unconfined-2.20180114-r3.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
+EBUILD selinux-unconfined-2.20180701-r1.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
MISC metadata.xml 328 BLAKE2B 87e024bb413e0c65f34313030016af3ead498111d26844172eb61cfdc17c6605ea41975127ed67f33b5c905a4a7095b2661288ecd4e383a314425f3661602297 SHA512 dcf584f01f9b74b9e5196147219616837c1c46a73b258a37ddd8d183b9bd61d6c0819d92e27390d67b4d6d01b8b1a1447010d6437459a329c3eaa4a79f39b050
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..43c9b7b8e9b3
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 133c82137b26..5b5ad9733e2d 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uptime-2.20170805-r2.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
-EBUILD selinux-uptime-2.20170805-r3.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-uptime-2.20180114-r1.ebuild 282 BLAKE2B 4a587715bc8740e154285ffdffa1bed01e580ca467680340a1c9e44a4b7e6267b667ff47cfa2cadce789269fb811db5be13357af114287ab2c7be3bfb0f20861 SHA512 df876d308c800b59741f3ec39c12182f89d7553dc8d8f7f31742736b944bd197f00ccacba7375c275f98ec97980d271f9d31d703b31b92fd4ab9f58a22718e3a
EBUILD selinux-uptime-2.20180114-r2.ebuild 282 BLAKE2B 4a587715bc8740e154285ffdffa1bed01e580ca467680340a1c9e44a4b7e6267b667ff47cfa2cadce789269fb811db5be13357af114287ab2c7be3bfb0f20861 SHA512 df876d308c800b59741f3ec39c12182f89d7553dc8d8f7f31742736b944bd197f00ccacba7375c275f98ec97980d271f9d31d703b31b92fd4ab9f58a22718e3a
EBUILD selinux-uptime-2.20180114-r3.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
+EBUILD selinux-uptime-2.20180701-r1.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
MISC metadata.xml 316 BLAKE2B acf9ae252e00852dd1e33874f4fb0cde71272e94c531f5a3efc4075426b883ba36564d25b107b68277ec09bcad64bd36e5a20e6a248098f916ebe6ee690a2b6b SHA512 9ed46568e9691f16b8574be220647e054032aa60cee04ddd1d69c739a6f7afeadef8bfd95d81f238339a9a4b2276190328c49d57c99d0a57bb2c16d63d6777f2
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ebc62cef7c80
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index e00e0d9c8012..7b326c681c63 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-usbmuxd-2.20170805-r2.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
-EBUILD selinux-usbmuxd-2.20170805-r3.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-usbmuxd-2.20180114-r1.ebuild 284 BLAKE2B bd43f1a8aa1980fb0f0c06136bc681325fb14f2e19c000383550b105d66dd32e2285e5db25a193530ff51e293407f61221cf694db455d31681eb6c1c014fd4ed SHA512 76c603b69f0e3be496ef012fece147642228dad86d4f1d7c08cf0a509ac46e704121d0dbd9e18fe6a9c98d1964775a1962a51c67005babedd924a31fbc7f653c
EBUILD selinux-usbmuxd-2.20180114-r2.ebuild 284 BLAKE2B bd43f1a8aa1980fb0f0c06136bc681325fb14f2e19c000383550b105d66dd32e2285e5db25a193530ff51e293407f61221cf694db455d31681eb6c1c014fd4ed SHA512 76c603b69f0e3be496ef012fece147642228dad86d4f1d7c08cf0a509ac46e704121d0dbd9e18fe6a9c98d1964775a1962a51c67005babedd924a31fbc7f653c
EBUILD selinux-usbmuxd-2.20180114-r3.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
+EBUILD selinux-usbmuxd-2.20180701-r1.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
MISC metadata.xml 317 BLAKE2B f5a31afd9b4f2c569006e7f7ab0368ff7cc392f05a9cb008c845a897f357824d78f7ee2d7e35699d4b0d7c3137af53eaeb68eb4247c7a7acd188ceff5f1bdad3 SHA512 665ff350330f9449152e4d72346e30788b685ec475ed56d90cfa6666b719c99fe1c26ed45281febe03d6104fd7a41d4cc0458b4f72bfce59d019c4dd43fe4bc1
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5b87f855a57e
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 4041ab7ff73d..5b3f232352cb 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uucp-2.20170805-r2.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
-EBUILD selinux-uucp-2.20170805-r3.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-uucp-2.20180114-r1.ebuild 372 BLAKE2B 829306d55c826225634344d409c89ca464d915819973b48c089433c4e34226b8d034cdba686bbf604a7fe8b4300e8612aaece467a6a47ba585107df559a16533 SHA512 053a408f95ff21aa4057a436a1fe73b4cb3588adba43ccbd7d176223eca06c7fd0f26a182b59b02aa6520bc1b45b8cbeb2bcac69dfcdf7163f5218b58d016453
EBUILD selinux-uucp-2.20180114-r2.ebuild 372 BLAKE2B 829306d55c826225634344d409c89ca464d915819973b48c089433c4e34226b8d034cdba686bbf604a7fe8b4300e8612aaece467a6a47ba585107df559a16533 SHA512 053a408f95ff21aa4057a436a1fe73b4cb3588adba43ccbd7d176223eca06c7fd0f26a182b59b02aa6520bc1b45b8cbeb2bcac69dfcdf7163f5218b58d016453
EBUILD selinux-uucp-2.20180114-r3.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
+EBUILD selinux-uucp-2.20180701-r1.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
MISC metadata.xml 314 BLAKE2B 711a4df7837b6f37b01d35252b543c170ac51971121f7815136c9938708cd26dfc34bec50d5bff21afcf1afddf78043475db37aef1e12994b120403550ed04ef SHA512 aa9491ed1334875262b8071e567e17188fdbba3e6befe80fdcc42784848f2b843fba7cd1dbd9f6958f67a221fd838405859a946cbd487130348cf8ed922df174
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8c9d51902f24
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 952f2ee8b49b..39c92a21a8a0 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uwimap-2.20170805-r2.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
-EBUILD selinux-uwimap-2.20170805-r3.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-uwimap-2.20180114-r1.ebuild 282 BLAKE2B bc36b21eda6e70b5842917c94e6b59120bfa09334d82dfa895919acfa4009f1276f4060b456b1e771c3cc7bd7ef7ff5dec1c1ce18e56212c67d46f90ca152c3b SHA512 0d0fac1daf81e01b62b3f58fc7d16773cb64db5af12c30df05b27e3b0d80db3599ede4a3b04a9cd10a41aaabb53c4e9fe23708fad97e1fcf041fc64fa5ce1ad4
EBUILD selinux-uwimap-2.20180114-r2.ebuild 282 BLAKE2B bc36b21eda6e70b5842917c94e6b59120bfa09334d82dfa895919acfa4009f1276f4060b456b1e771c3cc7bd7ef7ff5dec1c1ce18e56212c67d46f90ca152c3b SHA512 0d0fac1daf81e01b62b3f58fc7d16773cb64db5af12c30df05b27e3b0d80db3599ede4a3b04a9cd10a41aaabb53c4e9fe23708fad97e1fcf041fc64fa5ce1ad4
EBUILD selinux-uwimap-2.20180114-r3.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
+EBUILD selinux-uwimap-2.20180701-r1.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
MISC metadata.xml 316 BLAKE2B 25547926e63f1e897510bf7eabde2ebb5d7ad8643ef4225cf84e18d13f4652d3d194c501c617db3ba7c0a3f9afe63ddcc5a5b4b5367be18d3f016c7d7600e849 SHA512 687b16d372a27eb09ed8eadbd694b3ad9ff3ddcdee85aebc5cb685fe91767e6523bbd8db0a928d47bc3670a59966c474d6a761ba5d2f86bc44423693e52e6077
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..51464c765d13
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 5d32a17437a7..d3ef453e0f0f 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uwsgi-2.20170805-r2.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
-EBUILD selinux-uwsgi-2.20170805-r3.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-uwsgi-2.20180114-r1.ebuild 280 BLAKE2B fce7c3b0ace16e9bef7322edf25d3b4624059002671195ebb32152005f4a6fea8b104316de17f2308b74b571071521ac07c22810ce12f9976aec7e009c683a88 SHA512 4ed7bc730e9a99d391c4c3081bb552f83b0d645904dd6b6ac82a0473492de9fa3f0221212551ba8ee555051386f71f3a699eaf40518259497bc2a60c286f0c63
EBUILD selinux-uwsgi-2.20180114-r2.ebuild 280 BLAKE2B fce7c3b0ace16e9bef7322edf25d3b4624059002671195ebb32152005f4a6fea8b104316de17f2308b74b571071521ac07c22810ce12f9976aec7e009c683a88 SHA512 4ed7bc730e9a99d391c4c3081bb552f83b0d645904dd6b6ac82a0473492de9fa3f0221212551ba8ee555051386f71f3a699eaf40518259497bc2a60c286f0c63
EBUILD selinux-uwsgi-2.20180114-r3.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
+EBUILD selinux-uwsgi-2.20180701-r1.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
MISC metadata.xml 315 BLAKE2B f7cf3dfb0a58fc7095e7c5dc17d33936021b6214f45265bca604f80752de8b2e75d35f4e742b44c21e10b2e8d86069767047e439f38089175b2ddeabfa89664c SHA512 14aeb44c80b9433064e670dd4f1036507965fead0068adc05311bd13eff263f7c177a20b30f4057d3e1af7fc708de09777d820f6a7ce7dee67d305a61d198e24
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e25f57d05481
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwsgi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uWSGI"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 283dbe7f005b..03f601addcfc 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-varnishd-2.20170805-r2.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
-EBUILD selinux-varnishd-2.20170805-r3.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-varnishd-2.20180114-r1.ebuild 286 BLAKE2B a05ef9682e97179e502695fce0a5a32d377b39d0971f1681db38a5eaf3b3ac5637650537405d77df8edc6a637dacafd174dcb9947661998725f7d090852093ab SHA512 fd3d80286b324b920002f9b5167ba268603a10346ed88d7acd470a89ff328d4f79aa0d4d8e95363e072ec74530e6eaca605e41f15cbb3dbb4216f19bac6b73f8
EBUILD selinux-varnishd-2.20180114-r2.ebuild 286 BLAKE2B a05ef9682e97179e502695fce0a5a32d377b39d0971f1681db38a5eaf3b3ac5637650537405d77df8edc6a637dacafd174dcb9947661998725f7d090852093ab SHA512 fd3d80286b324b920002f9b5167ba268603a10346ed88d7acd470a89ff328d4f79aa0d4d8e95363e072ec74530e6eaca605e41f15cbb3dbb4216f19bac6b73f8
EBUILD selinux-varnishd-2.20180114-r3.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
+EBUILD selinux-varnishd-2.20180701-r1.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
MISC metadata.xml 318 BLAKE2B fb17ecb36c4fdba23d3b977a5b24b968b68c0d00fdec6762fcd0e99c6afa9f881a7e2b06035ecbb1ef4f025cdf770937c6c17aaba1a5bf1c20b274990166da06 SHA512 3385342c923b2616dd114a23706ae2094a384ced315787b9a47fe77a81c3ecf2effd26fb7faa403dabcf622b5893808950b0202eee80fee075c75e99c3f9a891
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..32059274afa4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 393b9d57ffe8..5ac54a5310be 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vbetool-2.20170805-r2.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
-EBUILD selinux-vbetool-2.20170805-r3.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vbetool-2.20180114-r1.ebuild 284 BLAKE2B f266fc031065a2e52ab7e803f596d5d7b5f07add4e5ce3e15e5459b1f0c85efa5e1e34e0148a8b4e10b1677c99096fc4333c2faf4cd749397e1dc69272fa9552 SHA512 69b1bb4c56d72cc331f883115fb50b0ec64acd73e0fad742d08ad673958735ea653d4001ab8554382b263e411b158224858a78fcb203fe4394967a8c40a88977
EBUILD selinux-vbetool-2.20180114-r2.ebuild 284 BLAKE2B f266fc031065a2e52ab7e803f596d5d7b5f07add4e5ce3e15e5459b1f0c85efa5e1e34e0148a8b4e10b1677c99096fc4333c2faf4cd749397e1dc69272fa9552 SHA512 69b1bb4c56d72cc331f883115fb50b0ec64acd73e0fad742d08ad673958735ea653d4001ab8554382b263e411b158224858a78fcb203fe4394967a8c40a88977
EBUILD selinux-vbetool-2.20180114-r3.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
+EBUILD selinux-vbetool-2.20180701-r1.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
MISC metadata.xml 317 BLAKE2B 085f433e29e9ea7829dbab4ee7c46a55235f4d37d19fc5ee2b662856eb4b730a9ccdecaf26b87b2b62f72fdf39d7cb14a686e3aa56b03fba7550a87d75b553c4 SHA512 4fee052e81194420528867acdb66be7ef51270f9d621773aec3da0ef33bafbdacb48cde9fe9da2cbac390b209eaac1579c3bb36cf999d2ff3bd00770913e1486
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9028867c2cf0
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 913838815d39..a00626bcc4d3 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vdagent-2.20170805-r2.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
-EBUILD selinux-vdagent-2.20170805-r3.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vdagent-2.20180114-r1.ebuild 284 BLAKE2B 217098909f7f7b0322e239fe7d6d8a69ce2beb3d40eef3290cc00ae5dd2f33b52d4e0858b23f0dba27837cdefd7af1e6da280623359bfb5a70df34a47a7d5547 SHA512 37929d854e935c5118f55a8ed08a1192f86f3e453076300668fbf149fb2d502515c2b7b632d9bca1993225aef98abab983de40b98d3916f293e393fde8d3d51b
EBUILD selinux-vdagent-2.20180114-r2.ebuild 284 BLAKE2B 217098909f7f7b0322e239fe7d6d8a69ce2beb3d40eef3290cc00ae5dd2f33b52d4e0858b23f0dba27837cdefd7af1e6da280623359bfb5a70df34a47a7d5547 SHA512 37929d854e935c5118f55a8ed08a1192f86f3e453076300668fbf149fb2d502515c2b7b632d9bca1993225aef98abab983de40b98d3916f293e393fde8d3d51b
EBUILD selinux-vdagent-2.20180114-r3.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
+EBUILD selinux-vdagent-2.20180701-r1.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
MISC metadata.xml 317 BLAKE2B a98ed12a533b34c929c1cd90b51fed25bb7492e88a06976f8281dd024d9a0b2085b46096fb15500db5d7c5470dd4cb707fcd04d5c8643a98992d96cadbd627f0 SHA512 e9c10cc57616d2df0efd1fe633998fcdfcb91ca11333f24045a146f45d42eae8b9e70a846e000f3331d4c84c5fbbad6ac29ee30a51d4c347bab682f7b80f8adb
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cc7d763e03dd
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 63fea5eb6944..7a1e453a5282 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vde-2.20170805-r2.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
-EBUILD selinux-vde-2.20170805-r3.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vde-2.20180114-r1.ebuild 276 BLAKE2B 5094788a012a8958853f5221d8ade087c7ea9ff55d674fdf41e5f2e15010da3952271b7e225f53b72cd636b1afa139fefadddbd23d36ccdf35d941e5e1bf208b SHA512 10756d7160bba9b8caa80719dac4f35c898a204fe53b7c4249e383e64fe864f398224a268da901f902917300510922da686cda0a92fcda23ecf7e03032d42a9a
EBUILD selinux-vde-2.20180114-r2.ebuild 276 BLAKE2B 5094788a012a8958853f5221d8ade087c7ea9ff55d674fdf41e5f2e15010da3952271b7e225f53b72cd636b1afa139fefadddbd23d36ccdf35d941e5e1bf208b SHA512 10756d7160bba9b8caa80719dac4f35c898a204fe53b7c4249e383e64fe864f398224a268da901f902917300510922da686cda0a92fcda23ecf7e03032d42a9a
EBUILD selinux-vde-2.20180114-r3.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
+EBUILD selinux-vde-2.20180701-r1.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
MISC metadata.xml 313 BLAKE2B bcbb05e797b8776598699d30290f26e68f54b310410214a23181f1aa5f3eb265817eb4efcd29977bc09129c3b38a2844bb55e5344077915d4ace391d0ef8394c SHA512 40aca5ba39fd653e4c621b4a0eff2b9eaed17e78f92144fd561c32470b72e69e0e191976af1f3bf6152e3b19c8fcc017be3ddeca3a4b191cfa513f6f42549e1e
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..69c143bd9777
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 414d6fd41f04..515c24838fa7 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-virt-2.20170805-r2.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
-EBUILD selinux-virt-2.20170805-r3.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-virt-2.20180114-r1.ebuild 278 BLAKE2B 005e5eb9c1ef5aff676a25dea35223f6799afe5198e8014c358db959b2202c0f5fa7a1b02a7fee4767d376dbbbeff97779fcfc4e968d02f810b1b7cb556eddb3 SHA512 b084320fe3be2f3253e93fa681e08a91040d8ef7f383b374b91207dc0e995c4e2d45f8306fb47b9cb7cc8fd1381188df7514aed1a7bacb8ca55f4f3f87f65fbb
EBUILD selinux-virt-2.20180114-r2.ebuild 278 BLAKE2B 005e5eb9c1ef5aff676a25dea35223f6799afe5198e8014c358db959b2202c0f5fa7a1b02a7fee4767d376dbbbeff97779fcfc4e968d02f810b1b7cb556eddb3 SHA512 b084320fe3be2f3253e93fa681e08a91040d8ef7f383b374b91207dc0e995c4e2d45f8306fb47b9cb7cc8fd1381188df7514aed1a7bacb8ca55f4f3f87f65fbb
EBUILD selinux-virt-2.20180114-r3.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
+EBUILD selinux-virt-2.20180701-r1.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
MISC metadata.xml 314 BLAKE2B ddfe4853a8e46120ae40067c91e5aae0b9398391620fdead4a2bd05ecb7aab29e9125e287b86a08fd5c7c11c31f231b1c82a5cb98bbaddbdff638bc87a779eb3 SHA512 0a2c6884ff96c1bab8de52467afdba253e06c6d873d5e389ac2f84c485e4e4fa1bd5cb95a907b0ab49777755afcc1a26446f653ded9b3e3f64b576af14013296
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4c2b8e1ee3ad
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index d9d0b188c146..63762ebc59df 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vlock-2.20170805-r2.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
-EBUILD selinux-vlock-2.20170805-r3.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vlock-2.20180114-r1.ebuild 280 BLAKE2B 89b7d29aeaa21f3a738e6620ae5a767ec7761c486877798a67143ed5c24c519620ecad6543345b6ee891d07ea04c814223e66a6f0c9c1b87b7eb3ea5955ccd1e SHA512 db6a4849319b5001ddac41ab71ea9126f758795d09992e1ce60efbbce9878581d09a575bcb0b66742493c0a39928647c6cd61fda441d657a0ec58d5edf7c9e96
EBUILD selinux-vlock-2.20180114-r2.ebuild 280 BLAKE2B 89b7d29aeaa21f3a738e6620ae5a767ec7761c486877798a67143ed5c24c519620ecad6543345b6ee891d07ea04c814223e66a6f0c9c1b87b7eb3ea5955ccd1e SHA512 db6a4849319b5001ddac41ab71ea9126f758795d09992e1ce60efbbce9878581d09a575bcb0b66742493c0a39928647c6cd61fda441d657a0ec58d5edf7c9e96
EBUILD selinux-vlock-2.20180114-r3.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
+EBUILD selinux-vlock-2.20180701-r1.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
MISC metadata.xml 315 BLAKE2B b864e9c08b6219c42e71fb64cd812a5583705c7bdc2383d6070600891e5747306a80604ab62e329e6dad082139792dc3bff0dc8d09d8594bb9b0b712b616f38c SHA512 5ded38e727d6a36ea133c0500a64212b193ff5935a53386bf4ca2286e4d18e9468ad18f5fb4c80e9d0cde1d4e1713f4a5fbfe7ede03ed17e3ee573dce1a094b1
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5ceb572ace30
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index d03398ba8cf4..eb6683fc5e20 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vmware-2.20170805-r2.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
-EBUILD selinux-vmware-2.20170805-r3.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vmware-2.20180114-r1.ebuild 380 BLAKE2B eccf5ce9368768a2941cad5478ad72796c9086dbe4917e24782f636c2af98e13dc81fc3d57f19aaebe5b31755d96447f46a197172de5150b843edeafe88e4adc SHA512 c27de4732968a38b8a2220c5b36ff4126763bea7113fc26f5cae87c1dd3324de2c10fb75074d9c71a3cb8ff64063a1da831c9041dc774f72087fbd1f32fa7bcb
EBUILD selinux-vmware-2.20180114-r2.ebuild 380 BLAKE2B eccf5ce9368768a2941cad5478ad72796c9086dbe4917e24782f636c2af98e13dc81fc3d57f19aaebe5b31755d96447f46a197172de5150b843edeafe88e4adc SHA512 c27de4732968a38b8a2220c5b36ff4126763bea7113fc26f5cae87c1dd3324de2c10fb75074d9c71a3cb8ff64063a1da831c9041dc774f72087fbd1f32fa7bcb
EBUILD selinux-vmware-2.20180114-r3.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
+EBUILD selinux-vmware-2.20180701-r1.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
MISC metadata.xml 316 BLAKE2B ede764cc96f6774fc982138cef45b3e8470e94c8bc8e25482d8b1934c4de5e35469e18bdddb60f3693a71f1ebbff9201f7c4d8456f709695eed7131e76a7d0d0 SHA512 6410be397d5216abf34e154e3d52de5bccddeceebe65bf886df5628c459cbc346c585debcc4d89ceac8302d9eb80acc1c7460c0a6327344850896aad2050d6fb
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..85939ad36b26
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 15f4e012f20c..2eb583d897ac 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vnstatd-2.20170805-r2.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
-EBUILD selinux-vnstatd-2.20170805-r3.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vnstatd-2.20180114-r1.ebuild 284 BLAKE2B b6c5c393b11075625bd94c5a853a3b80b145acfb28d328c5edd2c90af4b906278dc1a1b22e2dbac54520eb9e2d009f1e00374f4c6c6db703a5f89c6bcf972039 SHA512 8909a0d06b13429de400849ab141de67b7f4c75a9e10a5602b233e389e819acd9cf11e898877022f08d67a20d33f0323b2d5083b451815ed9614cb49c3db2cbf
EBUILD selinux-vnstatd-2.20180114-r2.ebuild 284 BLAKE2B b6c5c393b11075625bd94c5a853a3b80b145acfb28d328c5edd2c90af4b906278dc1a1b22e2dbac54520eb9e2d009f1e00374f4c6c6db703a5f89c6bcf972039 SHA512 8909a0d06b13429de400849ab141de67b7f4c75a9e10a5602b233e389e819acd9cf11e898877022f08d67a20d33f0323b2d5083b451815ed9614cb49c3db2cbf
EBUILD selinux-vnstatd-2.20180114-r3.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
+EBUILD selinux-vnstatd-2.20180701-r1.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
MISC metadata.xml 317 BLAKE2B bcb38dd9c3df8e508df7129013547025ff8f9856a4032c1599f237d398e874228318ac515ccf1710233e40b4aaea1ddf02f044b58d69e5a35f51221da2ca5ee4 SHA512 0384e8de44653fbeffaa82186ce1b560fa1a1f9f7c5e5255cfa61988d4189cf698da7f17abfbc35d8f608735d609496fe53077d5d9e84f870e2e376cc728c072
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a96ef5b2ccad
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index be6f8d1e2633..4dd897c400b0 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vpn-2.20170805-r2.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
-EBUILD selinux-vpn-2.20170805-r3.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-vpn-2.20180114-r1.ebuild 276 BLAKE2B 97e68bff55a22b4f136a7dd395eecd0bb80cde7c483ff58a6f0e1937f78ea92099bcd2b671970783c7a89a2c13377f4550622f9ed2ca7ffc830e32736038363d SHA512 c7a1f9ccaea4daa37b8f2aafc9494c568e494f0aec4abb582914d5576df403bb6625141426807ba00362f6fabcdf6b036f78cb4405916cc13ee819c1c42ae769
EBUILD selinux-vpn-2.20180114-r2.ebuild 276 BLAKE2B 97e68bff55a22b4f136a7dd395eecd0bb80cde7c483ff58a6f0e1937f78ea92099bcd2b671970783c7a89a2c13377f4550622f9ed2ca7ffc830e32736038363d SHA512 c7a1f9ccaea4daa37b8f2aafc9494c568e494f0aec4abb582914d5576df403bb6625141426807ba00362f6fabcdf6b036f78cb4405916cc13ee819c1c42ae769
EBUILD selinux-vpn-2.20180114-r3.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
+EBUILD selinux-vpn-2.20180701-r1.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
MISC metadata.xml 313 BLAKE2B aa394352994b58b3af9cfa456bf4bbdcac364ac6fbb30c784122ab4482ae84f26fff0a3b568017d2aa8a4c053e4dcf55b44ea90a7b013da56896393817ab8db8 SHA512 5932c33a47a1c1a8a64b94fc174b8f284d4fbfec1852b6a971d5b72008bce6c5d532f3075ab5dbf61eca24e8f59e8723facf83c57b7d5a0d3ee490cf34abb302
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..7132c9718995
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 81930c8fbc4a..6f47d6023f0e 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-watchdog-2.20170805-r2.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
-EBUILD selinux-watchdog-2.20170805-r3.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-watchdog-2.20180114-r1.ebuild 286 BLAKE2B c8be687a6675b575c9e0e0defac043bc5016b519c8b56c3f80fa51b0da504b82d0dcfe212d2ce7c78275d7097050e209fa7f7c1e48d91a7e64d0a102d142f540 SHA512 6f85669499407ff21e3d5785cb69b8c9017ed6903540160628e8bde81f51bff079f54f40eddd30f18239b6fef95e973440b7dec3ee86a1203a59f389aca531ca
EBUILD selinux-watchdog-2.20180114-r2.ebuild 286 BLAKE2B c8be687a6675b575c9e0e0defac043bc5016b519c8b56c3f80fa51b0da504b82d0dcfe212d2ce7c78275d7097050e209fa7f7c1e48d91a7e64d0a102d142f540 SHA512 6f85669499407ff21e3d5785cb69b8c9017ed6903540160628e8bde81f51bff079f54f40eddd30f18239b6fef95e973440b7dec3ee86a1203a59f389aca531ca
EBUILD selinux-watchdog-2.20180114-r3.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
+EBUILD selinux-watchdog-2.20180701-r1.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
MISC metadata.xml 318 BLAKE2B ffea2648ec00eff9dc1d23552633fee8cf1db446b8f7d110b613f9e2d40b5aac0ea80462754f72e70fa4e86ed42717c6ef1ecf1680ea771e497cd6349df0b283 SHA512 3c77f235f65bc644d316ec2bb0d859ee22c622049c4f406904a7c24a4c17156636d86f249f4dca2a15a90d0334da677df3038956991a256f591fe3c7c2284957
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3bf64e50b5ac
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 76e37c497f15..a7b5fd5093ef 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-webalizer-2.20170805-r2.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
-EBUILD selinux-webalizer-2.20170805-r3.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-webalizer-2.20180114-r1.ebuild 385 BLAKE2B 7619dd5c99386ecd1dd2262fc0aabba54be543c2978fcf83507637ad53c60df53ab7fb896847ba4453d550816992e9b8ebf78660f470fd45a834b89df15c053f SHA512 d67717e516eee69a05453c427d4bfba176432a1d75df00f67bca97cbadd0098963b3f22cbe3a339517963da71f7ff6e52bafa3225b4d4287c2af390ca70a5ddb
EBUILD selinux-webalizer-2.20180114-r2.ebuild 385 BLAKE2B 7619dd5c99386ecd1dd2262fc0aabba54be543c2978fcf83507637ad53c60df53ab7fb896847ba4453d550816992e9b8ebf78660f470fd45a834b89df15c053f SHA512 d67717e516eee69a05453c427d4bfba176432a1d75df00f67bca97cbadd0098963b3f22cbe3a339517963da71f7ff6e52bafa3225b4d4287c2af390ca70a5ddb
EBUILD selinux-webalizer-2.20180114-r3.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
+EBUILD selinux-webalizer-2.20180701-r1.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
MISC metadata.xml 319 BLAKE2B 2a6a658da12d525a5781ff850e1c0c732e099ed2173eb82f985b7dd1ed6550911653e6f87c36be245aa1044b4e85f69be26f7318b3a262d05e1975fac7524d84 SHA512 6986d5695bb17f98f786b3639631f0a2571c91b2e90f33bc4b8e63b8390c70995b1b9010d22e9ce2ec23444342c246aa1e36f6da0675831c59534c0da6a0cb04
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.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"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.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"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
- sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1faf79c01338
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="webalizer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+ sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 48c329235d4c..fc3992a9fa47 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wine-2.20170805-r2.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
-EBUILD selinux-wine-2.20170805-r3.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-wine-2.20180114-r1.ebuild 278 BLAKE2B 94afa0a4f935d584d67374584eef5d8d6500e0f31ba0b946e7495d593c778607cbae8536178ec60b66fddc2c2ee1026370fe0db049647e1e2c3f14bb2134738a SHA512 1cd810ae984811ae1aa37c7c2e67ca6e70c40b58e271844f1704b46547a137e67d840bc1f0a4038a58871d8d85ed5ff52d6958f3ca80b34c4d665e9f6cf58453
EBUILD selinux-wine-2.20180114-r2.ebuild 278 BLAKE2B 94afa0a4f935d584d67374584eef5d8d6500e0f31ba0b946e7495d593c778607cbae8536178ec60b66fddc2c2ee1026370fe0db049647e1e2c3f14bb2134738a SHA512 1cd810ae984811ae1aa37c7c2e67ca6e70c40b58e271844f1704b46547a137e67d840bc1f0a4038a58871d8d85ed5ff52d6958f3ca80b34c4d665e9f6cf58453
EBUILD selinux-wine-2.20180114-r3.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
+EBUILD selinux-wine-2.20180701-r1.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
EBUILD selinux-wine-9999.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
MISC metadata.xml 314 BLAKE2B 780bfce1351e4e91d04d338327f744c024f95f430bd756c235b7e198c24ef1af56f769ff4c7567be38c4e5e839afa03a1bc2ed8a56d6b7c0f4ce7b85bd95e1c7 SHA512 50bcf648ab54f3c7eb0a7027ccdf189eae0279672792f52cd52ac894a589154f9ca5feafb5d0eb646d666f1a0c1300c7403cd60efeda86087b44516ebca2da44
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2d14db60213d
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index d17b7984e2e1..693c3dd7c650 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wireshark-2.20170805-r2.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
-EBUILD selinux-wireshark-2.20170805-r3.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-wireshark-2.20180114-r1.ebuild 288 BLAKE2B 77c61f431d6c1193ae90fba2313c32c1e29f9de4eebe152415c030a6e513ac8e0f5b086dea9092d82ce7f44d9410e2fb7634b1ba9680c89fefca3b4a02eae762 SHA512 581a8344984e78d04a005b007fd9edb95abb674dda99be463078b75b08fe173218de1c9b36a6078af2955c6a5dae84e2c26f6ce1b09ce34e207849b0d86ed870
EBUILD selinux-wireshark-2.20180114-r2.ebuild 288 BLAKE2B 77c61f431d6c1193ae90fba2313c32c1e29f9de4eebe152415c030a6e513ac8e0f5b086dea9092d82ce7f44d9410e2fb7634b1ba9680c89fefca3b4a02eae762 SHA512 581a8344984e78d04a005b007fd9edb95abb674dda99be463078b75b08fe173218de1c9b36a6078af2955c6a5dae84e2c26f6ce1b09ce34e207849b0d86ed870
EBUILD selinux-wireshark-2.20180114-r3.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
+EBUILD selinux-wireshark-2.20180701-r1.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
MISC metadata.xml 319 BLAKE2B bcf0d4e0124dcc45b99b5087c5433088fc85bd11cba9728e30d7171b0c88da21bb44e3c945f3a4bfa749281aeea68f4d0ee93d59fbe0af66093ac260bd48c3d9 SHA512 80924418148b0afd56b379bf7b8295dcc9544be8b78dc0716f5b0e692be198fcb5629a283e5cb42a9eeee6cb4af348232bb3538bc27929b8e58494c6859327a0
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a53c36b9a8b4
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 8e7f9562b3c6..f0e9157854dc 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wm-2.20170805-r2.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
-EBUILD selinux-wm-2.20170805-r3.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-wm-2.20180114-r1.ebuild 274 BLAKE2B 69b9ed374aa90ae1606fcf46b205e196af64ded879e4a612c02d642383cb85e0d655e12b07f0dc7c3ff5ee914424a8ace25c8014e7adc813a30594f4b7dda827 SHA512 912bcac95aaba7ca7c6a56059eece95ab44a83c4cd8501ba169992155c50fd605e8e2d145291a9f30bed39f0a6934dae3ed509353c3835e642ff552d42a7a904
EBUILD selinux-wm-2.20180114-r2.ebuild 274 BLAKE2B 69b9ed374aa90ae1606fcf46b205e196af64ded879e4a612c02d642383cb85e0d655e12b07f0dc7c3ff5ee914424a8ace25c8014e7adc813a30594f4b7dda827 SHA512 912bcac95aaba7ca7c6a56059eece95ab44a83c4cd8501ba169992155c50fd605e8e2d145291a9f30bed39f0a6934dae3ed509353c3835e642ff552d42a7a904
EBUILD selinux-wm-2.20180114-r3.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
+EBUILD selinux-wm-2.20180701-r1.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
EBUILD selinux-wm-9999.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
MISC metadata.xml 312 BLAKE2B 33d3910b761a83e4c2053db450c00b83dfa1bce1ac99a444a6b8ad247fddbb3bb23cac7fa5da9f29e2cbe52c4ef1e69323526ea1e2c1b2f537505c0584a672fa SHA512 af59f138e5a0a4e5cfc193cbffb4a43623325f89fd7241630fef628faede5bfe521f4d8309cc4eb93bd51b25e7e0a62134d3579f9dddaa68e42ac410e0e2f437
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..356ec814381b
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index a3f364abac30..27cdb0957a91 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xen-2.20170805-r2.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
-EBUILD selinux-xen-2.20170805-r3.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-xen-2.20180114-r1.ebuild 276 BLAKE2B 0c71217578ee45452f0455b33cdd0b9aef68860852d1d8ad56ea9bb792b7315da5cf362778b2948284f34e2efd3ef3b3dc2794aca6fed5cad9f9c5c43e6c7158 SHA512 b291372923ada54cbe44b04191daea145a1447749df3209901d33bded7c03d35f47c104e2a2e70ce50f8f60b294bfc3331966bbb3662ee416f543139c2f1be3b
EBUILD selinux-xen-2.20180114-r2.ebuild 276 BLAKE2B 0c71217578ee45452f0455b33cdd0b9aef68860852d1d8ad56ea9bb792b7315da5cf362778b2948284f34e2efd3ef3b3dc2794aca6fed5cad9f9c5c43e6c7158 SHA512 b291372923ada54cbe44b04191daea145a1447749df3209901d33bded7c03d35f47c104e2a2e70ce50f8f60b294bfc3331966bbb3662ee416f543139c2f1be3b
EBUILD selinux-xen-2.20180114-r3.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
+EBUILD selinux-xen-2.20180701-r1.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
MISC metadata.xml 313 BLAKE2B 3d3cc15dc6bd1334114e59a81727a5bee2cd538013e7c438ba7d9df291daf38325683f8b5563cb11f644fb01c8c06915681ec8b5861c005c3550425712d24fa6 SHA512 9fcb80cf02e136d443c02877c738b8495f7ca07338d952e62e22a602ec39658117877871398b501700e31ab481a1566a04f6e30c797970191368b023e2bcb806
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a03e6da72146
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 8321233b5b39..d7598d4e0692 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xfs-2.20170805-r2.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
-EBUILD selinux-xfs-2.20170805-r3.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-xfs-2.20180114-r1.ebuild 276 BLAKE2B 147f608ceedad91e7242b8e884102dddf9c53f4d8d3cc97b3f1d503fbc015f8abc6da47e5740f560c034ab35e6bcab9e178584d1efc488514e992a1f32da3db8 SHA512 3f8d552e14115d167756575b0f25cbae7bafa38bad79e320415a063f2197012776ed1fb8e686a1fcfad78c5e074ef31367d96806df49c7c235245ad6b6c2754c
EBUILD selinux-xfs-2.20180114-r2.ebuild 276 BLAKE2B 147f608ceedad91e7242b8e884102dddf9c53f4d8d3cc97b3f1d503fbc015f8abc6da47e5740f560c034ab35e6bcab9e178584d1efc488514e992a1f32da3db8 SHA512 3f8d552e14115d167756575b0f25cbae7bafa38bad79e320415a063f2197012776ed1fb8e686a1fcfad78c5e074ef31367d96806df49c7c235245ad6b6c2754c
EBUILD selinux-xfs-2.20180114-r3.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
+EBUILD selinux-xfs-2.20180701-r1.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
MISC metadata.xml 313 BLAKE2B 04215c2d269e1175cde05c8e127fce9049b974992079c026d663d0415e8d76b988ee852e78291e6912453f4152a799b4b38cab4c97ac203fc6b76de00ccb78b4 SHA512 5e9759c65739b4c1392585addc79b9b430fbdc6a564d27836398d686e3e89b84b4213243b571022ee7703413b5212d212a92fbb3feb0134a14a8c31ab5e67bee
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf06c723ddfd
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 1b98a24ec10b..3b7ef6c685a7 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xprint-2.20170805-r2.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
-EBUILD selinux-xprint-2.20170805-r3.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-xprint-2.20180114-r1.ebuild 282 BLAKE2B 7ea7fa849abc73f5bed4a71e40e1b2def5b2268d069074495bdab88fba4b0825513328fca6fcf88c9a3a21ddee52ab4bf1d467c5c3fa0e2f099930116f3addf7 SHA512 36f1bfa35cceff1195eb5191aab8c78a2a9d8dbb98682cff87fda61167ccb0e3800d6d7e08442112b05610629837dad4be78f3e87fc17670645a8b7572da1cd1
EBUILD selinux-xprint-2.20180114-r2.ebuild 282 BLAKE2B 7ea7fa849abc73f5bed4a71e40e1b2def5b2268d069074495bdab88fba4b0825513328fca6fcf88c9a3a21ddee52ab4bf1d467c5c3fa0e2f099930116f3addf7 SHA512 36f1bfa35cceff1195eb5191aab8c78a2a9d8dbb98682cff87fda61167ccb0e3800d6d7e08442112b05610629837dad4be78f3e87fc17670645a8b7572da1cd1
EBUILD selinux-xprint-2.20180114-r3.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
+EBUILD selinux-xprint-2.20180701-r1.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
MISC metadata.xml 316 BLAKE2B 3e42fb74e71432a997cb3b59f7e614b5466967486715d78d3a4d736a1c5e8e233da7da42939cb23621dc0963f76e7ddeffdc5c57ee01064575ed2eafeeba0c35 SHA512 6025b0050ab23d7f203102d346962ab4042058052e4bd2fad5b376b8d408fc266e252fee0b99f218f39adb538c22b8cf740bf628b3c6f1db586af3e9c1ef988e
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..403d7b9730b2
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 866f65ef52c1..dd84531047f7 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xscreensaver-2.20170805-r2.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
-EBUILD selinux-xscreensaver-2.20170805-r3.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-xscreensaver-2.20180114-r1.ebuild 392 BLAKE2B 7fadaa134d872d94b19256d1f2e284f43f32ef17ba7fbc645f54fcfd47f6bfc585d2c351fec7c6b92b246104f66a88119b65feb5d69daede2e1dafd55648abd1 SHA512 9c7e9c63bd3b001a9c1808f2b8d8d1c16478b95edeb8ffed4b08d43b96f350ca7e38f3c5620b43419f1e1aa13469d5433d2a98be286b21d60246b7ff05d22511
EBUILD selinux-xscreensaver-2.20180114-r2.ebuild 392 BLAKE2B 7fadaa134d872d94b19256d1f2e284f43f32ef17ba7fbc645f54fcfd47f6bfc585d2c351fec7c6b92b246104f66a88119b65feb5d69daede2e1dafd55648abd1 SHA512 9c7e9c63bd3b001a9c1808f2b8d8d1c16478b95edeb8ffed4b08d43b96f350ca7e38f3c5620b43419f1e1aa13469d5433d2a98be286b21d60246b7ff05d22511
EBUILD selinux-xscreensaver-2.20180114-r3.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
+EBUILD selinux-xscreensaver-2.20180701-r1.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
MISC metadata.xml 322 BLAKE2B 7d5ab233185dd0f086b0950d3316a9cc8e6d69ea3d18520b1da4c068ff1a2768791c908f2bbf07f82920ce02bb2e68300025dc013e3dbdd59e801c56f87f97f7 SHA512 405222d4ec4a70637897d7122cfb105c70ecb118237a3a614faf5af8f97789ce88820cb4455ffa6c661b17c9352d8d31eb3afc46e9b02bc338d3ee23f16aca07
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
- sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
- sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2fde998e703d
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+ sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+ sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index d5addfa33a7e..bc53d7b7e5bf 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xserver-2.20170805-r2.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
-EBUILD selinux-xserver-2.20170805-r3.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-xserver-2.20180114-r1.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
EBUILD selinux-xserver-2.20180114-r2.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
EBUILD selinux-xserver-2.20180114-r3.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
+EBUILD selinux-xserver-2.20180701-r1.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
MISC metadata.xml 317 BLAKE2B 8283187fba1cffb267929f3370b79e9b3f363ce0a69cd687ef82824c577fc2dfe2b5790359f5f36b297ef290c483c850851c09d7ed8fe6aada33e085cbbe5559 SHA512 cdc8ee6cf27d1f6b67ab653cb4db301225fde367b52f0e37f31e15acb0ec0b9fc49be756b64a39188c8bf4e3e6ba417142659b98f1a5795b8cd350464b9fa359
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a32bb13fcdbb
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 3c46e7c11c3d..d1c8ebf3a6b5 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-zabbix-2.20170805-r2.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
-EBUILD selinux-zabbix-2.20170805-r3.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
EBUILD selinux-zabbix-2.20180114-r1.ebuild 282 BLAKE2B 853bb29c929da43388cb19be21687276d4f5a93938bba87031eab9f4fed008947c7801db3173146876666806ff3cc00799f758ddecc01cb33d56dbf8220a0a04 SHA512 b7978d976f070f2e5842b8b9a462c4b66a901826920387a57b911029a0f7fc51a8b219205cfa00f8be4cf39cbe7e9db52e7eb97f18b65fea4cdddcf0b3aca9d5
EBUILD selinux-zabbix-2.20180114-r2.ebuild 282 BLAKE2B 853bb29c929da43388cb19be21687276d4f5a93938bba87031eab9f4fed008947c7801db3173146876666806ff3cc00799f758ddecc01cb33d56dbf8220a0a04 SHA512 b7978d976f070f2e5842b8b9a462c4b66a901826920387a57b911029a0f7fc51a8b219205cfa00f8be4cf39cbe7e9db52e7eb97f18b65fea4cdddcf0b3aca9d5
EBUILD selinux-zabbix-2.20180114-r3.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
+EBUILD selinux-zabbix-2.20180701-r1.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
MISC metadata.xml 316 BLAKE2B adaaa83176d90d4c8b3ec542b1d471b62f69e49e450d31ee360bc4a73dde5af47db69f01f51fa344cf82eae338f4ab1d228eb75d3b24ce9fce43929ba89b1202 SHA512 723a790e3ec5cc0449a7d62d4f3d997a52de7c66238f0d8e6b4a1036e15df38b4aa1f57a559ef98747e85ab0208897aa5733a09bcfe498475bed45edea162b12
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..60a2bf7d34cf
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+if [[ ${PV} != 9999* ]] ; then
+ KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9fe6ef80e6a6..a5269626d18a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/ckbcomp/Manifest b/sys-apps/ckbcomp/Manifest
index 531e283d8c00..5bb09c6d8999 100644
--- a/sys-apps/ckbcomp/Manifest
+++ b/sys-apps/ckbcomp/Manifest
@@ -1,3 +1,3 @@
DIST ckbcomp-1.164.tar.gz 3044072 BLAKE2B 74abf0c971a188fbbacd77e9eadad84ec29cbb2cde4c968402b83c0a5cd47ba5432f03dab4ed6bd8f8ae6b0ed8ebb4dcd51b8eddffd3b5d77de445740d5d576f SHA512 b2a71c7c34ff677f555bdb76bc329ae06740c4d0fa5516356dcd833fc9f97c0c560b26b4497fd7e3e0a60acb975a461a75ecc765c3f0fa1250f8b2e0f01c4e40
EBUILD ckbcomp-1.164.ebuild 733 BLAKE2B 9fa2315780c80bf9a297b3af39c23fc75e93efbc3dce89dc3d6bf866e559d81501550bdf4cd71e53d60b54811ddc40359134cc88010bd2c44bf14f075a585575 SHA512 8cc85ff92d2e630c22f421f2af713936a5471a32e8032cffea637ca26fbdf43bf60f24194acdfa6df9d7361e62d9c445a624aa485f2f26ee740b58034bd6b3c6
-MISC metadata.xml 374 BLAKE2B bb45f7b3ad77b0f0b49f4ce381a211a1fe8f3a502dc50f8f6fada6af00f32deb7f9957ca90d47d1f66d2ec1fdf5a021aceeca8d5c4570d52a794b5f834b26ec8 SHA512 ceb5bc435924dee9095fbd025946cfd2185ca2ebb946036554e3bdcabd943a9e586ce5cd3448fed2612e63ba974875d85e29961822047ff3a20dadb1ec74db09
+MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/sys-apps/ckbcomp/metadata.xml b/sys-apps/ckbcomp/metadata.xml
index 0840566600d5..91b52104f179 100644
--- a/sys-apps/ckbcomp/metadata.xml
+++ b/sys-apps/ckbcomp/metadata.xml
@@ -1,12 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+ <!-- maintainer-needed -->
+ </pkgmetadata>
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 28421517cba8..eae68569d7a1 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -6,6 +6,6 @@ DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178
DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed
-EBUILD coreutils-8.29-r1.ebuild 6176 BLAKE2B 7401f3562c128eba7dece52d55464e345b782cbbb5d033a5c1321ba3a2485ab48f01e26a3f5eadf0614607949bf0f1aee34c83303f2ad442a2e4b618569323ac SHA512 d6e571fbf22f285d230c128fcc5d583070d7c9d5464ddf8a1198cbd1bdbd79b8394c229d045ce5a5d0ef042d5e26da0d9f60590df7d7ff6ec86b791268c812d1
+EBUILD coreutils-8.29-r1.ebuild 6171 BLAKE2B aa4372f4d8ecda310147d857e27c478fd29c632ca3b2002bee21059545ee48859e63a68202aa98add4e2866b4681ecaf70d5c2441225aeea471e1ec379b13feb SHA512 65e8e7120076cacb234158a91e84616ebb2f04844bee1fffce813c02fc3aaa5022e70d23b7ddf2390c398a38ddd6efd449af0688333a8c8f282a148f09aac7b7
EBUILD coreutils-8.30.ebuild 6171 BLAKE2B d695f8f24e64e3c35ac6ef58143c31598b1877a05abeaebafa733962804e7bcd2b6cd301bcd22a8043d80085f75b4098b2d00d56e7f2508f79737d56c8655c84 SHA512 b25eba145100bbf5f4963c93706ca09318a2ac0654fa57a5aaabcc1f3dfbe537527c639c9da7ee7e74f26592fe75d7e123065cea0904f98648e0dfbd24366f4e
MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.29-r1.ebuild b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
index 36ef844453e9..4e1b2641ee82 100644
--- a/sys-apps/coreutils/coreutils-8.29-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index ec9598c2cd84..640fc6cf37fa 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,14 +1,18 @@
DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d
DIST c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz 26255 BLAKE2B 10941922212219f3b4c09306b8daf26cd921b078472c15db85205adcd65d503de5f58bc05eef3a2e60ca1485ebe44d282c2966ddd732d42ee092fe7880db5bbf SHA512 bf1593ca794ca973e8336954b527733f61c0bd389a729da32c84bc35ba6decea6434ea9728789e92f1663d2ec10cf3e4d4f50c8db907ed1566790214c40eaf5c
DIST c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz 20726 BLAKE2B b9a4dd6d490136571600eeb790320986e8cd1e330772da28a6c5d7708f3f4026b5938369dc38827d8c19033feb254c58e155cb5c4359898be431cffb297fd393 SHA512 c9e5cdd30de45ead06565530eae996dd95712cb15880e33ae95bcc2a0ee65223177d1c46627f564eaf3edf13786410c870dec996a5103ea7ec02e280f0dbd650
+DIST c-list-071841c28d96e9104761af815a7ea367390c3174.tar.gz 24662 BLAKE2B d1d859d4c6c80540d984083c70b58fde62eed2074d942222d15430c475ee46280af098c2a4dbe00ccd81a80884432ae3043480f9a050cb73fe5c1675c0a3d6ef SHA512 de4fc5ed4d893b122ef320ad0323d44e616210fe590fedad8e38c3c3f8a6c0778178fb85e6e970913ff441f9b3e8861491f59fcef2c2c02ddf59120620d8cbe3
DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359
DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894
DIST c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz 28400 BLAKE2B 35a0529bd262cbd8aa11228714ac331d7cd8202bd79165db4bebe5d5a1895adb58440d52edd7fcbfffb8d9a2f86c44d7642b0328ffae0bbcbdcd5c48999fdd12 SHA512 425c4525b7aead4f68ed401eefdff81b3fe1f444c76e934a67e0f18a3ba17b52bf3a1398879fa929d97186da7d4cb485618aec74b671145560ba251f5d24af8b
DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
+DIST c-utf8-a77769a6c5b40c4a2e900cb4d1b59535696ef7e8.tar.gz 24767 BLAKE2B 064b2b7eabf8b23fcbd841a863c6c10c5079a534c5cdc9326486b2c5a0d754c86300c58edfb1fafc3972335fd3a90eeb0b8a14531d1f911ab3148c332fb48ed0 SHA512 d7e6b4162b452cd6e05bf9cdea039a7acbb02a1d72bc0197149745c9416b11ec394c0ea1363c72a3082931f0f738b34a11124d9e2aa962e83f4739e65e571065
DIST c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz 21436 BLAKE2B d94c87a8ce99f3585da45678f36e59bbeded5d66f4cf7908da9fee3a4691fc704a0deefe66ddc3c7d8f653ec4bd7b2e8ed5892548a34930a10d1e5132f0954db SHA512 915258ea1d0f4e575c5f37746d34f98aebd6c9dd0c42e137f117dea1a8bbc895b775d9f9a6b2d91a6b008b095eb322332b3ec4d3de1a2333c8cbfcd7b89364b5
DIST dbus-broker-11.tar.gz 160473 BLAKE2B b043709f5fcf18f27d0d76792c2f11f227764233d9362b65485fd76601f4cbabf4426065d6b2e659434a38b020901f2a8b3bdce86e8f5fef7acd8161df877c3e SHA512 c46f1739e289d82ef86d0d640c66f13ac97e10a483f513a4e6158e489ca1f05c45967131dd326a75f98d6b84e7891efcf605dde91ed73da4bfe2f076fcada56e
+DIST dbus-broker-14.tar.gz 179880 BLAKE2B bce75a5dacef22166c244151a1960119b1fb853357ffcdf5adf523223ed5a7beb2173fa872983cb1672c6fa2713e0a36916d7ff2ae6251c19bc0ec4ccc4e917d SHA512 7313a30facf2e64e98ac9d5e109b4ea2d5d0ad70bb4b82edd168ad7a7188b17710651b870827ae4d3b88db6dfdd41d4e9d0becea12307c481a581bfb524b572d
DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
EBUILD dbus-broker-11.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
+EBUILD dbus-broker-14.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
-EBUILD dbus-broker-9999.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
+EBUILD dbus-broker-9999.ebuild 2081 BLAKE2B 978622f99b77458cc54661f7a64b3986eb6775a556a5f66cb206a498570c7454e2f6dd74075792d5eea13490ad681df893cdd06f67a1902c08446f8b8400b951 SHA512 eca7c81a3c5b08c4488dd06245ab76a5dca3078ae26135188719a38da2916f2b9a0bc728511bea352ee2b7b4570c695bcedcc8e2a7bc4b0fc0ee652266921d03
MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-14.ebuild b/sys-apps/dbus-broker/dbus-broker-14.ebuild
new file mode 100644
index 000000000000..f3dd9cd82a47
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-14.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+ dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
+ list=071841c28d96e9104761af815a7ea367390c3174
+ rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
+ sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
+ utf8=a77769a6c5b40c4a2e900cb4d1b59535696ef7e8
+ SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
+ https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
+ https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
+ https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
+ https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
+ https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
+ "
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit doc +launcher selinux"
+
+RDEPEND="
+ audit? (
+ >=sys-process/audit-2.7
+ >=sys-libs/libcap-ng-0.6
+ )
+ doc? ( dev-python/docutils )
+ launcher? (
+ >=sys-apps/dbus-1.10
+ >=dev-libs/expat-2.2
+ >=dev-libs/glib-2.50:2
+ >=sys-apps/systemd-230
+ )
+ selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+ dev-python/docutils
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ if [[ ${PV} != 9999 ]]; then
+ rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry,c-utf8} || die
+ mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+ mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+ mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+ mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+ mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
+ fi
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ -Daudit=$(usex audit true false)
+ -Ddocs=$(usex doc true false)
+ -Dlauncher=$(usex launcher true false)
+ -Dselinux=$(usex selinux true false)
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index a21aaabdae9f..f3dd9cd82a47 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -10,10 +10,10 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
- list=05bada3508c21027dbbbf1319f27ed65c7c03bc0
+ list=071841c28d96e9104761af815a7ea367390c3174
rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
- utf8=cc67174f455c9196ebffc37b4d4f249da3dbc66f
+ utf8=a77769a6c5b40c4a2e900cb4d1b59535696ef7e8
SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
@@ -29,11 +29,16 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="audit +launcher selinux"
+IUSE="audit doc +launcher selinux"
RDEPEND="
- audit? ( sys-process/audit )
+ audit? (
+ >=sys-process/audit-2.7
+ >=sys-libs/libcap-ng-0.6
+ )
+ doc? ( dev-python/docutils )
launcher? (
+ >=sys-apps/dbus-1.10
>=dev-libs/expat-2.2
>=dev-libs/glib-2.50:2
>=sys-apps/systemd-230
@@ -59,9 +64,10 @@ src_prepare() {
src_configure() {
local emesonargs=(
- -D audit=$(usex audit true false)
- -D launcher=$(usex launcher true false)
- -D selinux=$(usex selinux true false)
+ -Daudit=$(usex audit true false)
+ -Ddocs=$(usex doc true false)
+ -Dlauncher=$(usex launcher true false)
+ -Dselinux=$(usex selinux true false)
)
meson_src_configure
}
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 41227d619ae1..90f351faf692 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,5 @@
DIST fakechroot_2.17.2.orig.tar.gz 463307 BLAKE2B c13e0bb649dc4ecafed1d1f7aa487659631bfae94b2fdc91aee8b23910954e46a74ba6f3d50107a9a282b9e7cb21bf4edb372257adaf157f43c4055738ddce49 SHA512 bcdcf8e77aae46b567acddb80e6817a118c7ef250ba7b6962982e60a6a5e3b8c1eeef950dc33335f31466c3f53ab6b7260bc64a1da9c4b156a44d811ef8cccd0
DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
EBUILD fakechroot-2.17.2.ebuild 586 BLAKE2B a19038407cd5be5f4facb1dadc4543a6d1bb19b30e1e003d20603eeb154db97caccb1633be9b564ce887ebf8131d686d6182f353e07be82c1d3419f5e00031a6 SHA512 b2fcfa6605167ffc457c273ab13aad743d7a92b51e7444ef9edc4744692b97bb608dc2529c73cc5441d6d458cbbf5ffe7ad843e1396c0b02a21fd142c737e296
-EBUILD fakechroot-2.19.ebuild 599 BLAKE2B 12bc33935ffc710c2a3ff21414902b7c71961489048aeff95d8aa8c53c7d90c8c8beb9c0c41d0331e51593e2f64e1b7b9db5e6dcdd25b9110a5f704cded171a3 SHA512 8e354f5b49a9648fe5f9655745805685a82c776d97217c743c7b6014b810be323d9b4525e044761dc9fe0fd83a6d08e4f88b3fde288b9816a1265bb3b6628a1a
+EBUILD fakechroot-2.19.ebuild 598 BLAKE2B 2f48bb72769e989e7cdc7f66706ecfd5105842504a45511347209888f78bc3f1cf0b118265afae6434ab0748cf2ac2f4ea382d72b72f4f614fb338970625bb3b SHA512 1e9cb88b964c02a82fc7a541032aa55c110792e51b64b8f7ffd35d4652d9c0d714e6246f21a251dba6155fba311732bd8dff402f012c180f7b28fbb2bc30ba49
MISC metadata.xml 345 BLAKE2B 3471b0985dec02f4065149b788a8edb64d5a90741719c02bb4c87dffc27ee6f61f4d231df83e716382f36d2220e7cb7a4797cd3960db955761ee4852c76b80e6 SHA512 940ab52cf3ad5ef13f24f093fcc41e4c39dc9cd484eaf0dc0bb0d29306cbab474044cc72898ddaf49604a63032d7a089e2f308c9ea94e79c6a16c27970aba08c
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 8126e0b444bd..98cde3ff96fa 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a37d11ad3ace..a44c1926b1ff 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
-EBUILD fwupd-1.0.6.ebuild 2487 BLAKE2B b752c547e695bfec356468b7fb5089ca75f75e3ea3c782acc50200024a0adc46d51ab1906d00e1a812fe10c9855ea48093e6005c5f94bee73997ff2804c5fb46 SHA512 6cf5280743a7123c18f0be9c58021d08d36a09f39251386ba1f34232b40471cbed9830b38dda676806098b280d8ed48c1d7328c7dcb048d2df0994903b66174e
-EBUILD fwupd-1.0.8.ebuild 2621 BLAKE2B 1996f358cf376ae14baaace3623a987e7a045bfcb9a3d3d38895c429e298439d71bec424feb03288309c0f47dbbf6014a8ecd1262e827f7c8d95f753870b2ad9 SHA512 792633ec3514a0189ea83da3e6e1a1e52b13a491b3e29b93329e014ffb750554636c3c17dc09eae4cdac0eb98f37b20e1e78477d89009185e5b3b31a46608b6e
-MISC metadata.xml 834 BLAKE2B c71e6a3c51d232413bc726375abfc6716b82a8228644c0032aae613936b47f0aa44d61c7c4d34b00b78b70dab6a1e8a0e8cb9d19ba0555cdee231310fb60230f SHA512 ac8f92d0d9dee26834fb46635451a7b053866d01614ea53f00d37281d34165d462aeb867cc770006b2abbcefa0051eeb3fa2cc9751c0017c72d31fedf6587a90
+DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae
+EBUILD fwupd-1.0.8-r1.ebuild 2571 BLAKE2B 319b1a34fdd87aadffcd39e73713b09b1cdf5191582c71bd2192fe07a4db3494a4108f92fa331c7cb5ab12725ece340df8dad94cd4544cf10cf0b3af3b8015c8 SHA512 4a42e8c3d1b860b7936b320b78d2e453f4412312d412176dc53f3dce0f8ce28311d2ec79dc2eedc381f46ddfe332c35e97e49775bdea9f1f07c600fd5ae866cc
+EBUILD fwupd-1.1.0.ebuild 2583 BLAKE2B 30a1ffe9ec7a4f6ae154c24478568c2b12c841e3fc16d1ee390edcc09379982c99aeddec75d7ae56e9e95db5776a579111a6cf9686ee20b3802605a7f8e93acc SHA512 447ce527e8aa2ee6bf629f9840dbbaa10826c1697503866928e0f58ebd2db0ce89de931cbbdb36af4ff52e8b31b2acf1fb89f56cde3093c5190875f8596dfee2
+MISC metadata.xml 889 BLAKE2B d567f74fb461b0740d21bbc1e2b37692928aa2dbab77250743b898b6aaab8579bea218d4aa1fe379f45422d7ca4b9b81fbcd6bb2c8c41b586b27c0b30f71715a SHA512 80c84c24df419837825e4dc4453dc360c32f4e3eef3d117fe51a8675717ebd6f64bae27df6221895d86d9f099092c3c7e9e5b7650851722ccfc927a874bec001
diff --git a/sys-apps/fwupd/fwupd-1.0.6.ebuild b/sys-apps/fwupd/fwupd-1.0.6.ebuild
deleted file mode 100644
index bf7962018270..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/appstream-glib-0.6.13:=[introspection]
- >=dev-libs/glib-2.45.8:2
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- >=net-libs/libsoup-2.51.92:2.4[introspection]
- >=sys-auth/polkit-0.103
- virtual/libelf:0=
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.3.3
- )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- pkcs7? ( net-libs/gnutls:= )
- systemd? ( >=sys-apps/systemd-231 )
- !systemd? ( >=sys-auth/consolekit-1.0.0 )
- uefi? ( >=sys-apps/fwupdate-5 )
- uefi_labels? (
- x11-libs/pango
- x11-libs/cairo
- media-libs/freetype
- media-libs/fontconfig
- media-fonts/dejavu
- media-fonts/source-han-sans
- )
-"
-DEPEND="
- ${RDEPEND}
- app-arch/gcab
- app-arch/libarchive
- virtual/pkgconfig
- $(vala_depend)
- doc? ( dev-util/gtk-doc )
- man? ( app-text/docbook-sgml-utils )
- test? ( net-libs/gnutls[tools] )
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
- default
- sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- xdg_environment_reset
- local emesonargs=(
- -Dconsolekit="$(usex systemd false true)"
- -Dgpg="$(usex gpg true false)"
- -Dgtkdoc="$(usex doc true false)"
- -Dman="$(usex man true false)"
- -Dpkcs7="$(usex pkcs7 true false)"
- -Dplugin_colorhug="$(usex colorhug true false)"
- -Dplugin_dell="$(usex dell true false)"
- -Dplugin_synaptics="$(usex dell true false)"
- # requires libtbtfwu which is not packaged (yet?)
- -Dplugin_thunderbolt=false
- -Dplugin_uefi="$(usex uefi true false)"
- -Dplugin_uefi-labels="$(usex uefi_labels true false)"
- -Dsystemd="$(usex systemd true false)"
- -Dtests="$(usex test true false)"
- )
- meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild b/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..da2b82c2bba9
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit meson python-single-r1 vala xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-arch/libarchive:=
+ dev-db/sqlite
+ >=dev-libs/appstream-glib-0.7.4:=[introspection]
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libgusb-0.2.9[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ >=net-libs/libsoup-2.51.92:2.4[introspection]
+ >=sys-auth/polkit-0.103
+ virtual/libelf:0=
+ colorhug? ( >=x11-misc/colord-1.2.12:0= )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.3.3
+ )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+ systemd? ( >=sys-apps/systemd-231 )
+ !systemd? ( >=sys-auth/consolekit-1.0.0 )
+ uefi? ( >=sys-apps/fwupdate-10 )
+ uefi_labels? (
+ x11-libs/pango
+ x11-libs/cairo
+ media-libs/freetype
+ media-libs/fontconfig
+ media-fonts/dejavu
+ media-fonts/source-han-sans
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/gcab
+ app-arch/libarchive
+ >=dev-util/meson-0.41.0
+ >=dev-util/ninja-1.7.2
+ virtual/pkgconfig
+ $(vala_depend)
+ doc? ( dev-util/gtk-doc )
+ man? ( app-text/docbook-sgml-utils )
+ test? ( net-libs/gnutls[tools] )
+"
+
+REQUIRED_USE="dell? ( uefi )"
+
+src_prepare() {
+ default
+ sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+ vala_src_prepare
+}
+
+src_configure() {
+ xdg_environment_reset
+ local emesonargs=(
+ -Dconsolekit="$(usex systemd false true)"
+ -Dgpg="$(usex gpg true false)"
+ -Dgtkdoc="$(usex doc true false)"
+ -Dman="$(usex man true false)"
+ -Dpkcs7="$(usex pkcs7 true false)"
+ -Dplugin_dell="$(usex dell true false)"
+ -Dplugin_synaptics="$(usex dell true false)"
+ # requires libtbtfwu which is not packaged (yet?)
+ -Dplugin_thunderbolt=false
+ -Dplugin_uefi="$(usex uefi true false)"
+ -Dplugin_uefi_labels="$(usex uefi_labels true false)"
+ -Dsystemd="$(usex systemd true false)"
+ -Dtests="$(usex test true false)"
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/fwupd/fwupd-1.0.8.ebuild b/sys-apps/fwupd/fwupd-1.0.8.ebuild
deleted file mode 100644
index b1dbd1d0395c..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-arch/libarchive:=
- dev-db/sqlite
- >=dev-libs/appstream-glib-0.7.4:=[introspection]
- >=dev-libs/glib-2.45.8:2
- dev-libs/libgpg-error
- dev-libs/libgudev:=
- >=dev-libs/libgusb-0.2.9[introspection]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- >=net-libs/libsoup-2.51.92:2.4[introspection]
- >=sys-auth/polkit-0.103
- virtual/libelf:0=
- colorhug? ( >=x11-misc/colord-1.2.12:0= )
- dell? (
- sys-libs/efivar
- >=sys-libs/libsmbios-2.3.3
- )
- gpg? (
- app-crypt/gpgme
- dev-libs/libgpg-error
- )
- pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
- systemd? ( >=sys-apps/systemd-231 )
- !systemd? ( >=sys-auth/consolekit-1.0.0 )
- uefi? ( >=sys-apps/fwupdate-10 )
- uefi_labels? (
- x11-libs/pango
- x11-libs/cairo
- media-libs/freetype
- media-libs/fontconfig
- media-fonts/dejavu
- media-fonts/source-han-sans
- )
-"
-DEPEND="
- ${RDEPEND}
- app-arch/gcab
- app-arch/libarchive
- >=dev-util/meson-0.41.0
- >=dev-util/ninja-1.7.2
- virtual/pkgconfig
- $(vala_depend)
- doc? ( dev-util/gtk-doc )
- man? ( app-text/docbook-sgml-utils )
- test? ( net-libs/gnutls[tools] )
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
- default
- sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
- vala_src_prepare
-}
-
-src_configure() {
- xdg_environment_reset
- local emesonargs=(
- -Dconsolekit="$(usex systemd false true)"
- -Dgpg="$(usex gpg true false)"
- -Dgtkdoc="$(usex doc true false)"
- -Dman="$(usex man true false)"
- -Dpkcs7="$(usex pkcs7 true false)"
- -Dplugin_colorhug="$(usex colorhug true false)"
- -Dplugin_dell="$(usex dell true false)"
- -Dplugin_synaptics="$(usex dell true false)"
- # requires libtbtfwu which is not packaged (yet?)
- -Dplugin_thunderbolt=false
- -Dplugin_uefi="$(usex uefi true false)"
- -Dplugin_uefi-labels="$(usex uefi_labels true false)"
- -Dsystemd="$(usex systemd true false)"
- -Dtests="$(usex test true false)"
- )
- meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.1.0.ebuild b/sys-apps/fwupd/fwupd-1.1.0.ebuild
new file mode 100644
index 000000000000..431667267fac
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.1.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit meson python-single-r1 vala xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ dell? ( uefi )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-arch/libarchive:=
+ dev-db/sqlite
+ >=dev-libs/appstream-glib-0.7.4:=[introspection]
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/libgpg-error
+ dev-libs/libgudev:=
+ >=dev-libs/libgusb-0.2.9[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ >=net-libs/libsoup-2.51.92:2.4[introspection]
+ >=sys-auth/polkit-0.103
+ virtual/libelf:0=
+ colorhug? ( >=x11-misc/colord-1.2.12:0= )
+ dell? (
+ sys-libs/efivar
+ >=sys-libs/libsmbios-2.4.0
+ )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libgpg-error
+ )
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+ redfish? (
+ dev-libs/json-glib
+ sys-libs/efivar
+ )
+ systemd? ( >=sys-apps/systemd-211 )
+ !systemd? ( >=sys-auth/consolekit-1.0.0 )
+ uefi? (
+ media-libs/fontconfig
+ media-libs/freetype
+ >=sys-libs/efivar-33
+ x11-libs/cairo
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/gcab
+ app-arch/libarchive
+ >=dev-util/meson-0.41.0
+ >=dev-util/ninja-1.7.2
+ virtual/pkgconfig
+ $(vala_depend)
+ doc? ( dev-util/gtk-doc )
+ man? ( app-text/docbook-sgml-utils )
+ test? ( net-libs/gnutls[tools] )
+"
+
+src_prepare() {
+ default
+ sed -e "s/'--create'/'--absolute-name', '--create'/" \
+ -i data/tests/builder/meson.build || die
+ sed -e "/'-Werror',/d" \
+ -i plugins/uefi/efi/meson.build || die
+ vala_src_prepare
+}
+
+src_configure() {
+ xdg_environment_reset
+ local emesonargs=(
+ -Dconsolekit="$(usex systemd false true)"
+ -Dgpg="$(usex gpg true false)"
+ -Dgtkdoc="$(usex doc true false)"
+ -Dman="$(usex man true false)"
+ -Dpkcs7="$(usex pkcs7 true false)"
+ -Dplugin_dell="$(usex dell true false)"
+ -Dplugin_redfish="$(usex redfish true false)"
+ -Dplugin_synaptics="$(usex dell true false)"
+ # requires libtbtfwu which is not packaged (yet?)
+ -Dplugin_thunderbolt=false
+ -Dplugin_uefi="$(usex uefi true false)"
+ -Dsystemd="$(usex systemd true false)"
+ -Dtests="$(usex test true false)"
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index db5cd052b861..b15f190a058b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -12,6 +12,7 @@
<flag name="gpg">Enable GPG support.</flag>
<flag name="man">Build and install man pages</flag>
<flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg>.</flag>
+ <flag name="redfish">Install redfish plugin</flag>
<flag name="uefi">Enable UEFI support</flag>
<flag name="uefi_labels">Enable UEFI labels support</flag>
</use>
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
index fad357917378..0653d42811b2 100644
--- a/sys-apps/fwupdate/Manifest
+++ b/sys-apps/fwupdate/Manifest
@@ -1,5 +1,5 @@
DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193
-EBUILD fwupdate-10.ebuild 852 BLAKE2B fde9ce5e48019e4b33907fe2c6c6c5887a02676297fb59282b90dd8ebbc69263d9634c5674218d56a0fa80cca4732950c92b28622eea54c4ddadfa62310c39c9 SHA512 40d3e3498c3797d230d3a38cd1ce9e5c8355942baad10f99d8f8d549d5416639f3375e6317f9762a42a5d477355f0016ae8286cbc7517d8c1c27a7d976e349dc
-EBUILD fwupdate-12.ebuild 876 BLAKE2B bdc849d79ff4f9b101093fdf64fc490a7fc779df53c0234778f4b6bf3a6e21afd640713b9598cc17adefcfd49cfba083fd9e77df997d2182c2c118846961aaed SHA512 2b151bc40e98f4d704aef4c1f6c87f26778db5009f269802de6b8842684b1c632d7c4bb55f25827c8a0be885ac8a2158dd5943c3b3ddfad5826d17a33d481748
+EBUILD fwupdate-10.ebuild 852 BLAKE2B d81f83274f7b81c7d1e572cfb3a4b368ce609c26207a01bda54b8927e6004dc0ead9aea40e51cc6ac4913b29fdb9c17d5aee0fbe9241c0b89be38f5dc31c317e SHA512 674bc7a7f008c55114c6fc095ea3a4d2a1f12c0177c5ea689564515229c82d7fe73b33fdc659fa0b1831e69c48bebbd94dfc0a1f16bfe4198caca291120fe256
+EBUILD fwupdate-12.ebuild 876 BLAKE2B 9a9e95e35cf311d8e964cfafa9b823c80c4fcfc4b41a0d0e5f80024bc2d35e09ce94c12935eecd328614d68e4c5d37e331fcfd936ea3a4aecf870fb3a5562205 SHA512 4d2ee910120ecff4aa506717042f64fac77523f0f2a48818057f53519d3206ca8d2e95993988a6c5d884d1136738d26bf59628d0c7786071ebe6f948cb923414
MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf
diff --git a/sys-apps/fwupdate/fwupdate-10.ebuild b/sys-apps/fwupdate/fwupdate-10.ebuild
index ac5e222c9472..e568ed34d907 100644
--- a/sys-apps/fwupdate/fwupdate-10.ebuild
+++ b/sys-apps/fwupdate/fwupdate-10.ebuild
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="
dev-libs/popt
>=sys-libs/efivar-32-r1
- >=sys-libs/libsmbios-2.3.2
+ >=sys-libs/libsmbios-2.3.3
"
DEPEND="
${RDEPEND}
diff --git a/sys-apps/fwupdate/fwupdate-12.ebuild b/sys-apps/fwupdate/fwupdate-12.ebuild
index 4f3674c54d8a..77dcb16f8ac6 100644
--- a/sys-apps/fwupdate/fwupdate-12.ebuild
+++ b/sys-apps/fwupdate/fwupdate-12.ebuild
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="
dev-libs/popt
>=sys-libs/efivar-32-r1
- >=sys-libs/libsmbios-2.3.2
+ >=sys-libs/libsmbios-2.3.3
"
DEPEND="
${RDEPEND}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index f82a9ec67815..7c2b026f949c 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,5 +1,7 @@
DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26caaca54d816c6e02539b652d967bb8de3138d6ffd7aa1d63c010632e4f888d6cff2e6a7b743a8816787319b67e5 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c
DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
-EBUILD gptfdisk-1.0.1.ebuild 1147 BLAKE2B 6b787408e745aa56eeb6b6ce01c6d0da7dd1bd27140e4a96220dd7318c520dfad9dbb15a870ec201afb853fc7b104d5e5d4ec01ba681671065bea11cdf2dedf1 SHA512 9b41a8424c197206d934afae1f29475c7e7861e9a65a0fd62cc56d5d029673f46900f3e63abb35a33ec4dc51e75a2b63724399fe807b7bce8e62635d18254b94
-EBUILD gptfdisk-1.0.3.ebuild 1199 BLAKE2B 229d33976f3c6d129f02f6c55f13ea5bc60284d16c96516cbcb2287c1e5b0945832fe256abae97d12e84498793f017697a4694e5a926ad461a5fbbc59ef13ad5 SHA512 522a3218406a2a9128161a12cdf72f62e5450885b2df313bd37e6ffbd3d129c8d54c09d135a102aa75b7f7e7117df621be325ca11f36baf9e64496ac3e4cabf2
+DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
+EBUILD gptfdisk-1.0.1.ebuild 1198 BLAKE2B 35a6dff3f8c26d31be4a1bbfd6b274847fb0ae854ed70c8f6ba02202b90437d7c5f195629bf5bb9865cb0e9601670470a7f9e4a313afc737a43f4f128c7fe776 SHA512 fff00afa1c3689f41c0908d5198b07ca14e34c785e6bd907d593343dac00cb9079880b18769f8856c09f3972619ef0b48a0a0bb49cd3e07ccfff189c5b31cac2
+EBUILD gptfdisk-1.0.3.ebuild 1261 BLAKE2B fa1235629b1994f619c9ac5a6bab2c861e90ae53a153f20c34ee12864e7731d9cda4149ac0ce8a332f964488faf8819a9b4cf5941f2712c553330b8cdd43db41 SHA512 54b9c3b5d3c5e3e374fe741991d459533d337ca9a763092fd4f9ebba81584b346ed9faa8b56f4a76853a3703275a279978362552c5701ad118d2e5e2492d885c
+EBUILD gptfdisk-1.0.4.ebuild 1259 BLAKE2B f2a4d0d41b9a128cb27d006a89031ca7a3b8ef27e142e32af77502c05572214edc1251f8793520e1cba22e13ece8dae7161daeba0543c16c3e56a5550c6e4838 SHA512 613080951e4db937ca66a117a89040a740d301b04a74a1d9db6b7cda73bee0e4e534a2dfcd42ebaf05f6e783283ed786942251a20b58ea5a97af3bd8c65faaa0
MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
index 90515a8c8f68..ebca9efb4734 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,13 +14,17 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="kernel_linux ncurses static"
-LIB_DEPEND="
- dev-libs/popt[static-libs(+)]
- ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] )
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="!static? (
+ dev-libs/popt
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+ kernel_linux? ( sys-apps/util-linux )
+ )"
DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
+ static? (
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+ )
virtual/pkgconfig"
src_prepare() {
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index b813139d2707..313d50db8813 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,19 +11,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="kernel_linux ncurses static"
# libuuid from util-linux is required.
-LIB_DEPEND="
- dev-libs/popt[static-libs(+)]
- ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] )
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="!static? (
+ dev-libs/popt
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+ kernel_linux? ( sys-apps/util-linux )
+ )"
DEPEND="
${RDEPEND}
- static? ( ${LIB_DEPEND} )
+ static? (
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+ )
virtual/pkgconfig
"
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
new file mode 100644
index 000000000000..ba13b2306d74
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+ dev-libs/popt
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+ kernel_linux? ( sys-apps/util-linux )
+ )"
+DEPEND="
+ ${RDEPEND}
+ static? (
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+ )
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ tc-export CXX PKG_CONFIG
+
+ if ! use ncurses ; then
+ sed -i \
+ -e '/^all:/s:cgdisk::' \
+ Makefile || die
+ fi
+
+ sed \
+ -e '/g++/s:=:?=:g' \
+ -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+ -i Makefile || die
+
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+ doman *.8
+ dodoc NEWS README
+}
diff --git a/sys-apps/idle3-tools/Manifest b/sys-apps/idle3-tools/Manifest
index c96a2f50bcd0..3cf15fcd42bc 100644
--- a/sys-apps/idle3-tools/Manifest
+++ b/sys-apps/idle3-tools/Manifest
@@ -1,3 +1,6 @@
+AUX makefile.patch 951 BLAKE2B 945ce0da10772695815b4ee6620dc27faafe232f696e3a11fa2e3f172b8e51095dfa2e034fa8f870871f9f0bc000b9aa7a1ab22659f6b0641b6223e5f87524e9 SHA512 544dfc040211706ca15272625ac95c876749670a6d7919e37651bb076bf7911682943ea621c6022e7a216c8fbe434f9fc74c44e3c737489297541bf2d8d29d3e
DIST idle3-tools-0.9.1.tgz 21201 BLAKE2B 07f8f5971e8ce48d7dbf793011ae3a9697b8d9abebeca430724d241991e0b3605790eee3b50ea035e699e955557b8225ec9b66eac74a435a106e09a768c6e610 SHA512 512991fad786684bd127f7ad3af94dcea4e28cd88d52221007436172725b8d2c0c2edd578c4c95bbcd425339ed664b9d81adbabbc2bb8a4a3ea71500e21db01e
+DIST idle3-tools-0.9.3_pre20120123.tar.bz2 19842 BLAKE2B 09095a1382e116c6171cf38c2d9cbdba32e38b3890f5169ed966b707bcd27f70e78efaef8c3500499fc261347c1cc228a8b39d910d719451cc11cc40fcb71b1a SHA512 309a6e500b71d64d569729f44b597fd218f983b9018373a4871a62137b32bd540524b757648fe9e873d949de772f26428cb82d16b367212e6d1fb592aa7bfbf1
EBUILD idle3-tools-0.9.1.ebuild 505 BLAKE2B 5d951c11979c926b95b790d8549273dc0e61140ff7a729503a7c8101dd4a53466bddf8454c82355be1fe4863ae65ebc2ccc336aef11ac672054fd8ab63be0e67 SHA512 5b8f7e29be4e28dafee521bab426888f47db49d4d9f03ba69854a66ad041f4ca7f20b054fbb1f65bb6c0c5808be091fac69e466da3a39bfed07fc0a7530f2dcb
-MISC metadata.xml 700 BLAKE2B 8c1da76f3aee3298fa69eb121bc11aff4f3400e4f35ef30f82c7b5351a7505fd3e1f14803868ef397e34e83121833d91fa7c7b93bdc5da3542212e45544be9f8 SHA512 bff2faaf83b67967d8b52eb9a3694ec78c707985f5a565588992248949e23a34de3d0c27ff52e17c832977047e38487eba737a8885775809cdf86bde580eb8c1
+EBUILD idle3-tools-0.9.3_pre20120123.ebuild 463 BLAKE2B 474c42e446d477f2624d4bfe97714b8dff4b7afe5d5f873428d1502fc524c5beea9377542716f46a7bbcd0db22034ac4899c23ffb3ae0a2ed21e0b56c3929610 SHA512 87fcdadb01cf43d536661ccefdefdf8005bdfd8021de0083e5dd4723bf8cc010e85db14000f1ad208611627ccf23b838c9c0cea999086fab10ef706634448f78
+MISC metadata.xml 952 BLAKE2B e4123a25039cf4653b5e0818fde19ad2827923f013b0ca8c345f2ed204b9e0a38e49da2185c42b8507b5c053801f84ebce62ce4efd91d7bfdd302ebbe5c94632 SHA512 a7e419e6421ab02ad87c430ead433738aa3043249deb164e51b81674661fd4b8edaf9da11b679cd098373f5cb627a95979525c0bfb8d60ab8b691fd541e3a061
diff --git a/sys-apps/idle3-tools/files/makefile.patch b/sys-apps/idle3-tools/files/makefile.patch
new file mode 100644
index 000000000000..ed76049865ee
--- /dev/null
+++ b/sys-apps/idle3-tools/files/makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile 2012-01-11 17:18:57.000000000 +0100
++++ b/Makefile 2018-07-09 23:00:04.111252307 +0200
+@@ -6,16 +6,15 @@
+ binprefix =
+ manprefix = /usr
+ exec_prefix = $(binprefix)/
+-sbindir = $(exec_prefix)sbin
++sbindir = $(exec_prefix)usr/sbin
+ mandir = $(manprefix)/share/man
+ oldmandir = $(manprefix)/man
+
+-CC = gcc
++CC ?= gcc
+ STRIP = strip
+
+-CFLAGS := -g -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
++CFLAGS := -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+
+-LDFLAGS = -s
+ #LDFLAGS = -s -static
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
diff --git a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123.ebuild b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123.ebuild
new file mode 100644
index 000000000000..b59424aeb0aa
--- /dev/null
+++ b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set, get or disable the value of the idle3 timer found on WD HDDs"
+HOMEPAGE="http://idle3-tools.sourceforge.net/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+PATCHES=( "${FILESDIR}"/makefile.patch )
+
+src_compile() {
+ CC="$(tc-getCC)" emake
+}
diff --git a/sys-apps/idle3-tools/metadata.xml b/sys-apps/idle3-tools/metadata.xml
index 2690edae260a..6d8e89f781f0 100644
--- a/sys-apps/idle3-tools/metadata.xml
+++ b/sys-apps/idle3-tools/metadata.xml
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription lang="en">
- Idle3-tools provides a linux/unix utility that can disable, get and set the value
- of the infamous idle3 timer found on recent Western Digital Hard Disk Drives. It
- can be used as an alternative to the official wdidle3.exe proprietary utility,
- without the need to reboot in a DOS environement. A power off/on cycle of the
- drive will still be mandatory for new settings to be taken into account.
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Idle3-tools provides a utility, that can disable, get and set the value
+ of the infamous idle3 timer, found on recent Western Digital Hard Disk Drives.
+ It can be used as an alternative to the official wdidle3.exe proprietary utility,
+ without the need to reboot into a DOS environement. A full power up cycle of the
+ drive will be still mandatory, for new settings to be taken into account.
</longdescription>
<upstream>
+ <bugs-to>https://sourceforge.net/p/idle3-tools/bugs/</bugs-to>
<remote-id type="sourceforge">idle3-tools</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 4dea65cf1e37..5175b28398ff 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,16 +1,8 @@
-AUX irqbalance-1.2.0-tinfo.patch 894 BLAKE2B a16f1b7f6111149ef7d76481de5badb280fa9f1853fdcdb43bc4cd8c2ecb6507493044db9afa115c849327e88bfa4de080e44c40e32b98ed5ab69638992de632 SHA512 28306e3af22e039edfad83e9aa37539b5491daf2ba663dd6bbe6419a369c1f4c8bf10025ce938495973415cee288a4bca22586d26fa5f66f57ee9fb234e5b7ac
+AUX irqbalance-1.4.0-configure.patch 2370 BLAKE2B 235d7a6b2fe7f49cb9ae7d98e0c991fea67c712aa430975b49967133441e213336ca94d8c788297984cb6d5343b82a1ec4824c9667c7a3d8e5dbced444055144 SHA512 70b7510df8f0ad61eb3b432f7fcf4ec8e3408ba7a7397b47a6052a3e9be3a4bbffb0bc1f9b0eb3b7eaad783e548f2f81fd195fa9a93d937e73a9dec80c549374
AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
-AUX irqbalance.init.3 670 BLAKE2B 7b82d4eb9aa957c390d869b525e5d29d6ab73de0ae0ec03cf84e19c9508f4905045cd645b5900e9e8b04397b1b0067be6dd7e043921bf9721c965a44c18916b1 SHA512 88c3902015c6ce2d0ed2f1e41b0239c3ff68a14c4e1879c9670111d5ed7f7e37dc61915f109998527b74331ced06e48d42fc0b5c9185c2280f116706ae108b7e
AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc
-AUX irqbalance.service.1 135 BLAKE2B 484be5a7cc397def4cc01c240c8d0953f49fa212f5021f318cb48ef83402e0e139b37f2f0e741e1d254216086bd11e9828150e1fa89ce98f322b4636609ff69b SHA512 c0ed7187eddef54645196d0ff072445decfa3ce358aa3d473aac685b55a2f2580bf45bab34b68ccbc2035a3db8597af8cc1f8e53981f5afe7d63f6f7f5683cbd
-DIST irqbalance-1.0.9.tar.gz 44661 BLAKE2B f6405629683499c0c92a954927e51dff56eeb1e9df175d3bf77251ea3d465e32e69500bed10da8e6b2d93c5fbc0102fefba09cb8eee80c846b2f4c6a2c25178e SHA512 ef3ce9eeec11ec86291e2e3cd701e782ee1fb4ba256e2ea5ea0ea04b373f97ff2eae0a44919127c4dbd7fd805e9e3df3a5e62a3528e4d1c9bbab4db39186b5c5
-DIST irqbalance-1.1.0.tar.gz 46742 BLAKE2B 621e97abd3b901b3ceac3b7959c6bcf88e5dda3742ff83bb3e15e0b65887c945180a9a24b93d20acbb6153015bceda849bb4552293ceb7d94c072aa9cb2781f9 SHA512 66abf71b87e25df190417afbf9da24d826d817de3c0ebdc686e3ae56ac131b2f9586092ba67e5f9c749cb139fbf2faaa2af2ef30700955a5b347f1964f61bf6b
-DIST irqbalance-1.2.0.tar.gz 55618 BLAKE2B 2f5be5564e4cfe510537d7a9322725eec0783b75ebc165d59edc742dde6af3ae694da9ecc4775b5e43c3f4f8946bc4e75cb227258936922f7487f0244752e072 SHA512 02510d0d4dc069570b5f98f3b8191384593a6ed9a88c65c87f5a4261f375c291d95c401b01c03ef9d80834925dd124a088f56ac90c5f290815e26337d4f61c1b
DIST irqbalance-1.3.0.tar.gz 53225 BLAKE2B 01820d3a3e465896823927dfb43655c4c5efd1eb043a25b438d7b0802c5a6dd7a966825cfb1e71a32d47eca41b72260ba29190e49d9f585c4bf70b676db75c81 SHA512 6328d3e419689192a9dce99ccfd803aaf3ad0e766498e63da1c8c5fbbd7ef669b94fa4102b841fa7aca3729ca595f72c05a0ae4373922fb340b6832648de12c4
DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9
-EBUILD irqbalance-1.0.9-r1.ebuild 1101 BLAKE2B 083823f898474bf5b2f77eb1d36112de974f3b0d45a9fd3e2cf5a11206406fe94d414c20aa9e5bb6d547171cb0dba5f4a256b30600a07f0544d07a2f58abdb3c SHA512 2678b9c3a2c6153da80f5d57544c830e77a757a1a7003097f69ae197da481b2de800feaef0c39fc3d44e7b9c033beb7bddb3c9f1c3b39872b677e6fa3463c50c
-EBUILD irqbalance-1.1.0.ebuild 1340 BLAKE2B e6ef271f0f0618a212ba68ca6d4054231456acd3426a660381b196baa35eab20a80b8f1109d67b3142e168a476697a1cd66a6c43e37e1a3ded7a6b8fdfa37b74 SHA512 0fa381cf76a3d8f3aaac20be25b475e224f33a96b150900d03e92f31699589a70ac39d5a31dee40f85aad851fec15292b4d9c44862ff0a9487ace4ed91f57ec7
-EBUILD irqbalance-1.2.0.ebuild 1388 BLAKE2B c1d4462b8f5351b917f914cc1c89da2f355dbb491d6a94bd1099694d80017eacfcdf2bc73f641215a4eccdefff7e97dfecc712c62d571cad1ead98646daa9503 SHA512 b3685c9dd1bbf964a65f26c6793c0f50a2c481c73984a11a03ba6f20e12a15d1e9af7b6ae85cfe0fd8f40ccd0140e442a62740120ae05fc32d58c1fa43340a21
-EBUILD irqbalance-1.3.0.ebuild 1309 BLAKE2B e20fa01ae98ed0c025757fa054e481d14310550c524fb5dc39ae3fc988801bbeaa6f82534573e147fd84e098a016650f0d3049570d174519c1685ca4bbe5056c SHA512 6c525633cd0e51f2619c0abefe0c72e0ecc088473d0340a2c32836b724c9a637d142733f1ada947b252f33f24fdffe7fb84af8273ab8a9e61783ee7eb8e97e18
-EBUILD irqbalance-1.4.0.ebuild 1312 BLAKE2B 01bceca1162ec02b2da9abdf4e61dd2e957065219340761759f17835ab8768c192ded2fbbfaf27a01a8de9d168f55a1042a346f06a93b38a4b7456a47b6847cd SHA512 6517f4e61420198ccbbd69af374fad9dea3b22b15bc53b2cef0fbb75cfc14d404eca565bf091c7e75392c10807deef4c89b9a319d2d02449f655c92dc745fddf
-MISC metadata.xml 470 BLAKE2B 36ac34fad0213fbffff8a7f905e2a225b98dabc69c5937803e9387c74e0fa500e3af38f398233cf9e25b014ef890d2cf8a7a22a545575651b585f44054a570f2 SHA512 287a8da55452b17215da39aed9dfaf52090f5c3faefcc07df2c713e29cbfc13f810b4dc72029a21741d36ef51edf8c5598f572e20fb635e105d708848996730a
+EBUILD irqbalance-1.3.0.ebuild 1339 BLAKE2B 9f78de3dbbcf32ae2ac58dbd27462451e802c0b5d0d1c8bd43d598611f8901584c724438cd31a94776b82a8f09455ea34610e4ecd29efb777a3e1541517dbb68 SHA512 d41e57841284df007f65fb30ef653b824594d337d178fd51164c646a5b05080c3d5a20a084435d21a0593b7b572d5b28903860fb539a2e2ad80615efd9cc81c3
+EBUILD irqbalance-1.4.0-r1.ebuild 1378 BLAKE2B 33bd7d885601927c4cf8257f3221740720e89fc377eed6b902fb07b434316957aa6b8003c1b4fb62d5297bdad9627849f77b375ea8462ce4ac71430379730e98 SHA512 525ea4f2d8568468302141fd24bba7857cede16098a6f591e77403b529290c39776f8ec8e5efc608c92f82a5f2ea41f6c01b0a0a989950c3e8a55fca62c57ce3
+MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/files/irqbalance-1.2.0-tinfo.patch b/sys-apps/irqbalance/files/irqbalance-1.2.0-tinfo.patch
deleted file mode 100644
index 20716542b6dd..000000000000
--- a/sys-apps/irqbalance/files/irqbalance-1.2.0-tinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 287d50594fe624bdb4400611d0dbecec6ff38a41 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 1 Mar 2017 17:11:42 +0100
-Subject: [PATCH] Prefer pkgconfig to check for ncursesw.
-
-That way we take possible separate tinfo lib into account.
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 17b879a..77d8aa4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,13 @@ AC_CHECK_FUNCS(getopt_long)
- AC_CHECK_LIB(numa, numa_available)
- AC_CHECK_LIB(m, floor)
-
--AC_CHECK_LIB(curses, mvprintw)
-+PKG_CHECK_MODULES([NCURSESW], [ncursesw], [has_ncursesw=yes], [AC_CHECK_LIB(curses, mvprintw)])
-+AS_IF([test "x$has_ncursesw" = "xyes"], [
-+ AC_SUBST([NCURSESW_CFLAGS])
-+ AC_SUBST([NCURSESW_LIBS])
-+ LIBS="$LIBS $NCURSESW_LIBS"
-+ AC_SUBST([LIBS])
-+])
-
- AC_C_CONST
- AC_C_INLINE
---
-2.12.0
-
diff --git a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
new file mode 100644
index 000000000000..6008e45126c7
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
@@ -0,0 +1,68 @@
+From 8ad74cdabac37599d20a985e6a456b1faca92df8 Mon Sep 17 00:00:00 2001
+From: Manuel Mommertz <2kmm@gmx.de>
+Date: Mon, 9 Jul 2018 14:08:35 +0200
+Subject: [PATCH 1/2] configure.ac: Fix --without-caps option
+
+irqbalance links to libcap-ng if it is installed, even when useflag
+caps is disabled. This is an error in the configure-script, which
+checks for the wrong variable to determine if the user used --with/
+--without for libcap-ng.
+
+Downstream bug report: https://bugs.gentoo.org/660782
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f6c60da..19b148a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ AC_ARG_WITH([libcap-ng],
+ AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
+
+ AS_IF(
+- [test "x$libcap_ng" != "xno"],
++ [test "x$with_libcap_ng" != "xno"],
+ [
+ PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
+ [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
+--
+2.18.0
+
+From bc56dbd4eead9ad19ff1d84dc8810123c96503c0 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 9 Jul 2018 14:11:44 +0200
+Subject: [PATCH 2/2] configure.ac: Fix --enable-irqbalance-ui logic
+
+Before this patch --enable-irqbalance-ui disabled compilation/
+installation of the ui because AC_ARG_WITH is used wrong.
+The third arguement to AC_ARG_WITH is _action-if-present_ which means
+that this action gets triggered once the --enable option has been
+submitted to configure on command line no matter if it's enabled or
+disabled.
+See also https://autotools.io/autoconf/arguments.html chapter 3.1
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19b148a..75c234d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,9 +43,9 @@ AM_PROG_CC_C_O
+ AC_ARG_WITH([irqbalance-ui],
+ [AC_HELP_STRING([--without-irqbalance-ui],
+ [Dont build the irqbalance ui component])],
+- [with_irqbalanceui=false], [with_irqbalanceui=true])
++ [with_irqbalanceui=$withval], [with_irqbalanceui=yes])
+
+-AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xtrue])
++AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xyes])
+
+ AC_ARG_WITH([systemd],
+ [ AS_HELP_STRING([--with-systemd],[Add systemd-lib support])]
+--
+2.18.0
+
diff --git a/sys-apps/irqbalance/files/irqbalance.init.3 b/sys-apps/irqbalance/files/irqbalance.init.3
deleted file mode 100644
index 9ed16416510d..000000000000
--- a/sys-apps/irqbalance/files/irqbalance.init.3
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
- need localmount
- after bootmisc
-}
-
-command="/usr/sbin/irqbalance"
-command_args="${IRQBALANCE_OPTS}"
-
-check_sysfs() {
- if grep -q MSI /proc/interrupts 2>/dev/null && \
- test -z "$(find /sys/devices -type d -name msi_irqs 2>/dev/null)"; then
- eerror "MSI interrupts found in /proc/interrupts but none found in sysfs."
- eerror "You need to update your kernel."
- return 1
- fi
-}
-
-start() {
- check_sysfs || return 1
- ebegin "Starting irqbalance"
- start-stop-daemon --exec ${command} --start -- ${IRQBALANCE_OPTS}
- eend $?
-}
diff --git a/sys-apps/irqbalance/files/irqbalance.service.1 b/sys-apps/irqbalance/files/irqbalance.service.1
deleted file mode 100644
index af7a979a25d0..000000000000
--- a/sys-apps/irqbalance/files/irqbalance.service.1
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CPU Interrupt Balancer
-
-[Service]
-ExecStart=/usr/sbin/irqbalance --foreground
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
deleted file mode 100644
index 6d9972b6a36b..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="caps +numa selinux"
-
-CDEPEND="dev-libs/glib:2
- caps? ( sys-libs/libcap-ng )
- numa? ( sys-process/numactl )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
- CONFIG_CHECK="~PCI_MSI"
- linux-info_pkg_setup
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with caps libcap-ng)
- $(use_enable numa)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- newinitd "${FILESDIR}"/irqbalance.init.3 irqbalance
- newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
- systemd_newunit "${FILESDIR}"/irqbalance.service.1 irqbalance.service
-}
diff --git a/sys-apps/irqbalance/irqbalance-1.1.0.ebuild b/sys-apps/irqbalance/irqbalance-1.1.0.ebuild
deleted file mode 100644
index 0673ae2ab01a..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="caps +numa selinux"
-
-CDEPEND="
- dev-libs/glib:2
- caps? ( sys-libs/libcap-ng )
- numa? ( sys-process/numactl )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
- CONFIG_CHECK="~PCI_MSI"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- # Follow systemd policies
- # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
- sed -i -e 's/ $IRQBALANCE_ARGS//' misc/irqbalance.service || die
- sed -i -e '/EnvironmentFile/d' misc/irqbalance.service || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with caps libcap-ng)
- $(use_enable numa)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- newinitd "${FILESDIR}"/irqbalance.init.3 irqbalance
- newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
- systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/irqbalance/irqbalance-1.2.0.ebuild b/sys-apps/irqbalance/irqbalance-1.2.0.ebuild
deleted file mode 100644
index 5a860709ee8d..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="caps +numa selinux"
-
-CDEPEND="
- dev-libs/glib:2
- sys-libs/ncurses:0=[unicode]
- caps? ( sys-libs/libcap-ng )
- numa? ( sys-process/numactl )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-irqbalance )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-tinfo.patch"
-)
-
-pkg_setup() {
- CONFIG_CHECK="~PCI_MSI"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- # Follow systemd policies
- # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
- sed \
- -e 's/ $IRQBALANCE_ARGS//' \
- -e '/EnvironmentFile/d' \
- -i misc/irqbalance.service || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with caps libcap-ng)
- $(use_enable numa)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
- newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
- systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/irqbalance/irqbalance-1.3.0.ebuild b/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
index 144745c1bc8b..e8685a791611 100644
--- a/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.3.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-AUTOTOOLS_AUTORECONF=true
inherit autotools systemd linux-info
@@ -28,6 +27,10 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-irqbalance )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.0-configure.patch"
+)
+
pkg_setup() {
CONFIG_CHECK="~PCI_MSI"
linux-info_pkg_setup
diff --git a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..c3874ddf72d9
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="caps +numa selinux tui"
+
+CDEPEND="
+ dev-libs/glib:2
+ caps? ( sys-libs/libcap-ng )
+ numa? ( sys-process/numactl )
+ tui? ( sys-libs/ncurses:0=[unicode] )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-irqbalance )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-configure.patch"
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~PCI_MSI"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ # Follow systemd policies
+ # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+ sed \
+ -e 's/ $IRQBALANCE_ARGS//' \
+ -e '/EnvironmentFile/d' \
+ -i misc/irqbalance.service || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with caps libcap-ng)
+ $(use_enable numa)
+ $(use_with tui irqbalance-ui)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+ newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+ systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/irqbalance/irqbalance-1.4.0.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0.ebuild
deleted file mode 100644
index a38439a45dc5..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="caps +numa selinux"
-
-CDEPEND="
- dev-libs/glib:2
- sys-libs/ncurses:0=[unicode]
- caps? ( sys-libs/libcap-ng )
- numa? ( sys-process/numactl )
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
- CONFIG_CHECK="~PCI_MSI"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- # Follow systemd policies
- # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
- sed \
- -e 's/ $IRQBALANCE_ARGS//' \
- -e '/EnvironmentFile/d' \
- -i misc/irqbalance.service || die
-
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with caps libcap-ng)
- $(use_enable numa)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
- newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
- systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 8aa1af6dd709..d4dedf3afa55 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="numa">Support balancing IRQs across NUMA nodes</flag>
+ <flag name="tui">Enable build of irqbalance terminal user interface</flag>
</use>
<upstream>
<remote-id type="google-code">irqbalance</remote-id>
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
new file mode 100644
index 000000000000..a04d39134fd4
--- /dev/null
+++ b/sys-apps/onerng/Manifest
@@ -0,0 +1,3 @@
+DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
+EBUILD onerng-3.6.ebuild 730 BLAKE2B bbdfd2e288070323e491939801078c5c0b9ef1470c5a4bcdc9ee24f664984a0122a8c9c8b265d462eb3d7fe585c6c0328600c822acd7b12861f8cb8e10dd656e SHA512 44e7285df363002d3b139ad1b6652247a97a0617a8443f8e4eb47d6a4c433b84257888453562c357afdda604d259dd7e7603bf5da0d7cc4a469f9cb3f5a5d31f
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/onerng/metadata.xml b/sys-apps/onerng/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/sys-apps/onerng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sys-apps/onerng/onerng-3.6.ebuild b/sys-apps/onerng/onerng-3.6.ebuild
new file mode 100644
index 000000000000..811776a17c32
--- /dev/null
+++ b/sys-apps/onerng/onerng-3.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 udev
+
+DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
+HOMEPAGE="https://www.onerng.info/"
+SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/gnupg
+ dev-python/python-gnupg[${PYTHON_USEDEP}]
+ sys-apps/rng-tools
+ sys-process/at
+ virtual/udev"
+
+DEPEND="virtual/pkgconfig
+ virtual/udev"
+
+S="${WORKDIR}/${PN}_${PV}"
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index b1f7eef743f5..eb7d8dbcedc3 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,5 @@
DIST osinfo-db-tools-1.1.0.tar.gz 481935 BLAKE2B e9c4400aee8d3d4c361a20ed2859348e3cf98943f2927c36b85c408c3baad43cd3bc247e001b8cb1dd4d2b5c2a54069a58980bed2d222b06005bcdd40fd24455 SHA512 52e08e67b75fb84c7d7721dd76f1bf09f71c27deffc4d8391234aec939863de4e96cbd8fc9783944b2493fef183518a21ff185ec5a5d9934adc6d3c67bf0f972
+DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb1ed69bff02342617f3b64256120a93696965aa18ba6810b96b1746ed8db6d72db446a72caaf2c3ad850db9d4d4f260bd9 SHA512 6e2519eacb5b60449c968e53a4363966b42ca7c564fac7db7d982ceeecfa70ac0662dc6ea75a2d503a7fa74c8789e0fd1331cd8fd3d75fec5d2cd1a646896b3d
EBUILD osinfo-db-tools-1.1.0.ebuild 765 BLAKE2B 36e2b4d444ca924dc1119fa0ed8594889aa7a1bb0c950516b39b67c9c284c5bc6a2cdd726bf06869b5741d9f91c7b1174ad78dbb23da5b354f3087f39cc3673c SHA512 dc2e71d375aa5425eb6c18ff260a2d3c97b53b492d82ece7d13c8c61efe0d26b3964c81cdc36dffc9031f55543823f5d59bb98c2e5418c7cea05ad6852a3be46
+EBUILD osinfo-db-tools-1.2.0.ebuild 842 BLAKE2B dd53d1b2f0fc2fed23236e6c178cfb8563f8bd52184f09bef9c038bf18e88204599804e39953e18d7aba3ddbbe172370de56354c83311f92f73e4b14d9098268 SHA512 8b0c6609d64d65c6cf21f1c806a8d0abf696c61a0bab2d25aefe821b34a10c84107b1268f51bc03711f2c8a941fe7a48f364b0af6c7e556b6dd03ab8a8514c9e
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild
new file mode 100644
index 000000000000..6115da055d99
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Blocker on old libosinfo as osinfo-db-validate was part of it before
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libxml2-2.6.0
+ >=app-arch/libarchive-3.0.0:=
+ !<sys-libs/libosinfo-1.0.0
+"
+# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
+# libxslt is checked for in configure.ac, but never used in 1.1.0
+DEPEND="${RDEPEND}
+ >=dev-libs/libxslt-1.0.0
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.0
+ dev-lang/perl
+"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 5c94a5c669b2..fbf8eaa5f373 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,9 +1,5 @@
-DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
-DIST osinfo-db-20180416.tar.xz 70324 BLAKE2B 44bcc2be467f7e1ce50d1a0fd2bd2f3695f6aa68ab038fd0d548a8c46606032a9fb805152f0de08a0f56d6e096397cc17582a7451e0695dbb58760fa94363630 SHA512 e8d25dc501909803a949987239ea5a2e7a01ac4bb536f1040edff93d8ce3871499fceda882da799ada295dd5d4cc284e99c6b5f493c464dda776f6144803a1f1
-DIST osinfo-db-20180514.tar.xz 70780 BLAKE2B ccde92692b6b6a77007bd4f78f8f3f0e9db4c4d8ed3a270df2f8ba6a8073c3467a9f51e53cc7ab9138b66af7424bdb84cad0fc76edf9c5a19b8ce798bffec155 SHA512 518791269148c0e3cc6b65b4481f37284780497a5643a1c9523458aa56ecd47cb7bfe9d95c086b2155b282369214c4cd3e2926c304ab84f78ddc0568d3b30216
DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9
-EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
-EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
-EBUILD osinfo-db-20180514.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
-EBUILD osinfo-db-20180531.ebuild 672 BLAKE2B f9e1033698f65341d73f12b20368bda941d4445c6a3c72bff034853a8bb38cf6929415efe41ca423996c4f2876de7ad58029737c8787029af821322c2df8f2d2 SHA512 6a0cd6854b1609e3d8c9765fd67ef2f8ef068f01e213214b33a6534b2b7e6e127e78093afe90005bc5aec4d9f98bfab41fabd6a70c9841e894ab83e6e3b09226
+DIST osinfo-db-20180612.tar.xz 71356 BLAKE2B 3dcf9d843d32eb4e5be7cda47e8c8d123939b381d41f0596d8fd5794c64130b1fed39b367a1f6b58c34e91b5a38811af54066311ece209cbcaf268d1f032e55c SHA512 02c92bca33ae35abe28fb575c73ab96fedf5652e7822a10a213f084390b3d863e3ea83469d8a2bbf6ed69328803d48f2f35a1e45f938ca698a63e08b82c05e9d
+EBUILD osinfo-db-20180531.ebuild 671 BLAKE2B c2911f510895eb36e53bb93ecbc8914cbbfdec31c836f6828688ac022aa3f0dcba8fd22effde1238736bb2b5029404e232933eac6bcd41ce1b9c1ac28a0c5a7a SHA512 1ededfeaa0e2271d861deab2b9ed94eae3c6fa323af8b50b850a8ccd3d2f9128f6701252ccedf80c385a0f4d1dbfa979859fbd4b74d92a8b786c92de8da4a453
+EBUILD osinfo-db-20180612.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild b/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
deleted file mode 100644
index 23e97e0aa428..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="http://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
- osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20180416.ebuild b/sys-apps/osinfo-db/osinfo-db-20180416.ebuild
deleted file mode 100644
index 9e69a433ac60..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20180416.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="http://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
- osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20180514.ebuild b/sys-apps/osinfo-db/osinfo-db-20180514.ebuild
deleted file mode 100644
index 9e69a433ac60..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20180514.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="http://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
- osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
index db4a3c50856c..3b6e0493c49c 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20180612.ebuild b/sys-apps/osinfo-db/osinfo-db-20180612.ebuild
new file mode 100644
index 000000000000..05bfe3807574
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180612.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+ osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 8fa5dbb26c8b..58f395d54975 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,9 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
DIST pciutils-3.6.0.tar.gz 454912 BLAKE2B 1f37307ba21085d5f49dd908781ce34dff98a1e4d818158800a1fbdc1fc689e1b868ee9c762378a8cd28ab17cbaaf1e9255da94c44029bfa2f4a8b5d9fd4b273 SHA512 e59cb5685f1dee2673368c90fdf1f5b7689de9fa45f249ce472258f278288da7a81644c76d1ecb7cc857f8029d3d70c367fe62190caf55328143b51017cc5c6f
+DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
EBUILD pciutils-3.5.6.ebuild 2900 BLAKE2B ce68aba5b8564d1b3d043a1e71398fbbb5608e48401013a600186d6f1fb76a700b0f91ec6d1e50f28ab1388064203504e8948bbcb93f4163b526f4a7e706b8b4 SHA512 b4e20c6644a5767c960dfa2e232f0e3e148a15f3476825507fd7d4895e883b96de2e346f2d0e474259ac2e8321f8ec6b02e4796e6d7e250ac7e5c05088073065
EBUILD pciutils-3.6.0.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
+EBUILD pciutils-3.6.1.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
new file mode 100644
index 000000000000..4fa617e1c488
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/libudev-208[static-libs(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ kmod? ( sys-apps/kmod )
+ static-libs? ( ${LIB_DEPEND} )
+ !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+"
+RDEPEND="
+ ${DEPEND}
+ sys-apps/hwids
+"
+DEPEND="
+ ${DEPEND}
+ kmod? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+ [[ $# -ne 2 ]] && return 1
+ local opt=$1 val=$2
+
+ sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+ return 0
+}
+
+src_prepare() {
+ default
+
+ if use static-libs ; then
+ cp -pPR "${S}" "${S}.static" || die
+ mv "${S}.static" "${S}/static" || die
+ fi
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ append-lfs-flags #471102
+}
+
+pemake() {
+ emake \
+ HOST="${CHOST}" \
+ CROSS_COMPILE="${CHOST}-" \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ RANLIB="$(tc-getRANLIB)" \
+ DNS=$(usex dns) \
+ IDSDIR='$(SHAREDIR)/misc' \
+ MANDIR='$(SHAREDIR)/man' \
+ PREFIX="${EPREFIX}/usr" \
+ SHARED="yes" \
+ STRIP="" \
+ ZLIB=$(usex zlib) \
+ PCI_COMPRESSED_IDS=0 \
+ PCI_IDS=pci.ids \
+ LIBDIR="\${PREFIX}/$(get_libdir)" \
+ LIBKMOD=$(multilib_native_usex kmod) \
+ HWDB=$(usex udev) \
+ "$@"
+}
+
+multilib_src_compile() {
+ pemake OPT="${CFLAGS}" all
+ if use static-libs ; then
+ pemake \
+ -C "${BUILD_DIR}/static" \
+ OPT="${CFLAGS}" \
+ SHARED="no" \
+ lib/libpci.a
+ fi
+}
+
+multilib_src_install() {
+ pemake DESTDIR="${D}" install install-lib
+ use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog README TODO
+
+ rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+ "${ED}"/usr/share/man/man8/update-pciids.8*
+
+ newinitd "${FILESDIR}"/init.d-pciparm pciparm
+ newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+ elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+ elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+ fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e11cc16b02b0..70f2ef8f73cd 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,12 +7,14 @@ DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f
DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
DIST portage-2.3.41.tar.bz2 996250 BLAKE2B f76c9198b5a4f00a5d67c85613b182dcb30c8ff568cd74b798c230945294532ecac65a682e97b64da28dd297b6d985445b7f3999b84d5152e4241f22e8813330 SHA512 113113a982e346c31e65c326326913458229c05d443f531c1d1897a679dda143d80223cab8bfbe831f4d92b6db9d09fc451ae3c7753e4d73b33736cc4f34c5e9
+DIST portage-2.3.42.tar.bz2 998518 BLAKE2B 8943dcaf80b9bd566dcc9297e655a225cfafb0d316b17a82aeb25ea05f9cfeeda1ff6a78eb500f85057e98f936ae923200112f3dca920325182e793b4bde74be SHA512 406776e7e026ed5f91c8f16b823a0f18d59deb864ac9e5f86447eba9785b33a91ffc737d9aec19ea764b3f1c32b15dad9c5bb7d35cbf0225c6ed9daa8a471d5f
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
EBUILD portage-2.3.40-r1.ebuild 9948 BLAKE2B 148e93c0bda6febdcabe74eea89aabae4d9be7ad68fa284824b78d1b32bab8404b89904a791ba487c0152270d0578a2dd35a07160483703eeb5ccab330f5a54d SHA512 4c184513337bc67deaf118986b5be94e81bf8dba02ade64a767c796525c51e66754674e4e323c0d89c0002b83cf99b5ad56f290fe764ecf1b19a6af84b79dddf
EBUILD portage-2.3.41.ebuild 9322 BLAKE2B 702e4104d52fa5f2e159cdccf9f8ff2103b5db4b6b4ebd984a77029642da9626914eeb353122dffc1852e3e3cb68ce4041c7df0cb402737067b05c1d930273b4 SHA512 0153700fac90fe752ab925c8bcc4d2ab362a5730a1724a36d8166ba4468fecc888eefad83dd20328ead52375ff23e9c598985e11a6fe42fe6553be0d986953be
+EBUILD portage-2.3.42-r1.ebuild 9476 BLAKE2B 54b2a7eec574774671a17403d39541ff5b39ee0ea57e089bd72629e92def9a252aa99e873cdb0ce81b6f5c677528a5b87518aac3339305e4aa94b1e737812889 SHA512 088e2b4b816f531d0596dbfe5c3ae7e1e7c4b254e3dc113f6592f5918fad928fe9c9bdd6ec82f8742fb06cde48870e5d12e07fc58ccd51f429345c6dbbfd988e
EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.42-r1.ebuild b/sys-apps/portage/portage-2.3.42-r1.ebuild
new file mode 100644
index 000000000000..cc042b0b156e
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.42-r1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_4 python3_5 python3_6
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+ python{2_7,3_4,3_5} pypy)
+ rsync-verify? (
+ >=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+ app-crypt/openpgp-keys-gentoo-release
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ )
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # Apply 36dca004be44 so that sync-allow-hardlinks can
+ # be set in the DEFAULT section.
+ sed -e 's:^sync-allow-hardlinks:#\0:' -i cnf/repos.conf || die
+
+ if use gentoo-dev; then
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+ -i pym/_emerge/create_depgraph_params.py || \
+ die "failed to patch create_depgraph_params.py"
+
+ einfo "Enabling additional FEATURES for gentoo-dev..."
+ echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+ >> cnf/make.globals || die
+ fi
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if use build || ! use rsync-verify; then
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i pym/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+ -i cnf/repos.conf || die "sed failed"
+ if use prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=(
+ install_docbook
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ use epydoc && targets+=(
+ install_epydoc
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then
+ SYNC_DEPTH_UPGRADE=true
+ else
+ SYNC_DEPTH_UPGRADE=false
+ fi
+}
+
+pkg_postinst() {
+ if ${SYNC_DEPTH_UPGRADE}; then
+ ewarn "Please note that this release no longer respects sync-depth for"
+ ewarn "git repositories. There have been too many problems and"
+ ewarn "performance issues. See bugs 552814, 559008"
+ fi
+ einfo ""
+ einfo "This release of portage NO LONGER contains the repoman code base."
+ einfo "Repoman has its own ebuild and release package."
+ einfo "For repoman functionality please emerge app-portage/repoman"
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index ef9512987e21..fe5d1b202627 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,6 +1,3 @@
-AUX sed-4.1.5-alloca.patch 413 BLAKE2B ace3926149e5190bb800a1e1871d70613fee6ef5ef6fee2fca27f5f572adfab36864f4032a9a8c86d77f21672050ed77ca3665ee96a43329a81128d3512956c0 SHA512 dccdad774cbf1eb71744b9d1a49ce45e6c6197ffed66448b6de9302dc88d46246b52a6cbed95a5b86511f19a735a710af177003732d54ca01baa84ef21734d29
-DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
-EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99
-EBUILD sed-4.5.ebuild 1776 BLAKE2B df963a59bce049101826f79df324566bc8554c714ff03357edcdbd81b763e5f4de7e7c54d2c78fd49efc64b33e25cd0111f23f9e647a7772830268ecf5099fa8 SHA512 3e57199639a6e3aed9ddf9b29c1552845983d5c7df86fca0050fa6361471ff793d93289f325693977bcfd91781ba179c17cc753a2ba16bfd8198d4ca59869535
+EBUILD sed-4.5.ebuild 1772 BLAKE2B c37f0dce76f72965fea3842bb71c67ec085136ae2b887c7de08575dad80ee01f2f4059de9a30c4d46f9a738c5608a55bc00caf6544da8b6420228c8ad7852d8d SHA512 ad512028213e8149960346b3493cb173ea989986c52946a6c2a8d65bc7127a00f7f0f61ab611979ec00b4f08766812dc1bbab42f9be83d67c839fd63f8454c1b
MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch
deleted file mode 100644
index 89679c5362e3..000000000000
--- a/sys-apps/sed/files/sed-4.1.5-alloca.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix building on BSD systems which often do not have alloca.h
-
---- sed-4.1.5/lib/regex_internal.h
-+++ sed-4.1.5/lib/regex_internal.h
-@@ -410,7 +410,9 @@ static unsigned int re_string_context_at
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
-
- #ifndef _LIBC
- # if HAVE_ALLOCA
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
deleted file mode 100644
index b6da5a256ce2..000000000000
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl nls selinux static"
-
-RDEPEND="acl? ( virtual/acl )
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_bootstrap_sed() {
- # make sure system-sed works #40786
- if ! type -p sed > /dev/null ; then
- mkdir -p "${T}/bootstrap"
- printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
- chmod a+rx "${T}/bootstrap/sed"
- PATH="${T}/bootstrap:${PATH}"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch
-
- # don't use sed before bootstrap if we have to recover a broken host sed
- src_bootstrap_sed
- # this has to be after the bootstrap portion
- sed -i \
- -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
- doc/Makefile.in || die "sed html doc"
-}
-
-src_configure() {
- local myconf=()
- if use userland_GNU; then
- myconf+=( --exec-prefix="${EPREFIX}" )
- else
- myconf+=( --program-prefix=g )
- fi
-
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
- export ac_cv_search_setfilecon=$(usex selinux -lselinux)
- export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
- use static && append-ldflags -static
- econf \
- $(use_enable acl) \
- $(use_enable nls) \
- "${myconf[@]}"
-}
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index ec5f65f082e8..948e57a8ad83 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl forced-sandbox nls selinux static"
RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
new file mode 100644
index 000000000000..13fbf00e33e5
--- /dev/null
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -0,0 +1,4 @@
+AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
+DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
+EBUILD smc-sum-driver-1.6.0.20151201.ebuild 886 BLAKE2B d11e9409609902cf9a0c40c04646cdc990cfb190db7a399fc3d1e0aedfa06c6fb33a64de1d91952dada7eb45b14e572632a34c9e149813931af6f006562d4986 SHA512 1c5461d28af43409d444ba481f2f1a3246a732185802812fa2cce456d0931f265a9219812d96c68292c3c7d33d377d059cb31498b15bc660843f89d854a15621
+MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e
diff --git a/sys-apps/smc-sum-driver/files/makefile b/sys-apps/smc-sum-driver/files/makefile
new file mode 100644
index 000000000000..35564dcc8fec
--- /dev/null
+++ b/sys-apps/smc-sum-driver/files/makefile
@@ -0,0 +1,15 @@
+obj-m := sum_bios.o
+
+KVERSION := $(shell uname -r)
+KDIR := /lib/modules/$(KVERSION)/build
+PWD := $(shell pwd)
+
+EXTRA_CFLAGS = $(CFLAGS) -Wno-incompatible-pointer-types
+EXTRA_LDFLAGS = $(LDFLAGS)
+
+default:
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+
+install:
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
+
diff --git a/sys-apps/smc-sum-driver/metadata.xml b/sys-apps/smc-sum-driver/metadata.xml
new file mode 100644
index 000000000000..3720c27565ed
--- /dev/null
+++ b/sys-apps/smc-sum-driver/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ This is the kernel module for the Supermicro Update Manager (SUM).
+ It's needed to access specific low level elements, like BIOS.
+ Supermicro SuperDoctor5 will also need this kernel module.
+ </longdescription>
+</pkgmetadata>
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild
new file mode 100644
index 000000000000..f37dc6d72d09
--- /dev/null
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver linux-mod
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN//-/_}"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN/smc_/}_V${MY_PV}"
+
+DESCRIPTION="Supermicro Update Manager (SUM) kernel module"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_P}_${MY_DATE}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RESTRICT="bindist fetch mirror"
+
+S="${WORKDIR}"/${MY_P}/Linux
+
+BUILD_TARGETS="default"
+MODULE_NAMES="sum_bios(misc:${S})"
+
+pkg_nofetch() {
+ elog "Please download ${A} from"
+ elog "sftp://dataharbor.supermicro.com"
+ elog "Username: dpguest\$ts"
+ elog "Password: supermicro!@#"
+ elog "and place it in your DISTDIR directory."
+}
+
+src_prepare() {
+ # Install new Makefile to respect users CFLAGS and LDFLAGS
+ cp "${FILESDIR}"/makefile Makefile
+
+ default
+}
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
new file mode 100644
index 000000000000..11b2e948e9d5
--- /dev/null
+++ b/sys-apps/smc-sum/Manifest
@@ -0,0 +1,3 @@
+DIST sum_2.0.1_Linux_x86_64_20180420.tar.gz 6150348 BLAKE2B 1aa520ac18f97bfe16b9160c632cf09bc2021d47789712dec5ea9c9789022cfc8a24f15b1cebd0bdfde65af639a97b2de1474ea0af07c9bf569a56d02e1e8e56 SHA512 61a46b7bc745267fb2f224151fa29b965a56d163ec0e30d46ebdc925b3fab036903f9364cf83428f3e17c6e57db93be48a1ec2a5e7ab6599588d7430af1af628
+EBUILD smc-sum-2.0.1.20180420.ebuild 960 BLAKE2B 0a75747290f3ee2b1939347080e55fece135f704c73f9d3f0a587999246754fd13e479982994152ebd4b194e9e4a948b0c97ffea184813e4a61442eafb6b2f8b SHA512 c113dabcf3a971b6dbbdf4333f23f6a8d66bf4b18488666b3cc162f796770128fc1f8121eb46df06f0314610ab76a0a5b94ecc7eedf6e359854d407b97be7197
+MISC metadata.xml 1136 BLAKE2B 4fbbabd1a17374af0549a687211c55f4633ae1beea70b844b85b5f90b8f0c1cf053e11d271c9fd61be371a443bb0dcff268ac08476b5ae8d27a2580fa35a8371 SHA512 0d16f9dc63d86b301ce11ca3ae269aa9ea0e755370f46d875dabaf33f0ea244eb304d622bfe22d92dafbf014eb259f56c69ac53dcd0d8688f4792760f267531b
diff --git a/sys-apps/smc-sum/metadata.xml b/sys-apps/smc-sum/metadata.xml
new file mode 100644
index 000000000000..f51d8926c17f
--- /dev/null
+++ b/sys-apps/smc-sum/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Supermicro Update Manager (SUM) can be used to manage the firmware and configuration
+ for Supermicro X9 (Romley), X10, B10, X11, B11, H11 generation motherboards.
+ SUM is a command line interface utility that can execute parallel commands
+ from a centralized management server. Two channels are possible for management:
+ the OOB (Out-Of-Band) channel, i.e. communication through the BMC/IPMI interface,
+ and the in-band channel, i.e. communication through the local system interfaces.
+ Through the OOB channel, most management commands can be executed independently
+ of the OS on the managed system and even before the system OS is installed.
+ Licensing: SFT-OOB-LIC or SFT-DCMS-Single required for each monitor node.
+ </longdescription>
+</pkgmetadata>
diff --git a/sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild b/sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild
new file mode 100644
index 000000000000..cdbd078eb847
--- /dev/null
+++ b/sys-apps/smc-sum/smc-sum-2.0.1.20180420.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN/smc-/}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RDEPEND="sys-apps/smc-sum-driver"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
+
+DOCS=( "ReleaseNote.txt" "SUM_UserGuide.pdf" "ExternalData/SMCIPID.txt" "ExternalData/VENID.txt" )
+
+QA_PREBUILT="usr/bin/smc-sum"
+
+pkg_nofetch() {
+ elog "Please download ${A} from"
+ elog "sftp://dataharbor.supermicro.com"
+ elog "Username: dpguest\$ts"
+ elog "Password: supermicro!@#"
+ elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+ newbin sum smc-sum
+
+ einstalldocs
+}
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 7f923fd26c2c..3f0e1ea66a5b 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,7 +1,5 @@
AUX 0.88-ar-ranlib.patch 545 BLAKE2B c0b9b9c67e7e9682cbf1aefd194c0a590bbe17592a242bd7e140cd0e3cd201197f3cedb2d79cbaad2a647da0c804944f6b4dc84f7f373f7f2d94bffb3c133871 SHA512 9788fff2aaa01f24ae101a1fd45512218dd5032946614eb73ab033d839b21ce9fa9ff967593eb7add15ba4735dd5656e67f79beaaee720d2a2cae1fe8889b7e9
AUX 0.88-bigendian.patch 458 BLAKE2B 940a5aba8b3aa103d8cf2e64ce3d9dd09464f1fe643f6ca194198db3d2dd4ed23205cacc9ab05e1551b04542c582d6ecb54acd65b83116231daeb9cf7ca6e22e SHA512 042d2810a8fc968cc8b456216465a349bbde19402a26a64204fb3c9bd2621dfda8ceed1283b11812df8d33ba0eb2f4133de289306ef906060b9a9f5775db3918
-AUX 0.88-errno.patch 200 BLAKE2B 7cd0dbd13ecbeb78dd42716881837098087aa07e3e6b64cfc04d5cc442fbd76e1cc0b35c326631ea91b39a96e067cd91a465db49a465752294a7217444dd40f5 SHA512 d5d22c44835d232c8e7bff370c27aa266c4b6017ee3a957843610b34c3f7beab61441a8da0db67207c59e03be6d4e93d912f57b34484e752670e01dda97693e3
-AUX 0.88-exit.patch 281 BLAKE2B 386382db4b547278c675c8389fe6e9f5a7eb488b505eae50b836f64269b91a281b4712515d14987ec851c64e333f4ecd20d733d7e990e9fcaaa17d5fcbed8a79 SHA512 457017ce0cb1b4e21a04adc1cf3376488f20c1b1dfaa764cbabeacf8fdd9ba00f087660823f3817d7f75fc2d4510eb9686b998052a765bbe7dcccab5afec99f9
AUX 0.88-large-responses.patch 772 BLAKE2B 6c1cfc91d76094a282e4cd2a4084e52409b3a4193dff8f89fdb477ef54fcb2bd102b082128eed906422ca87f7a1ef0ea018ea1e9ad297c4390395ad7a1e049f1 SHA512 d429065d9fa232207e21c6fb1c2359b0e7d35ac0142ed28ee6b00e150b0b3c5756e7eb684ee1b8aea35236986bdb046eff529e127c9c09994c4ced41370c26b7
AUX 0.88-protos-ipv6.patch 2127 BLAKE2B fbef8e74c8ea24246db9d09e26c4b3e4af50ce8ff43ea3efc8f3203d7760d53012d46cd6546efc3ce88cac349e3083bc680429338300402c968d35d1813ac1b9 SHA512 953b3a53246ad16636276f679c84c5f1b86f3dc49a910017fa9c05b175d25a184ed870a920437f4305e2b54021ee2aa2a1d6fa8b7e8d5a367bbc060617b3eb8f
AUX 0.88-protos-no-ipv6.patch 671 BLAKE2B d0c052a53833d9034b92d6ace244aad487c30c17fec5778b9df474aed9de194e92061f496216c50667da41b9dbbf88c8ef439ebbdb0be3c4001fba16425ef3f5 SHA512 56557365c1951e437b6a6b0b8c80d865adc16e2d1fb464a85b367af2d43fbce99e64a6e5a6c8fd4aa0cff53025db6c1ed25458f96316b3c51189d20c5688c0ed
diff --git a/sys-apps/ucspi-tcp/files/0.88-errno.patch b/sys-apps/ucspi-tcp/files/0.88-errno.patch
deleted file mode 100644
index 0d15819b9390..000000000000
--- a/sys-apps/ucspi-tcp/files/0.88-errno.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/16804
-
---- a/error.h
-+++ b/error.h
-@@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
-
--extern int errno;
-+#include <errno.h>
-
- extern int error_intr;
- extern int error_nomem;
diff --git a/sys-apps/ucspi-tcp/files/0.88-exit.patch b/sys-apps/ucspi-tcp/files/0.88-exit.patch
deleted file mode 100644
index 4925441b49d2..000000000000
--- a/sys-apps/ucspi-tcp/files/0.88-exit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: ucspi-tcp-0.88/tcprulescheck.c
-===================================================================
---- ucspi-tcp-0.88.orig/tcprulescheck.c
-+++ ucspi-tcp-0.88/tcprulescheck.c
-@@ -1,3 +1,5 @@
-+#include <unistd.h>
-+
- #include "byte.h"
- #include "buffer.h"
- #include "strerr.h"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9ae24ec67745..3defb28b4978 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,13 +1,12 @@
AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1
+AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b7d3e7c4a3e63adecfe341e60fc65cf784a2df021cc7b567b0283902f22e1653a54644f508c4ae16d8056c21c3b279649af04a SHA512 9c065bc91e22f38eb8ad8156db8e66671749d2544cb8452da787f0d9e07f34107e9db49beb0d80962020e0b5c134fd8b090d7484d1dbf87eac933e65c81989dc
AUX util-linux-2.32_rc2-umount_completion.patch 1157 BLAKE2B a20c9965747048e236cabbc5902afde093732794d8898c8aac619e9841332566b7fc07a0f7d5841e49bac08f3502986f37eaca8d66f258f22ed9afe5434a00cb SHA512 6f5311ea43495bb0b0da180e77044124c8fbeb3a3791182871afd562a7bfa4799184faf7a43f34845ddf11611412df342826679169f55831f43c2f256fb6c799
DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
-DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
-EBUILD util-linux-2.30.2-r1.ebuild 6505 BLAKE2B c1d22b2567a811b2b4727eca13ed9974eb115f0e1bad9a0cc096b96afdcedeef013480aa7d5832b93c94b1a885be0edfceb3eb80d693b6f09d10a37d0e9113a8 SHA512 d27ea0f42a066dfdc1c5c5bfa5af3fb50e5f7b04b27a692cd810316143c942f3befd18e1d83880e5cf56b3505d0c265b751c570ef947f568fb417bb92e0c6c60
-EBUILD util-linux-2.31.1-r1.ebuild 6542 BLAKE2B 7fe9468885f684c1300f731a3c9bfbd3b55b6fe68e7d9eaeb90145e74ae70ca4fa06208f6d2a2d3a3dc86beddbdee972bc34099e077c24f98920a236fb07a352 SHA512 c71aa0e58861fb36f186ee6d9e65ad889b6a0339ae6c1544c9def001331739dff4e7950dd7c70565531e28acbb81862392f1c369081b18489a13cc026b2d4a90
-EBUILD util-linux-2.32-r3.ebuild 6958 BLAKE2B b2bfa2c490c21eb7808eaf426e0b8d55d9fa2e97db69ff7c0e5335df5e8c8002d5e48f4d4e363801479d1aebec2f9ad21f7bce84247c8cf18907145fccda57f8 SHA512 123f7c97559ed0c57b83ec5fcee9150ad0d6a0e489acdb873ca1f033de13d3a818db3487629da0c32f615e5ee3ee24bbc9bb283f3702b27b260ead63bf739819
-EBUILD util-linux-2.32.ebuild 6469 BLAKE2B 6c84dfecb250b52372b56ba381efaa419f4a896476a3da5642cba7b5d1b10c1acc298aaccc12e35ab2d0345437c91ee49b65240e8abbf8bad0c3cb2d0785c733 SHA512 7dae1d9371295d2f2a415927afe945b7a9ba1e893e33a7fd63b560ff4d619ed706280e644572a1828bab6df76084e7b31d868cea26d06acf6aa2ca9f7e995cfa
-EBUILD util-linux-9999.ebuild 6767 BLAKE2B 4261596c33cca1149917f85b68ec8f50e95a1d1afe3ebb776cd0f173a3e05c4c98473eb4e7ccef8d6afe94c9cca974cad49d9d09f2dd06f995f3c5c97492b810 SHA512 ae8878647760889f7305b1be43c46acef682959f527460c83cd353da3c61d631b585b9e82b4f5649b00a2311ed21ee63eb9373256f3740bddb0d945f4ea953db
+EBUILD util-linux-2.30.2-r1.ebuild 6489 BLAKE2B 45ce658cfffcf33f2c50090be7d19a645a9694f9cf2307f7fbdb3bc7b5823ad310e73291ef64c96995dca5da0bede72d74218857ecb9da044c87c5f9a281c6b2 SHA512 3b34b7a023e092177537ed518be1b3f603751d58166e68bb2425c2438e592ec57ef5b91da5f36c010ec472ef519be4e7b26e07db3942cd5adfe8bd18dc13e955
+EBUILD util-linux-2.32-r4.ebuild 7288 BLAKE2B 6ac6e765f793217d4b7f5fbee8eebf13e9eca2bb26fc9e340c148b30db3b990e7148bbefabae8186df4b957a9b9a6a2978788c36bcdd4900d57f235872e51669 SHA512 d3c7e30f23403494fc4271c42601ba823ee7c5fd5b2fe51619f662b0fc3e610dea66e813d8181377c526646a99abed736d3f7f759fec3b1e61f8497ee2e7519d
+EBUILD util-linux-2.32-r5.ebuild 7373 BLAKE2B eb956b454e12433bdcb142e26ceb7caf37867009caf97ab21a173499741f3c431d228606e38f4286cfd1c7a1e312c976456db364a524ad797869ca937a33048b SHA512 f9b23adedf11cc21757cfb1b4684027b18a5fc362eb5ab3f1954984f537bae29f3f90f789046525758ba08d45f1e5ef0715c278c98648346f37eaea782c73716
+EBUILD util-linux-9999.ebuild 7118 BLAKE2B b121e4cbf52de36406205013823d04cb7a0f9aca156a067199f1cddc9799846d887cbfa94ec34ab1f1a841790924209136ee3e8b73e53acabeed89f3ea8fd935 SHA512 47ebbee7e21abb56fc3523104512d697191b934781a7c003ce0855625032d350b5df14a9896b86ab788d57753a2b3866a0d501df0b5791d998f52c39beeffae6
MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
new file mode 100644
index 000000000000..7b8867ba0347
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
@@ -0,0 +1,105 @@
+From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
+From: Frank Schaefer <kelledin@gmail.com>
+Date: Tue, 10 Jul 2018 20:21:02 -0500
+Subject: [PATCH] * break up large strings for PySys_WriteStdout()
+
+---
+ libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 43 insertions(+), 13 deletions(-)
+
+diff --git a/libmount/python/fs.c b/libmount/python/fs.c
+index d6490d248..634a914ef 100644
+--- a/libmount/python/fs.c
++++ b/libmount/python/fs.c
+@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
+ return PyObjectResultInt(mnt_fs_get_devno(self->fs));
+ }
+
++static void _dump_debug_string(const char *lead, const char *s, char quote)
++{
++ /* PySys_WriteStdout() will automatically truncate any '%s' token
++ * longer than a certain length (documented as 1000 bytes, but we
++ * give ourselves some margin here just in case). The only way I
++ * know to get around this is to print such strings in bite-sized
++ * chunks.
++ */
++ static const unsigned int _PY_MAX_LEN = 900;
++ static const char *_PY_MAX_LEN_FMT = "%.900s";
++ unsigned int len;
++
++ if (lead != NULL)
++ PySys_WriteStdout("%s", lead);
++
++ if (quote != 0)
++ PySys_WriteStdout("%c", quote);
++
++ for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN)
++ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
++
++ if (len > 0)
++ PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
++
++ if (quote != 0)
++ PySys_WriteStdout("%c\n", quote);
++ else
++ PySys_WriteStdout("\n");
++}
++
+ #define Fs_print_debug_HELP "print_debug()\n\n"
+ static PyObject *Fs_print_debug(FsObject *self)
+ {
+ PySys_WriteStdout("------ fs: %p\n", self->fs);
+- PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
+- PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
+- PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
++ _dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
++ _dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
++ _dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
+
+ if (mnt_fs_get_options(self->fs))
+- PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
++ _dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
+ if (mnt_fs_get_vfs_options(self->fs))
+- PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
++ _dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
+ if (mnt_fs_get_fs_options(self->fs))
+- PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
++ _dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
+ if (mnt_fs_get_user_options(self->fs))
+- PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
++ _dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
+ if (mnt_fs_get_optional_fields(self->fs))
+- PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
++ _dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
+ if (mnt_fs_get_attributes(self->fs))
+- PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
++ _dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
+
+ if (mnt_fs_get_root(self->fs))
+- PySys_WriteStdout("root: %s\n", mnt_fs_get_root(self->fs));
++ _dump_debug_string("root: ", mnt_fs_get_root(self->fs), 0);
+
+ if (mnt_fs_get_swaptype(self->fs))
+- PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
++ _dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
+ if (mnt_fs_get_size(self->fs))
+ PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
+ if (mnt_fs_get_usedsize(self->fs))
+@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
+ PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
+
+ if (mnt_fs_get_bindsrc(self->fs))
+- PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
++ _dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
+ if (mnt_fs_get_freq(self->fs))
+ PySys_WriteStdout("freq: %d\n", mnt_fs_get_freq(self->fs));
+ if (mnt_fs_get_passno(self->fs))
+@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
+ if (mnt_fs_get_tid(self->fs))
+ PySys_WriteStdout("tid: %d\n", mnt_fs_get_tid(self->fs));
+ if (mnt_fs_get_comment(self->fs))
+- PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
++ _dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
+ return UL_IncRef(self);
+ }
+ /*
diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
index 3077f85b78e7..adba6b4d54f7 100644
--- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-single-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild
deleted file mode 100644
index ce356da9a592..000000000000
--- a/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- pam python-single-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3 autotools
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-RDEPEND+="
- kill? (
- !sys-apps/coreutils[kill]
- !sys-process/procps[kill]
- )
- !net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-2.7-r1
- !<sys-apps/s390-tools-1.36.1-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Prevent uuidd test failure due to socket path limit. #593304
- sed -i \
- -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
- tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
-
- # Undo bad ncurses handling by upstream. #601530
- sed -i -E \
- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
- configure || die
-
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- # The scanf test in a run-time test which fails while cross-compiling.
- # Blindly assume a POSIX setup since we require libmount, and libmount
- # itself fails when the scanf test fails. #531856
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
- local myeconfargs=(
- --disable-chfn-chsh
- --disable-login
- --disable-nologin
- --disable-su
- --docdir='${datarootdir}'/doc/${PF}
- --enable-agetty
- --enable-bash-completion
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
- --enable-line
- --enable-partx
- --enable-raw
- --enable-rename
- --enable-rfkill
- --enable-schedutils
- --with-bashcompletiondir="$(get_bashcompdir)"
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
- $(multilib_native_use_enable caps setpriv)
- $(multilib_native_use_enable cramfs)
- $(multilib_native_use_enable fdformat)
- $(multilib_native_use_enable nls)
- $(multilib_native_use_enable suid makeinstall-chown)
- $(multilib_native_use_enable suid makeinstall-setuid)
- $(multilib_native_use_enable tty-helpers mesg)
- $(multilib_native_use_enable tty-helpers wall)
- $(multilib_native_use_enable tty-helpers write)
- $(multilib_native_use_with python)
- $(multilib_native_use_with readline)
- $(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
- $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
- $(tc-has-tls || echo --disable-tls)
- $(use_enable unicode widechar)
- $(use_enable kill)
- $(use_enable static-libs static)
- $(use_with selinux)
- $(usex ncurses '' '--without-tinfo')
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # build libraries only
- emake -f Makefile -f - mylibs \
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
- install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
- fi
-
- if multilib_is_native_abi; then
- # need the libs in /
- gen_usr_ldscript -a blkid mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- find "${ED}" -name "*.la" -delete || die
-
- if use pam; then
- newpamd "${FILESDIR}/runuser.pamd" runuser
- newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
- fi
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.32-r3.ebuild b/sys-apps/util-linux/util-linux-2.32-r3.ebuild
deleted file mode 100644
index 4fe88effdfb8..000000000000
--- a/sys-apps/util-linux/util-linux-2.32-r3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- pam python-single-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3 autotools
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib:= )
- ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
- nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-RDEPEND+="
- kill? (
- !sys-apps/coreutils[kill]
- !sys-process/procps[kill]
- )
- !net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
- touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
- touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
-
- # Prevent uuidd test failure due to socket path limit. #593304
- sed -i \
- -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
- tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
- if ! use userland_GNU; then
- # test runner is using GNU-specific xargs call
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die
- # test requires util-linux uuidgen (which we don't build)
- rm tests/ts/uuid/oids || die
- fi
-
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
-
- # Undo bad ncurses handling by upstream. #601530
- sed -i -E \
- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
- configure || die
-
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- # The scanf test in a run-time test which fails while cross-compiling.
- # Blindly assume a POSIX setup since we require libmount, and libmount
- # itself fails when the scanf test fails. #531856
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
- local myeconfargs=(
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
- --with-bashcompletiondir="$(get_bashcompdir)"
- $(multilib_native_use_enable suid makeinstall-chown)
- $(multilib_native_use_enable suid makeinstall-setuid)
- $(multilib_native_use_with python)
- $(multilib_native_use_with readline)
- $(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
- $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
- $(tc-has-tls || echo --disable-tls)
- $(use_enable nls)
- $(use_enable unicode widechar)
- $(use_enable static-libs static)
- $(use_with selinux)
- $(usex ncurses '' '--without-tinfo')
- )
- # build programs only on GNU, on *BSD we want libraries only
- if multilib_is_native_abi && use userland_GNU; then
- myeconfargs+=(
- --disable-chfn-chsh
- --disable-login
- --disable-nologin
- --disable-su
- --enable-agetty
- --enable-bash-completion
- --enable-line
- --enable-partx
- --enable-raw
- --enable-rename
- --enable-rfkill
- --enable-schedutils
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- $(use_enable caps setpriv)
- $(use_enable cramfs)
- $(use_enable fdformat)
- $(use_enable tty-helpers mesg)
- $(use_enable tty-helpers wall)
- $(use_enable tty-helpers write)
- $(use_enable kill)
- )
- else
- myeconfargs+=(
- --disable-all-programs
- --disable-bash-completion
- --without-systemdsystemunitdir
- # build libraries
- --enable-libuuid
- --enable-libblkid
- --enable-libsmartcols
- --enable-libfdisk
- )
- if use userland_GNU; then
- # those libraries don't work on *BSD
- myeconfargs+=(
- --enable-libmount
- )
- fi
- fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
- emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use userland_GNU; then
- # need the libs in /
- gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- find "${ED}" -name "*.la" -delete || die
-
- if ! use userland_GNU; then
- # manpage collisions
- # TODO: figure out a good way to keep them
- rm "${ED%/}"/usr/share/man/man3/uuid* || die
- fi
-
- if use pam; then
- newpamd "${FILESDIR}/runuser.pamd" runuser
- newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
- fi
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.32-r4.ebuild b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
new file mode 100644
index 000000000000..907bea63807a
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+ pam python-single-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+ [[ "${PV}" = *_rc* ]] || \
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+ cramfs? ( sys-libs/zlib:= )
+ ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+ pam? ( sys-libs/pam )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+ slang? ( sys-libs/slang )
+ !build? ( systemd? ( sys-apps/systemd ) )
+ udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( sys-devel/bc )
+ virtual/os-headers"
+RDEPEND+="
+ kill? (
+ !sys-apps/coreutils[kill]
+ !sys-process/procps[kill]
+ )
+ !net-wireless/rfkill
+ !sys-process/schedutils
+ !sys-apps/setarch
+ !<sys-apps/sysvinit-2.88-r7
+ !<sys-libs/e2fsprogs-libs-1.41.8
+ !<sys-fs/e2fsprogs-1.41.8
+ !<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
+ touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
+ touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
+
+ # Prevent uuidd test failure due to socket path limit. #593304
+ sed -i \
+ -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+ tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+ if ! use userland_GNU; then
+ # test runner is using GNU-specific xargs call
+ sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+ # test requires util-linux uuidgen (which we don't build)
+ rm tests/ts/uuid/oids || die
+ fi
+
+ if [[ ${PV} == 9999 ]] ; then
+ po/update-potfiles
+ eautoreconf
+ fi
+
+ # Undo bad ncurses handling by upstream. #601530
+ sed -i -E \
+ -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+ -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+ configure || die
+
+ elibtoolize
+}
+
+lfs_fallocate_test() {
+ # Make sure we can use fallocate with LFS #300307
+ cat <<-EOF > "${T}"/fallocate.${ABI}.c
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ main() { return fallocate(0, 0, 0, 0); }
+ EOF
+ append-lfs-flags
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+ || export ac_cv_func_fallocate=no
+ rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+ lfs_fallocate_test
+ # The scanf test in a run-time test which fails while cross-compiling.
+ # Blindly assume a POSIX setup since we require libmount, and libmount
+ # itself fails when the scanf test fails. #531856
+ tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+ export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+ export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+ local myeconfargs=(
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ $(multilib_native_use_enable suid makeinstall-chown)
+ $(multilib_native_use_enable suid makeinstall-setuid)
+ $(multilib_native_use_with python)
+ $(multilib_native_use_with readline)
+ $(multilib_native_use_with slang)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+ $(tc-has-tls || echo --disable-tls)
+ $(use_enable nls)
+ $(use_enable unicode widechar)
+ $(use_enable static-libs static)
+ $(use_with selinux)
+ $(usex ncurses '' '--without-tinfo')
+ )
+ # build programs only on GNU, on *BSD we want libraries only
+ if multilib_is_native_abi && use userland_GNU; then
+ myeconfargs+=(
+ --disable-chfn-chsh
+ --disable-login
+ --disable-nologin
+ --disable-su
+ --enable-agetty
+ --enable-bash-completion
+ --enable-line
+ --enable-partx
+ --enable-raw
+ --enable-rename
+ --enable-rfkill
+ --enable-schedutils
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable caps setpriv)
+ $(use_enable cramfs)
+ $(use_enable fdformat)
+ $(use_enable tty-helpers mesg)
+ $(use_enable tty-helpers wall)
+ $(use_enable tty-helpers write)
+ $(use_enable kill)
+ )
+ else
+ myeconfargs+=(
+ --disable-all-programs
+ --disable-bash-completion
+ --without-systemdsystemunitdir
+ # build libraries
+ --enable-libuuid
+ --enable-libblkid
+ --enable-libsmartcols
+ --enable-libfdisk
+ )
+ if use userland_GNU; then
+ # those libraries don't work on *BSD
+ myeconfargs+=(
+ --enable-libmount
+ )
+ fi
+ fi
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi && use userland_GNU; then
+ # need the libs in /
+ gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+
+ use python && python_optimize
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+ # e2fsprogs-libs didnt install .la files, and .pc work fine
+ find "${ED}" -name "*.la" -delete || die
+
+ if ! use userland_GNU; then
+ # manpage collisions
+ # TODO: figure out a good way to keep them
+ rm "${ED%/}"/usr/share/man/man3/uuid* || die
+ fi
+
+ if use pam; then
+ newpamd "${FILESDIR}/runuser.pamd" runuser
+ newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+ fi
+
+ # Note:
+ # Bash completion for "runuser" command is provided by same file which
+ # would also provide bash completion for "su" command. However, we don't
+ # use "su" command from this package.
+ # This triggers a known QA warning which we ignore for now to magically
+ # keep bash completion for "su" command which shadow package does not
+ # provide.
+}
+
+pkg_postinst() {
+ if ! use tty-helpers; then
+ elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+ fi
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "The agetty util now clears the terminal by default. You"
+ elog "might want to add --noclear to your /etc/inittab lines."
+ fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.32-r5.ebuild b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
new file mode 100644
index 000000000000..1bce9daa5a9f
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+ pam python-single-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+ [[ "${PV}" = *_rc* ]] || \
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+ cramfs? ( sys-libs/zlib:= )
+ ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+ pam? ( sys-libs/pam )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+ slang? ( sys-libs/slang )
+ !build? ( systemd? ( sys-apps/systemd ) )
+ udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( sys-devel/bc )
+ virtual/os-headers"
+RDEPEND+="
+ kill? (
+ !sys-apps/coreutils[kill]
+ !sys-process/procps[kill]
+ )
+ !net-wireless/rfkill
+ !sys-process/schedutils
+ !sys-apps/setarch
+ !<sys-apps/sysvinit-2.88-r7
+ !<sys-libs/e2fsprogs-libs-1.41.8
+ !<sys-fs/e2fsprogs-1.41.8
+ !<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/util-linux-2.32-python3-tests.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
+ touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
+ touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
+
+ # Prevent uuidd test failure due to socket path limit. #593304
+ sed -i \
+ -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+ tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+ if ! use userland_GNU; then
+ # test runner is using GNU-specific xargs call
+ sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+ # test requires util-linux uuidgen (which we don't build)
+ rm tests/ts/uuid/oids || die
+ fi
+
+ if [[ ${PV} == 9999 ]] ; then
+ po/update-potfiles
+ eautoreconf
+ fi
+
+ # Undo bad ncurses handling by upstream. #601530
+ sed -i -E \
+ -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+ -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+ configure || die
+
+ elibtoolize
+}
+
+lfs_fallocate_test() {
+ # Make sure we can use fallocate with LFS #300307
+ cat <<-EOF > "${T}"/fallocate.${ABI}.c
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ main() { return fallocate(0, 0, 0, 0); }
+ EOF
+ append-lfs-flags
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+ || export ac_cv_func_fallocate=no
+ rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+ lfs_fallocate_test
+ # The scanf test in a run-time test which fails while cross-compiling.
+ # Blindly assume a POSIX setup since we require libmount, and libmount
+ # itself fails when the scanf test fails. #531856
+ tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+ export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+ export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+ local myeconfargs=(
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ $(multilib_native_use_enable suid makeinstall-chown)
+ $(multilib_native_use_enable suid makeinstall-setuid)
+ $(multilib_native_use_with python)
+ $(multilib_native_use_with readline)
+ $(multilib_native_use_with slang)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+ $(tc-has-tls || echo --disable-tls)
+ $(use_enable nls)
+ $(use_enable unicode widechar)
+ $(use_enable static-libs static)
+ $(use_with selinux)
+ $(usex ncurses '' '--without-tinfo')
+ )
+ # build programs only on GNU, on *BSD we want libraries only
+ if multilib_is_native_abi && use userland_GNU; then
+ myeconfargs+=(
+ --disable-chfn-chsh
+ --disable-login
+ --disable-nologin
+ --disable-su
+ --enable-agetty
+ --enable-bash-completion
+ --enable-line
+ --enable-partx
+ --enable-raw
+ --enable-rename
+ --enable-rfkill
+ --enable-schedutils
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable caps setpriv)
+ $(use_enable cramfs)
+ $(use_enable fdformat)
+ $(use_enable tty-helpers mesg)
+ $(use_enable tty-helpers wall)
+ $(use_enable tty-helpers write)
+ $(use_enable kill)
+ )
+ else
+ myeconfargs+=(
+ --disable-all-programs
+ --disable-bash-completion
+ --without-systemdsystemunitdir
+ # build libraries
+ --enable-libuuid
+ --enable-libblkid
+ --enable-libsmartcols
+ --enable-libfdisk
+ )
+ if use userland_GNU; then
+ # those libraries don't work on *BSD
+ myeconfargs+=(
+ --enable-libmount
+ )
+ fi
+ fi
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi && use userland_GNU; then
+ # need the libs in /
+ gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+
+ use python && python_optimize
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+ # e2fsprogs-libs didnt install .la files, and .pc work fine
+ find "${ED}" -name "*.la" -delete || die
+
+ if ! use userland_GNU; then
+ # manpage collisions
+ # TODO: figure out a good way to keep them
+ rm "${ED%/}"/usr/share/man/man3/uuid* || die
+ fi
+
+ if use pam; then
+ newpamd "${FILESDIR}/runuser.pamd" runuser
+ newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+ fi
+
+ # Note:
+ # Bash completion for "runuser" command is provided by same file which
+ # would also provide bash completion for "su" command. However, we don't
+ # use "su" command from this package.
+ # This triggers a known QA warning which we ignore for now to magically
+ # keep bash completion for "su" command which shadow package does not
+ # provide.
+}
+
+pkg_postinst() {
+ if ! use tty-helpers; then
+ elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+ fi
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "The agetty util now clears the terminal by default. You"
+ elog "might want to add --noclear to your /etc/inittab lines."
+ fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.32.ebuild b/sys-apps/util-linux/util-linux-2.32.ebuild
deleted file mode 100644
index a6b7310e742c..000000000000
--- a/sys-apps/util-linux/util-linux-2.32.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- pam python-single-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3 autotools
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib:= )
- ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-RDEPEND+="
- kill? (
- !sys-apps/coreutils[kill]
- !sys-process/procps[kill]
- )
- !net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-2.7-r1
- !<sys-apps/s390-tools-1.36.1-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Prevent uuidd test failure due to socket path limit. #593304
- sed -i \
- -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
- tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
-
- # Undo bad ncurses handling by upstream. #601530
- sed -i -E \
- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
- configure || die
-
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- # The scanf test in a run-time test which fails while cross-compiling.
- # Blindly assume a POSIX setup since we require libmount, and libmount
- # itself fails when the scanf test fails. #531856
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
- local myeconfargs=(
- --disable-chfn-chsh
- --disable-login
- --disable-nologin
- --disable-su
- --docdir='${datarootdir}'/doc/${PF}
- --enable-agetty
- --enable-bash-completion
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
- --enable-line
- --enable-partx
- --enable-raw
- --enable-rename
- --enable-rfkill
- --enable-schedutils
- --with-bashcompletiondir="$(get_bashcompdir)"
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
- $(multilib_native_use_enable caps setpriv)
- $(multilib_native_use_enable cramfs)
- $(multilib_native_use_enable fdformat)
- $(multilib_native_use_enable nls)
- $(multilib_native_use_enable suid makeinstall-chown)
- $(multilib_native_use_enable suid makeinstall-setuid)
- $(multilib_native_use_enable tty-helpers mesg)
- $(multilib_native_use_enable tty-helpers wall)
- $(multilib_native_use_enable tty-helpers write)
- $(multilib_native_use_with python)
- $(multilib_native_use_with readline)
- $(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
- $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
- $(tc-has-tls || echo --disable-tls)
- $(use_enable unicode widechar)
- $(use_enable kill)
- $(use_enable static-libs static)
- $(use_with selinux)
- $(usex ncurses '' '--without-tinfo')
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # build libraries only
- emake -f Makefile -f - mylibs \
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
- install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
- fi
-
- if multilib_is_native_abi; then
- # need the libs in /
- gen_usr_ldscript -a blkid mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- find "${ED}" -name "*.la" -delete || die
-
- if use pam; then
- newpamd "${FILESDIR}/runuser.pamd" runuser
- newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
- fi
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index a41435eb9a9a..0ddfbaa27d27 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -212,6 +212,14 @@ multilib_src_install_all() {
newpamd "${FILESDIR}/runuser.pamd" runuser
newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
fi
+
+ # Note:
+ # Bash completion for "runuser" command is provided by same file which
+ # would also provide bash completion for "su" command. However, we don't
+ # use "su" command from this package.
+ # This triggers a known QA warning which we ignore for now to magically
+ # keep bash completion for "su" command which shadow package does not
+ # provide.
}
pkg_postinst() {
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 1f08592d468b..c201ae299da4 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
Binary files differ
diff --git a/sys-auth/docker_auth/Manifest b/sys-auth/docker_auth/Manifest
index e6fc530834a2..46a9623f2354 100644
--- a/sys-auth/docker_auth/Manifest
+++ b/sys-auth/docker_auth/Manifest
@@ -1,5 +1,3 @@
-AUX docker_auth-ldap-cacert.patch 2806 BLAKE2B 3af756a2c0cd1dd41e0f17550885f0fd03520dbf8c0ae0b8e7747bd8b66f653c88c7aae366170528ff2345c0cfa4b42640882e5fecf1955f118b0bb2be91d7e8 SHA512 ae86f8d2adae073fae30753c054627a737ddbd05dd94107a65abe2935043a14a9eaf5987a83f06a5b7f827862a8df3510554f34f34693d5e97d77008d7da3b97
-AUX docker_auth-ldap-group-support-1.patch 13612 BLAKE2B 0f61d633858ca42b0f460b912f8b014fda1008359ab9ec4b7e097e4db119fec6c7676b1378413c3d4b5b03d08dacf29c05df32deb9c294eac6b5cdb63d327f7f SHA512 3479435540fd371ef2b294261e2d7196f4ee92e5621178e25c8ee240c066c49a2a846abae860b3baba5bac4e8787e0795b33a7bd1fb6689aa9961acdbd728a16
AUX docker_auth-ldap-group-support-2.patch 15137 BLAKE2B 0774a94db7825d1b103a812547de79aa75c324fd37426bf0f609d0e19d85add35ae1569afe96fa45fe3bc0ec547dc1983b11ce5973d9363d613ea12f258d7bdf SHA512 6897b1fa232290f3f26e3779fa4297089e1288904462c03ea9ffa2dbcb8141740dc07c6da181d4f4a8884e16fd2757b7b880611bec04bc7e497a71d0bce93eea
AUX docker_auth.confd 71 BLAKE2B 63190ce49fe26406107db51be1d0b87a0e3686287733ce2061e76fa14ed0811d0648049adaf448fbe8e4721cbe9eaf284c9d1f38c9c0aa7291cc78eaca1fd6db SHA512 b089b5ea299b701c3e0ed682e59e87e3f1fe1af4f097f21be80ed2e33c8dd021b9dca0c4310ab453518310306af3c7f2c084a4d17db1504cf1f392dcc993d337
AUX docker_auth.initd 596 BLAKE2B 42722f51138e8d32d991b37436dddfafa0e6e460fea6ee9e3be080e6373330366ddce1ce992046569929ee660f5c1cc4c43e0baaf57d4cb82257e6e743cc656b SHA512 11dd3d6c3a947571a719b3fcb76a4fe75af4ee1d1b8957f4b0b3b7ee14cefec7acca9fb52e438b185651c38519e820ab0016d439405652f419399c823e74579c
diff --git a/sys-auth/docker_auth/files/docker_auth-ldap-cacert.patch b/sys-auth/docker_auth/files/docker_auth-ldap-cacert.patch
deleted file mode 100644
index e43e9e6ca889..000000000000
--- a/sys-auth/docker_auth/files/docker_auth-ldap-cacert.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5505de31a91aea88e0cf623ec8edfd928b5432a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@gentoo.org>
-Date: Mon, 18 Sep 2017 14:02:38 +0200
-Subject: [PATCH] Set custom CA certificate for ldap cert verification
-
-Code taken from: https://github.com/hashicorp/go-rootcerts/blob/master/rootcerts.go
-Original author: Paul Hinze <phinze@phinze.com>
----
- auth_server/authn/ldap_auth.go | 17 ++++++++++++++++-
- examples/reference.yml | 2 ++
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/auth_server/authn/ldap_auth.go b/auth_server/authn/ldap_auth.go
-index 3bdf7c3..a3425ed 100644
---- a/auth_server/authn/ldap_auth.go
-+++ b/auth_server/authn/ldap_auth.go
-@@ -19,6 +19,7 @@ package authn
- import (
- "bytes"
- "crypto/tls"
-+ "crypto/x509"
- "fmt"
- "io/ioutil"
- "strings"
-@@ -31,6 +32,7 @@ type LDAPAuthConfig struct {
- Addr string `yaml:"addr,omitempty"`
- TLS string `yaml:"tls,omitempty"`
- InsecureTLSSkipVerify bool `yaml:"insecure_tls_skip_verify,omitempty"`
-+ CACertificate string `yaml:"ca_certificate,omitempty"`
- Base string `yaml:"base,omitempty"`
- Filter string `yaml:"filter,omitempty"`
- BindDN string `yaml:"bind_dn,omitempty"`
-@@ -140,7 +142,20 @@ func (la *LDAPAuth) ldapConnection() (*ldap.Conn, error) {
- tlsConfig := &tls.Config{InsecureSkipVerify: true}
- if !la.config.InsecureTLSSkipVerify {
- addr := strings.Split(la.config.Addr, ":")
-- tlsConfig = &tls.Config{InsecureSkipVerify: false, ServerName: addr[0]}
-+ if la.config.CACertificate != "" {
-+ pool := x509.NewCertPool()
-+ pem, err := ioutil.ReadFile(la.config.CACertificate)
-+ if err != nil {
-+ return nil, fmt.Errorf("Error loading CA File: %s", err)
-+ }
-+ ok := pool.AppendCertsFromPEM(pem)
-+ if !ok {
-+ return nil, fmt.Errorf("Error loading CA File: Couldn't parse PEM in: %s", la.config.CACertificate)
-+ }
-+ tlsConfig = &tls.Config{InsecureSkipVerify: false, ServerName: addr[0], RootCAs: pool}
-+ } else {
-+ tlsConfig = &tls.Config{InsecureSkipVerify: false, ServerName: addr[0]}
-+ }
- }
-
- if la.config.TLS == "" || la.config.TLS == "none" || la.config.TLS == "starttls" {
-diff --git a/examples/reference.yml b/examples/reference.yml
-index 3090978..769cc91 100644
---- a/examples/reference.yml
-+++ b/examples/reference.yml
-@@ -131,6 +131,8 @@ ldap_auth:
- tls: always
- # set to true to allow insecure tls
- insecure_tls_skip_verify: false
-+ # set this to specify the ca certificate path
-+ ca_cert:
- # In case bind DN and password is required for querying user information,
- # specify them here. Plain text password is read from the file.
- bind_dn:
diff --git a/sys-auth/docker_auth/files/docker_auth-ldap-group-support-1.patch b/sys-auth/docker_auth/files/docker_auth-ldap-group-support-1.patch
deleted file mode 100644
index f9e98f410c8a..000000000000
--- a/sys-auth/docker_auth/files/docker_auth-ldap-group-support-1.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-From 4a33badac6b74617dfe3797a716a6907cf018b27 Mon Sep 17 00:00:00 2001
-From: Kevin <kcd83@users.noreply.github.com>
-Date: Mon, 27 Feb 2017 19:09:52 +1300
-Subject: [PATCH 1/4] Initial proof of concept mapping memberOf CN to the label
- groups #63
-
----
- auth_server/authn/ldap_auth.go | 73 ++++++++++++++++++++++++++++++++++--------
- 1 file changed, 60 insertions(+), 13 deletions(-)
-
-diff --git a/auth_server/authn/ldap_auth.go b/auth_server/authn/ldap_auth.go
-index f8fc08f..42f5ad0 100644
---- a/auth_server/authn/ldap_auth.go
-+++ b/auth_server/authn/ldap_auth.go
-@@ -17,7 +17,6 @@
- package authn
-
- import (
-- "bytes"
- "crypto/tls"
- "fmt"
- "io/ioutil"
-@@ -71,10 +70,20 @@ func (la *LDAPAuth) Authenticate(account string, password PasswordString) (bool,
- account = la.escapeAccountInput(account)
-
- filter := la.getFilter(account)
-- accountEntryDN, uSearchErr := la.ldapSearch(l, &la.config.Base, &filter, &[]string{})
-+
-+ // dnAndGroupAttr := []string{"DN"} // example of no groups mapping attribute
-+ groupAttribute := "memberOf"
-+ dnAndGroupAttr := []string{"DN", groupAttribute}
-+
-+ entryAttrMap, uSearchErr := la.ldapSearch(l, &la.config.Base, &filter, &dnAndGroupAttr)
- if uSearchErr != nil {
- return false, nil, uSearchErr
- }
-+ if len(entryAttrMap) < 1 || entryAttrMap["DN"] == nil || len(entryAttrMap["DN"]) != 1 {
-+ return false, nil, NoMatch // User does not exist
-+ }
-+
-+ accountEntryDN := entryAttrMap["DN"][0]
- if accountEntryDN == "" {
- return false, nil, NoMatch // User does not exist
- }
-@@ -93,6 +102,20 @@ func (la *LDAPAuth) Authenticate(account string, password PasswordString) (bool,
- return false, nil, bindErr
- }
-
-+ // Extract group names from the attribute values
-+ if entryAttrMap[groupAttribute] != nil {
-+ rawGroups := entryAttrMap[groupAttribute]
-+ labels := make(map[string][]string)
-+ var groups []string
-+ for _, value := range rawGroups {
-+ cn := la.getCNFromDN(value)
-+ groups = append(groups, cn)
-+ }
-+ labels["groups"] = groups
-+
-+ return true, labels, nil
-+ }
-+
- return true, nil, nil
- }
-
-@@ -170,9 +193,9 @@ func (la *LDAPAuth) getFilter(account string) string {
-
- //ldap search and return required attributes' value from searched entries
- //default return entry's DN value if you leave attrs array empty
--func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, attrs *[]string) (string, error) {
-+func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, attrs *[]string) (map[string][]string, error) {
- if l == nil {
-- return "", fmt.Errorf("No ldap connection!")
-+ return nil, fmt.Errorf("No ldap connection!")
- }
- glog.V(2).Infof("Searching...basedDN:%s, filter:%s", *baseDN, *filter)
- searchRequest := ldap.NewSearchRequest(
-@@ -183,30 +206,54 @@ func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, att
- nil)
- sr, err := l.Search(searchRequest)
- if err != nil {
-- return "", err
-+ return nil, err
- }
-
- if len(sr.Entries) == 0 {
-- return "", nil // User does not exist
-+ return nil, nil // User does not exist
- } else if len(sr.Entries) > 1 {
-- return "", fmt.Errorf("Too many entries returned.")
-+ return nil, fmt.Errorf("Too many entries returned.")
- }
-
-- var buffer bytes.Buffer
-+ result := make(map[string][]string)
- for _, entry := range sr.Entries {
-+
- if len(*attrs) == 0 {
- glog.V(2).Infof("Entry DN = %s", entry.DN)
-- buffer.WriteString(entry.DN)
-+ result["DN"] = []string{entry.DN}
- } else {
- for _, attr := range *attrs {
-- values := strings.Join(entry.GetAttributeValues(attr), " ")
-- glog.V(2).Infof("Entry %s = %s", attr, values)
-- buffer.WriteString(values)
-+ var values []string
-+ if attr == "DN" {
-+ // DN is excluded from attributes
-+ values = []string{entry.DN}
-+ } else {
-+ values = entry.GetAttributeValues(attr)
-+ }
-+ valuesString := strings.Join(values, "\n")
-+ glog.V(2).Infof("Entry %s = %s", attr, valuesString)
-+ result[attr] = values
-+ }
-+ }
-+ }
-+
-+ return result, nil
-+}
-+
-+func (la *LDAPAuth) getCNFromDN(dn string) string {
-+ parsedDN, err := ldap.ParseDN(dn)
-+ if err != nil || len(parsedDN.RDNs) > 0 {
-+ for _, rdn := range parsedDN.RDNs {
-+ for _, rdnAttr := range rdn.Attributes {
-+ if rdnAttr.Type == "CN" {
-+ return rdnAttr.Value
-+ }
- }
- }
- }
-
-- return buffer.String(), nil
-+ // else try using raw DN
-+ return dn
- }
-
- func (la *LDAPAuth) Stop() {
-
-From ddde2fa779e746d7e74cd972a4c6795c72f17ee6 Mon Sep 17 00:00:00 2001
-From: Kevin <kcd83@users.noreply.github.com>
-Date: Tue, 28 Feb 2017 18:09:55 +1300
-Subject: [PATCH 2/4] Apply attribute mapping from configuration
-
----
- auth_server/authn/ldap_auth.go | 125 ++++++++++++++++++++++++-----------------
- 1 file changed, 74 insertions(+), 51 deletions(-)
-
-diff --git a/auth_server/authn/ldap_auth.go b/auth_server/authn/ldap_auth.go
-index 42f5ad0..6f733a2 100644
---- a/auth_server/authn/ldap_auth.go
-+++ b/auth_server/authn/ldap_auth.go
-@@ -26,16 +26,22 @@ import (
- "github.com/golang/glog"
- )
-
-+type LabelMap struct {
-+ Attribute string `yaml:"attribute,omitempty"`
-+ ParseCN bool `yaml:"parse_cn,omitempty"`
-+}
-+
- type LDAPAuthConfig struct {
-- Addr string `yaml:"addr,omitempty"`
-- TLS string `yaml:"tls,omitempty"`
-- InsecureTLSSkipVerify bool `yaml:"insecure_tls_skip_verify,omitempty"`
-- Base string `yaml:"base,omitempty"`
-- Filter string `yaml:"filter,omitempty"`
-- BindDN string `yaml:"bind_dn,omitempty"`
-- BindPasswordFile string `yaml:"bind_password_file,omitempty"`
-- GroupBaseDN string `yaml:"group_base_dn,omitempty"`
-- GroupFilter string `yaml:"group_filter,omitempty"`
-+ Addr string `yaml:"addr,omitempty"`
-+ TLS string `yaml:"tls,omitempty"`
-+ InsecureTLSSkipVerify bool `yaml:"insecure_tls_skip_verify,omitempty"`
-+ Base string `yaml:"base,omitempty"`
-+ Filter string `yaml:"filter,omitempty"`
-+ BindDN string `yaml:"bind_dn,omitempty"`
-+ BindPasswordFile string `yaml:"bind_password_file,omitempty"`
-+ LabelMaps map[string]LabelMap `yaml:"labels,omitempty"`
-+ GroupBaseDN string `yaml:"group_base_dn,omitempty"`
-+ GroupFilter string `yaml:"group_filter,omitempty"`
- }
-
- type LDAPAuth struct {
-@@ -71,22 +77,19 @@ func (la *LDAPAuth) Authenticate(account string, password PasswordString) (bool,
-
- filter := la.getFilter(account)
-
-- // dnAndGroupAttr := []string{"DN"} // example of no groups mapping attribute
-- groupAttribute := "memberOf"
-- dnAndGroupAttr := []string{"DN", groupAttribute}
-+ labelAttributes, labelsConfigErr := la.getLabelAttributes()
-+ if labelsConfigErr != nil {
-+ return false, nil, labelsConfigErr
-+ }
-
-- entryAttrMap, uSearchErr := la.ldapSearch(l, &la.config.Base, &filter, &dnAndGroupAttr)
-+ accountEntryDN, entryAttrMap, uSearchErr := la.ldapSearch(l, &la.config.Base, &filter, &labelAttributes)
- if uSearchErr != nil {
- return false, nil, uSearchErr
- }
-- if len(entryAttrMap) < 1 || entryAttrMap["DN"] == nil || len(entryAttrMap["DN"]) != 1 {
-- return false, nil, NoMatch // User does not exist
-- }
--
-- accountEntryDN := entryAttrMap["DN"][0]
- if accountEntryDN == "" {
- return false, nil, NoMatch // User does not exist
- }
-+
- // Bind as the user to verify their password
- if len(accountEntryDN) > 0 {
- err := l.Bind(accountEntryDN, string(password))
-@@ -102,21 +105,13 @@ func (la *LDAPAuth) Authenticate(account string, password PasswordString) (bool,
- return false, nil, bindErr
- }
-
-- // Extract group names from the attribute values
-- if entryAttrMap[groupAttribute] != nil {
-- rawGroups := entryAttrMap[groupAttribute]
-- labels := make(map[string][]string)
-- var groups []string
-- for _, value := range rawGroups {
-- cn := la.getCNFromDN(value)
-- groups = append(groups, cn)
-- }
-- labels["groups"] = groups
--
-- return true, labels, nil
-+ // Extract labels from the attribute values
-+ labels, labelsExtractErr := la.getLabelsFromMap(entryAttrMap)
-+ if labelsExtractErr != nil {
-+ return false, nil, labelsExtractErr
- }
-
-- return true, nil, nil
-+ return true, labels, nil
- }
-
- func (la *LDAPAuth) bindReadOnlyUser(l *ldap.Conn) error {
-@@ -193,9 +188,9 @@ func (la *LDAPAuth) getFilter(account string) string {
-
- //ldap search and return required attributes' value from searched entries
- //default return entry's DN value if you leave attrs array empty
--func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, attrs *[]string) (map[string][]string, error) {
-+func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, attrs *[]string) (string, map[string][]string, error) {
- if l == nil {
-- return nil, fmt.Errorf("No ldap connection!")
-+ return "", nil, fmt.Errorf("No ldap connection!")
- }
- glog.V(2).Infof("Searching...basedDN:%s, filter:%s", *baseDN, *filter)
- searchRequest := ldap.NewSearchRequest(
-@@ -206,38 +201,66 @@ func (la *LDAPAuth) ldapSearch(l *ldap.Conn, baseDN *string, filter *string, att
- nil)
- sr, err := l.Search(searchRequest)
- if err != nil {
-- return nil, err
-+ return "", nil, err
- }
-
- if len(sr.Entries) == 0 {
-- return nil, nil // User does not exist
-+ return "", nil, nil // User does not exist
- } else if len(sr.Entries) > 1 {
-- return nil, fmt.Errorf("Too many entries returned.")
-+ return "", nil, fmt.Errorf("Too many entries returned.")
- }
-
-- result := make(map[string][]string)
-+ attributes := make(map[string][]string)
-+ var entryDn string
- for _, entry := range sr.Entries {
--
-+ entryDn = entry.DN
- if len(*attrs) == 0 {
-- glog.V(2).Infof("Entry DN = %s", entry.DN)
-- result["DN"] = []string{entry.DN}
-+ glog.V(2).Infof("Entry DN = %s", entryDn)
- } else {
- for _, attr := range *attrs {
-- var values []string
-- if attr == "DN" {
-- // DN is excluded from attributes
-- values = []string{entry.DN}
-- } else {
-- values = entry.GetAttributeValues(attr)
-- }
-- valuesString := strings.Join(values, "\n")
-- glog.V(2).Infof("Entry %s = %s", attr, valuesString)
-- result[attr] = values
-+ values := entry.GetAttributeValues(attr)
-+ glog.V(2).Infof("Entry %s = %s", attr, strings.Join(values, "\n"))
-+ attributes[attr] = values
- }
- }
- }
-
-- return result, nil
-+ return entryDn, attributes, nil
-+}
-+
-+func (la *LDAPAuth) getLabelAttributes() ([]string, error) {
-+ labelAttributes := make([]string, len(la.config.LabelMaps))
-+ i := 0
-+ for key, mapping := range la.config.LabelMaps {
-+ if mapping.Attribute == "" {
-+ return nil, fmt.Errorf("Label %s is missing 'attribute' to map from", key)
-+ }
-+ labelAttributes[i] = mapping.Attribute
-+ i++
-+ }
-+ return labelAttributes, nil
-+}
-+
-+func (la *LDAPAuth) getLabelsFromMap(attrMap map[string][]string) (map[string][]string, error) {
-+ labels := make(map[string][]string)
-+ for key, mapping := range la.config.LabelMaps {
-+ if mapping.Attribute == "" {
-+ return nil, fmt.Errorf("Label %s is missing 'attribute' to map from", key)
-+ }
-+
-+ mappingValues := attrMap[mapping.Attribute]
-+ if mappingValues != nil {
-+ if mapping.ParseCN {
-+ // shorten attribute to its common name
-+ for i, value := range mappingValues {
-+ cn := la.getCNFromDN(value)
-+ mappingValues[i] = cn
-+ }
-+ }
-+ labels[key] = mappingValues
-+ }
-+ }
-+ return labels, nil
- }
-
- func (la *LDAPAuth) getCNFromDN(dn string) string {
-
-From cd37001980267a99a9faa19f1927891af63acb90 Mon Sep 17 00:00:00 2001
-From: Kevin <kcd83@users.noreply.github.com>
-Date: Tue, 28 Feb 2017 18:27:16 +1300
-Subject: [PATCH 3/4] Remove unused configuration fields, never implemented?
-
----
- auth_server/authn/ldap_auth.go | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/auth_server/authn/ldap_auth.go b/auth_server/authn/ldap_auth.go
-index 6f733a2..9c8bcb8 100644
---- a/auth_server/authn/ldap_auth.go
-+++ b/auth_server/authn/ldap_auth.go
-@@ -40,8 +40,6 @@ type LDAPAuthConfig struct {
- BindDN string `yaml:"bind_dn,omitempty"`
- BindPasswordFile string `yaml:"bind_password_file,omitempty"`
- LabelMaps map[string]LabelMap `yaml:"labels,omitempty"`
-- GroupBaseDN string `yaml:"group_base_dn,omitempty"`
-- GroupFilter string `yaml:"group_filter,omitempty"`
- }
-
- type LDAPAuth struct {
-
-From 2fd43be4e5c2cfe177d9e1d36bcd1b29f4d6f262 Mon Sep 17 00:00:00 2001
-From: Kevin <kcd83@users.noreply.github.com>
-Date: Fri, 1 Sep 2017 22:50:19 +1200
-Subject: [PATCH 4/4] Add LDAP label map examples to the reference config
-
----
- examples/reference.yml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/examples/reference.yml b/examples/reference.yml
-index b8bb08c..40c5762 100644
---- a/examples/reference.yml
-+++ b/examples/reference.yml
-@@ -134,6 +134,16 @@ ldap_auth:
- # User query settings. ${account} is expanded from auth request
- base: o=example.com
- filter: (&(uid=${account})(objectClass=person))
-+ # Labels can be mapped from LDAP attributes
-+ labels:
-+ # Add the user's title to a label called title
-+ title:
-+ attribute: title
-+ # Add the user's memberOf values to a label called groups
-+ groups:
-+ attribute: memberOf
-+ # Special handling to simplify the values to just the common name
-+ parse_cn: true
-
- mongo_auth:
- # Essentially all options are described here: https://godoc.org/gopkg.in/mgo.v2#DialInfo
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 6d43364c0a2a..a5ad3e6d4848 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -8,7 +8,7 @@ DIST libfprint-0.5.1.tar.bz2 277342 BLAKE2B ebf653f147d3c75ab9885ffc4a30fb07235b
DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
EBUILD libfprint-0.4.0-r1.ebuild 1068 BLAKE2B e80c359e0bd4afed41063b0bad4aa7144a342520fdffda10f2ebbea630fabcbba8422474005c82de28d065fe2f349f863d20cc664af1ff9550c8a1445f781f32 SHA512 8c94812ca690945c455dd71f34b50c323e966e2f7997326c003c33ff5403ffde3953efa9fbd8b8c75a50fd9cad805a6e9aa92d0fb6c0ab20da987ff3789a11f9
-EBUILD libfprint-0.5.0-r2.ebuild 1195 BLAKE2B 9e65af8f34ad801d84a98bf8458e854e5b7593e464523bcabed47fb6d2f569130a37d8be38ca0dcd86d9fab7cefd4604a092369a76879a3bcf50c34c9d0f8de9 SHA512 eb8e9519a21653bdef75a998a656ea82443952754c1a7c74d6d611e47b8ce3f1484d2c60f784f4312ce8e6946ff446ff4113a1631a85c28ebc836d1407b09665
-EBUILD libfprint-0.5.1-r2.ebuild 1252 BLAKE2B 5dfd0ad1bb18f6e56851b4b11cc5db57be44276f4bcbde131deaeddee1d1f5eb249b624ef3abcb240d8f48feaff02a3b3ee411f5bf4e983ea557af0f5851647f SHA512 18962e934fc0f562a2fa855134b10cad4b14708d81c5e2974c26ad460211d1d52a3c76f4077fa2fdf46b48c8ab64c8b4061b3e3fdd9ed4ee61bf140a433d1dcb
-EBUILD libfprint-0.6.0-r2.ebuild 1270 BLAKE2B ac3b5b56ff4983d543ae56d3f4e1bc57e01757e0f7d9cc8738644358d4a69dcd895efe040af0af9e7a6abce5b0a48eeb9a2840b58bacf6a4c98c01d4312c1563 SHA512 65b50c536f9a459138280e6d44c3c6dd5875ea8854856a26a5dc4bb293ff0bc5c4b6a0c83123a47e61b0172f6647f7357fa92845f42db894beb977192787f55f
+EBUILD libfprint-0.5.0-r2.ebuild 1200 BLAKE2B 3f26892b852549d6ce13c5808518afb791239cfa8242bb10ab0d8a3a05058f0fc458a421c6b6a6f5e6cd247092ddf4e07585ab9aada9e52983978a553daa6ca6 SHA512 ff419c47707d1a26835bcf25d412d92b1dab2ac15927d86107f09200f85a849f9f647799b472b3697f908cdc7d9fd2cd01b9d5b8da579158a274bb74ee2fbf6f
+EBUILD libfprint-0.5.1-r2.ebuild 1257 BLAKE2B d9cf70ff5315eb87402db4e63c268f3b835a2dfb34751c03cf6bfdbabf96d16e7599db754349ff802f9a4e2bba63b3005f6826b4f71ee39107ab23f35abe92d9 SHA512 e51fd3caabcd5e3a1db0ce22ac74cf7221428584fd3160232c4a430c4bb2fc378847b8ad8e1548a1f2ca535d892146f2eaa49d13d7fc48d0a095b252f15b7800
+EBUILD libfprint-0.6.0-r2.ebuild 1275 BLAKE2B 9c746c70cb2f036cd989c4f37de0fd35f3ac968aadcd3126b57bd605a0c1549715e84bc512172f694eb5c99bdbf3f7c1d2e14c78e4c1e11642f7976ebbc77ecb SHA512 eb2c3bad1f59ccd905f4d7113514da2c997fcde6aa6ad04e045d6c7b54b3bc1903dc8117907f82a24f4d61c268fe5b5033a5f900eed91a32751e7c77e627b289
MISC metadata.xml 348 BLAKE2B e32864052d6e6ce6c7f9acb93908a337c47811334e279d20d23bfc6939c993593caed200b9e403e0fb9b37fc0339224d14342c631949af8ce3ed5fcb6387d266 SHA512 2f678a8d401f6823cbcd351316428e571a0cc1026656dd249abda031f690feef55f2628b79bea4c0b44c6f70af099717d04bdb854f17a20ee41d46860fd28eff
diff --git a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
index 6a9a3d3d00a8..9e1a994e4533 100644
--- a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
+++ b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> $
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86"
IUSE="debug static-libs"
RDEPEND="virtual/libusb:1
diff --git a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
index 88858c64dcfd..4aacb0111500 100644
--- a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
+++ b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> $
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="debug static-libs"
RDEPEND="virtual/libusb:1
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
index a0d859e69bde..9511bd2036ed 100644
--- a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
+++ b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> $
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86"
IUSE="debug static-libs vanilla"
RDEPEND="virtual/libusb:1
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index b0b3e3771f71..47e8c5119f34 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -6,6 +6,6 @@ DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 5523c76d6f7364efde54b9bf303dfdf34c11b96
DIST nss-mdns-0.13.tar.gz 380261 BLAKE2B 555b7b9df8ff15da423712fac04ccbc303395d38a07121906cf31871a8684c71e43809b80674a489d87397902a33f4d19b0ae49a4c384290bad227a24880476f SHA512 f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b
EBUILD nss-mdns-0.10-r3.ebuild 1689 BLAKE2B 4050f59ac44f5a510f9a7beb3be44e609d8a40bb0e54fe43c2c48ec2f128fe5d1467a23343d7029953eff93a230175c20339005e879160b1147f8044bd41d413 SHA512 f10e8583fd7624dcddcd17c17bdd5c375f22903a21e4c595bb5f7a447a5e92abbafda9f549b3f3acb8c387451b10765f4f826340484003000f04762e3732eb5b
EBUILD nss-mdns-0.11.ebuild 1667 BLAKE2B 35aea7515b9117cacc47f8680886d5d60e63752515712ba654655e127f40e4fdf40fc8ac6967e85d01e8b32e6894b84358d344faf95b5eb199c9fb7dcd9b6fa7 SHA512 4b4f9c48ea0bb498061b98f3add9b06b148e524140b798f3ac0b3a60e830a084506231118cbf3cfd3f7d3795b7c43e9e3dfe036713a03f45b4d8dd694549eace
-EBUILD nss-mdns-0.13.ebuild 1645 BLAKE2B 32bdc61a16d02da36749e35e8ba3e568bcf69ef3505349998baf7e404f06a8673e2a27a6190e23259824e261f64060b7eb8393daab7a3c01ee7d55f2a22e3bbf SHA512 e2b28370094484fd898821cbeb06d14d4248b7c8e9aca17ff7afac7c06c0beb93dcbeb6f9ee594550f37008748141cfbd0bb05886802f469a21aa8680e3981ac
+EBUILD nss-mdns-0.13.ebuild 1644 BLAKE2B 4cdfeca5e34f7aae869defc2fe01098698626ffb487f78eb1eccc5275c7e63e42503914085b7dec3a899f42234bd80762dcc5fb601d350e3d69bce9d61e4389e SHA512 48c221b7575195fbfac29f05015717170e8820a4e0d17ebdbf69b2203b1356b775d65b86694a95c0333b4bacd272616ccb7ec1864886f835c8e832c3eee5985a
EBUILD nss-mdns-9999.ebuild 1681 BLAKE2B 1ae2e683def7ecd909d010611439201c6eb3827fcc7ead3c7b6229165413f725611061deec56e31cf19682a572afe2510c58591f4a6120043a4893ca4d50abd8 SHA512 edcc52347c4d4c1abd751be2b2f8965d7153ee087ca280acc2baa875e6f50f58460dd2c419e04f35d47bfca33cd8bfdc57be741193c5b2ce2125389a4246356a
MISC metadata.xml 795 BLAKE2B 9237e6e6cc772633d1e45db608880c8bf112a361a2914ccc8f413020d31905d10e5822c922659bd500072f47580c63c94a68f54171a259ae3dc28b0b17499387 SHA512 912e8a154a0672a58bd89ee1f52efd8d43cfbeff1f1c40def47d6bd7600fb9b74e1b11dd633ea1ad6f75ef9ae9979ac5b741cfd5df97ea6b0055b060df33c977
diff --git a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
index 1285c4be869a..dc8347e21d45 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
IUSE="test"
RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 895031500184..23c00980e9ff 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
Binary files differ
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 3ad4e97b44d0..1fd0336bc886 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,4 +1,3 @@
-AUX blktrace-1.0.1-ldflags-parallel-make.patch 2951 BLAKE2B 478ad1fb6c00c6d7813318b34842ecf779946b2267d52c1c17e21430a52cae02f0268f30146b67486805ef770c03fdb8ec426854aa2e37e37a02627a62f69334 SHA512 b384b90d86e52d8a314efa2bee2ae67ed562d56b2c2412211e28cae9dabb448378fe083e0dfe30b6462c5e5d1d85ad7fda6c7d81e3ede0da5ba4c73606b36c7b
AUX blktrace-1.1.0-ldflags-parallel-make.patch 3043 BLAKE2B e6c3c6fd23795f18665ddc39ab55b351c1250cdb29bbbc171d8fcf4f0a0f2b2be94e7f697e2fd83d1dc56353aa98a8604fc540cb82e5c2800990dee0b9c01fbd SHA512 d119ef833ca50527a9f2705ff4a741a9d091625286253bf0d7440f695326eaa753232965bf69a6dad4ea24cf411ef2a992d4226e009d9b4fcadbec616c384fce
AUX blktrace-1.2.0-ldflags.patch 2748 BLAKE2B 2e5bb94aeb829d6f187bb22c109f732fd442df20c1da4acc4cb31fff46d51e9dc37f0aa2c2bceac661c334c0f1727214fba4ee22455e4df2a58efb817d9eb1c3 SHA512 d0a411020f7ca01beea5c7915e1d934c93120d86111d789fd2c7719d10b116e56634b86fe5f37717e104c6493bbce2878df2abf9ddea8ba87089cb2f0a01c084
AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70bab6f4b1c0843452cb1ec63b5d3efda549b0ff99d01170e43b9bcb8ab9ccb3206792aac7f69bc1b1fee5e39378159d4c30463bc8abc3 SHA512 b72a7f6bb03105e7e10116c70bc79d4fe131f223cf5d56649850f777c59226a8c78d7f0dc758fba97891f2f29bde903e41c7bf5e04cae710058a3e38017c02b7
diff --git a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
deleted file mode 100644
index 40c7d97d5dea..000000000000
--- a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile
---- blktrace-1.0.1.orig/btreplay/Makefile 2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/btreplay/Makefile 2011-02-03 03:01:41.161365886 +0000
-@@ -32,10 +32,10 @@
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btrecord: btrecord.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- btreplay: btreplay.o
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- depend:
- @$(CC) -MM $(CFLAGS) *.c 1> .depend
-diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile
---- blktrace-1.0.1.orig/btt/Makefile 2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/btt/Makefile 2011-02-03 03:01:41.161365886 +0000
-@@ -38,7 +38,7 @@
- $(CC) $(CFLAGS) -c -o $*.o $<
-
- btt: $(OBJS)
-- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- ifneq ($(wildcard .depend),)
- include .depend
-diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile
---- blktrace-1.0.1.orig/Makefile 2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/Makefile 2011-02-03 03:03:32.713725832 +0000
-@@ -4,38 +4,35 @@
- PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
- LIBS = -lpthread
- SCRIPTS = btrace
-+SUBDIRS = btreplay btt
-
--ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
-+ALL = $(PROGS) $(SCRIPTS)
-+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
- btt/bno_plot.py
-
--all: $(ALL)
-+all: $(ALL) $(SUBDIRS)
-+.PHONY: $(SUBDIRS)
-
--btt/btt:
-- $(MAKE) -C btt
--
--btreplay/btrecord:
-- $(MAKE) -C btreplay
--
--btreplay/btreplay:
-- $(MAKE) -C btreplay
-+$(SUBDIRS): $(PROGS)
-+ $(MAKE) -C $@
-
- %.o: %.c
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
-
- blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blktrace: blktrace.o act_mask.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-
- verify_blkparse: verify_blkparse.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkrawverify: blkrawverify.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
-
- blkiomon: blkiomon.o rbtree.o
-- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-
- $(PROGS): | depend
-
-@@ -81,7 +78,7 @@
- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
-- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
- $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
-
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c0a1eac25d48..1dc28ce2f27e 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index ef6ad7cd34da..a82c1973aa9a 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,7 +1,7 @@
DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd SHA512 a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
DIST refind-src-0.10.8.tar.gz 4059265 BLAKE2B 597d8df1cb74f6f686c5b702c02eb2712adb2076934f1ffc746ca9aaf3d349d6384c8aa09d17fe440b656cc054ee928131f8ecbc059fe0b654e9c32799e54e86 SHA512 a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050 SHA512 796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
-EBUILD refind-0.10.4-r2.ebuild 6184 BLAKE2B e49d6ce4d20d75f36eadb7153acdc6ced59bbc5afc5a4b5e94b67078a61923f41fbf9b1f44999365039172bfc2b8e6ea58122051df14347e175eddf70c4be6dd SHA512 4169cd79dc65ff764e94ec10437ad1c10871a31f0bf20de3ace5c5d35be6a66caa6c138772ede5178145ec9ef46293377f3603bf8123821b3abd33718aaa4f0e
-EBUILD refind-0.10.8.ebuild 6186 BLAKE2B 8548bf8dc911eb501c0a1f8e3614133e00c5a0732f751f051276937cd84d36279226ca176bde6cc520c5e7ff92162aca8118f2bfa71ee387f549ec37c960a000 SHA512 d2b4d180f7c2d8c0734656d308b063e33f8b9ff7c7b11378d8d775f62012eb4f81844af62dacaf2def0c663d8a1bc4db1d0d0bfd920a3145762e873069051e8f
-EBUILD refind-0.11.2.ebuild 6278 BLAKE2B e724a6c9b4ed09a971f0d5c12bb109087faf243f45f1f37232fdac5e6ce750bfc33c5fb0261152daf698f7fc8abee7cf7ae1a258275be996d7b5ed9e34716f91 SHA512 6a876170d43c10a8c2f5b701d729f7510b8e68f78c01432698fb6190f39aa2b7a7901faf6fd0b64486f6565e66b729e9d24136601d4a032e8e17985bcb982c3f
+EBUILD refind-0.10.4-r2.ebuild 6185 BLAKE2B 077c7e57eeed02eba132dbae17c7045acfedb62ec282e8af15c28f39bab1668a952656807a8e476230b8a6735d71c930937d4386030cd3fda5e4cd9dbf4c9f94 SHA512 bacd7b2acd10ff4ac50074626364d1a97e53a82fd545669acbb9efd7b2f1da0edb86d41138155340cc0e07f756484a88f57ef7165ab88755526c57629f889138
+EBUILD refind-0.10.8.ebuild 6187 BLAKE2B 99dff8bcd23599f94bb9dac9c4d6050a6ee7b5369f9f726e57bd8f491b05dc91c36193c0bb7286a08abcb1c671b2cbbef81fc9694d90ad7cc3290a0075e3b36c SHA512 9febaecbf474e10c1b14be93f5ad5151aa1ea8c5eeeb89a3a3f92f62bff071f80b4ec2fa431d66855d142d41edaa1a1f943f944dbcd79351a49f79760877a0ec
+EBUILD refind-0.11.2.ebuild 6279 BLAKE2B 209d4d8eda0b18cf10350d2a1ef8cbda5bfa6e3e2e46534e8fcadcc370917202d38b7f7dd344315e8986cf811f5452e72dd0a11d6237eaaa5b531f3e7f5b9624 SHA512 47f9bc81cc441e94615baa06e0e6c797e5f4e7be156b51ffea20d20409dcc5e94053c48ddae1c42bb959e538e29f2bd4a0e0083ae0be584320aa3cb0ae0b5e56
MISC metadata.xml 3924 BLAKE2B 0b6d9ed6c48bbd09f1ca3d7661d4b9c1c6800ba551341ee8a434cdf15872561a58221bfd58cca59d3e14785a7fdecfa98e82ec281f805d5fe200ff5115fafad7 SHA512 40432e3b97f448c671c9af35f25457481069f7c4b43e7d93958cf93e52856badf576f878f656185c58eda880e6e1eb1bc6c4a96d67d6f7a6b569da870bcea6bd
diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild b/sys-boot/refind/refind-0.10.4-r2.ebuild
index 96ca6a4c75a9..349f17cfc64e 100644
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ b/sys-boot/refind/refind-0.10.4-r2.ebuild
@@ -177,7 +177,7 @@ pkg_postinst() {
elog ""
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "refind-install requires additional packages to be fully functional:"
- elog " app-crypt/sbsigntool for binary signing for use with SecureBoot"
+ elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
elog " sys-boot/efibootmgr for writing to NVRAM"
elog " sys-block/parted for automatic ESP location and mount"
elog ""
diff --git a/sys-boot/refind/refind-0.10.8.ebuild b/sys-boot/refind/refind-0.10.8.ebuild
index 598fa7cd8dcb..9978fe0dbf07 100644
--- a/sys-boot/refind/refind-0.10.8.ebuild
+++ b/sys-boot/refind/refind-0.10.8.ebuild
@@ -177,7 +177,7 @@ pkg_postinst() {
elog ""
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "refind-install requires additional packages to be fully functional:"
- elog " app-crypt/sbsigntool for binary signing for use with SecureBoot"
+ elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
elog " sys-boot/efibootmgr for writing to NVRAM"
elog " sys-block/parted for automatic ESP location and mount"
elog ""
diff --git a/sys-boot/refind/refind-0.11.2.ebuild b/sys-boot/refind/refind-0.11.2.ebuild
index 6f050a747dcf..5987cc179ee1 100644
--- a/sys-boot/refind/refind-0.11.2.ebuild
+++ b/sys-boot/refind/refind-0.11.2.ebuild
@@ -180,7 +180,7 @@ pkg_postinst() {
elog ""
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "refind-install requires additional packages to be fully functional:"
- elog " app-crypt/sbsigntool for binary signing for use with SecureBoot"
+ elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
elog " sys-boot/efibootmgr for writing to NVRAM"
elog " sys-block/parted for automatic ESP location and mount"
elog ""
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index b20cfcb33dac..2e3ed9fb3f23 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,3 @@
DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
-EBUILD woeusb-3.1.5.ebuild 1037 BLAKE2B 92407e8c3cf98ad238afcd2fc9f571f03c92104f639d588cfa439bbe83d9186c905cb830f76f34ab4e496d181a61a5ab0d72c1012c7c49924e0feefbf614c755 SHA512 3498557fc17d2c77e03997ae998376ef337196848c84eafe5cb5e928fbc2bd49ba2ca324af5a19898fe89fef193c76e10962c20f21d693b18f6b18e18370dc79
+EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B e0daa3852bc84b27c218d9be5a10f497a7653a0b94fa3e47807f6b99b2399ba0f612e9345e9d6ef1d56a179e9eb320e15e2e0b258273af57011d337e10a4a2f4 SHA512 66f0e68bb9e37d7bc18f6e7e88042bf9b2da13827dbc23fdcfeee82897252fc03a0b34c6cd14a5d129f4ac4b62dc47b0c62fbd7c8762c02e14654e82f37a676d
MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
index 803545692f5b..a3f3d8132079 100644
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="minimal"
RDEPEND="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b0befded0ae9..0ee41ec8311d 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
Binary files differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 317d8ba502c9..dc7d04f3414e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -24,6 +24,8 @@ AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a0
AUX ceph-12.2.4-boost-sonames.patch 5145 BLAKE2B 70609fbcf98c556bc681a27da37abaf0178f0d60850f3d5dd7806f71dcc21affd103bbc4ffcd21be7ebe6a82a04eab5a46548aeb1d18ad398860e14f50b86ec6 SHA512 d8a69c34c02848ba918bf65f318bb02f27cbbbd618a337cc21153cad4ab33a07dfef27d8cfb1d2839b145a245483c57dfdbddb87061a5f9ce215fb6df94ef591
AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
+AUX ceph-12.2.5-boost-sonames.patch 5546 BLAKE2B 8062f550dd36371b1f89981ed2c63e5d8ff4273a6843f8cb8227c38fcfe29c1ce42c07578c3491a9b04e548d0c76a27481a7cb9ae2afad2870191090697c6f4b SHA512 0f48e5107be166306c832bc998c4375759e783ce0159250b3440f22ed7ef3b16fefc9e2258b53829145361d2e2e6bae97e09dde6ed81149a137f3ce84fe4ee47
+AUX ceph-12.2.5-no-werror.patch 2214 BLAKE2B b8878f8dd9e971f0f11f0954ba81fdf2df270e0ac3588220f629255737119a05def4012caa202b2e13f693b3962322126d7b6fb91ca18e844b0a1aed3de37586 SHA512 db945087453b83a87c963bf87b35ab77946a53f3b86e24dafd4b947e098d9780ff41aa6df979adcd306fa9e740d1dbba8cf7c391feb5b934ea83c55621b350cd
AUX ceph-13.2.0-boost-sonames.patch 6598 BLAKE2B 906530f288518b26b005140645241da4deda6ab38a1780fdd92e9a7602547cc8f6ef65da66a2fe689d047339aa1237a32ea524419649109309634b8516ce687b SHA512 4d62c4babfcd20fadbe25572d3aebb4b01360a22fa5554e73454d59d9a46ed011b59ab0538e0ddd182c006889c160394d8eda171171aeb55c131ce7237c54343
AUX ceph-13.2.0-cflags.patch 1011 BLAKE2B a7d911ed0ded1a1eb5426bae3a7b1cc169774668cdefd120ce8a5bb2f2082d792dfa0d2e14bac558bf27343763b66d42b9d84046acfa5a1cb1d61fc1219955b3 SHA512 8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df
AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df501f1c31eaf6a9ca7d46164e84a37aec7e99ac12456bd299604d18b2f0ac70898de90427a80390644a8e3d455c5e3caf297854 SHA512 aa0f3dab73573c1ac91513bca378a8441ace5f58a0e469f4f01d7ab22869b41e5d4a1e44c3fe8e2bc23ab5249fd1a52a4b72000d458521b6ee291512e51d474c
@@ -55,6 +57,7 @@ DIST ceph-12.2.1.tar.gz 148738778 BLAKE2B df4bea1ad552ab2361174c1e2f285f42b4a07a
DIST ceph-12.2.2.tar.gz 148763718 BLAKE2B 5c9a56bc536b723ca3a6a0aa68c7f456032c892716167dfa213cda4964e3a45e970efe6dd67e5c43ef6f6018bd9367e0c890de270acccf3217b848b58cb98488 SHA512 89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88
DIST ceph-12.2.4.tar.gz 78694838 BLAKE2B 862c275eb5e42065b2f42d417f8efd2ee8ee67c19575eb19bc799d5923d0720fa4810e1c51915fee6f96a44d433059ca6b180861013b735287751ad24235e611 SHA512 ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6
DIST ceph-12.2.5.tar.gz 78758920 BLAKE2B 0e4a515ff80fdd39e8f1afd737434c7dc2a218f0a89b53ec31bc3a5478bfd876c6f2bf3c2947a8c2f056d9b94ffa34d18ceac06b00008605e84485ec631c7a32 SHA512 bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
+DIST ceph-12.2.6.tar.gz 77212021 BLAKE2B ad61ab226a9007fc4ddbbddccde3572c6e6a2a8070aeb26cbf1ec8a64e8e292e703c13fc40f1921ef9a4bf2330300dd2f9bdf4cc3ebd70550b6b690bbe8c58b5 SHA512 7512623a9bf64b5da1989f62a6c5a3761ae21773bdac185f36a4dcd470f6489724807f28e98e9861ff34f86d2b0ce7af00eac2ddbaa5bba43b49786cb65ad7ff
DIST ceph-13.2.0-frontend-node-modules.tar.xz 44082360 BLAKE2B 0f1bcf1c5154bdc352c9314853099b314b76c76cf1c3ee2447803ea5d79d02bbc91a0f8aefa6df96b47fc2d89e531354ac485752d2dbb762498d3eaba273635a SHA512 ad3c38b055ba886215aea07c4afb202cc3bfb64cdebc816eb4f124f76f2401e04e5645859b2a780828bf8eddcc0093b36d4d9935b703ac2bbc4212e913abeb8c
DIST ceph-13.2.0.tar.gz 89077825 BLAKE2B 07ee531a672e436df8f218ecb4a2425d33911771dcf9c63fa9fc36a868c93a101029d8a8c69fcea026882ac466e6032da76be0dc961ceb03845b955fb5762add SHA512 2524ad5a868024463e1a1edc5bd9c3f7bc1f58e47bf8d331902ed53206120abc6a427dd9c1d657131e67efd955d6ed8052b6c3fed8658aa905d58ac58ee62973
EBUILD ceph-10.2.10-r1.ebuild 7632 BLAKE2B dbd9ddb6dc6c196af4553c24bd0beb33e409334d72fb5838c98343bf7b3d807f657aac1586fa156edf8c5378c69cd1b072fdac03cdee0d9b4154e97d0ddbc647 SHA512 94dea0f2b98fda249641d6f60d673dbf9793ee4205ff0b10267604c0022ceef8640eab54be3c39afd84a07bd0a29b2a667d140a4010bb3d8c5c0134dfb4a9eb7
@@ -69,6 +72,7 @@ EBUILD ceph-12.2.1.ebuild 7338 BLAKE2B cd4cccedaeb34e9057da645ba7640e1577b593dda
EBUILD ceph-12.2.2-r1.ebuild 7315 BLAKE2B 4ea06a4679902338bcfc631f16c3d3fe60efa59baee88d06579fbc54b4ffe12ac6b003551edbbd18f1ee3c42814c64f4efa948dec2a2881231620b2f0a5acc91 SHA512 806d2a6ce722da06e6430bc4e7b6091e858333b84631690d3b6702c0c158618a09368ec352b563c437ce8253cdf38a487011b6601ee78ce4adfe148191c303f4
EBUILD ceph-12.2.2.ebuild 7315 BLAKE2B dee5111ca1f52b26f49f27384bbff20d339ab9dd9ad4eba77709f2f9af59c42480f1d55324e8691b9b86b7ee2615a68c473d2d389355c7d57fc2b2b19672f980 SHA512 af0421ed063be53baa3daef7a8ec0b9c7bfdf66180afa483ed3459a664fce463b4de65a23869577f616ff4149a40e8223ed27de792bbb2a9b001bf9baaed39ab
EBUILD ceph-12.2.4-r2.ebuild 7823 BLAKE2B 5f79161d66f36efab2282d6d40ed9982921cdc647584aef23a049083c42be27a016322ffb0fb4480b8c6993d5242760d4502fa29a5e23c0aa575863e8c6a1ced SHA512 57e8cb259190716954a2e5603fc9fdaced2abfdf93f12ae744e0beb6f0d311f0b51a715a60e335b4f14d40062fdd7147bb21975de016ae23ea7878f023d70b9b
-EBUILD ceph-12.2.5.ebuild 7845 BLAKE2B c9719913a9c4d362871131f2a302231c6705ffa0770e4a8668d48fbc8f5aea357fb895a53a2114dea2f4027b4bd9d64364485a427e3b0f95ca5b1900f79106b3 SHA512 a5c958a257d7764f2d0e3d2ebabfb65b3027726c5a4f8976464f9cf13190a5ca161057dae43746c8aac43c7df1f5828b2aad1f2c2ca88d8a3a2103298d9096e2
-EBUILD ceph-13.2.0.ebuild 9379 BLAKE2B 49969daeb122519f4c20cf33123e67925ae32a4532cb9a59d0881779986e8e07389335d100c1f256f5760f9674fa94eb95fc0f33e02d08b02cfb0f528db8ddcd SHA512 39f9a42d3cb820a957839b271b4b6b88f40095ca3c6bd444921583909f1ba50abbccf8d1a04da61282da37bf288a2d4da109e54c60e607c1b3f54f794c2b9ed6
+EBUILD ceph-12.2.5.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615
+EBUILD ceph-12.2.6.ebuild 7888 BLAKE2B 6234f761f69dca588bf797c822d8d44b6c52db8cf5f5cc4448c4404c6dc14f1908b864aadbe4bae9f751d98dc20b69aa4217b69ea21c3c4358e194d093cec547 SHA512 f0a7a534d40e0868aa2a0c1700738136d56eaa59fedf7ab765bc1ea1993d6a973cf4c8c08644693bc4115afd84ba9fa86eb13d66e45e613edacec1877a6b09aa
+EBUILD ceph-13.2.0.ebuild 9378 BLAKE2B b891cb92b54974ece68422dacd347ddebfa89a3e0513b9dac6b25d0f779041f220c007b206d96d0a1e9d2e99f09016776ee494019d8e6de4164fc7ddd11bf1de SHA512 dcd41abd5722e2bd27137cb4e900300e14cf6e5fa8ef0e33b1e61e1b176ba2df401eb54efbb90ae20848752228f92e29cd72bb124527cb441e0e87ec531c037a
MISC metadata.xml 1773 BLAKE2B e6fa9ca15441688a4072db66e4e02ca9afcad1c0da4ac06e581a84815b09d8e0793e39f10840cb6950f811cf679ed3322a8b234d3a4a9ac1f0e58aa0927d1447 SHA512 8a74d9f391e32c7d13f12b7234a7e4b36f81acb67764fe7d6c53217723e2fa98ea918edf4b3c908595974c82353def83a3ff236bcdaac5a6f2234b14ea17ca9a
diff --git a/sys-cluster/ceph/ceph-12.2.5.ebuild b/sys-cluster/ceph/ceph-12.2.5.ebuild
index c7805109ba2c..75cd704ac78f 100644
--- a/sys-cluster/ceph/ceph-12.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Ceph distributed filesystem"
@@ -128,6 +128,7 @@ PATCHES=(
"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
"${FILESDIR}/ceph-12.2.4-cflags.patch"
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+ "${FILESDIR}/ceph-12.2.5-no-werror.patch"
)
check-reqs_export_vars() {
@@ -163,7 +164,7 @@ src_prepare() {
cmake-utils_src_prepare
if use system-boost; then
- eapply "${FILESDIR}/ceph-12.2.4-boost-sonames.patch"
+ eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
fi
# remove tests that need root access
diff --git a/sys-cluster/ceph/ceph-12.2.6.ebuild b/sys-cluster/ceph/ceph-12.2.6.ebuild
new file mode 100644
index 000000000000..000712b8e6fc
--- /dev/null
+++ b/sys-cluster/ceph/ceph-12.2.6.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+ python-r1 udev user readme.gentoo-r1 systemd
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+ SRC_URI=""
+else
+ SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+ virtual/libudev:=
+ app-arch/bzip2:=[static-libs?]
+ app-arch/lz4:=[static-libs?]
+ app-arch/snappy:=[static-libs?]
+ app-arch/zstd:=[static-libs?]
+ app-misc/jq:=[static-libs?]
+ <dev-libs/crypto++-7.0:=[static-libs?]
+ dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+ dev-libs/libaio:=[static-libs?]
+ dev-libs/libxml2:=[static-libs?]
+ sys-apps/keyutils:=[static-libs?]
+ sys-apps/util-linux:=[static-libs?]
+ sys-libs/zlib:=[static-libs?]
+ babeltrace? ( dev-util/babeltrace )
+ ldap? ( net-nds/openldap:=[static-libs?] )
+ lttng? ( dev-util/lttng-ust:= )
+ nss? ( dev-libs/nss:= )
+ fuse? ( sys-fs/fuse:0=[static-libs?] )
+ ssl? ( dev-libs/openssl:=[static-libs?] )
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+ zfs? ( sys-fs/zfs:=[static-libs?] )
+ radosgw? (
+ dev-libs/expat:=[static-libs?]
+ dev-libs/openssl:=[static-libs?]
+ net-misc/curl:=[curl_ssl_openssl,static-libs?]
+ )
+ system-boost? (
+ >=dev-libs/boost-1.66:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+ )
+ jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+ !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+ ${PYTHON_DEPS}
+ "
+DEPEND="${COMMON_DEPEND}
+ app-arch/cpio
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/sphinx
+ dev-util/gperf
+ dev-util/valgrind
+ sys-apps/which
+ sys-devel/bc
+ virtual/pkgconfig
+ test? (
+ dev-python/tox[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ sys-apps/grep[pcre]
+ sys-fs/btrfs-progs
+ )"
+RDEPEND="${COMMON_DEPEND}
+ net-misc/socat
+ sys-apps/gptfdisk
+ sys-block/parted
+ sys-fs/cryptsetup
+ sys-fs/lvm2
+ !<sys-apps/openrc-0.26.3
+ dev-python/cherrypy[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pecan[${PYTHON_USEDEP}]
+ dev-python/prettytable[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ "
+REQUIRED_USE="
+ $(python_gen_useflags 'python2*')
+ ${PYTHON_REQUIRED_USE}
+ ?? ( ssl nss )
+ ?? ( jemalloc tcmalloc )
+ "
+
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+ src/erasure-code/jerasure/jerasure
+ src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+ "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+ "${FILESDIR}/ceph-12.2.0-cflags.patch"
+ "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
+ "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+ "${FILESDIR}/ceph-12.2.4-cflags.patch"
+ "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+ "${FILESDIR}/ceph-12.2.5-no-werror.patch"
+)
+
+check-reqs_export_vars() {
+ if use amd64; then
+ CHECKREQS_DISK_BUILD="12G"
+ CHECKREQS_DISK_USR="460M"
+ else
+ CHECKREQS_DISK_BUILD="1400M"
+ CHECKREQS_DISK_USR="450M"
+ fi
+
+ export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+ enewgroup ceph ${CEPH_GID}
+ enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+ check-reqs_export_vars
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ python_setup 'python2*'
+ check-reqs_export_vars
+ check-reqs_pkg_setup
+ user_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if use system-boost; then
+ eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+ fi
+
+ # remove tests that need root access
+ rm src/test/cli/ceph-authtool/cap*.t
+
+ #rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+ local flag
+ local mycmakeargs=(
+ -DWITH_BABELTRACE=$(usex babeltrace)
+ -DWITH_CEPHFS=$(usex cephfs)
+ -DWITH_FUSE=$(usex fuse)
+ -DWITH_LTTNG=$(usex lttng)
+ -DWITH_MGR=$(usex mgr)
+ -DWITH_NSS=$(usex nss)
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_RADOSGW=$(usex radosgw)
+ -DWITH_SSL=$(usex ssl)
+ -DWITH_SYSTEMD=$(usex systemd)
+ -DWITH_TESTS=$(usex test)
+ -DWITH_XFS=$(usex xfs)
+ -DWITH_ZFS=$(usex zfs)
+ -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+ -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
+ -DWITH_SYSTEM_BOOST=$(usex system-boost)
+ -DBOOST_J=$(makeopts_jobs)
+ -DWITH_RDMA=no
+ -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+ -DEPYTHON_VERSION="${EPYTHON#python}"
+ )
+ if use amd64 || use x86; then
+ for flag in ${CPU_FLAGS_X86[@]}; do
+ mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+ done
+ fi
+
+ rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+ cmake-utils_src_configure
+
+ # bug #630232
+ sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+ "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+ || die "sed failed"
+}
+
+src_configure() {
+ ceph_src_configure
+}
+
+python_compile() {
+ local CMAKE_USE_DIR="${S}"
+
+ ceph_src_configure
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+ emake VERBOSE=1 all
+
+ # python modules are only compiled with "make install" so we need to do this to
+ # prevent doing a bunch of compilation in src_install
+ DESTDIR="${T}" emake VERBOSE=1 install
+ popd >/dev/null || die
+}
+
+src_compile() {
+ cmake-utils_src_make all
+
+ # we have to do this here to prevent from building everything multiple times
+ BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+ python_foreach_impl python_compile
+}
+
+src_test() {
+ make check || die "make check failed"
+}
+
+python_install() {
+ local CMAKE_USE_DIR="${S}"
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+ DESTDIR="${D}" emake install
+ popd >/dev/null || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ python_foreach_impl python_install
+
+ prune_libtool_files --all
+
+ exeinto /usr/$(get_libdir)/ceph
+ newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+ fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+ newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+ newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+ use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+ # units aren't installed by the build system unless systemd is enabled
+ # so no point installing these with the USE flag disabled
+ if use systemd; then
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+ "ceph-mds@.service"
+
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+ "ceph-osd@.service"
+ fi
+
+ udev_dorules udev/*.rules
+
+ readme.gentoo_create_doc
+
+ python_setup 'python2*'
+
+ # bug #630232
+ sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+ || die "sed failed"
+
+ python_fix_shebang "${ED}"/usr/{,s}bin/
+
+ # python_fix_shebang apparently is not idempotent
+ sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+ "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-13.2.0.ebuild b/sys-cluster/ceph/ceph-13.2.0.ebuild
index 41559adb2006..113df40b6e0a 100644
--- a/sys-cluster/ceph/ceph-13.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.0.ebuild
@@ -17,7 +17,7 @@ else
mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
# unkeyworded for testing that this actually works
# had to do a lot of hackery for the mgr frontend, dunno if anything broke
- #KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
new file mode 100644
index 000000000000..57482b3f27c4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
@@ -0,0 +1,165 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa90ba65da..ea65dd4209 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS
+ set(BOOST_HEADER_COMPONENTS container)
+
+ if(WITH_MGR)
+- list(APPEND BOOST_COMPONENTS python)
++ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+ list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7aa8a4392e..111f669f2e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -622,13 +622,13 @@ set(ceph_common_objs
+ $<TARGET_OBJECTS:crush_objs>)
+ set(ceph_common_deps
+ json_spirit erasure_code rt ${LIB_RESOLV}
+- Boost::thread
+- Boost::system
+- Boost::regex
+- Boost::random
+- Boost::program_options
+- Boost::date_time
+- Boost::iostreams
++ boost_thread
++ boost_system
++ boost_regex
++ boost_random
++ boost_program_options
++ boost_date_time
++ boost_iostreams
+ ${BLKID_LIBRARIES}
+ ${Backtrace_LIBRARIES}
+ ${BLKIN_LIBRARIES}
+@@ -712,7 +712,7 @@ if (WITH_MGR)
+ $<TARGET_OBJECTS:heap_profiler_objs>)
+ target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
+ target_link_libraries(ceph-mgr osdc client global-static common
+- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
++ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+ install(TARGETS ceph-mgr DESTINATION bin)
+ endif (WITH_MGR)
+
+@@ -885,7 +885,7 @@ set(ceph_mds_srcs
+ ceph_mds.cc)
+ add_executable(ceph-mds ${ceph_mds_srcs})
+ target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
+- Boost::thread)
++ boost_thread)
+ install(TARGETS ceph-mds DESTINATION bin)
+
+ add_subdirectory(erasure-code)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index f3999e3b01..0ce7fca1ba 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
+ )
+ target_link_libraries(ceph_omapbench
+ librados
+- Boost::program_options
++ boost_program_options
+ global
+ ${BLKID_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
+ cls_rgw_client
+ cls_user_client
+ cls_lock_client
+- Boost::regex
++ boost_regex
+ ${BLKID_LIBRARIES}
+ ${CURL_LIBRARIES}
+ ${EXPAT_LIBRARIES}
+@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
+ cls_rgw_client
+ cls_user_client
+ cls_lock_client
+- Boost::regex
++ boost_regex
+ ${BLKID_LIBRARIES}
+ ${CURL_LIBRARIES}
+ ${EXPAT_LIBRARIES}
+diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
+index 9fba701e05..da3cbcfe96 100644
+--- a/src/test/bench/CMakeLists.txt
++++ b/src/test/bench/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(smalliobench_srcs
+ add_executable(ceph_smalliobench
+ ${smalliobench_srcs}
+ )
+-target_link_libraries(ceph_smalliobench librados Boost::program_options global
++target_link_libraries(ceph_smalliobench librados boost_program_options global
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+
+ # ceph_smalliobenchrbd
+@@ -27,7 +27,7 @@ if(WITH_RBD)
+ librados
+ os
+ global
+- Boost::program_options
++ boost_program_options
+ ${BLKID_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ )
+@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
+ add_executable(ceph_smalliobenchfs
+ ${ceph_smalliobenchfs_srcs}
+ )
+-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+
+ # ceph_smalliobenchdumb
+@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
+ add_executable(ceph_smalliobenchdumb
+ ${smalliobenchdumb_srcs}
+ )
+-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+
+ # ceph_tpbench
+@@ -73,7 +73,7 @@ set(tpbench_srcs
+ add_executable(ceph_tpbench
+ ${tpbench_srcs}
+ )
+-target_link_libraries(ceph_tpbench librados Boost::program_options global
++target_link_libraries(ceph_tpbench librados boost_program_options global
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+
+ install(TARGETS
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index 9f72fa3b48..665c977606 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
+ install(TARGETS ceph_radosacl DESTINATION bin)
+
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
++target_link_libraries(ceph-osdomap-tool os global boost_program_options)
+ install(TARGETS ceph-osdomap-tool DESTINATION bin)
+
+ add_executable(ceph-monstore-tool
+ ceph_monstore_tool.cc
+ ../mgr/mgr_commands.cc)
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
++target_link_libraries(ceph-monstore-tool os global boost_program_options)
+ install(TARGETS ceph-monstore-tool DESTINATION bin)
+ install(PROGRAMS
+ ceph-monstore-update-crush.sh
+@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
+ ceph_objectstore_tool.cc
+ rebuild_mondb.cc
+ RadosDump.cc)
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
+ if(WITH_FUSE)
+ target_link_libraries(ceph-objectstore-tool fuse)
+ endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
new file mode 100644
index 000000000000..dd24e7819fe0
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
@@ -0,0 +1,55 @@
+diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt ceph-12.2.5/src/rapidjson/CMakeLists.txt
+--- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt 2018-07-09 11:18:09.188115751 -0700
++++ ceph-12.2.5/src/rapidjson/CMakeLists.txt 2018-07-09 11:36:56.848639110 -0700
+@@ -50,7 +50,7 @@
+ endif(CCACHE_FOUND)
+
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
+ if (RAPIDJSON_BUILD_CXX11)
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+@@ -73,7 +73,7 @@
+ endif()
+ endif()
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers")
+ if (RAPIDJSON_BUILD_CXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt ceph-12.2.5/src/rocksdb/CMakeLists.txt
+--- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt 2018-07-09 11:18:09.219115543 -0700
++++ ceph-12.2.5/src/rocksdb/CMakeLists.txt 2018-07-09 11:34:58.843411195 -0700
+@@ -174,15 +174,6 @@
+ PROPERTIES COMPILE_FLAGS "-msse4.2")
+ endif()
+
+-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
+-if(FAIL_ON_WARNINGS)
+- if(MSVC)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+- else() # assume GCC
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+- endif()
+-endif()
+-
+ option(WITH_ASAN "build with ASAN" OFF)
+ if(WITH_ASAN)
+ add_definitions(-DROCKSDB_TSAN_RUN)
+diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile
+--- ceph-12.2.5.orig/src/rocksdb/Makefile 2018-03-11 18:58:51.000000000 -0700
++++ ceph-12.2.5/src/rocksdb/Makefile 2018-07-09 11:35:53.847049123 -0700
+@@ -243,11 +243,6 @@
+ WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
+ -Wno-unused-parameter
+
+-ifndef DISABLE_WARNING_AS_ERROR
+- WARNING_FLAGS += -Werror
+-endif
+-
+-
+ ifdef LUA_PATH
+
+ ifndef LUA_INCLUDE
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 2c76d4f2aa55..99dca0b656a2 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,12 +1,6 @@
AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
-DIST galera-3-25.3.20.tar.gz 3319355 BLAKE2B 0f00da318e11713d0e44f9de38a941fd0c18c1c64faa780c797262d467305f16bbb91c5e1d130b9b351a3956573aa297aa520239db54fbdc01d23f1be1530952 SHA512 4531073bbd13542cf4b0ed06788ec0b857971bd2e0161b8df2d90072b134d5343216c012d2f712ff336209f6e34920e2aadf7b0f58f91d6ce365fb2b65ed7fbd
-DIST galera-3-25.3.21.tar.gz 3317865 BLAKE2B e3f1fec764c171615d0db3a0375bf660185c3271470a0f9114299cc0159bf43cce7bdf4ad85cfb8e7fcd3d50917846ed3ce0726a3a5e371439f5ca0a1b2d63d6 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033
-DIST galera-3-25.3.22.tar.gz 3320337 BLAKE2B f55ac3f5dc18bb5aa0cf5f3fd8eee4cc7697324d3c62902303b36311dac06042b5a497be4beba2a202865cdd5866d37ca74239014ec3c3960847fe9bb3bc873f SHA512 4367ed8b36013e2c68c90d91b83a1929aa602bf82447f9d2382a1ad56f287867da543cdd995ed5791a1ba60f891fbc380afe1ecec983c2184f2050a83eed0fed
DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
-EBUILD galera-25.3.20.ebuild 1816 BLAKE2B 6699e5f545d51d15f7b82c17ce56fa5733a817a820a80ab6b84e16f7eef3bf88baf6ebcae54af0f06072a2e299b83d8a87478271efd378fa2d19fa70c11e148b SHA512 ac38b5e8a74494baebc889fe312eca034dc7637c3aab2ccc560f6e8ac4d81e95e36e9a08b8f2a11e8020fc4c8e01a5b2fcb2d0d453d51c6b94a644f7f853fb4b
-EBUILD galera-25.3.21.ebuild 1828 BLAKE2B 01cf04ad9d25318480f7d44242c4295ca49bdbf4de6f7d5650707e323a57fe0fe0883057d7a3aef7729c4485a65eca51ae45797c97a3c47b283150ab848a9d9b SHA512 701753adad3fe6556f18d53990f0fb8eb9acc8625dff14b6ce2666e168ae19b68f78d08935ff735fbca8ac93102549ebc0bd46aea17a1effb9d64de67a0a4a84
-EBUILD galera-25.3.22.ebuild 1824 BLAKE2B 9a0b5ca6268fa6b82920323d801a7fb5d4b3b497b950e777bbfbe7264407655b81c25ac2817bc84db7e1deb45bfc3e8ccfa611a87b97e7b91877d0dd450ffcd8 SHA512 e6e1126a523a996d99ed0286ef1ef04005eb48d9e99300e421dcdb7330fe8823c91f8eb22138af0a5b51256b1ffbb6c1420ca6487fbfbd12d805faebf4aeea57
-EBUILD galera-25.3.23.ebuild 1812 BLAKE2B 1f9944a4972c29adad2c1e74113155366e073af5c90d25bea7323aa0f1295bb74a66b0e0b1fe6bb2dbf97b8ee386fedd1f63b175862768563de9f1813783ec6f SHA512 94bb2004d6579ec099864fcd312867e87b4ee3b09ef7f849b5fa4d2065ee0d9dfcf2b9399210a28c6712c2c972df0c7cd1886c5bc627fb3344c2d83c761fa717
+EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae
MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.20.ebuild b/sys-cluster/galera/galera-25.3.20.ebuild
deleted file mode 100644
index 08d698fa170c..000000000000
--- a/sys-cluster/galera/galera-25.3.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.10.1[ssl]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export CC CXX
- # Uses hardware specific code that seems to depend on SSE4.2
- if use cpu_flags_x86_sse4_2 ; then
- append-cflags -msse4.2
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- ssl=1
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.21.ebuild b/sys-cluster/galera/galera-25.3.21.ebuild
deleted file mode 100644
index b81600aef42d..000000000000
--- a/sys-cluster/galera/galera-25.3.21.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.10.1[ssl]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export CC CXX
- # Uses hardware specific code that seems to depend on SSE4.2
- if use cpu_flags_x86_sse4_2 ; then
- append-cflags -msse4.2
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- ssl=1
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.22.ebuild b/sys-cluster/galera/galera-25.3.22.ebuild
deleted file mode 100644
index 2800a6fdeeb3..000000000000
--- a/sys-cluster/galera/galera-25.3.22.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.10.1[ssl]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export CC CXX
- # Uses hardware specific code that seems to depend on SSE4.2
- if use cpu_flags_x86_sse4_2 ; then
- append-cflags -msse4.2
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- ssl=1
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild
index 13c2d41fc3fa..bcb3d49b1677 100644
--- a/sys-cluster/galera/galera-25.3.23.ebuild
+++ b/sys-cluster/galera/galera-25.3.23.ebuild
@@ -25,6 +25,7 @@ DEPEND="${DEPEND}
dev-libs/check
>=sys-devel/gcc-4.4
>=dev-cpp/asio-1.10.1[ssl]
+ <dev-cpp/asio-1.12.0
"
#Run time only
RDEPEND="${CDEPEND}"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index d14ed145fbc0..0d16485bb0c6 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -7,7 +7,7 @@ DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a7602
DIST keepalived-2.0.4.tar.gz 845498 BLAKE2B f05b25b04e1dddbf5f6a90de6b4088b7fbd453f628130343f0688147ae40094e74a0892f3c30d91e41bad31c029692e7a1be6462d2906cdf53e4b82a98b4935c SHA512 b5df152b49a7b5187612b8719328c05fada57e8625c0e8053261c1d5f7afd09cc9b67200052d7a58ce596d1c718915109f5a9bf03520d80e0710157e938f72fb
EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
EBUILD keepalived-1.3.5.ebuild 1532 BLAKE2B 273a9f41e4a1d190a6ffd882b230f95fdc536cfc7d92a1b1b8f0e465165d80de282a6f4bc1d2450b6cecf6ea6086384602e6f8d8a639ff0fba9ba1f4b6cb1b57 SHA512 79052c15fd3329bb2493fb5833d951f70620d04cbe4077964416a029fe9ec953732061f751913b35c7c64a1f73c230a6d0691454d18ba9610270578397fc52f8
-EBUILD keepalived-1.4.3.ebuild 1590 BLAKE2B d478eed6ad58e06e3c08ae6f9086fa40787782fbff2f2da76b281605d8d02c84200e72da948a6ad959b1883e35df3a5d311e01ace955cae20b6f3168494405d6 SHA512 0d977c7098c262f7b537d2e463e6f5f9f7706b7867c863793db0441795082e6d143cb7fcd682fbc1dd7e0577677154c5c5e257bc489dff4be45d18eabcf5c6e5
+EBUILD keepalived-1.4.3.ebuild 1589 BLAKE2B 8904f68eff7b87dc34c43f1fd1b4aa997b00601f9e37335e772dbae16c171a3c713ba8fafe1d983c82b351ad6b94406bd21a8f6aed73dd1888cb6a5b5389fa6e SHA512 c5d39527428ece9df892c8ba92cc9c344c5bdfca2f42ca224d4693aa5f80fb47ab890086d461fa0a0567842896cb495f79409f3a8093cd4d365ab9f76432373b
EBUILD keepalived-1.4.5.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
EBUILD keepalived-2.0.4.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.4.3.ebuild b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
index 3b2f25d06b77..a7ddf6aa5a94 100644
--- a/sys-cluster/keepalived/keepalived-1.4.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE="dbus debug ipv6 -json snmp"
RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 8077c7b88e05..e72c6c72e99f 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,10 +3,12 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
EBUILD kube-controller-manager-1.10.4.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
EBUILD kube-controller-manager-1.10.5.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.11.0.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
EBUILD kube-controller-manager-1.9.9.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
new file mode 100644
index 000000000000..3a0b835d0991
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 7b169c7c2933..a3252ac8c331 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,10 +3,12 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
EBUILD kube-proxy-1.10.5.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.11.0.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
EBUILD kube-proxy-1.9.9.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+ keepdir /var/log/${PN} /var/lib/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index c37b3d7f64ba..d3885553cac4 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,10 +3,12 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
EBUILD kube-scheduler-1.10.4.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
EBUILD kube-scheduler-1.10.5.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
+EBUILD kube-scheduler-1.11.0.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
EBUILD kube-scheduler-1.9.9.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
new file mode 100644
index 000000000000..576989d30fd3
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index eadfe1b73d49..77e9037e0487 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,10 +3,12 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
EBUILD kubelet-1.10.5.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.11.0.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
EBUILD kubelet-1.9.9.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.11.0.ebuild b/sys-cluster/kubelet/kubelet-1.11.0.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.11.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+ keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3f7b7d93c6e7..d8589880ed7d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
Binary files differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 20f5ee639504..7650490e8e52 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -89,6 +89,6 @@ EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a
EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B 22b567881a1abbccc5622724141d50c5344c3da7c02ed58d59775e1b0861d556a01bf06de3908115f47d22a204468850a8a57f9e088ad241f05bb004a6bad295 SHA512 c5638c9a78270e06db2423acd6a5a109befb0b883d569ed8978ecd6c7755ecce5ff3450a91ee2fe12a3dda88717b31364dce0e621cd475307dec18f204fc8cfe
EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6
EBUILD gcc-6.4.0-r2.ebuild 593 BLAKE2B 818b2c9e89d0309b5c12b6eda290f40607e2a2cbd456072eaefe9409c3140c614bd2e30618d7204fa0b7caf54f8754a007c17263f3f3e53def586a83d4fe717e SHA512 6ee2a73319826a51d2db816490a04a2c2ce740570089c3bd711243b8b1561b6b14aa7eacb3eaefccd867a1e18d32749b45f1f7c865c3568b62a0fc21dbbcc76e
-EBUILD gcc-7.3.0-r3.ebuild 539 BLAKE2B 868c3dbd2458e8cd8f6ac7b863ca67c12bfc83b5b3f4991ea104b6a8839f638c697a5f168c430cc330e984e316f2a890b4d110a994fda81a472cb487abf7b4d0 SHA512 7c5f6057ba6b8dd451aed54f0262bd080b3a06f458cb845cf08b4e46b3a0881e669485ea05246234210a500ce3efa2b445d98b9f0e558210de25c53e816f8d95
+EBUILD gcc-7.3.0-r3.ebuild 538 BLAKE2B 30fcecbad082dced4b8df9153c47d1a5790279f431861fcf0a8c4ed42a7664aba2de7ea21f6a8ba6b4a7ff40532b08f0997d87446ab3ea1453415fb277e2fe00 SHA512 5d78ec61508df750fdc93eb412214027ee8355f8fb10c371432fe338b8a6a7c49b171d161f22dec3a7a0cfa3bf0b40d751315ec73c653be0e3a358735558f4c5
EBUILD gcc-8.1.0-r3.ebuild 577 BLAKE2B 891a45aa2515e3769f2ae7ec6c618a8cfcf88b9f2832a4f19ae477231823f3fb7d15234b4fcd225e3c51fe6e4c2a445f3a07417529c98c81792fb1550a484ea1 SHA512 3442b806a35ab0f04fe34771c885ee64f7bf218743ad8281c6e8739857ad7145fd4ffe73418378523dc3df1bdb24b423435a45b8b44029cf548b77677c97515e
MISC metadata.xml 2591 BLAKE2B ac029d38d0b2001f9d21214ccd272347f16f541cae5b86a00aa24802af42cc5e85a6447c854ca540274b991c77112b6083fd710209a785638ad64f0d4c78292a SHA512 3691a50f215303f18c8624852dba09f9486fc3818a9dac770c1e4c1a4be15b1bc5291e2584ed7e48510160ce264e1eef26126c075cc7d09b62e1963cc84edc7d
diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 4e4bff32b6d7..ffa5df4593ad 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
inherit toolchain
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c18588eb6a3a..9202dbe4ac9a 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -13,7 +13,7 @@ EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed5
EBUILD gdb-8.0.1-r1.ebuild 7008 BLAKE2B ccb35ca9316b0df5e6940036c33de7bbf2f8dd86ebbe093128595f3f7b8619ea61d59481feb1e49e11a4260f3137d523989b977f01953cfc37204151e2e65704 SHA512 17253bdfb5c2e9976a1f8a6e88fa854d4fc8cbb8b73173f19283a1beec2bf3691b0dad2b4938b2e9d4755a3775945104120ce280fba5fd99b8db63d23adb140a
EBUILD gdb-8.0.1.ebuild 7001 BLAKE2B 51ee8a28536516b731e510f295fa337d380bc70cbcbddbf6f0f6c03c96feb37f59f873d024823da267152f1a8b5f3e7bc1c9cb977e06b8e02335e66845df1f0b SHA512 ee436fa97e4d7921689115c3aef6d2380d87929b559e5654989727bd5a9c220258df6f9cf0974c02f9518458b3c791e285bbe995cd00d36044be748fc5b3c899
EBUILD gdb-8.0.ebuild 6817 BLAKE2B 71e593bb7f4f2b9b4d3b3b0eef223c6e0084b2f71ae38ce5035e0e72e3056538087481e8448730a06a35d4f3c307244ff1e68ebd480a3afbd48e030ad352b74a SHA512 1e7cbeb9b79cb2090698fbce6e212f87061db60c25efd9ddeee5db0997607bfb65be8bb22eff5f293adde9601304b9015ab6387fef4b590b618772f317b0edb2
-EBUILD gdb-8.1-r1.ebuild 7127 BLAKE2B b0435fbd2729aaa714da716334bbce1f8336d391f539c9d70153ffe61f53d6475b81581712cc4c416a4c4fa1b0be66054c07a85c7c87584cfbdb7781e553b215 SHA512 31801015fdf97646c933b0172a585e5be607c5a2d9a047dd417bf1b5093f36741f22657585062dc8fcab7e83f8d87bc5851bdc5de3e0caaf570805c301b0945c
+EBUILD gdb-8.1-r1.ebuild 7126 BLAKE2B 9011c0cc4ad54ccf9be48378c9ff7c163eb62fd0f417530fed52c043dc85e3f6b4d62e99da24493e51a7534be4cc8a3947254edd9bdb2414b3e4e871468f7072 SHA512 632e224626829dc12facb8359697d74eb210fd0bfb8cb3971764d2ac546452e1e9b09027ff39bdba73ac74824f50e89d4fff3c94b65a5a65e9fa1691eb81027b
EBUILD gdb-8.1-r2.ebuild 7122 BLAKE2B 1153eb28162a2d14a4bc5b55e14f599f63426e6facb568ccd134d20a6787aa51bd87c43a02420245eb52578766802ed39fed6694662b099d863ce20d25479c3c SHA512 28da5ca5c834b0d13d1d56c2c7d157fcbad64b5dd85be7f469f2069aff258a80ae3803e7c0719bef4a31892f11944dad431a1eb5b4abe822b077dd55e80233e2
EBUILD gdb-8.1.ebuild 7101 BLAKE2B 8397bec2c3686234fcfd01e853dbd4cc81441bc088f0eba6ccb928c4a7ae387f57d0ca207d0ccb178f144bd95550d4636a9af927a827e6ddf90d6ce59f9c69f4 SHA512 92519800772fae8b3ca8a35c25c241f8b5df2843e3acf834cacd3cd7e9fd752712e2b2c8d9299e20462a98ce414151ef16766414bb0a2435dd45fdc560e25090
EBUILD gdb-9999.ebuild 7093 BLAKE2B 1a908012e31ea0be096d8df0e564d835e0318d7c4747e157d2f25c32b2126181c437980b83ea48d228573d8349bf7f9c368e6c92c40d7c7ac1d183d6dfb17f50 SHA512 47d87dd4193e490fa95257bdc98bbb60ca3825024f46aee682b155717d3018fd555694c527ae5a42bcfcb9bf2891471e7eedd3b6d5358a4426ea5e58e68ab9b1
diff --git a/sys-devel/gdb/gdb-8.1-r1.ebuild b/sys-devel/gdb/gdb-8.1-r1.ebuild
index a98d71a9625d..c31689b222a9 100644
--- a/sys-devel/gdb/gdb-8.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.1-r1.ebuild
@@ -60,7 +60,7 @@ SRC_URI="${SRC_URI}
LICENSE="GPL-2 LGPL-2"
SLOT="0"
if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client lzma multitarget nls +python +server test vanilla xml"
REQUIRED_USE="
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 104893998a6d..4ceffefaa256 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
Binary files differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 2906f479e702..77e2afb15af2 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,7 +1,4 @@
-DIST intel-microcode-collection-20180616.tar.xz 4413444 BLAKE2B 4ba5371914f64c8a7261720512dff128f83cc25950a4bdf8d41e9eeb724c6d3150212b1a7f2ee966a2b9c835a2622ac885625fada497ec2bc0aa3c435a2968e8 SHA512 5c0cd4e764397f8c2593153256d573db8f57cce1fc062f5e687a108e5a430c7ed506f63d0d324ea2b88cc8bf8762d3fec507252ee9890c55bb9d3b5604151afe
DIST intel-microcode-collection-20180630.tar.xz 4456400 BLAKE2B 493229bb8ce65c62b4a894a219bd89e677a5908a774e1104389335f88fe27479de8e117bbd3b1c5bd1d9e70ed0f1c79ddba684357138dbb559141d48d5a3c456 SHA512 66a1217514c43dcc308cc1e9e4737041c48cad85cd846a9adaabd5885197ffffca3fef71c43ccdaaf25d10df747a3c3e837d95ae332d53961579e4bb3c1f0bed
-DIST microcode-20180425.tgz 1565473 BLAKE2B 70e0a56f0f5f720e00ab18d6553bc221147589e83df34fdc0c130c6f74a239e48355bfe1845b1de919ed1bce9ade7b7db298883eb3de1d53732a694b15d76f62 SHA512 6cea53cc0f486891fb9ddffc1e03e8e0a6d1d91df6bfda81250b2c60714e7b4111caa9df5afa7f13d8144e591550ef7eb4fd1e153fc67fc904afb83ccc2e3bb0
DIST microcode-20180703.tgz 1550181 BLAKE2B edf86dcc8dedeffd22a9b608cc11e5b043d36617ae6325e14326d402388f42ead29c8483a0312ab9ea2015604803cc07506d6f119b314b922639a71f9d65a39d SHA512 25af4158f97fba2fb88f05a44f42ed7d2415001ccc58f573d366f405ff198472517468f619628f4f6e5a371793c41ea8faf5a932d2362b2a51726bb5c84e0eed
-EBUILD intel-microcode-20180616.ebuild 7246 BLAKE2B e3fd6eddc68b5c98d263f4d546e9c0c590f79c735ce9ef9fb3c76eb17857784fc95823bfab26f461b8c97f42dd82d2f38605d0c7b00c0f2b9ef93073be8229fa SHA512 d97ffa0cee802f5fcd0a720d6609aab76d16f73f36cc5c19d8c886777af43b160bee50a9f5e1ef935d96b9730d08da63831341c9921cff6fcc8db177a8c22269
-EBUILD intel-microcode-20180703.ebuild 7248 BLAKE2B c005f7d181dcfe9eca405d32ac7598cebca3b54ad8580c411e78c210763525dc2ff262792fb3780fd4de41afcd58d3d312f662704ab4181e37afdfa7a68e0401 SHA512 d57879fe4b65dd3118751c67b9d53e18407c2bdd28549c6fc03c2498fa116f0f1d903656878715b8c9448e808072f99f471627634034d377ec4ddcb2e943b1f8
+EBUILD intel-microcode-20180703.ebuild 7246 BLAKE2B 719e23809172ca9598400586b8919f36cfaed57c37421f373544d4da7e3653acd147a405ec6bd244842a474deb7cb412587651c68951ac9b341fe2636516812d SHA512 a33b6287ec3edc6f59fa0d0d6e158a29ddbb6eaf4809ae6a2fe125f5894da31a62dcf0c219cc20d22473bf96650cb78393bbf6d74494ed65433f644b6f8ce2bf
MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
deleted file mode 100644
index 66dbdc30dc6a..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="20180616"
-INTEL_SNAPSHOT="20180425"
-NUM="27776"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
- https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
- hostonly? ( sys-apps/iucode_tool )"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
-
-pkg_pretend() {
- if [[ "${MICROCODE_BLACKLIST}" != "${MICROCODE_BLACKLIST_DEFAULT}" ]]; then
- ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
- fi
-
- if [[ "${MICROCODE_SIGNATURES}" != "${MICROCODE_SIGNATURES_DEFAULT}" ]]; then
- ewarn "The user has opted in for advanced use:"
- ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
- fi
-
- use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
- default
-
- # Prevent "invalid file format" errors from iucode_tool
- rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
- # This will take ALL of the upstream microcode sources:
- # - microcode.dat
- # - intel-ucode/
- # In some cases, they have not contained the same content (eg the directory has newer stuff).
- MICROCODE_SRC=(
- "${S}"/intel-ucode/
- "${S}"/intel-ucode-with-caveats/
- )
-
- # Allow users who are scared about microcode updates not included in Intel's official
- # microcode tarball to opt-out and comply with Intel marketing
- if ! use vanilla; then
- MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
- fi
-
- opts=(
- ${MICROCODE_BLACKLIST}
- ${MICROCODE_SIGNATURES}
- # be strict about what we are doing
- --overwrite
- --strict-checks
- --no-ignore-broken
- # we want to install latest version
- --no-downgrade
- # show everything we find
- --list-all
- # show what we selected
- --list
- )
-
- # The earlyfw cpio needs to be in /boot because it must be loaded before
- # rootfs is mounted.
- use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
- # split location (we use a temporary location so that we are able
- # to re-run iucode_tool in pkg_preinst; use keepdir instead of dodir to carry
- # this folder to pkg_preinst to avoid an error even if no microcode was selected):
- keepdir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
-
- iucode_tool \
- "${opts[@]}" \
- "${MICROCODE_SRC[@]}" \
- || die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
- dodoc releasenote
-}
-
-pkg_preinst() {
- use initramfs && mount-boot_pkg_preinst
-
- if use hostonly; then
- einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=hostonly ..."
- opts=(
- --scan-system
- # be strict about what we are doing
- --overwrite
- --strict-checks
- --no-ignore-broken
- # we want to install latest version
- --no-downgrade
- # show everything we find
- --list-all
- # show what we selected
- --list
- )
-
- # The earlyfw cpio needs to be in /boot because it must be loaded before
- # rootfs is mounted.
- use initramfs && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
- # split location:
- use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
- iucode_tool \
- "${opts[@]}" \
- "${ED%/}"/tmp/intel-ucode \
- || die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
-
- else
- if use split-ucode; then
- # Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
- dodir /lib/firmware
- mv "${ED%/}/tmp/intel-ucode" "${ED%/}/lib/firmware" || die "Failed to install splitted ucodes!"
- fi
- fi
-
- # Cleanup any temporary leftovers so that we don't merge any
- # unneeded files on disk
- rm -r "${ED%/}/tmp" || die "Failed to cleanup '${ED%/}/tmp'"
-}
-
-pkg_prerm() {
- use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
- use initramfs && mount-boot_pkg_postinst
-
- local _has_installed_something=
- if use initramfs && [[ -s "${EROOT%/}/boot/intel-uc.img" ]]; then
- _has_installed_something="yes"
- elif use split-ucode; then
- _has_installed_something=$(find "${EROOT%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
- fi
-
- if use hostonly && [[ -n "${_has_installed_something}" ]]; then
- elog "You only installed ucode(s) for all currently available (=online)"
- elog "processor(s). Remember to re-emerge this package whenever you"
- elog "change the system's processor model."
- elog ""
- elif [[ -z "${_has_installed_something}" ]]; then
- ewarn "WARNING:"
- ewarn "No ucode was installed! You can ignore this warning if there"
- ewarn "aren't any microcode updates available for your processor(s)."
- ewarn "But if you use MICROCODE_SIGNATURES variable please double check"
- ewarn "if you have an invalid select."
- ewarn ""
-
- if use hostonly; then
- ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
- ewarn ""
- fi
- fi
-
- # We cannot give detailed information if user is affected or not:
- # If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
- # to to force a specific, otherwise blacklisted, microcode. So we
- # only show a generic warning based on running kernel version:
- if kernel_is -lt 4 14 34; then
- ewarn "${P} contains microcode updates which require"
- ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
- ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
- ewarn "can crash your system!"
- ewarn ""
- ewarn "Those microcodes are blacklisted per default. However, if you have altered"
- ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
- ewarn "re-enabled those microcodes...!"
- ewarn ""
- ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
- ewarn "requires additional kernel patches or not."
- fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild
index a9113dcbc00e..e960379c77aa 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}
LICENSE="intel-ucode"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE="hostonly initramfs +split-ucode vanilla"
REQUIRED_USE="|| ( initramfs split-ucode )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c49d782ca908..04fa80f007a4 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
Binary files differ
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index d1dbfeb0cd94..da2737dd5f1c 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,7 +1,6 @@
-DIST btrfsmaintenance-0.3.1.tar.gz 19698 BLAKE2B f792d7e55dd738b4be2f18aa4047c8b2c092244b71c50e32cf881a7862b14a2d897a170515388fcee40a89763c4c91d357ca3ceb559e372ca3c673d0b1d3aec2 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb
+AUX fix-btrfs-defrag.patch 298 BLAKE2B 3fb4d86066af4a09701494c82b1aa595d7a8989732c12e0aa41cfe9c4faf1f03a5a9b2e8b74b06118e4d789fd914a0f142af1ef4b877d9a99d0d1aa89b429a81 SHA512 5305f9e7d7b80f901c6a8a9a52d6a08cfa38a720b590f9413a621604fe6f468d7259491ebb08e8dd87a2fd5274bc9d493d2e47a6b642e535114fd8a3b3a9a5e6
DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
-EBUILD btrfsmaintenance-0.3.1.ebuild 1381 BLAKE2B c3dcf441fb735792133f6dca9a5bdf5d2cb76d03fc46540a2ac87ea0211b83027249706c6eb55494aaab223ac222c0e3dfd65d09cfa169c37b950436daa46a59 SHA512 f681469cc0db852d21625736f3ecca7cd745c2dae6ef3d2d1b7ca1a4cf51645e904346ab18ce0d19abcd5b372aa40d42822629c9e113dd7fee856e7481b5c2c6
-EBUILD btrfsmaintenance-0.4.1.ebuild 2008 BLAKE2B ad5bf783282a0eb8a58b3d059d8996dfd7c4b374ccf21f80379cab09c0bd4c90b02d205f6849f3e2d8416227118524fddf935591c4756ab1c02559eb785d986c SHA512 0a40cef065c104f976241a80bc4377d07eeb8f8f9a4920e650127d897e1e64fa77bdb601c709ac23014b1e0c9a77884b9d96112bb1fdf13b8f9ec22563038967
+EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
deleted file mode 100644
index 7e5966d6ecfd..000000000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- sys-fs/btrfs-progs
- virtual/cron"
-
-src_install() {
- dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
- insinto /etc/default
- newins sysconfig.btrfsmaintenance btrfsmaintenance
- insinto /usr/share/btrfsmaintenance
- doins btrfsmaintenance-functions
- exeinto /usr/share/btrfsmaintenance
- doexe btrfs*.sh
- insinto /usr/lib/systemd/system
- doins btrfsmaintenance-refresh.service
-}
-
-pkg_postinst() {
- elog "Installing default btrfsmaintenance scripts"
- "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
- elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance"
- elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
- elog "update cron symlinks"
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} ]] ; then
- elog "Removing symlinks from btrfsmaintenance cron tasks"
- "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
- fi
-}
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..6290c1a9ccc1
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="systemd"
+
+RDEPEND="
+ sys-fs/btrfs-progs
+ virtual/cron
+ systemd? ( sys-apps/systemd )
+"
+
+PATCHES=(
+ "${FILESDIR}/fix-btrfs-defrag.patch"
+ )
+
+src_prepare() {
+ # Fix config path into watching service
+ sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+ die "Unable to patch btrfsmaintenance-refresh.*"
+ default
+}
+
+src_install() {
+ dodoc README.md CONTRIBUTING.md CHANGES.md
+ insinto /etc/default
+ newins sysconfig.btrfsmaintenance btrfsmaintenance
+ insinto /usr/share/btrfsmaintenance
+ doins btrfsmaintenance-functions
+ exeinto /usr/share/btrfsmaintenance
+ doexe btrfs*.sh
+ systemd_dounit *.service *.timer *.path
+}
+
+pkg_postinst() {
+ elog "Installing default btrfsmaintenance scripts"
+ if use systemd; then
+ "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+ else
+ "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+ fi
+ elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+ elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+ elog "update cron symlinks or run"
+ elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+ elog "to update systemd timers."
+ elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+ elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ elog "Removing symlinks from btrfsmaintenance cron tasks"
+ "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+ fi
+}
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild
deleted file mode 100644
index 1a84583a1cbd..000000000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )
- sys-fs/btrfs-progs
- virtual/cron"
-
-src_prepare() {
- # Fix config path into watching service
- sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
- die "Unable to patch btrfsmaintenance-refresh.*"
- default
-}
-
-src_install() {
- dodoc README.md CONTRIBUTING.md CHANGES.md
- insinto /etc/default
- newins sysconfig.btrfsmaintenance btrfsmaintenance
- insinto /usr/share/btrfsmaintenance
- doins btrfsmaintenance-functions
- exeinto /usr/share/btrfsmaintenance
- doexe btrfs*.sh
- systemd_dounit *.service *.timer *.path
-}
-
-pkg_postinst() {
- elog "Installing default btrfsmaintenance scripts"
- if use systemd; then
- "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
- else
- "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
- fi
- elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
- elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
- elog "update cron symlinks or run"
- elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
- elog "to update systemd timers."
- elog "You can also enable btrfsmaintenance-refresh.path service in order to"
- elog "monitor the config files changes and update systemd timers accordly."
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} ]] ; then
- elog "Removing symlinks from btrfsmaintenance cron tasks"
- "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
- fi
-}
diff --git a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
new file mode 100644
index 000000000000..4dc5fd6b1d92
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
@@ -0,0 +1,12 @@
+diff --git a/btrfs-defrag.sh b/btrfs-defrag.sh
+index 284abc8..5ced921 100755
+--- a/btrfs-defrag.sh
++++ b/btrfs-defrag.sh
+@@ -15,6 +15,7 @@ if [ -f /etc/default/btrfsmaintenance ] ; then
+ fi
+
+ LOGIDENTIFIER='btrfs-defrag'
++. $(dirname $(realpath "$0"))/btrfsmaintenance-functions
+
+ {
+ OIFS="$IFS"
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 17b71bb54731..b15814e9b51f 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -7,10 +7,10 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
-DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
+DIST e2fsprogs-1.44.3.tar.gz 7570472 BLAKE2B be713a388e3de73c0f21c85ababcf0a63aa654c988106bd38b21db6d4566915afb201ce1a3c6d55c9a300880e2b39b1702e8463c478bad51749482f379e4d844 SHA512 6203a24e5149de5b6d44cc158f9ed1d87c3083a2b41c5249ceb09fb3cdf795ab3839d7d8ce73d4b0e11d4c505b961ff8cbf0de45b9aab0a03d504750fc7da885
EBUILD e2fsprogs-1.43.6.ebuild 3792 BLAKE2B 6eed219723a8af06340afd9b2d483e663634ff96add9e073270c91ab4011b0fe531466d488b796d423f8b51d1440c7b09bdea5e33a03c6c41ad26483c4cfc2f0 SHA512 ac14f85a1926ce45994ddc07fd61ead5287341aa77826d28c6f350d9a2c0037629f3f239f0792458b9b448532850bf29bbe16059d6b7d2365a3e012433533c01
EBUILD e2fsprogs-1.43.9.ebuild 3815 BLAKE2B 5ff7acc3f08ec6c96730e18f5660b49f996e28cbca389f07997965220fbfec2501c97fcb8b6c50a2ce6ff8518515ad12cc9ecfda35eccc4739a4b8876313f6ac SHA512 0e2966f93d6bbaa2ce99af63fc2552f0bf931f3829a1d47be1e2e1a95a7bb2e99bb46add48e5733cdc09da9364bb7ff97f71353ee602fd30fd3a3140e17de47d
-EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
EBUILD e2fsprogs-1.44.2.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
+EBUILD e2fsprogs-1.44.3.ebuild 3820 BLAKE2B e1d9d4528bed4566955743a32f5c3871faddf6d5bb0790f6e63f3e4f9c161c4b0231956b805cfd54713586fffccb8d8429acbf4a14db4ba298c1c5af63f24f69 SHA512 13334fd36ad01576cb09d04cde5fa4afbc377db4a77cdedb230172ffb137a5a762301d68ae0279247f4ecd9a789bad58f8b83b6493821c455f6dd78b8a2638d0
MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
deleted file mode 100644
index 76d036d2679c..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*) UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
- mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
- elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
-IUSE="fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
- >=sys-apps/util-linux-2.16
- fuse? ( sys-fs/fuse:0 )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- sys-apps/texinfo"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.41.8-makefile.patch
- "${FILESDIR}"/${PN}-1.40-fbsd.patch
- "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
- # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
- if [[ ${CHOST} == *-mint* ]] ; then
- PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
- fi
-
- default
-
- # blargh ... trick e2fsprogs into using e2fsprogs-libs
- rm -rf doc
- sed -i -r \
- -e 's:@LIBINTL@:@LTLIBINTL@:' \
- -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
- -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
- MCONFIG.in || die "muck libs" #122368
- sed -i -r \
- -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
- Makefile.in || die "remove subdirs"
- ln -s $(which mk_cmds) lib/ss/ || die
-
- # Avoid rebuild
- echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
- # Keep the package from doing silly things #261411
- export VARTEXFONTS="${T}/fonts"
-
- # needs open64() prototypes and friends
- append-cppflags -D_GNU_SOURCE
-
- local myeconfargs=(
- --with-root-prefix="${EPREFIX}/"
- --enable-symlink-install
- $(tc-is-static-only || echo --enable-elf-shlibs)
- $(tc-has-tls || echo --disable-tls)
- --without-included-gettext
- $(use_enable fuse fuse2fs)
- $(use_enable nls)
- --disable-libblkid
- --disable-libuuid
- --disable-fsck
- --disable-uuidd
- )
- ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
- if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
- eerror "INTL sanity check failed, aborting build."
- eerror "Please post your ${S}/config.log file as an"
- eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
- die "Preventing included intl cruft from building"
- fi
-}
-
-src_compile() {
- emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
- # Build the FreeBSD helper
- if use elibc_FreeBSD ; then
- cp "${FILESDIR}"/fsck_ext2fs.c .
- emake V=1 fsck_ext2fs
- fi
-}
-
-src_install() {
- # need to set root_libdir= manually as any --libdir options in the
- # econf above (i.e. multilib) will screw up the default #276465
- emake \
- STRIP=: \
- root_libdir="${EPREFIX}/usr/$(get_libdir)" \
- DESTDIR="${D}" \
- install install-libs
- dodoc README RELEASE-NOTES
-
- insinto /etc
- doins "${FILESDIR}"/e2fsck.conf
-
- # Move shared libraries to /lib/, install static libraries to
- # /usr/lib/, and install linker scripts to /usr/lib/.
- gen_usr_ldscript -a e2p ext2fs
- # configure doesn't have an option to disable static libs :/
- if ! use static-libs ; then
- find "${D}" -name '*.a' -delete || die
- fi
-
- if use elibc_FreeBSD ; then
- # Install helpers for us
- into /
- dosbin "${S}"/fsck_ext2fs
- doman "${FILESDIR}"/fsck_ext2fs.8
-
- # filefrag is linux only
- rm \
- "${ED%/}"/usr/sbin/filefrag \
- "${ED%/}"/usr/share/man/man8/filefrag.8 || die
- fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
new file mode 100644
index 000000000000..306a1bb38a03
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*) UP_PV=${PV} ;;
+esac
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+ mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+IUSE="fuse nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+ >=sys-apps/util-linux-2.16
+ fuse? ( sys-fs/fuse:0 )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+ sys-apps/texinfo"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.41.8-makefile.patch
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+ # Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+ if [[ ${CHOST} == *-mint* ]] ; then
+ PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+ fi
+
+ default
+
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs
+ rm -rf doc
+ sed -i -r \
+ -e 's:@LIBINTL@:@LTLIBINTL@:' \
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+ MCONFIG.in || die "muck libs" #122368
+ sed -i -r \
+ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+ Makefile.in || die "remove subdirs"
+ ln -s $(which mk_cmds) lib/ss/ || die
+
+ # Avoid rebuild
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+ # Keep the package from doing silly things #261411
+ export VARTEXFONTS="${T}/fonts"
+
+ # needs open64() prototypes and friends
+ append-cppflags -D_GNU_SOURCE
+
+ local myeconfargs=(
+ --with-root-prefix="${EPREFIX}/"
+ --enable-symlink-install
+ $(tc-is-static-only || echo --enable-elf-shlibs)
+ $(tc-has-tls || echo --disable-tls)
+ --without-included-gettext
+ $(use_enable fuse fuse2fs)
+ $(use_enable nls)
+ --disable-libblkid
+ --disable-libuuid
+ --disable-fsck
+ --disable-uuidd
+ )
+ ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+ if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+ eerror "INTL sanity check failed, aborting build."
+ eerror "Please post your ${S}/config.log file as an"
+ eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+ die "Preventing included intl cruft from building"
+ fi
+}
+
+src_compile() {
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+ # Build the FreeBSD helper
+ if use elibc_FreeBSD ; then
+ cp "${FILESDIR}"/fsck_ext2fs.c .
+ emake V=1 fsck_ext2fs
+ fi
+}
+
+src_install() {
+ # need to set root_libdir= manually as any --libdir options in the
+ # econf above (i.e. multilib) will screw up the default #276465
+ emake \
+ STRIP=: \
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" \
+ install install-libs
+ dodoc README RELEASE-NOTES
+
+ insinto /etc
+ doins "${FILESDIR}"/e2fsck.conf
+
+ # Move shared libraries to /lib/, install static libraries to
+ # /usr/lib/, and install linker scripts to /usr/lib/.
+ gen_usr_ldscript -a e2p ext2fs
+ # configure doesn't have an option to disable static libs :/
+ if ! use static-libs ; then
+ find "${D}" -name '*.a' -delete || die
+ fi
+
+ if use elibc_FreeBSD ; then
+ # Install helpers for us
+ into /
+ dosbin "${S}"/fsck_ext2fs
+ doman "${FILESDIR}"/fsck_ext2fs.8
+
+ # filefrag is linux only
+ rm \
+ "${ED%/}"/usr/sbin/filefrag \
+ "${ED%/}"/usr/share/man/man8/filefrag.8 || die
+ fi
+}
diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest
index 75f6194ccbcf..398836ded65f 100644
--- a/sys-fs/extundelete/Manifest
+++ b/sys-fs/extundelete/Manifest
@@ -1,8 +1,4 @@
-AUX extundelete-0.2.0-build.patch 1083 BLAKE2B e1c96c1e5a6b427bfb112f90a53c8a9d00b041ff7b6ddbcb9ab96dc0e7ba24d9c406b8f66e4c843326407f14e933a28a8a08ada91ef585c4e96a61821061f8ed SHA512 e7a4c9497f9c349bf6bcc04bfe643313246dce6f38b7d1e86bf6b9cacb937fb0ef5f56980c17d951a810d7f298ff2348484d8078d081cc084725ff6da50d8f1d
-DIST extundelete-0.2.0.tar.bz2 97851 BLAKE2B 2d8d1a9d96de0a450fa7afa07f3532c3df11f5de36284ebe2114127de9e8431e9d029ab51ef4a59b45bccaf029254a998013e1fcec8479ae1064fec2a907a83e SHA512 2d4b18110795a5318fab5c5889a9b516360ea420215d0a3692322b30e87d5bb3954bbba725a067322cd76e7bba06466032a1405f9fc6dbc3f318723be238b317
+AUX extundelete-0.2.4-e2fsprogs.patch 582 BLAKE2B 12176abdccb06b9ad2a55dac5dabfbef402a95ac00ca28ba951e4fcba024d5f99e0355b1f6f0bf38f6b2878cd190cde6774136c1b0b1bbba27b73fc3d0a7adee SHA512 c0df34bfdef07e931503cc8f3270cd070328b54053da1d8dbfefb8a49a81c4234cbdb4205d30cf654b5d5ca42dd27ad104f08f6ab7839d5f3d0cebc6ec6ef499
DIST extundelete-0.2.4.tar.bz2 108472 BLAKE2B 3627c092672957e25f2bd351a6d92f6d32a0e322a0555766edc35545cccab7ee47fb0c471ebea31692779bdf44433bb98a07cab0bc26141f1f09b33601da57ea SHA512 5c896055b6fa3c38f283a043cca744513fdc1a60e212eac0c78fa868064a8eeb11f540c4cc5ca89ac68da0c1705a40fe45731c203b6748808f85e9870a207bcd
-DIST extundelete_0.2.0-2.1.debian.tar.gz 6862 BLAKE2B 0a453e9f6062064d616ce621e34ca8fc1b6235304073594475cb0f88dbe94efb72807d12cd6b4b1e9faea3025e4bec8cc2522a771732046b310a7311051943c5 SHA512 37b74347a3017edfd28714731125f968f66beac1b7b7ebd1d44e3d3dff9da06216560433f330f4a544da24f7083f6e900fbe8a5c2930e8760405cb72e6a918e3
-EBUILD extundelete-0.2.0-r1.ebuild 536 BLAKE2B 622f212ee0df186ea343b791be9c3b831ab8615e07a040944642644bb46f0fe54d720dcb2da0fa451f83980b9e06a1d4a0e2a4b13b0c539eca4b3f8b9d99bcb7 SHA512 b82f1918c06342a65f49575a01deb966d1bb54ef27b597c02f1f76f09477b721265907975f95e4d1c368095f5a6b360b9615382ada841b492a022e66a91ed072
-EBUILD extundelete-0.2.0-r2.ebuild 691 BLAKE2B 7078c336ae786be96b7451622b98d49a3cb28750da0fdf542dae9bc2d8599a98dbfd3639050591966aab82f6e1b556e08bce357f14ba641cc129e69b645786e7 SHA512 9aa727f0e2e7c6a7f4f9d40f9c0b1ef5e95c11096db8b8e1adb5eeb4dd0ddec8b84b3c16231131122701bf0cc02a951edddc09519642af2463ea57bba56e43de
-EBUILD extundelete-0.2.4.ebuild 475 BLAKE2B 356473168ddb2f13abc64692467f3fa29fe63b6d4b9668634c57f3920d4b650903ec555b1c9b6011e0f85a7cb0e5346b0ba114689a92bae9bec8b642d1ce0195 SHA512 7fe852c3762b56654c1cf17c7cfa7f27eadafc999051a12613a330c2e055c13392d61965a9e4ff902dd0e499a9ef85934a38945fef2a09c9dd0ef50b44092ae1
-MISC metadata.xml 331 BLAKE2B cbd7483af8763169e07af4ead8a51e64d110a5a1847cd1b2663d96b249665463dc3711e4661c2a974ae52f10c951bd2f537567b89fd8c0b7a65b4c1a4b412e5b SHA512 80a20fc119f4dca6944d16d590b6eea94162aa1286c6e797e5c9d29b6782696b00e64d1ec07f6e1f0cf99ce5fa02cccddadb7056abc8997d4919384b3e0b1c09
+EBUILD extundelete-0.2.4.ebuild 470 BLAKE2B 34fafb00384416683c2d2540008d02963b98ab14b08982ffc37a38ca9340cdc315eb9956403d3cfe41676d27cbae15e31425a8bedcbbfd12767bb7d2c4369d5b SHA512 8a5dfe4900521948c22d359fa24af7f7fe4f64673ebb3e716030b0ba7dec9e93420c1d70db0fa5fb9cc93078bbf006c0325db4b3ea48871675d8f3cb9d744f98
+MISC metadata.xml 406 BLAKE2B 4c2a6bafa8e20b7f14cd822c94b18bf99ebdcbfb9716b87bb1300302308d5967dccd75b27d28339846932883461f1451922e6bf42ae3c53b5a0b9746ebc330da SHA512 f09a0ee3a375c3dfe446f24f8295c9bb452dd9b79975646d2ea49ecaf8f71ddb518fbe8681e9bd5fe1265c6c9b9c7cda43d68796c297b244fc81e85da4b0e73b
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
deleted file mode 100644
index 0e929fe3ab72..000000000000
--- a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-_E2FS=1.42
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_E2FS}
- >=sys-libs/e2fsprogs-libs-${_E2FS}"
-DEPEND="${RDEPEND}"
-
-DOCS="README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-}
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
deleted file mode 100644
index 59f1f1bda6e0..000000000000
--- a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-_UNDEL_DEB=2.1
-_UNDEL_E2FS=1.42.6
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${_UNDEL_DEB}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_UNDEL_E2FS}
- >=sys-libs/e2fsprogs-libs-${_UNDEL_E2FS}"
-DEPEND=${RDEPEND}
-
-DOCS=README
-
-src_prepare() {
- local d=${WORKDIR}/debian/patches
- EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
diff --git a/sys-fs/extundelete/extundelete-0.2.4.ebuild b/sys-fs/extundelete/extundelete-0.2.4.ebuild
index c39d376e3b00..cb98d1828d50 100644
--- a/sys-fs/extundelete/extundelete-0.2.4.ebuild
+++ b/sys-fs/extundelete/extundelete-0.2.4.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
+HOMEPAGE="https://extundelete.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT=0
KEYWORDS="amd64 ~arm x86"
-IUSE=""
-E2FSPROGS=1.42.6
-RDEPEND=">=sys-fs/e2fsprogs-${E2FSPROGS}
- >=sys-libs/e2fsprogs-libs-${E2FSPROGS}"
+RDEPEND="sys-fs/e2fsprogs
+ sys-libs/e2fsprogs-libs"
+
DEPEND=${RDEPEND}
DOCS=README
+
+PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" )
diff --git a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch b/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
deleted file mode 100644
index 2bd56ef2bbdf..000000000000
--- a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/402633
-http://projects.archlinux.org/svntogit/community.git/tree/trunk/extundelete-build.patch?h=packages/extundelete
-
---- src/extundelete.cc
-+++ src/extundelete.cc
-@@ -943,3 +943,3 @@
- {
-- group_descriptor_table[n] = fs->group_desc[n];
-+ group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n);
- }
-@@ -2613,3 +2613,4 @@
- inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] );
-- inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] );
-+ inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] );
-+ inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] );
- }
---- src/insertionops.cc
-+++ src/insertionops.cc
-@@ -65,3 +65,3 @@
- os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
-- os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
-+ os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
- os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;
diff --git a/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch
new file mode 100644
index 000000000000..ea0da14f1650
--- /dev/null
+++ b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch
@@ -0,0 +1,11 @@
+--- a/src/insertionops.cc 2012-12-30 18:23:32.000000000 +0100
++++ b/src/insertionops.cc 2018-05-07 22:58:13.065868723 +0200
+@@ -33,7 +33,7 @@
+ os << "File flags: " << inode.i_flags << std::endl;
+ os << "File version (for NFS): " << inode.i_generation << std::endl;
+ os << "File ACL: " << inode.i_file_acl << std::endl;
+- os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++ os << "Directory ACL: " << inode.i_size_high << std::endl;
+ os << "Fragment address: " << inode.i_faddr << std::endl;
+ os << "Direct blocks: ";
+ for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
index a5550604b142..458b539da8fd 100644
--- a/sys-fs/extundelete/metadata.xml
+++ b/sys-fs/extundelete/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<upstream>
- <remote-id type="sourceforge">extundelete</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://sourceforge.net/p/extundelete/tickets/</bugs-to>
+ <remote-id type="sourceforge">extundelete</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 7b7f0b7a24bf..b69bcf6bced9 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -5,7 +5,7 @@ DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d51
DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
DIST fuse-3.2.3.tar.xz 1238628 BLAKE2B 07b073d0af9d8db3b8799d872225f0637351b99bafb5db11b45dab1173101669731de66215a31e2141cfe5aa6d467e87d469f432194ddf7b8d5eb8e10825d679 SHA512 f91ee4b24df64e62d0c50db0bc3807229cfde06da118c87826bc3ee01b41689ec93a96b026226e948e6d7904bb506dc1d8ffa83d29aa12ea7f17009f6060263e
-EBUILD fuse-2.9.7-r1.ebuild 1967 BLAKE2B c520b94126a010188fbe36391efff49287b41216996bc51179fc33bcbcd1830fad0178d1e62cc568460963512cbd5bb0817648bca39d4934748114fd013a9612 SHA512 16beaf9cbef8060d07f26017adab1364731a75870993d87ab807bb3f6f8023e7d62a3e2ed0c8d540d2350353c0555de8590f9ac2eb1bce3078d161a558b2a1d6
+EBUILD fuse-2.9.7-r1.ebuild 1966 BLAKE2B e34936a30ec864d5cbd96365a0d0a03bee6dcc5ade7d7b4689e043be56994a2694d818a07e411e0221d30aeff7eb6d7309190e046d4d4df9e0588c0234df3ae1 SHA512 74025dca9b38d66b45752ca743edb0b5f1b5f8d0d28fd2ce93b84977f487cff4e5c98d87fffbb3a61a365042f2b80ccd75ac95b2fc43aa8624504fe0258834ea
EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c
EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
diff --git a/sys-fs/fuse/fuse-2.9.7-r1.ebuild b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
index b27dc23c1413..822f1b2592de 100644
--- a/sys-fs/fuse/fuse-2.9.7-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
@@ -69,5 +69,5 @@ src_install() {
rm "${ED%/}"/sbin/mount.fuse || die
# handled by the device manager
- rm -r "${ED%/}"/dev || die
+ rm -r "${D%/}"/dev || die
}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index e7daf9f8d455..fdebd6b59e42 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
-EBUILD ncdu-1.13.ebuild 437 BLAKE2B 762f15757e0beb237b5ae0708fc3fd0b11742ed8dcab0d695ae5732ebd13264c80d2c564d202d91988f74e40406beda7b61be189b7da13a5b763584f981e6dff SHA512 fbe604ab44f4dd62d0d7588cb7c5c48a803faecaea328d5e333c54bc81bbe6e880071be00854da6ad8d1c048c4490cc227175c157f44cc0e0c5a9e0a369df128
+EBUILD ncdu-1.13.ebuild 436 BLAKE2B 6315deebd10a847adb2c9f8dd917a0244cadcbee5fce34956fb2d37d820147834d6d418ddd45631b45a9aad54e5ee41e557272bbc066797c285f681975e8ddc0 SHA512 879773bd6c0d1cd05271f1dcc1eb2c2692bc13d8707258cf0635e3b25e4ed451937b3ed3a476217cdb16412ae5a54c0977b2d25511a0f95267537091d6565ec8
MISC metadata.xml 580 BLAKE2B 02c4868a6afb6f72a6e8ce6b2f6310dc05f895f08783d1163601c79f0ffc913f7e8f92cdf4eb53156ab4afba573eb17d0bb5763b0bf6409632b10d948e9e2a1f SHA512 71aa0fba8e2f364b9f4a7da7d50ab86e5534518d84f8a26f08a5738655eb5f335de1da5b373dae93b21610881023b6197ca06cedb3c12f4b7f1a02850bf1729f
diff --git a/sys-fs/ncdu/ncdu-1.13.ebuild b/sys-fs/ncdu/ncdu-1.13.ebuild
index 71f698e8c142..d16fd10811c8 100644
--- a/sys-fs/ncdu/ncdu-1.13.ebuild
+++ b/sys-fs/ncdu/ncdu-1.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index d08cf071b8b6..08333ec15e6f 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -5,5 +5,5 @@ AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b
DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee43f2c1f035d080dde1201746d994e705756ab219de8359b1f8708e83e11c0036cdc33339e54299aa433f383e698e425ff2fed SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15
DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
EBUILD ntfs3g-2016.2.22-r2.ebuild 2461 BLAKE2B d1dce35bb7970bb4c338ec4f37ea4a653a8272eab6f550ee0efe86553d8f0f9c1f1479d647f5c0c0ad1e04b1e5583006539a5cbc776941d6541070c7aaa22835 SHA512 0e97a1235323d44ed6bb994e6160377f16641b15772a3ee84de12d671661a795db09b99d2c3f8dd82545d406a83b2f3465c898b4e7a84c7c5dadfbf56977ecb5
-EBUILD ntfs3g-2017.3.23-r1.ebuild 2372 BLAKE2B 41f6776c6945d39e4c045706fb8d3674fa2fece72644126796770fc8f9ed40cd3d25d6c9f6345ae2fae4f65b870192edf2f5c152ab90f1027745addfa0f40e68 SHA512 9d7413739cd8c1d50f08e0da462080466709c2cbfeb1c2b30f0dbd9dc218f0414b4da01f48f506085c0cdfff76882f4824351141fb6f8fe68307b35dee02b16e
+EBUILD ntfs3g-2017.3.23-r1.ebuild 2371 BLAKE2B 97c63e80c8a04f5e4c0baa78c8735032eb834ff2554be8bc786fb7669dfe9f28e1652cffc5443d5ae00e9780c3063de4a64019677eaf7fc88919df6b1b493604 SHA512 91cc25780e73f4fcb65ddcb36eaa87c1a10261ad90708b0763ee8ee08f49f6f860a0487eeaf020b25365f2194c0823f20bbbcc3d9b3bc4d01931086803f7d67e
MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
index 8b217b0ad54b..da14c1c0f871 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
LICENSE="GPL-2"
# The subslot matches the SONAME major #.
SLOT="0/88"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index 2b397b1ffe49..94377e6bb5e6 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,5 +1,3 @@
-DIST simple-mtpfs-0.1.tar.gz 116145 BLAKE2B 9a29b31ad754ed009653aa6b5516aca20827b85368fa537e0c6b8f8a9d56bac10cb26f12f0b599c54942466ddc293999428816646e7071ca8637dcade80011b9 SHA512 5c4b390c43ede521061c677b496d47376304a4625414853a2183a41cb4a2c67361ecd7e26d0b6197cc78e84d0a9c99ec92e85bd1c179784b5a7c06ae05ede308
DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
-EBUILD simple-mtpfs-0.1.ebuild 491 BLAKE2B ce878b1cd6028871b42cb691d44ec17e94de443c4f79b6de02f6ca2ea0bf0a15dfa6fa8784741c4aed1303ad48d31832a50e2da064545d39c69f390f8b79fbfb SHA512 2884514b1f118abbe2dcf6aa53f849452a378504d734e3b326e5d1d6460d5f333082a31abd97a6f9d16023947478189b8915faaacaf6c35c8e67bda3d60ba032
EBUILD simple-mtpfs-0.3.0.ebuild 565 BLAKE2B 0240a0e68c96934b1db597609eb3589c886f93e26eba9b23f7a4b17d43f2d9485ff0e7aa67011897990568e1503a88227e57435dca1a1c20910903b8d1562abb SHA512 c1fa45fa3c6dc0db336c11710e8f454084b6afd6e203c6bca11fd680346c5b229aecf163a93a9dc6d8e964a05303a41bd48e3b86fa49f94488e522491f89474f
MISC metadata.xml 773 BLAKE2B 1b3bfd72c09a0ac9b421ff81fb424fc6936f58d5b02e271d62327881bd5120d7ab32d13b064fd59e4c1986b78e60ff8b4d02750887f87ed1492512dd3b9c418c SHA512 7173333c51707c87eb22a79ea5cf0d0b06313555472f12a3b591148e14e12ddb45c97bcb8bfee6ceac708ff0fabf7787a1892419ba4f1cc27a5cee75f990b67c
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
deleted file mode 100644
index 2e98a9c8c77b..000000000000
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Simple MTP fuse filesystem driver"
-HOMEPAGE="https://github.com/phatina/simple-mtpfs"
-SRC_URI="mirror://github/phatina/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="media-libs/libmtp
- >=sys-fs/fuse-2.8"
-
-DEPEND="virtual/pkgconfig
- ${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-AUTOTOOLS_AUTORECONF=1
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7f36ee3d08f5..4a496ca3c809 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,16 +1,19 @@
AUX 233-fix-includes.patch 1053 BLAKE2B 77e46c52bfed92e86e784dba346198413672de31c33f7fdfc4dc63786b1dd47a6c3f80d4bf0873a57fc676f3b72a4a27e7dd2e94ef2bd2ac0b4d7fcc1f8dc7bc SHA512 a4df18879862a17c6135a51591677c7e1ab8a98e5f2ba4eaec8e9275e4345c85a84ccd5bf2f8d8c6da51fd9152711681fd71eec86aab311e24bfe5469940f5ab
AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
AUX 236-uucp-group.patch 743 BLAKE2B 6dd28f1096d25cd776f66b1e574874d840a287b645701620459d5f5a5aec40784aca3ba86018911b5274e3643d17bd4b19dbe5fcad8a1ce4477ed136eae9bbdb SHA512 481400b0fd66ccfd559353a54e6d00749a10de3e67b304eeac0e63346ca404abc9e744c0dfaadc7783a231db929dc1cd4d97bf6e5bf585d7c41e03331c4e37ba
+AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B 7e846f475ae42e3c0e461b042042adca0475dc88d49a6bacea257381235f755dbd67569b8119efd7f25e68d64dbcd2b50a922df0f91c51ec16fe52cec65f9523 SHA512 2c8064540b669aa90a26bbd1d5af0b1afff030598a1a11bfe32a9c7f7ee59860acecfcdc7a94066c8ba6b62534432c28f72739dbbe16047958e5362a46d52215
DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2
DIST systemd-225.tar.gz 3878442 BLAKE2B 24bf9f6bfdd7d7c585829c1b172f73e669e137020b990ecd07dffafbe6890f1819e6c8efd5b322008473a62007a4a6f6ab2fb209be7db4ecb89a2bc01d60aaab SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19
DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
+DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
EBUILD udev-216.ebuild 15081 BLAKE2B adc66d5478de63a817c208832802557672c072368d98495b9d1e8f53d790a4171bbe451503c81efd53d293e43426cb1b44acc0f8ae755dfe33a8138665c35b5a SHA512 8884c4ab00af90cd6e910e6137674f9dbe6baa846876a16e6048e6960dba74dd685407a24343e9e20f61d18299b1900f7eab1b9c9eab726ddba9a62ebd826709
EBUILD udev-225-r1.ebuild 13436 BLAKE2B 551c495815193eeaf89dd70e1b0d969bb717200f18eedd241b6a308cbfe62388c5fb9bcd801597482f5c4f8451475c61b628b4f38de1df01d62a7cce11361cfb SHA512 b3310daf82972b710c37a6ee25776369bc09beac4926ea056d73421bd01627f93c2aaacdb2bd2b0819989629d82eea619d475ae4c6cd4179be2201cf7ec632a7
EBUILD udev-233.ebuild 12904 BLAKE2B 53e3f5f68bf504acf0085f5e957894c1a3462bdcf8282e2399787a6d2ccf0a3b409116cbac5a3df22432d7576604807c8400755102731031416e9cec3a899fca SHA512 d7bc4f8d9c68ce67b25de78669301b39816c1ab2221e498dcf27c80c62466db99db32581648e5aab79fd960989c498cd035794c3f80666c388d363e6a9628c9c
EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
EBUILD udev-238.ebuild 9595 BLAKE2B 9b475a74399ce0fc0187d8dd265fe7cc4c615080a4bb7ba6fd22cb8876570d78232ea5b36c02b0de2581c540a798cefd9d17d23d59c7c494969a7ab3d9e0cd6f SHA512 0c219e93fa5f35821d83707ffb061c3a01a5b6f1788ca4cc72cb1a89039f648d87f159c80c7cade5048babbd6456e7c6e6e794fbf2240cae0170ec0dec4d49f0
+EBUILD udev-239.ebuild 9686 BLAKE2B fc36f38c3634825efc120fc97c6f08d530068def4fe1d471fc94c4ccceae524fece9bc610277fd3e00fdf94ca10bdd176d9f47a6fed14a0ea2681da3fbe6c377 SHA512 905e177799fa810c260a07e4f684de80f9ae9f1d8dc182a81c1d89c7ec5b8db5bd80e58ccc0f73013f9dc5b0c4ed25f48c470f8f10491bf2e3298b9f229613e5
EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch b/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch
new file mode 100644
index 000000000000..5f253bbaab9c
--- /dev/null
+++ b/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch
@@ -0,0 +1,29 @@
+From 7a022d7583f13fb3d4fb437d386364782f4efa88 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 27 Jun 2018 10:36:50 -0400
+Subject: [PATCH 18/19] basic: add missing comma in raw_clone assembly for
+ sparc
+
+Fixes: 96f64eb5741b157f26a9089816fdd992e959792e
+Closes: https://github.com/systemd/systemd/issues/9444
+(cherry picked from commit 358248caa3eca525751694de7c34b16bb46d5a9c)
+---
+ src/basic/raw-clone.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
+index 1f134ba7f..b8857b0cd 100644
+--- a/src/basic/raw-clone.h
++++ b/src/basic/raw-clone.h
+@@ -60,7 +60,7 @@ static inline pid_t raw_clone(unsigned long flags) {
+ "mov %%o0, %1" :
+ "=r"(in_child), "=r"(child_pid), "=r"(error) :
+ "i"(__NR_clone), "r"(flags) :
+- "%o1", "%o0", "%g1" "cc" );
++ "%o1", "%o0", "%g1", "cc" );
+
+ if (error) {
+ errno = child_pid;
+--
+2.18.0.rc2
+
diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
new file mode 100644
index 000000000000..b09e0c65e66c
--- /dev/null
+++ b/sys-fs/udev/udev-239.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ kmod? ( >=sys-apps/kmod-16 )
+ selinux? ( >=sys-libs/libselinux-2.1.9 )
+ !<sys-libs/glibc-2.11
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=dev-util/meson-0.40.0
+ dev-util/ninja
+ >=sys-apps/coreutils-8.16
+ virtual/os-headers
+ virtual/pkgconfig
+ >=sys-kernel/linux-headers-3.9
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+ !<sys-fs/lvm2-2.02.103
+ !<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+ >=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+EGIT_CHECKOUT_DIR=${S}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+ linux-info_pkg_setup
+
+ # CONFIG_FHANDLE was introduced by 2.6.39
+ local MINKV=2.6.39
+
+ if kernel_is -lt ${MINKV//./ }; then
+ eerror "Your running kernel is too old to run this version of ${P}"
+ eerror "You need to upgrade kernel at least to ${MINKV}"
+ fi
+
+ if kernel_is -lt 3 7; then
+ ewarn "Your running kernel is too old to have firmware loader and"
+ ewarn "this version of ${P} doesn't have userspace firmware loader"
+ ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+ fi
+ fi
+}
+
+src_prepare() {
+ cat <<-EOF > "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ local PATCHES=(
+ "${FILESDIR}/236-uucp-group.patch"
+ "${FILESDIR}/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch"
+ )
+
+ default
+}
+
+meson_multilib_native_use() {
+ if multilib_is_native_abi && use "$1"; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dacl=$(meson_multilib_native_use acl)
+ -Defi=false
+ -Dkmod=$(meson_multilib_native_use kmod)
+ -Dselinux=$(meson_multilib_native_use selinux)
+ -Dlink-udev-shared=false
+ -Dsplit-usr=true
+
+ # Prevent automagic deps
+ -Dgcrypt=false
+ -Dlibcryptsetup=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dseccomp=false
+ -Dlz4=false
+ -Dxz=false
+ )
+ meson_src_configure
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ # meson creates this link
+ local libudev=$(readlink src/udev/libudev.so.1)
+
+ local targets=(
+ src/udev/${libudev}
+ )
+ if multilib_is_native_abi; then
+ targets+=(
+ systemd-udevd
+ udevadm
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/collect
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ )
+ fi
+ eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+ local libudev=$(readlink src/udev/libudev.so.1)
+
+ into /
+ dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+
+ if multilib_is_native_abi; then
+ into /
+ dobin udevadm
+
+ exeinto /lib/systemd
+ doexe systemd-udevd
+
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
+
+ rm rules/99-systemd.rules || die
+ insinto /lib/udev/rules.d
+ doins rules/*.rules
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+ rm man/systemd-udevd-{control,kernel}.socket.8 || die
+ doman man/*.[0-9]
+ fi
+}
+
+multilib_src_install_all() {
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /lib/systemd/network
+ doins network/99-default.link
+
+ # see src_prepare() for content of 40-gentoo.rules
+ insinto /lib/udev/rules.d
+ doins "${T}"/40-gentoo.rules
+ doins "${S}"/rules/*.rules
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ mkdir -p "${ROOT%/}"/run
+
+ # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+ # So try to remove it here (will only work if empty).
+ rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+ if [[ -d ${ROOT%/}/dev/loop ]]; then
+ ewarn "Please make sure your remove /dev/loop,"
+ ewarn "else losetup may be confused when looking for unused devices."
+ fi
+
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+ while read -r dev path fstype rest; do
+ if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+ ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+ ewarn "filesystem. Otherwise udev won't be able to boot."
+ ewarn "See, https://bugs.gentoo.org/453186"
+ fi
+ done < "${fstab}"
+
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+ ewarn
+ ewarn "Please re-emerge all packages on your system which install"
+ ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+ ewarn "/lib/udev."
+ ewarn
+ ewarn "One way to do this is to run the following command:"
+ ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+ ewarn "Note that qfile can be found in app-portage/portage-utils"
+ fi
+
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+ for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+ if [[ -f ${old_rules} ]]; then
+ ewarn
+ ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+ ewarn "rename it to something else starting with 70- to silence this deprecation"
+ ewarn "warning."
+ fi
+ done
+
+ elog
+ elog "Starting from version >= 197 the new predictable network interface names are"
+ elog "used by default, see:"
+ elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+ elog
+ elog "Example command to get the information for the new interface name before booting"
+ elog "(replace <ifname> with, for example, eth0):"
+ elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+ elog
+ elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+ elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+ elog "to disable the feature."
+
+ if has_version 'sys-apps/biosdevname'; then
+ ewarn
+ ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+ ewarn "detected to be installed with the new predictable network interface names."
+ fi
+
+ ewarn
+ ewarn "You need to restart udev as soon as possible to make the upgrade go"
+ ewarn "into effect."
+ ewarn "The method you use to do this depends on your init system."
+ if has_version 'sys-apps/openrc'; then
+ ewarn "For sys-apps/openrc users it is:"
+ ewarn "# /etc/init.d/udev --nodeps restart"
+ fi
+
+ elog
+ elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+ elog "fixing known issues visit:"
+ elog "https://wiki.gentoo.org/wiki/Udev"
+ elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+ # do the same for 80-net-setup-link.rules to keep the old behavior
+ local net_move=no
+ local net_name_slot_sym=no
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+ if [[ ! -e ${net_setup_link} ]]; then
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+ net_move=yes
+ net_name_slot_sym=yes
+ fi
+ fi
+ if [[ ${net_move} == yes ]]; then
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+ if [[ ${net_name_slot_sym} == yes ]]; then
+ ln -nfs /dev/null "${net_setup_link}"
+ else
+ cp "${net_name_slot}" "${net_setup_link}"
+ fi
+ eend $?
+ fi
+
+ # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+ # https://bugs.gentoo.org/246847
+ # https://bugs.gentoo.org/514174
+ enewgroup input
+
+ # Update hwdb database in case the format is changed by udev version.
+ if has_version 'sys-apps/hwids[udev]'; then
+ udevadm hwdb --update --root="${ROOT%/}"
+ # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+ # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ [[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+ fi
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e4338d16e35b..e91977d27ae2 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -4,14 +4,12 @@ AUX udisks-1.0.5-stat-includes.patch 656 BLAKE2B 6deb3f7fbdce118480572ac50ac896f
AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45595ba8cf6832f560e6fb314e47139104c981b332f0a6b0db3a3eb63b2b771525e3903ad67b3eeb9f1749bd6f86538d SHA512 9402c931dda2f415577f3b6d60cab03891e83cc804a0cbd790bb3bc71d160d8b6fa14d13829281ffb55a9032ac289798ee5f2d6e14348c96a4e9b1e922111bb2
DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a
DIST udisks-2.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83df3cdce632d6269ebd1543e11be8e0e70143c82883e503fa6d5ce88e815e8a7e8d508a06e967868b4e3987d926 SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb
-DIST udisks-2.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7
DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
-DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310
DIST udisks-2.7.6.tar.bz2 1315047 BLAKE2B 48ad99512068a1ea863f2c4474cd77953c9c69b9d03cae2905f8e07589a3822e666938f9eaa5b291c55589c10b676644627f678491edc06af60e55b6df15f024 SHA512 29df238c6648700e8a18659ecb099baf4cdd811540856a5298439a88cffeee40ae8deb2fc312375913333dbe92fbc55131389f958a8b80efd5b2fdb5b3f11ec7
+DIST udisks-2.7.7.tar.bz2 1330588 BLAKE2B 18e4ddeb474a12a22493fcb91361df9f9fec1192723730dfe187217f84bc193b675d3079e7478bb38cfbbcc85151bf8bd2ac28847f829428400c4750d00368c0 SHA512 f679feb10a4a569445538a835fc573035639ace7821b4319d2ff5be801145d74966f3bbd8c90afbd4ab02bee552af23fa23db55a5d3e7699d41a15df3477008e
EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
EBUILD udisks-2.1.8.ebuild 2920 BLAKE2B 66910a00b8b01456188ca325218b048c2634ee5385d894d24c01361e52733553f73bdda35aaa0556a10579aea947994f45b3f6d2fd01b8818e75f196472cddbc SHA512 0ba34f7f3d951911da1f2904638ca98d10ea3203cb7766610a5e7c03c8dcb01c22157f9099878cdc3ada0193ba82bc73c37777a8b9336474a1a65f77250e1832
-EBUILD udisks-2.6.5.ebuild 3271 BLAKE2B 3541f6e93c01380fd9617cffc9c829cad537fb085eccf222ad012aefc2c577bd83c197137b782aed6c358e9d089e476e325e964af1a3815df5de17c6c2db4ec0 SHA512 236af3f68f0767b409dd8a8033c80c74ed66f321761f77bbb199c3158de65dedbd52eedaa44dd2378734cdddb265b5337db63ffc2c8f7c23d9563ca947da383e
EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
-EBUILD udisks-2.7.5-r1.ebuild 3381 BLAKE2B 93a8fbcf187c13d3a4be00d109e4accd7c24f7ed90c16fcb5a82c94af624e8dfe51823b17d53fe7917c75a95d97587c7357403a726349484d158ff182489c92c SHA512 d4e4d51e50ba07a55bb2ad05ce44c9d91c25903c614407c5141cc67e3638dd78ac37753f0b300becf23696a0981b16ec5e4cf639d3a52c7fc00282315fb2abe9
EBUILD udisks-2.7.6.ebuild 3179 BLAKE2B 36d1dd022087907f0d20f6392114ef5d2abab8da12316eb0a8c7b46956340f192c20dda5218f3ce62ef73462edc6e99691fc1cb8ef541b13c41c2867037e84af SHA512 fc25fa2b3f2fd4b85832d020bfca48fa339b8bec7c4b7b88916e791464da830311eff5b5cd052eeca0163208d823de8c0176fc004d3c0b51ba6c914389d38daa
+EBUILD udisks-2.7.7.ebuild 3193 BLAKE2B f466518a4373e7792eab39ccb21c669114715f0a47b1fdaef483aa7305747c5d869ea49914a02c9662a0570aa5fed54c7f7be2cca00718cd89fe7ae0978b60f3 SHA512 bd4ffc4d9b9b19c9527daa46757feacc553da660865a41fdbd670a0287cfc36ae8022e671a3b61dbf9eb471c7890b87852b263c4a5d4f560c0f89ea75574a163
MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.6.5.ebuild b/sys-fs/udisks/udisks-2.6.5.ebuild
deleted file mode 100644
index 5e8db1bcdac9..000000000000
--- a/sys-fs/udisks/udisks-2.6.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.36:2
- >=dev-libs/libatasmart-0.19
- >=sys-auth/polkit-0.110
- >=virtual/libgudev-165:=
- virtual/udev
- acl? ( virtual/acl )
- elogind? ( sys-auth/elogind )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- lvm? ( sys-fs/lvm2 )
- systemd? ( >=sys-apps/systemd-209 )
-"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/util-linux-2.20.1-r2
- >=sys-block/parted-3
- virtual/eject
- cryptsetup? (
- sys-fs/cryptsetup[udev(+)]
- sys-fs/lvm2[udev(+)]
- )
- gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
- selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.32
- >=dev-util/gtk-doc-1.3
- gnome-base/gnome-common:3
- sys-devel/autoconf-archive
- >=sys-kernel/linux-headers-3.1
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
- # Listing only major arch's here to avoid tracking kernel's defconfig
- if use amd64 || use arm || use ppc || use ppc64 || use x86; then
- CONFIG_CHECK="~!IDE" #319829
- CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
- CONFIG_CHECK+=" ~NLS_UTF8" #425562
- kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- xdg_environment_reset
-
- default
-
- eautoreconf
-
- if ! use systemd ; then
- sed -i -e 's:libsystemd-login:&disable:' configure || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-gtk-doc
- --disable-static
- --localstatedir="${EPREFIX}"/var
- --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-udevdir="$(get_udevdir)"
- $(use_enable acl)
- $(use_enable debug)
- $(use_enable introspection)
- $(use_enable lvm lvm2)
- $(use_enable lvm lvmcache)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- prune_libtool_files
- keepdir /var/lib/udisks2 #383091
-
- rm -rf "${ED}"/usr/share/bash-completion
- dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
- # Remove gtk-doc symlink, #597628
- if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
- rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
- fi
-}
-
-pkg_postinst() {
- mkdir -p "${EROOT}"/run #415987
-
- # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
- if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-fs/udisks/udisks-2.7.5-r1.ebuild b/sys-fs/udisks/udisks-2.7.5-r1.ebuild
deleted file mode 100644
index e7466089c864..000000000000
--- a/sys-fs/udisks/udisks-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.36:2
- >=dev-libs/libatasmart-0.19
- >=sys-auth/polkit-0.110
- >=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
- >=virtual/libgudev-165:=
- virtual/udev
- acl? ( virtual/acl )
- elogind? ( >=sys-auth/elogind-219 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- lvm? ( sys-fs/lvm2 )
- systemd? ( >=sys-apps/systemd-209 )
-"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/util-linux-2.20.1-r2
- >=sys-block/parted-3
- virtual/eject
- cryptsetup? (
- sys-fs/cryptsetup[udev(+)]
- sys-fs/lvm2[udev(+)]
- )
- gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
- selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.32
- >=dev-util/gtk-doc-am-1.3
- >=sys-kernel/linux-headers-3.1
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# gnome-base/gnome-common:3
-# sys-devel/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
- # Listing only major arch's here to avoid tracking kernel's defconfig
- if use amd64 || use arm || use ppc || use ppc64 || use x86; then
- CONFIG_CHECK="~!IDE" #319829
- CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
- CONFIG_CHECK+=" ~NLS_UTF8" #425562
- kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- xdg_environment_reset
-
- default
-
- if ! use systemd ; then
- sed -i -e 's:libsystemd-login:&disable:' configure || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-btrfs
- --disable-gtk-doc
- --disable-static
- --localstatedir="${EPREFIX%/}"/var
- --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
- --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-udevdir="$(get_udevdir)"
- $(use_enable acl)
- $(use_enable debug)
- $(use_enable introspection)
- $(use_enable lvm lvm2)
- $(use_enable lvm lvmcache)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- prune_libtool_files
- keepdir /var/lib/udisks2 #383091
-
- rm -rf "${ED%/}"/usr/share/bash-completion
- dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
- # Remove gtk-doc symlink, #597628
- if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
- rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
- fi
-}
-
-pkg_postinst() {
- mkdir -p "${EROOT}"/run #415987
-
- # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
- if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
- echo
- ewarn "You should reboot the system now to get /run mounted with tmpfs!"
- fi
-}
diff --git a/sys-fs/udisks/udisks-2.7.7.ebuild b/sys-fs/udisks/udisks-2.7.7.ebuild
new file mode 100644
index 000000000000..e19ad37d8cbb
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.7.7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug elogind +introspection lvm nls selinux systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.50:2
+ >=dev-libs/libatasmart-0.19
+ >=sys-auth/polkit-0.110
+ >=sys-libs/libblockdev-2.18[cryptsetup,lvm?]
+ >=virtual/libgudev-165:=
+ virtual/udev
+ acl? ( virtual/acl )
+ elogind? ( >=sys-auth/elogind-219 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+ lvm? ( sys-fs/lvm2 )
+ systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/util-linux-2.30
+ >=sys-block/parted-3
+ virtual/eject
+ selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.32
+ >=dev-util/gtk-doc-am-1.3
+ >=sys-kernel/linux-headers-3.1
+ virtual/pkgconfig
+ nls? ( dev-util/intltool )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# gnome-base/gnome-common:3
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+ # Listing only major arch's here to avoid tracking kernel's defconfig
+ if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+ CONFIG_CHECK="~!IDE" #319829
+ CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+ CONFIG_CHECK+=" ~NLS_UTF8" #425562
+ kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ xdg_environment_reset
+
+ default
+
+ if ! use systemd ; then
+ sed -i -e 's:libsystemd-login:&disable:' configure || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-btrfs
+ --disable-gtk-doc
+ --disable-static
+ --localstatedir="${EPREFIX%/}"/var
+ --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
+ --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-udevdir="$(get_udevdir)"
+ $(use_enable acl)
+ $(use_enable debug)
+ $(use_enable introspection)
+ $(use_enable lvm lvm2)
+ $(use_enable lvm lvmcache)
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name "*.la" -delete || die
+ keepdir /var/lib/udisks2 #383091
+
+ rm -rf "${ED%/}"/usr/share/bash-completion
+ dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+ # Remove gtk-doc symlink, #597628
+ if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+ rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+ fi
+}
+
+pkg_postinst() {
+ mkdir -p "${EROOT}"/run #415987
+
+ # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+ if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+ echo
+ ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+ fi
+}
diff --git a/sys-fs/yaffs-utils/Manifest b/sys-fs/yaffs-utils/Manifest
deleted file mode 100644
index c0545d77270c..000000000000
--- a/sys-fs/yaffs-utils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX yaffs-utils-9999-build.patch 1009 BLAKE2B 99ccc435b26ca5d9140f4b4d2c4b4310b33a060f75911f8dec6b3772b00b686cdce7d545f0de61452d2f292ab3940209c58a681e089e1cace60a026bf76355ea SHA512 1651712ee6749ea5b33af179e9e128f00f53ed530d9bee1ea1b628a6217849297f342ee7aeec148ffd4cb0d79e9fa0c7d143c8bfb90c63b3f35f1e4e91c6c91a
-EBUILD yaffs-utils-9999.ebuild 514 BLAKE2B 2f84c48d932869a1aba98c4f82b883f743eeb62157e5aec055b5235097211fa04c5c4fb4570563a88067708065be9da1894d284b1d6d578317bafeed7602d1fe SHA512 64bdd6a7c9e006bcf5bf708b392a615a46b2bf9e1b9cc905e2377305257cb5f64c0064b55a4049619b05a91a1b42884720e652de0a1b6bdea6d158e1d93e7162
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
deleted file mode 100644
index 901484db9995..000000000000
--- a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index 4929e08..51c4e5f 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -16,14 +16,13 @@
-
- #KERNELDIR = /usr/src/kernel-headers-2.4.18
-
--CFLAGS = -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
-+CFLAGS+= -I.. -Wall -DCONFIG_YAFFS_UTIL $(CPPFLAGS)
- CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
- CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
-
- ## Change if you are using a cross-compiler
- MAKETOOLS =
-
--CC=$(MAKETOOLS)gcc
-
- MKYAFFSOBJS = mkyaffs.o
-
-@@ -36,13 +35,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
- $(CC) -c $(CFLAGS) $< -o $@
-
- mkyaffsimage: $(MKYAFFSIMAGEOBJS)
-- $(CC) -o $@ $(MKYAFFSIMAGEOBJS)
-+ $(CC) $(CFLAGS) -o $@ $(MKYAFFSIMAGEOBJS) $(LDFLAGS)
-
- $(MKYAFFSOBJS): %.o: %.c
- $(CC) -c $(CFLAGS) $< -o $@
-
- mkyaffs: $(MKYAFFSOBJS)
-- $(CC) -o $@ $(MKYAFFSOBJS)
-+ $(CC) $(CFLAGS) -o $@ $(MKYAFFSOBJS) $(LDFLAGS)
-
- yaffs_ecc.c:
- ln -s ../yaffs_ecc.c yaffs_ecc.c
diff --git a/sys-fs/yaffs-utils/metadata.xml b/sys-fs/yaffs-utils/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/sys-fs/yaffs-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>embedded@gentoo.org</email>
- <name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
deleted file mode 100644
index 9606fd88801f..000000000000
--- a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs"
-EGIT_SOURCEDIR=${WORKDIR}
-
-inherit eutils git-2 toolchain-funcs
-
-DESCRIPTION="tools for generating YAFFS images"
-HOMEPAGE="http://www.aleph1.co.uk/yaffs/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-S=${WORKDIR}/utils
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
- tc-export CC
-}
-
-src_install() {
- dobin mkyaffs || die
- dodoc ../README
-}
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index d2d8daab8483..c02854a70e87 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,7 +1,3 @@
-DIST zerofree-1.0.1.tgz 8333 BLAKE2B 24d3ebdf26d7a3186fad3fcde8e6ae196f60e85f0414975ee1a745b8e1a5caab69bb359b8ec40e004e210f8c3bad7dc986b1a7b40d87a8a52eccf0f05943d180 SHA512 c3d06990f8e61f9a60908e20d3d1534a3da76f1a28aec28c89d1df7978a78844c1420edc27e44340bb98d4d929dda42426d0efb8a42c66501f09f2b06bc27a26
-DIST zerofree-1.0.3.tgz 8506 BLAKE2B ccc1892b7e5653f50f5791bd94b1eb35780e17922e75cfe0d05764d7a3c6a5749b74076d341ba5262db8aea8e6008bba0fa86f4bcaca8b3fd3b85ed3b4ba5aa0 SHA512 e23d343471240382629b4c86b6caa74571a77fb19f1b31bbbd9fad03ba1b42898f8ae042d1238d9c91d9b7fbc9893fb708cb557d3bbd9ab9a024aca6a8ddbbe3
DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b
-EBUILD zerofree-1.0.1.ebuild 888 BLAKE2B 3e3762fdf25b2fdaea76578bcb9fd75d9acbdc35bc2441c71300cc92a4b8a7aadb6ca5c49b05a7f2245f70a7a9a8e7f32bdc49415cf3cd61996e4d6024c4caa3 SHA512 a22d538bc87a827b943c81b7d32c1cdbf93ded9ea1448eb9010508ddbbe944d3ad91b88a06222f25e2b03bda5fae1c10394e92c0451ee59d6dbf780ec1c2b8b1
-EBUILD zerofree-1.0.3.ebuild 888 BLAKE2B 3e3762fdf25b2fdaea76578bcb9fd75d9acbdc35bc2441c71300cc92a4b8a7aadb6ca5c49b05a7f2245f70a7a9a8e7f32bdc49415cf3cd61996e4d6024c4caa3 SHA512 a22d538bc87a827b943c81b7d32c1cdbf93ded9ea1448eb9010508ddbbe944d3ad91b88a06222f25e2b03bda5fae1c10394e92c0451ee59d6dbf780ec1c2b8b1
EBUILD zerofree-1.0.4.ebuild 864 BLAKE2B 1626ca1e04d50de59381f6338bb29fd0c7ff15b96a0df76ebc3023504c6cbeae55b77f9198ee8c1d250e64e0f07fe80f14cd1615d4dee563e1f3721b689c164f SHA512 3e28d7c18ea0b8da0e6b94b87ea9e74635a98c057bd66bcfc4e3cf81381897023b1a52dc8974247f86f2384b5125250b73162626779e8ed7560317f55a64147c
MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/zerofree-1.0.1.ebuild b/sys-fs/zerofree/zerofree-1.0.1.ebuild
deleted file mode 100644
index daeafd39b4e9..000000000000
--- a/sys-fs/zerofree/zerofree-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Zero's out all free space on a filesystem"
-HOMEPAGE="http://intgat.tigress.co.uk/rmy/uml/index.html"
-SRC_URI="http://intgat.tigress.co.uk/rmy/uml/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~mips"
-IUSE=""
-
-DEPEND="sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Honor system CFLAGS.
- sed -i \
- -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \
- -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \
- -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \
- Makefile || die "Failed to sed the Makefile"
-}
-
-src_compile() {
- # Just a Makefile, nothing fancy.
- make || die "Failed to compile ${PN}."
-}
-
-src_install() {
- # Install into /sbin
- into /
- dosbin zerofree
-}
diff --git a/sys-fs/zerofree/zerofree-1.0.3.ebuild b/sys-fs/zerofree/zerofree-1.0.3.ebuild
deleted file mode 100644
index daeafd39b4e9..000000000000
--- a/sys-fs/zerofree/zerofree-1.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Zero's out all free space on a filesystem"
-HOMEPAGE="http://intgat.tigress.co.uk/rmy/uml/index.html"
-SRC_URI="http://intgat.tigress.co.uk/rmy/uml/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~mips"
-IUSE=""
-
-DEPEND="sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Honor system CFLAGS.
- sed -i \
- -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \
- -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \
- -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \
- Makefile || die "Failed to sed the Makefile"
-}
-
-src_compile() {
- # Just a Makefile, nothing fancy.
- make || die "Failed to compile ${PN}."
-}
-
-src_install() {
- # Install into /sbin
- into /
- dosbin zerofree
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2bca6c425d15..03b70804f8fa 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
Binary files differ
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index d7900b8a9d39..2fea4c7ac1ba 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,5 +16,5 @@ EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a538
EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26
EBUILD dracut-046-r1.ebuild 4807 BLAKE2B f31663293ad74ca0ac058a43edac505a8f7bea5af6677535a6425588de39bbd2a0750085e0c290af234de075d05cb9c71f43587490f7090724140856361e424b SHA512 b6c93ec687c3d005ba7e2b0f5ad1317f343edc20c527b68927b00c6c64c29c74fdcb6db0b4a738e22de94141bae43e5aef37aaf1625667f8824dd8dbc5691748
EBUILD dracut-047-r1.ebuild 4736 BLAKE2B 6940ade45fdac58fabaf6f814037ca704e77f01872163da3e4dc96572051961ca92a1e467dfe0541e40c920988400fbaa37e2a62a1e7edda31d99564d4c3b5b9 SHA512 4f39489389f78dc8aab806156821e6bd95a276f117c5d1711a8fe4498a94d83590cdab10d533bfc0bf5e6e0b66de46c349aa827f244ca86101aa67aad9ba2756
-EBUILD dracut-9999.ebuild 4741 BLAKE2B 32973c0e3706bc6d46aaa8ffa9ea24da1098454bbbb03fe68b9b34637a59fdcac5a20bc334f1b12c066972f3c53780328ba89de576ffa46e2c3ac074582d301a SHA512 70e4e0e9a3b95290eeba46c7d3cdfa63b9af08c96522a697bc4efe9ed041232841142947d13bcc3a64e08a8a802e9cd8399a64b1297f501bf43dc41b9e99636f
+EBUILD dracut-9999.ebuild 4701 BLAKE2B c0da9267ec48b6c5640e4bc425eba6997023fa5a80cf1e22f613aa852270fc4cecac9261736730646d70a838f8aa74f3f509b2411afc12ae6c512396f14e523c SHA512 e508b5128a039a920ea792ddc1cf9393f2bdf0a6188c6eb4209e7625b17da982283d401fe7fcb5f048ad965ca56878b73a4548295fece70d24de81940dc0aed3
MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 791e382ac490..161652aa8438 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -58,7 +58,6 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
- "${FILESDIR}/045-systemdutildir.patch"
)
src_configure() {
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 662c9f4301e7..e0206449443d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,6 +28,12 @@ DIST genpatches-4.14-57.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a280
DIST genpatches-4.14-58.base.tar.xz 1514872 BLAKE2B 1ab441025043ce159131d12731adfdb60ab194a1c681d3f93f82b67e22b4451cfe4d50157158607abaf7538e6c148ed8b34deb1f9af92bec91fd20f2d3ad84f3 SHA512 55d50bc2f401ddf9ce903d200ef4216824d6303ad5a3b59e1e07741775b2737dc1b0454ebd1c769953f8365e9d1279417c1c21c1b7192a61b6432d4ece209a76
DIST genpatches-4.14-58.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
DIST genpatches-4.14-58.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
+DIST genpatches-4.14-59.base.tar.xz 1533752 BLAKE2B 358e49ee26f28f4603be045a180ff1d1cc49e222697b73ce83830bd6f9f407caf28012d4e87774799773772a269156a4ff63e3ebf4ba6d4d077dc41e24d6ae6e SHA512 d21ea98b782b91bb94d2e8b7555e54ac2437c74ac03277992a293590948500f80aa15f55708c15e4b61f9cefee90dd90721b86a1185280a8f424c811163b3433
+DIST genpatches-4.14-59.experimental.tar.xz 5216 BLAKE2B 173e88535b054ff1d1710e889f011f86d0c0b8dd3cf39adc8dcbbfbd310665a10c3a7759886d1fb15fb5c76e14cc6fea1b65614fb5be4680d4fea60322d97727 SHA512 d5fef6588a3804d63ec9f160b6837f28c0935f02e55252cc7e92723427720cc635e2493b69a67de38e4ec2def62f90f3de3d6aa17c11ea6e3bcf5f51fd21c134
+DIST genpatches-4.14-59.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
+DIST genpatches-4.14-60.base.tar.xz 1548212 BLAKE2B dfd2881e403a6f657d22a203e352b0a34eff071150c80fffc1e10de3b9263d5a1d1352f25303e63d527b8ae1ca811190c135dd1fe2cc6c6bfc0117f6c83b5fee SHA512 083b0945079ee7c9334e5f6bb86f8a5969bb677bc9dc73063dbe68c3d7fb6ca28d428602aa1042207347431998985c20860eeeea54c13c7b16361013a75c00f6
+DIST genpatches-4.14-60.experimental.tar.xz 5216 BLAKE2B ecaf744867f77064c251d4e35fc7737d25d46e66374edf9cb38004111ba3799728e0a02a9157f67ddb5d7577fe211ea3e6e09f8b272fd79ceab5f1097a34403e SHA512 1a6c77c94c2c7ff559e915fa4db238595c21b1faa7f716acecf68b7f31a349a30575f89e31ee2d64e2a4571feba4ff016fb858a5b1d3a3b7661923b1f3581fa4
+DIST genpatches-4.14-60.extras.tar.xz 17480 BLAKE2B ba9706cc7fd251ce586062354be3af5bd1760a3f19c458ecac4da4d094489bc54a50e27c792725c8b8d5b5a9be0de09949fa7c389db226344bcdfd8ffb859455 SHA512 5f384790402cbd7a7ed9f00401f868d10b3f9a55b63f3cbcac37e196da48eced24c2994f1716267f9ce7be7d80fe118a42855b1e1c884acb8d1e3a1ad3ca5a09
DIST genpatches-4.16-19.base.tar.xz 523512 BLAKE2B d28c63e46779861cecc7ef02c0b49a52794d8ab4a369ba9789cb2783af3440121c2e1906eaca15a0973db84c52d2fe52fbfa03734336c9f1b2651ef9ca10325d SHA512 7dc7ff4fe9f0b75dc5ced0ead5dafec43633bcd95b1fe605f6729d1d9a3ac9155bd3bec605edff1563a37654f55123a68c93d7b70b411f1ce22ac1a2e1b24599
DIST genpatches-4.16-19.experimental.tar.xz 5160 BLAKE2B 101cb9fe2be60a0e9ff7089ccc4c5c808c436fceaadfc40e4e8fa86eaaead8875ef592521f5005e5b8746087aa133236faf80c1a6448d316ef28d2ce7d27ffe1 SHA512 c452893e1778951865d72611b9ebb38edaa3d3de452693ee1c3fe9ab18063e6093f0a115f571f90ed50153b6052f2d4ac396ea4aa2a66ce0d0b27a99f13972b6
DIST genpatches-4.16-19.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
@@ -46,6 +52,12 @@ DIST genpatches-4.17-4.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a2804
DIST genpatches-4.17-5.base.tar.xz 112304 BLAKE2B 3f92f0d9298d36cc414d924ac90abffb654f70b95beacb4ebe913f0a2a0fda577af8cfeb6f2e0c5e4a9d5a9942fb1fb16d8aca37dd4f60c1442bbbaec0117b6e SHA512 a928f056ce098e931309fdb6c4004b5426022af3c839ea2d9ea703344cf34291ac688d8c03bc274bfad6cab86020480b8c08d52d2a09744d2fcb0715a8dc9be7
DIST genpatches-4.17-5.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
DIST genpatches-4.17-5.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
+DIST genpatches-4.17-6.base.tar.xz 127088 BLAKE2B f7dd24fa19f3d9f47246683e6f219441172b8dbda28501406796c37fe053e75dd06b8569b755a600e4b6975fb4ff0048890e05584bc924b108c2698a33566a9a SHA512 436958fdff49c9e71b275220d304c3e2df9d9986acefffacc163e92bcf1008b2dcee793b229dcce1d0db50611a0016a2bdfd049b03278451e36a474e08ee1790
+DIST genpatches-4.17-6.experimental.tar.xz 5216 BLAKE2B 173e88535b054ff1d1710e889f011f86d0c0b8dd3cf39adc8dcbbfbd310665a10c3a7759886d1fb15fb5c76e14cc6fea1b65614fb5be4680d4fea60322d97727 SHA512 d5fef6588a3804d63ec9f160b6837f28c0935f02e55252cc7e92723427720cc635e2493b69a67de38e4ec2def62f90f3de3d6aa17c11ea6e3bcf5f51fd21c134
+DIST genpatches-4.17-6.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
+DIST genpatches-4.17-7.base.tar.xz 145032 BLAKE2B b227c23375bc4b16bcc281b3c8e31776538d1d91a61f0df1a6f49dff41494c87c7f75abc455aa5afaa422f47e7d9900bff4834dd038f4af8ea07f0ac0628b3bb SHA512 95e67406a0400354b74e73273edd3dd6512212e408f7aa2202b5c7e6b03d541af05cdd37de9451673eebb6ec9893695d00a78bcabe4ff8686a51a62e8ae85899
+DIST genpatches-4.17-7.experimental.tar.xz 5216 BLAKE2B ecaf744867f77064c251d4e35fc7737d25d46e66374edf9cb38004111ba3799728e0a02a9157f67ddb5d7577fe211ea3e6e09f8b272fd79ceab5f1097a34403e SHA512 1a6c77c94c2c7ff559e915fa4db238595c21b1faa7f716acecf68b7f31a349a30575f89e31ee2d64e2a4571feba4ff016fb858a5b1d3a3b7661923b1f3581fa4
+DIST genpatches-4.17-7.extras.tar.xz 17480 BLAKE2B ba9706cc7fd251ce586062354be3af5bd1760a3f19c458ecac4da4d094489bc54a50e27c792725c8b8d5b5a9be0de09949fa7c389db226344bcdfd8ffb859455 SHA512 5f384790402cbd7a7ed9f00401f868d10b3f9a55b63f3cbcac37e196da48eced24c2994f1716267f9ce7be7d80fe118a42855b1e1c884acb8d1e3a1ad3ca5a09
DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
@@ -64,6 +76,9 @@ DIST genpatches-4.4-140.extras.tar.xz 16468 BLAKE2B 0c29a4579a4de7934c0f81629782
DIST genpatches-4.4-141.base.tar.xz 2190120 BLAKE2B ac1b13252fe87ff8ee767bafe8e4ede16cc53dca75624384ebdf2113ed311310776993fcf2b7337ae3d2f3285afc9f32ba843c8107dfe9912f584841a1301ee5 SHA512 01659e5fc5e1d2c458fe2129819dd2b4acd56c552165aa37635c66e17fe34155751147a3f42ea520bd0b93aad08c1f1fe0a245dd689a2306b8184fd56fc8dd5d
DIST genpatches-4.4-141.experimental.tar.xz 87736 BLAKE2B 8ec765b43cf9a77a855b8a133cd599c1f8d440e443daf71ed66c7f04e19c8fa958515ecba22c3a002b10e8f348350a87418b37ae2b3d16c4ae5d657e21a229f7 SHA512 4b6226b36898c57791ee9053993cbcd630924b67b38cdef1a9c66d9cecfc6ba5dffd4f1217182c3bac51fd178a2b6e6e195a8b802b448d1334346935ddf8190e
DIST genpatches-4.4-141.extras.tar.xz 16456 BLAKE2B 30723f6af4c0132d140395a45fb280a28c7946824efc5937553ccbb866905f14912fd9873a4c3fa39e891199aa1f547cecd7d1ff404abfe3b3da9faa93b4eab8 SHA512 e63f977df366ae457346eb88590df185c7200f36d6c7e0840265cde3cf21fe88c9f0c400e81284ac16df2a39929e6811d562330879fe8db3cc23b0784184dac5
+DIST genpatches-4.4-142.base.tar.xz 2201916 BLAKE2B 59ea17e829918be8ff8abab73f5f1423edcd1ed0f42e18ea45c620c38faa37bd4c2944d0321d8772af6338375f160411c11838b9c71613c66ce3a990e2e0f621 SHA512 ae9737eccad6ac72e96747f0bbe74665e452b6b600f1669384cc05471cbe1783f02b37f4c2f88a54d10a0db46470b00051da9863f13bd70043aa75b0560f23d3
+DIST genpatches-4.4-142.experimental.tar.xz 87768 BLAKE2B 7dc8c54dc310a960ce3a940e68c1fad81423123f864ae6a8b2207aeca30de480fe3702d63fa964f3c853f6fa8a2f01603d00035f2a321e474fd63304668597f1 SHA512 c11b2f6df14146d250ffc63cca798347cda3ded757ba5b765402d9ff6df0d9998306140df13ffa5f6c47246c9721988dbe35f397c4cf548ec228459f2b5a7150
+DIST genpatches-4.4-142.extras.tar.xz 16452 BLAKE2B 995e57d9fc33bd0c16650b952fa0924f0f355342d4a13abc02220f0f7b8c178732a858002c82faee9c29c29e2ac440bf44a1867589f039ee4b0cfdd73abf9c0e SHA512 618bbd5cf0ee5cb7ab94bc063e5b5700715df34bcf0fb78414c90a1bef5d6d096584af84726368c37ca221775f3dc8a8b7161613d8a7464f054c055d62b6f958
DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -88,6 +103,9 @@ DIST genpatches-4.9-113.extras.tar.xz 17352 BLAKE2B 48d898c4d97fcf1768abd2a8919b
DIST genpatches-4.9-114.base.tar.xz 2222376 BLAKE2B 8f773b85ab1787ceda8be275bde6c46be29ab27db5105bdb65aaa0be38b369df64ea2ae1af5d324810f6eb7c7853bd52bf2154b83743eeabb753c5c821bee67b SHA512 9f7696a84cf257c23b5f4cb4e57e6291961a7b5ee362ab538754251a01299f2014f0f56442b8be179f20cbd6c0de5520ad72bca1a2805ccbb06b55b889a1d2ae
DIST genpatches-4.9-114.experimental.tar.xz 106388 BLAKE2B ad5fee26f465efc9ca5b4c8c823c51770f0399d2be95b12ed57e47b0ee8a2c3d63cb4a2ce33946c501c59bcb19c516208d831468202acceed5e3a6355f5f26a0 SHA512 8a3c2a8101988ebc5c05ec34e5369dbfef078f6bb87fe8be744672be895282e1031078c688ec64fa9025c3f3750f0340299cb493b15aded109bb8525955e6200
DIST genpatches-4.9-114.extras.tar.xz 17356 BLAKE2B 53adee41fa88f2979f1857885f06456947cd0c6872a8962922a27a55a5492f22bf6d90d0213087a15b6b783a3d950c6389fb595eda98b3608084f1ef233899a0 SHA512 c6c9aa4e23351f58ac46ebfb088254f2c9690760b972743273700cd76dc873f63fbddaaeff934b64a29956c1ee951917afaef18ae5dcca44d371baafbf321ecf
+DIST genpatches-4.9-115.base.tar.xz 2235464 BLAKE2B aba96689140a03c19cbd0b7f06ad8bf121975e3ee8eb298461f75f8d2fa142705613eecf79d5764e4e41c9bacf5dd5e903c6acb02a77e81e75aa3429ce340f20 SHA512 0d20a2b31af02c92f4e3489263d731b12914ac2ed6c8771d7b18e06a6c8a6378ed051afd7e10adac46f0ff1a768b0f6f14764a3b771f05ea8404214d7e396725
+DIST genpatches-4.9-115.experimental.tar.xz 106444 BLAKE2B 7289b1cb954c10b20e4e81af4e5d5b75812283cd273ca2bf46e16ea3e94359873b3b486b407ab919df98cff9afcc20c045ccc8e418a6c80eede4d175c86bccb5 SHA512 442f2ba6c4bb4d5e9c272ecd8c5779079b0d57f8360e4a6eb4ca3a01468a434f8d9977f3fc61d364b6d05bf76af6dc0ba8fa3ccf22a1e03d93450273930f9730
+DIST genpatches-4.9-115.extras.tar.xz 17344 BLAKE2B 713ff0e6fcebf64ba05a3adef5f52f10ebdc8d2287e65c169d45d2dabbd05e1d267f07061bc9a04158953638d59151faf7402179c329885cea36d7a95af04196 SHA512 49ae65147e364065c6f14281f50337835d3d4f3fe9e54df02054f058a9f744c5b2b0dbade4a408319147bc937d2be11a33ee864fedc1d6d1f07de822767deac2
DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
@@ -117,20 +135,25 @@ EBUILD gentoo-sources-4.14.48.ebuild 742 BLAKE2B f98cd4f7f1a56c455a26cecabc6504e
EBUILD gentoo-sources-4.14.49.ebuild 742 BLAKE2B cb1c5e338857e4efddc9e0bf773a472a4ad373b499f54f815d548d778765a1f9f3d55579e796886d41fba95e4f715de9824102b6e2160d1f73a3c3df3e7a5fdc SHA512 c07e5e7e979c083e069ab5f7f4edfa457390c3712e92a7cc6575bc3df81f7660fc2125624c024373c29f0604650651300452f7241ccd6c8db49122dae50acd94
EBUILD gentoo-sources-4.14.50.ebuild 742 BLAKE2B 533d571a6b976647441b8b79a1bb1eab0043551ad05f4d129ccdc9c18c482081b6bd606ff59b754e0b512e0312844e98a01a995e380396d7b58884d4b2904908 SHA512 d4694cba9b2c38b3c9c7fb707ad15285e7bf8d02b946c06cd0f43479820f9a2be23e0e8618bc45c7de94c40ad976fdaa590886a8c1305bf09fa0a5c41d83a289
EBUILD gentoo-sources-4.14.51.ebuild 742 BLAKE2B eae1f0ca2b031194af508b6d221c1eb9133ecc07f1b5685074b95d8fe757eb231fc6dce0ffac09cd836510e56582610d40d9768fbffe083a48360de64da44e01 SHA512 e4b7bc94b57d48e3852116473b87f3a07f44da3258a423e792b2952852cb0b2e554de877e0112c3fa33850d6c25bfafff665bdfb2adfc2806451cca323e29fd4
-EBUILD gentoo-sources-4.14.52.ebuild 740 BLAKE2B c978763d80481c7e4fd16df0b42e99b803ab49c536a464c2b13177d85da3ada6a1db84f7a3b0b4c3a777d2d2e59f922b8b5cd566241c09aad75dfec3a56297e5 SHA512 78f7f662bcff0535b6be59cef78bb6112a17f54638b145c56298fbd83b9857af7d92d560d78553e3552331d073287037d2301c12f9a564a651bd11908e8d22af
+EBUILD gentoo-sources-4.14.52.ebuild 738 BLAKE2B fd0f63a82892484d22d0ddb8ec9cd5c5cd990b0cc1bf3c25c1b1e12d27fc2b115079f7dd87d01b7533cf8c8757228c4041b76a84b09ad5209ed307e8c77913a9 SHA512 9b52545ef76a74059ded7d583b8b57640a1017300088769c44c22ea21fbd5a760c0f87749219d08656a01b0f45a89729a25e52a101e868d0127052a6ada7ea3f
EBUILD gentoo-sources-4.14.53.ebuild 742 BLAKE2B 06edae98dd56976eaf837e9d51f7984e98955a63fd336aa998a13d1ffa2633d6837d752666d65663d1da94251f866444e6817a5bd9a2335e1d9e88ed06c185ae SHA512 6f53a34bf00ca702c277945612069a128583d8a7029aa67acb60a7ca2ce151e66888764b102befc4ad9b308485fe5fdc478cd3176baade69c7a6e8729e1366e0
+EBUILD gentoo-sources-4.14.54.ebuild 742 BLAKE2B 921e23e18c2a360fec2379d1a67b767be66e6d2db46daed11826ff711cac388d04aa50eb0986799f3108409260c47a730f47b80b430221b699fae367d98858c2 SHA512 5fbf2cb41e1d6d47f17f8657d2fee5ada07e9f6e5c6a3a1d3360989605af05f13a6d770711652ec31b424096973377ad6bd09ea4f349d3e8683a25a1dd00e8ea
+EBUILD gentoo-sources-4.14.55.ebuild 742 BLAKE2B 4264bc695467ed52587c75c48c87a309077d55f214697275cba65d7bce1e82c04cb0a831b42ac27e4c80d7a399aedc9856815c99687e00ffcccf74136df6a2db SHA512 191fb9c77cd98c7ed3983eda2dd143f2975b1fa3a12666bafd427d5652b37569f2153859dd18d050d9d98356a6a9f51589ec94612a5385be785e776184bd7fe1
EBUILD gentoo-sources-4.16.18.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
EBUILD gentoo-sources-4.17.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
EBUILD gentoo-sources-4.17.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
EBUILD gentoo-sources-4.17.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
EBUILD gentoo-sources-4.17.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
EBUILD gentoo-sources-4.17.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
+EBUILD gentoo-sources-4.17.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
+EBUILD gentoo-sources-4.17.6.ebuild 741 BLAKE2B df58106245c600e0bf9dd35a7eb2f4d25469e29769d81e314e552dd32b95e592acbb90af0413ae1559939a302d289005043ff729ca43c2fff520b133ac38a2d5 SHA512 4e94b88e040b686d34e8083e6cf9ae23a4d1b5bdddd456150b1b8f85203b645de42182c3043339600bb24c9ebe4b5e4893ce633f13fdbfaab9815809169a8f64
EBUILD gentoo-sources-4.4.111-r1.ebuild 738 BLAKE2B 2052014422e63b1e20f01d48f63a8eff2ae594e15ff9c873cc9d062db10c238c61084ff3c4e61bd3576af1b2744776a137972f6766e2752283b05835e40f50a8 SHA512 589b508bafdfa91c3b1f9faf390dc56795cfd5d43e8e55cde64b75ff7595f13e614d06f59a83ae1a30c2be816cabca08cdd5578c19bb459e8beab6cbc2945a07
EBUILD gentoo-sources-4.4.128.ebuild 739 BLAKE2B addd997d6cd91e4b777dcdb847bd5c3444b4c995025a8fd1202597082bfe87ba9e46817d5db2902737d7f73ab733db4b14c6688108da061fb229f234b5c19358 SHA512 8ec27f6b753c3d839a7741da8aab3e0fe4b3095a1535ca018605b31fb9dca8ebcbcf2fee47c2da99be42e8036fce6733e0b7bfda5c2d7a5d20a50b94b42ebcc7
EBUILD gentoo-sources-4.4.136.ebuild 743 BLAKE2B b0fd4a8b5501581a53820c0276119222184abe01bbd0c831f56b97015c4f1b39a8e5dbe47e6e647e82f322d9012c280e5fd91e04c1b464a111bb54362cc4079c SHA512 0139337d5e991cc8d318be840ee9fd2a927d058bbc869bfc1bd6d3d8b6e18a3f4e78a376a4b662c5e56afc4e90e44d2596af94dcb290dc0a744a2afb35924dbc
EBUILD gentoo-sources-4.4.137.ebuild 743 BLAKE2B 1f645c941deca2dd0f79956cfa522e97f28f086d7097b7a3dc443872ba6a14a213f40822c92d2add9f7675d14e321b607fc205258a9c2baeae52fafa72325324 SHA512 e0a71dd70576da3d9f641a654c4a830e2b5219a7bfe07ab7620add7ba77056a843633095f0978eb4b279aa006f2d8c00755396bc139bfc59e2df50e692d2bfcf
EBUILD gentoo-sources-4.4.138.ebuild 743 BLAKE2B 150ce5cd4bd48b9d45075c5da113c055fb748b18dedf700a0ff0bed0d08738a3870cce1f0e508b85bb23a92fb6f14128e4b240ecaf89ea7a662f5a05f979372b SHA512 0ab002e550fdb139f81e494a6b2f8a10e12e29a3a5c8457094212778d8e5271a52ca343d6af4f8dc798780faa55c4f0699c1a58c2ea6b6642c64890acff029d1
EBUILD gentoo-sources-4.4.139.ebuild 743 BLAKE2B ec3907567d2e4b558c0ef876361c4e521904672f4e4015002af6f3c19fbcf71d987ea5fe85d7955f044e3b7faf5c594b3f1f0462bc25dc4b06b11de3764600b0 SHA512 990c535730055aa1a656ff83a5e09ee3d724cf6717752d633e91efad29ad2638ebd9bd448283390d57036b73b61de280a284246bb34461984829f3130fa63a86
+EBUILD gentoo-sources-4.4.140.ebuild 743 BLAKE2B fc51ae791456368ecb5d6288c231609d8cdb05a87279ea1348d0f3de103098d0bc4bfc56e79e5b60f3faf99b5a28db082c07ba518dfbf3b930d5d7ccc29b3e31 SHA512 63896a27ad76ca4dd228021764ff540e4ab00391be283671ab7771040276ec786192c26311d25bd6e96703ae183532a530c2054c77ef1fe7e54639bf72308483
EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
EBUILD gentoo-sources-4.9.105.ebuild 743 BLAKE2B 05acabc46d977b7413be20fcdd250902f53d123f9cdfc66ae7f4d001b640afacf2f06092bd29b93d784a80fd1fb8ace5826a8ced01bcae4d299fe2b823f18550 SHA512 55d0ddf436ffb22424361f5c9dece9feffdb261faacdb9952ee21b3a7e3a94831da464fe445e4b4a0d4599ac13561b71f7a135ed63841a78e46eaa2b8429d204
EBUILD gentoo-sources-4.9.106.ebuild 743 BLAKE2B 17213846eec1bbab283ea3865c91479bb5867b6959a23cb9ed5d20b4b470bd88ffe42f55c0ff66c699603dfd44fd33fe483ba23419d5024d8fe56c76f40bc59d SHA512 ef339a1ec15a04c17748e36bbe8a408ff1278d42de5acc41332dd45ccdf23cd11b7915a92e317d8b90afb96bb2cd5fd185a57ee263566a7e98a7422e93d2dba2
@@ -139,9 +162,10 @@ EBUILD gentoo-sources-4.9.108.ebuild 743 BLAKE2B 9e804201d9ce8040b2d1cde4e3e4f8c
EBUILD gentoo-sources-4.9.109.ebuild 743 BLAKE2B d2f07b1daf99971fa57fa83274bcc489ce838fbab5363f270561cfbaa7847e0eadad8f8d964620c478135d2017e1abff4893575e0843d2dcd03594a5c4a130cc SHA512 3dff599c48976414d3a916b52dd892c3e6271d990a04432a442aadb70b8f6466e109bcedc3d3d14107115d8c4ede40758787403406d9f8fd82496d427d78f363
EBUILD gentoo-sources-4.9.110.ebuild 743 BLAKE2B b97cdb80532d857229893737c3897de72b7d480826c5b2e5ac8d0f71879d15ebdf38d2bf99c0eba90f69200bd9087482a423fe0220600df1ac87f4b06b2fee74 SHA512 d8f68277462fb19f98da7a5185d4617c72a531727ed014bf08c7b2bb36252561f2eef85fa94024d10c6d0c151fd74414ac0d68da80406ba25a018fa501b566a2
EBUILD gentoo-sources-4.9.111.ebuild 743 BLAKE2B 056a55dfb35a0ba7ecf78908c7cdee90e23756f9df93c803772908fc845368062d5117c0d0f98dc569db812721161e10084f311c7d6dd5c8387b78992d50b8f1 SHA512 a6b238120c4e158711bc9b2d8164c00396ae956344787c152d235dab88ac647f4215f700840c3a31c7693763318248ae93be6058773b2e16cbc620b600c8a976
+EBUILD gentoo-sources-4.9.112.ebuild 743 BLAKE2B a6fc92d93f52762d475da22e3537c497c2a726e12fb297dc3e643440e00e77302d5696d11c5c450a9c02d1e6ad79fdbcf3ba9897e8883ea677fe14ec7d86ebe1 SHA512 0ea9f84e0008c913ec9850b58edcc501e34ddf98e61a72e12e3040549a70a1a7c9cb7538269fe5fd984a16b3c57e6d7aa4b1a929fa1aedc9396083e50530a7f1
EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7ebc29ec545fdbff53dae3113b028392c41fc5557e949c4c07503fdc88b5c5f925b79316e48bc8ba8978a316554a2aa191 SHA512 d1c3b5fbcb59ac3ab703b8dd62a8f4f213dbc14526be00a34c3bb480dc4eb068297d02ab0fff33bd0d6fcf8973e862df74ca31e774cbdb0a437edcf892c233e9
EBUILD gentoo-sources-4.9.76-r1.ebuild 737 BLAKE2B fac5a16968488d560fa550e85e6f73c7f356d23f287abfcf1a2fe1aad048832f46bb152db6afcf2cab4daea535f7c51dff3672062d8379620cf2451d5d3e65a1 SHA512 6e3af1a01abcadaef0846cb4fb861d583561fb54937d60d22803eac7a7d62f1d4d1e3e05202fad77c9699a8d4a34d09ff915cf2af948a4e64224c4d1a1818d2b
EBUILD gentoo-sources-4.9.85.ebuild 741 BLAKE2B 8d7baaaa6ccca981447f036d1abad26bdd90c00ec806881a66bbfd528af255fc6797dd99de8c41f579e9b90c6ecfc0c0f030c6dc1557804ba9447522a69ea705 SHA512 de571b34110f7359fa11e474898fcf1ed05ed560e974a23fbedce8dee41967d414807d3826ed0aaea1190fb43f7313ad3ed444b351143bbc1caf0e8af8349ff9
-EBUILD gentoo-sources-4.9.95.ebuild 738 BLAKE2B d2daa641001c04dce2298a3737d6a97d3a53957bc7d78690321a90cbf13f83cf9991f974fa4e2a0c058c18e60f840b9796e19be504719bf717362b4a9106717e SHA512 9b3a3725f3845bdcd3853eb7ea37de374c38987c537f7e4c3d4010669a8688d6983e6e83e407e70b07ca69da5002d8388445369c99df90bf531d6acafebc4cae
+EBUILD gentoo-sources-4.9.95.ebuild 737 BLAKE2B 78f196e9dbf5c3d24f32edc2bea8bb23a525a2427d4196dce20b3f1608138ffa431103c8f586c9523880f1ffc5b5e2a31b9109b04a0a7016db2cf834ea19d065 SHA512 ab82a5279bec8af76c9d33e77ced819ae40ab93f9ca660f70feb5d62bcc35ebf71cbc10c9b8dd520f4ecf08acd06448d9ffd61a5515021e9cbeaba2498b6cbc0
MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.52.ebuild
index d23dac18490c..7ef92029cf3f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.52.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.52.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.54.ebuild
new file mode 100644
index 000000000000..5bf73911d6e5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.54.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="59"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.55.ebuild
new file mode 100644
index 000000000000..074d288a601c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.55.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="60"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild
new file mode 100644
index 000000000000..84cfe321515a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild
new file mode 100644
index 000000000000..8a49ade7edb4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.17.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.140.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.140.ebuild
new file mode 100644
index 000000000000..7a5a8e9c586b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.140.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="142"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.112.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.112.ebuild
new file mode 100644
index 000000000000..4e724bc3e318
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.112.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="115"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild
index 2501c7de4c5d..324752203a4a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 3e5de8bfa96a..1084bde056cc 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b
DIST patch-4.18-rc1.patch 52274025 BLAKE2B 8f3f9b01d981fbbdf4eb2b5857f8de305ccf434b3769d52bd029e98690f28ed82991001138bfbac38036b0c25bc491256647245b961ac90c1fedb693310ebbcb SHA512 3bf7227d5fc39d01f4be7706febde0973c3d8761457728bd0a01adb844954a9ef223d5d3f7c9a09132f6966cee0fe58ea72951363a96e7e8b579cf86da1ec8c6
DIST patch-4.18-rc2.patch 52841801 BLAKE2B b9d65a0f2afb2f75b34ca3886cb2599cf85aa60eff943d9afacb5d708b131dfdb8956b357e6e94dc5e82f21f60135d887d6a1845edac0f0b3da1b5216c5f2a16 SHA512 1fdd5360543080f53d0889ce644818672c29a27850e1cf54cddaa3d4037ff91c01ac582dbfc7bb9a7b1e265c35f1c202145c44830a03feccfd807b13654c0e66
DIST patch-4.18-rc3.patch 53031653 BLAKE2B 681fb4262705d4aaea58f43f050bbb781924c36adedbbf3c28768b1695e8bb22cf659d562dd6cd787dbe1007029646d575f10f228971d680526cc35bc1f48ce5 SHA512 ee568a9345d28a055a96a66681276ccb4240a159c57eb4d62c19ec640cf733a9be7e0b6536344be7c642cbc662ee5383399128bbc6210d627565a9f58c080a0e
+DIST patch-4.18-rc4.patch 53258687 BLAKE2B 3abd80176b7de14be61a8fd6826f9eaab970c20fe1199bd64615b44dbb573e20453f6dd4c9f23e029f8b83f95356fa1936f9b9c2527e4e0c0cd9d96bfcadb723 SHA512 c57e72111add18fe27c15487fa3c54e7982511a9d1f2bd46c530396a560422ed03c5988a0b2d3cf6225eeef08637c535c6c316932d5beb214582a801f8cd0bc2
EBUILD git-sources-4.18_rc1.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
EBUILD git-sources-4.18_rc2.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
EBUILD git-sources-4.18_rc3.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
+EBUILD git-sources-4.18_rc4.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.18_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc4.ebuild
new file mode 100644
index 000000000000..25e1d9d7bdbe
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.18_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.17"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index cd544b941748..4e2ad64db256 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -10,7 +10,7 @@ DIST mipsgit-4.9.0-20161216.diff.xz 1120 BLAKE2B 1207d943aa39d157cf1ed87918082fe
DIST patch-4.13.16.xz 271596 BLAKE2B 3ff4ae40c1ea5f9b547ff3d6bf59a065f84cdc66e9b6423b344c8fd7ea5ba96bd60e18861be64d2c6027b3b73fd30dcda99ada9b19f4a2daa8f7917fae0f1bb2 SHA512 6d9e6593477fb7aa663e6b9cdccb1d30df8d3bb3721b93afa9ddefce539d267bee062809dd6c50135ba113cf5220ef4b2799f25eca73c791ff59f4480189d211
DIST patch-4.4.110.xz 1553352 BLAKE2B eb4e37d1deee89586db12a56dab415a985a678291b74fd4c0c5ded3214e47ca7f9019e572db79ed2d534f737dac01ecf065460c998de5e902b49fbe2d8631be9 SHA512 c247b8258d203448f5f8e0595475a4ac73c9550dadf2cd910c3179aaffb43cf11580647146e6e27d9fbcb33d869be91d4c206f3f1090492123973e3f239324fd
DIST patch-4.9.75.xz 1339980 BLAKE2B 9f644981b4a1c173b505b9828a012417c0536732844ee9034e868b8679feadb40db5cfba1f1bffd31bb2f97960b13e3f682b01a27009d9fcca924e4dbe72d11a SHA512 4dbf9b7c6da142b63506542c0f1c5f0f3d4bb22c5291d4d99bcfc3945691ab5f969ce16b1d1a30553ba002feb3de66a9c39c1cf9c51a6c315e8820bc8853d221
-EBUILD mips-sources-4.13.16.ebuild 13150 BLAKE2B 2282d42810a3a08f26a4edded3b364a9fc704fdd9690d48a7fe8acfc2acd7405080b86f295ebf3c0134073ebaeae5dca5ad3c786d939c663611c2c9d0e44643a SHA512 5b60aae18f37390d715278753b97b39537061e447e526490b084108ff9bdf41471b48a91b89243c8ea1fba23d8f003aea2ecd4c2f9323c393c570fd7620ea89a
-EBUILD mips-sources-4.4.110.ebuild 13243 BLAKE2B 2e88921ec5522fe6a939276a8acfa4a21ac3ac25ddbe0ced5175358a5eebef1facab2c4cc941e8ece0cb4003366117c145ceefd56efb86922b026ad35019f5c5 SHA512 6a7812edd0bbfa9f65b0084a2b447f5185d597f635f90e306c377cc3b72f2be6b46d1e511cea1b47a3021b896e6f0297507dc19ea26a715a4bc57641e8e19ed0
-EBUILD mips-sources-4.9.75.ebuild 13145 BLAKE2B e1202b692eabf12cea2b5c81d2fd24fe2616fa4c0de9182c21b6ccfca78de1ebf32300fd2d0d9708153e73d09e0e67a2b2e926449fb01b822843af07904f007d SHA512 053284bbc06539cd1e3d21be171c8881898b2f24a7a3b1a46bbe93be0d9b0a08335bcb16fb456b80ec139f17a68d3cca861d3566e8998c9551d7ad88fadf672a
+EBUILD mips-sources-4.13.16.ebuild 13140 BLAKE2B 8f08b6b870d092a5b678c1a73c01ac252a4f3045496e25be72060922307b42fe44c2f33efb36815734e5a0fa14651833c8516b73998c929b465f3d5d231d1476 SHA512 81209ba1b342529ecc14172630574b11fbc2313042b4ab5e24d8f8b541071c51fcd74eebce5d5b9c74ae07cfb04f068a1851fc49ce0dbbe05fe7ea5e3d996c8e
+EBUILD mips-sources-4.4.110.ebuild 13233 BLAKE2B 1f6b8e4f13a245bbd86cfe3f81d4fc242d64279ab73b4944a2a00292d27e4e1e2dc6c14fd82fd33c2e75fc2dd900cee332a62660fff8a6514741d476154172c5 SHA512 866f79fdd9740b64a1f8b08aaaa6e77b92ed458bddee5f98ee3865112625f4cc9d6993bd7e4119052bb33229197d5f164f8b35819790ba0bdc5630b5c7f37360
+EBUILD mips-sources-4.9.75.ebuild 13135 BLAKE2B 01aadc5f38e521000e359a678109ab6ec92868810ae3a7009e1178fe39e588ea019e606c4e91887f1e1343aa50aeee273e7d20186e3a4e3c8ded702c25cde2c9 SHA512 bb30cc2249f70de0688bd0ec1b319b36922de9a6a391baf124d32ceaa4e43279224fc340f0c90b60993230f7011cb7539eb82d77f81791f31f328a06a01b8e83
MISC metadata.xml 791 BLAKE2B 8f6a800e1ce23fc8d8fa9a2e93f29c7161c30770ed2ed7345e1175d06a44298c645020317f6e21eac3d798edf4b2a72eaca8ae32207ad62c2e151e9d87c8cd07 SHA512 8a8f75a760d1ca13dc53038271236e16801136db499d52f97cedf0120077d06870750f51440f5cf765bbc8bc1cbc8745b354f467c582e219c58be3e700ee29cf
diff --git a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
index 656f5f1012a3..2aa774a33d25 100644
--- a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
@@ -24,12 +24,12 @@ K_FROM_GIT="yes"
ETYPE="sources"
# Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
detect_version
# Version Data
F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
# Portage Vars
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
index ec5f5a516a58..79d5f1e3cf28 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
@@ -24,7 +24,7 @@ K_FROM_GIT="yes"
ETYPE="sources"
# Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
detect_version
# EPATCH Vars
@@ -33,7 +33,7 @@ EPATCH_OPTS="-F3"
# Version Data
F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
# Portage Vars
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
index 06dc974cbd3b..124b95b19f6d 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
@@ -24,12 +24,12 @@ K_FROM_GIT="yes"
ETYPE="sources"
# Inherit Eclasses
-inherit kernel-2 eutils
+inherit eapi7-ver eutils kernel-2
detect_version
# Version Data
F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
+BASE_KV="$(ver_cut 1-2).0"
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
# Portage Vars
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index a7533baeaf47..230ae8e10144 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -14,31 +14,37 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.18.104-rt101.patch.xz 175128 BLAKE2B 62f113e88d0bbd54a9676f6404839e82a7f5facdd91d12ccc2ec82742e718efd0c43baae242c6c093d93944c5ffdb47cafc05e2df01e0eb4258215fa8e222e94 SHA512 a6a98f8b6ff56446d815f4dc775284e913cb4c2d3f477fb2eca9444b55cbc6247d8278bcb3786c97b9bba7456fb7ede572e4538ddb2c90163338374743eaf994
-DIST patch-3.18.104.xz 1502324 BLAKE2B 6404c3abb990667669f773fd86808397dc55636e61b501e4c4e25c13f4ce2584460dde7153f4864170e12e314dcf262ee42dc8ea17c80c33374b9dadc16b38b1 SHA512 d2c37043f1a4cf94b383ad48df3340783f1ea5ea59479028c8ec75328a46bf37ce2992c8e7568ecdba3f83d96a18b2fc32d5318094cfdb0d686ded9398535ec4
DIST patch-3.18.109-rt102.patch.xz 175080 BLAKE2B c9d5914c5a9e8cb4ce5d8a90d732f05649ea2f55d83c0ba1a2a0a3502667e1c354dae4455ea955a4e38619e479dd0ffc8e7efb99648581765a9e0d576caae39e SHA512 39f9a241dd9b113df6125c48744b7a061f7ff41a53c2cf3046558a144fe6456993ee229cf939d410ca655f95ec92689633cbdd5d641686b6b46533ee84a7075e
DIST patch-3.18.109.xz 1543076 BLAKE2B 92c0226ce5a701d3c814008c6686351694d724ad3fc4df20b492c4e408f47011d8e6a1c73617556d1dca5223f7b5d96f553fbd2f63e825aacc793796e7dd4036 SHA512 053ad85e88910ae4830061c5c33b6d82d02b459b83a3084cf4b136f90153ee2ddce6555ebb84ee7d11fe8c2b412eb4a59eaf1970a753bc9835851ff276f2b966
+DIST patch-3.18.113-rt103.patch.xz 174972 BLAKE2B b0ec6aa7d6093caa6e2c9cb6ca8e10b2ac61ec5687442219856df5c52a784d849c19db793b8bd67665237da8a1a54e68179ead6feed74768d99dd19b89990e24 SHA512 38a58067c8957bfb1ff7c353e0dfacbb9aeb3b3c5477e4dce4ec8d705624667cf76bd333a83a2fc50d75c528c237719399ab8e9af1e96b188c0343f0bb5b971f
+DIST patch-3.18.113.xz 1585572 BLAKE2B fb9fec8f364df103b73e7804f6d6deeb2605ff51fb4a4c82613010b300e2d52259af24c93e47c55b86f0aeff248e309314f06bff3814a438a062d1ff509e2863 SHA512 006830bc456a63bd64e0fc0a090ce60dc9e001c6b9a3bb845d9f635976004be1b0969078bd408b8bb0a339adf67cac958a23fddde2c2a86430033a9138c41abf
DIST patch-4.14.40-rt30.patch.xz 230352 BLAKE2B b788d4034b4398c2c499d5010c6e20bc455d35925f66acaeb02f4bf11efa43ddb793bcb92590008cfc0aaafa385148efd124ca2881247381bc85f0461375dcc3 SHA512 acd6e26bae67d7961abf9d3cac0a2ddf124b83b5087bfe533446a135dff42bc59bd415b88dfb56500239a0e726bd6b7f894a89f74e6cd1a6370c5e944dfae0d5
DIST patch-4.14.40.xz 1103932 BLAKE2B a06e9f1208a0396e3bf28ddad9fefb7bcd669271731fc3a3745e61eb62f4186138c00b03a5f7afb7a0c236a278d164043f07f01ee6faf0aca29ca1cd11e02d52 SHA512 4961a454836b8583cf3b0a743f08951c7084745039593f2cfb2630f836f33c471b7456d162556359255e6952e3652e9bb30e2b363985467787d4d0d73ad24738
+DIST patch-4.14.52-rt34.patch.xz 230384 BLAKE2B e31f747aa6c252627e5cb57a4f1978d115edf2ad724bc93e4772c58e47a15695d2bdbc60fb9d7433c40f6fc08d55a5703228ee4208643b5eeec182d430654a42 SHA512 78a85512412c5caf0a4d83b8b6dcb78087635f1c35abbc2675860d67ecebdd31b0d6c986ae61af76c776b66889bf626223e5ff0774ae524df2495ce7cb72ae33
+DIST patch-4.14.52.xz 1373656 BLAKE2B 387b9d34af20df773f4cea44f3b9ed28aa5c84411ec4754af1248dc120470fcc1b10537505952a0d32f3d5681d5eca96b4868975651c6b3288f0f80d6c6731cd SHA512 720b310700337d7c8b77b78592aae6c8d9bd08cb4da0437110ddcdf4e9e8146367293a2f2d94325787b5f201a09847badb50657082426212b610f6993eefc536
DIST patch-4.16.12-rt5.patch.xz 227940 BLAKE2B f7b6eef1a729f29cccc0587d235aea921623fdd5e1ab0f9e738651719fac66ab49084a416334886e128385a50132572ff04ababc827cdf1521df6841b32f4210 SHA512 5b981b5758933c61526d50a47e0f454fdf6ee91d45c191dd97339972ea27f3bb27ebfa23460cf8dbbfb593e013f40ba53e3f164053ef28e4fa0aadcf4c21da03
DIST patch-4.16.12.xz 301028 BLAKE2B 8700a03dda8a741311d0b09e7a6aa96476978dad03451582a9fe772dc4abe410a9f542edc65742bb7a214b3a6a9e5e2aba0e9113b42a48864763c11c60669b7d SHA512 7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72
DIST patch-4.16.15-rt7.patch.xz 226680 BLAKE2B 702333605c62ddb4ca71afad3807784842dc8cdf75682f15672e9be535fc89cfe9035a9f1056d39ed7b99ad0cd30d4e8c573cf27e9eed74886da9b2c69c1b23e SHA512 72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb
DIST patch-4.16.15.xz 400912 BLAKE2B 6250e736f10d71228aeef4db42c626684e8a323ce411d08e2dab3663fec400150b9285a08af9ed13fcea9e9cdb6442cdd68fcf389d2e836ebfc1c5a7a8791500 SHA512 496a8a85758b4bae9b3082c45d7e9c8a87bd10a8a2ffbb086f96b83e0ed2e3449ebe8bdd50d138219a55c96a93dd87c9d4802dc0962112e8e78115de77d3c363
-DIST patch-4.16.8-rt2.patch.xz 225952 BLAKE2B 767a9c4a51a886a544203d8a4863e72000eb5d347edf66f1a7b60085628f96ec0a336582bbee7e956211cb312b0eb3f03987ad319c42ad1e88599c2717ea6dfe SHA512 609541e14f89d771ddf8c5cc5b7f4724f886f992511883aad021dca56ce905c34fe7f0215788928052e40d21f938f822fadd7cd4073890e809789263ef725aca
-DIST patch-4.16.8.xz 189408 BLAKE2B ba3586ae91ef7a43a81da76c812dca3bd6bcd0e00c508d04d1f81b28d6304eb4aa3177efe0acdcd231a0d829a0dc231f4c5463a97c9999d0cf1ab16f007d2a58 SHA512 8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0
+DIST patch-4.16.18-rt9.patch.xz 226696 BLAKE2B 5084fa7d266b14ce2050a311cebfd9279e26c950f65b2931e646adbc9414be15b3f298f8eabaa892e49d50b4b890424bac583ad0a7cc2824b75b5dc8543bfff3 SHA512 ba4a38055bd86e1284efbb2cd08645a8b687bf96fa0e64fc42345e2f98c5f58ddf62683f7943dd525ece39b1026a8751930eb02e75cc98314c6a8e91536ef822
+DIST patch-4.16.18.xz 506924 BLAKE2B dc41b7247e58808e1827fda7b4236ccac1ef8150f4c200161f4a9cd91912a7cb8b72337dfd403c3b1d7bee3d2626b5d53e3c3d595d80418da57bc3f9b58fdbce SHA512 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
DIST patch-4.4.131-rt148.patch.xz 196408 BLAKE2B d58fc0441b7282ffbe01644304f6630b079aff1af200e7fac98e3ee95d1664f3186f5f26e6377a56376a8ac7324774d159d232577101988cb773facf86360c64 SHA512 44ae0b66cca897d850486b1be2f97a2d0d697ebc31e46326673ccd5ed373f7f0deb7777a5f538d3932e41669fd86f3f496da7d32c79081383668ebb7144867b4
DIST patch-4.4.131.xz 1871404 BLAKE2B 3d7729d4e3ce75888670d57368b651f2750f46e4c94826525095b791f6717badefede520a144b098fffb9ac08b3a08d0c567f0e391b94cff8869cdb6afe9592d SHA512 856ef10be19b07a2e1fbc777dd0052a145f5ca49c59b29ec4e5205babd478d623bfef40ed06c2fa113292e512701b4dbc67723cf1a946f27ce38b601d003bff2
DIST patch-4.4.137-rt154.patch.xz 196172 BLAKE2B 2eb6b97ee9c9f59a0d9ca0bc622f4163ae117de2d230b9a4b26c9e8f0fa9fb78f604d2fb44b804106fc900fafe101fa1b0fc02567e172dcb414d58c8c3b60b39 SHA512 6c378e5502a69f7fc10d9a97ecc0981cae2ac4275c8858cc087691142ae55016a6388c0d4bacf575f368756930a63a77b0a19bf8234a5f9e4d38068d85d72a57
DIST patch-4.4.137.xz 1966024 BLAKE2B 802b4711b07ab799be48b74c51eedb7fa5ee5d327e29a972c92fc300d3b7180848fdeb4c95f28d25d16a56605335a2c44c644eb66dbf6517bbdaaf3a77cd4f77 SHA512 ddab3061b1406d3fb8975e3ef4ead22a97388309232bc30df48d24a0724302dc6b92293a0bdc10ec37964af0d86fc66118fdaeac22a8853bfdc85ab6d66a0ee8
+DIST patch-4.4.138-rt155.patch.xz 196252 BLAKE2B 963697e179660b30ccd1e166be93a0e7bb7a08cea7422a906af11b6d4859cb3b97158c64ba57ae35569e95f7358d839f401439f92cb094ca5da79429d6f85cae SHA512 30dafe87c77080396385de6c2ea0a02294a61b7c853034ea35158f7bfe8a640eb6006d5eddec8ce1b1d7bc57560dc995f2bd6bd0020b94c5b5eac57fb3f06b7e
+DIST patch-4.4.138.xz 1975088 BLAKE2B a95590d1576f078c3c2811b676ef6d88768d8dd1f55d35dcd6859a9d778e0c6a9c0298d9d3c38f6ca69db041103572f63645353e0b9528721169870e9f458bd6 SHA512 fb4cf2b1eaefa1cf1b34f7ef238fc6536e8f00c12c80629535e4e026b502471b66b3f3d005e06ff1f09facb89cc7dfdc5475b812f3a80181a4382f5d190457d8
DIST patch-4.9.98-rt76.patch.xz 173232 BLAKE2B 77f8e3a17bdcf126b9854d54f6a15fee483e422ffc60e7f656ca6298bbbcedc7c9a1d907ec151e1305bb1c8673644473de4410088892007bd1c8c80c3b1b4d53 SHA512 1adcb149f5991300aebdb88595bd93d941325cca5880e9f0e195c2771468ee018cbca5af21401b78064695785e6bc16252767d7399df4002b5add03cedce9988
DIST patch-4.9.98.xz 1811528 BLAKE2B f6244076779eeef08399128daf07d4a9ceb42065bff4f89b5f40ef3dd9dbdcf36daa5cb064ad13635c91e73b3d9bbdb57dd64dc4d5adf07042b1f96c7e8733f4 SHA512 e1aa814fac33ae6dbfbf2e0cda40a1bebbf420d33c6448de718726f94d2ba0c9538b18c3251fb46202d90da6aa56add466d4328696faa1a05c50478aa3f99a5e
-EBUILD rt-sources-3.18.104_p101.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
EBUILD rt-sources-3.18.109_p102.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
+EBUILD rt-sources-3.18.113_p103.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
EBUILD rt-sources-4.14.40_p30.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
+EBUILD rt-sources-4.14.52_p34.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
EBUILD rt-sources-4.16.12_p5.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
EBUILD rt-sources-4.16.15_p7.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
-EBUILD rt-sources-4.16.8_p2.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
+EBUILD rt-sources-4.16.18_p9.ebuild 1423 BLAKE2B 27526bbd4639ec9ea40b2642d6663831bb0515aaaaf4b498d90db260fd2ac0413bb16955d8b9dc4f02d4802d2c696b4625f28c1d36abbc2ca33c0d79d92b2e5b SHA512 d4976cc287b4ebcd5f4aa9fb57a2e3d92a37bc47d191d36b2bcb2c745d8c343bcbf3c0a7315ac3c3c5d9d5bce6c48efe50f89b69ba4768eb15289b9f1d62946e
EBUILD rt-sources-4.4.131_p148.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
EBUILD rt-sources-4.4.137_p154.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
+EBUILD rt-sources-4.4.138_p155.ebuild 1490 BLAKE2B cbced23c3d21d46097b3e36694867ae87b0e1325b9632cf65f2c1da3adf2cbecf46f3f957e5cee2751eec7ffe2752491d514de90c5ed24a37864e2c8f3dcb85f SHA512 27616ae3b89249b1f96034bc72dcb01f76fd12c3563f41a1314d0d949cc2b05548e0582ca20607623dca4eefad71a451d3c9eca345de3f87ff4d9b0a36c71390
EBUILD rt-sources-4.9.98_p76.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
MISC metadata.xml 656 BLAKE2B 3bd604678b07a267b32917a36104fae8ac19abfed08ad8400368dd1d165f628712ba924653b6a03062f065a1d93660c5bd95addd463633f799a525cdcc5134a6 SHA512 7645322de766780bef064c3b6313009bf7ce4e4e28c247ce7707d0950bb7bbb792091254a4af1fc9ab3d24923fd69ebea0f9d253115527ef6b48cffecbcdfb67
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.104_p101.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.104_p101.ebuild
deleted file mode 100644
index 1ca2170247ac..000000000000
--- a/sys-kernel/rt-sources/rt-sources-3.18.104_p101.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
- mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-PATCHES=(
- "${FILESDIR}"/rt-sources-posix-printf.patch # 627068
-)
-
-src_prepare() {
- default
-
- # 627796
- sed \
- "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
- -i "${S}/kernel/Kconfig.preempt"
-}
-
-pkg_postinst() {
- kernel-2_pkg_postinst
- ewarn
- ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
- ewarn "If you need support, please contact the RT project developers directly."
- ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
- ewarn "the ebuilds."
- ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.113_p103.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.113_p103.ebuild
new file mode 100644
index 000000000000..6ec80f749bb1
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.18.113_p103.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+ mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+ "${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+ default
+
+ # 627796
+ sed \
+ "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+ -i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ ewarn
+ ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the RT project developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds."
+ ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.52_p34.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.52_p34.ebuild
new file mode 100644
index 000000000000..d65a86c4c306
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.52_p34.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+ mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+ default
+
+ # 627796
+ sed \
+ "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+ -i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ ewarn
+ ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the RT project developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds."
+ ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.16.18_p9.ebuild b/sys-kernel/rt-sources/rt-sources-4.16.18_p9.ebuild
new file mode 100644
index 000000000000..d65a86c4c306
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.16.18_p9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+ mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+ default
+
+ # 627796
+ sed \
+ "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+ -i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ ewarn
+ ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the RT project developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds."
+ ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.16.8_p2.ebuild b/sys-kernel/rt-sources/rt-sources-4.16.8_p2.ebuild
deleted file mode 100644
index ad4f19f2289a..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.16.8_p2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
- mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
- default
-
- # 627796
- sed \
- "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
- -i "${S}/kernel/Kconfig.preempt"
-}
-
-pkg_postinst() {
- kernel-2_pkg_postinst
- ewarn
- ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
- ewarn "If you need support, please contact the RT project developers directly."
- ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
- ewarn "the ebuilds."
- ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.138_p155.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.138_p155.ebuild
new file mode 100644
index 000000000000..6ec80f749bb1
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.4.138_p155.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit eapi7-ver
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+ mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+ "${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+ default
+
+ # 627796
+ sed \
+ "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+ -i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ ewarn
+ ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the RT project developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds."
+ ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 77657c76a514..5c6ac0fdd302 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,17 +9,17 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
DIST patch-3.16.57.xz 2026584 BLAKE2B 275c631a26fd7832f5845f2bb74ec053b2e289e72b4a7578cf36427f8939f6267d99395857cd40b26e61a56fa2ea8d913298889bf0b629f48f8fc951ab62b398 SHA512 ceb84c52cee592f2bf19d47522a01e66c98edea1c5b532b667fb92c8919ebe905c9340bb68bf38205518e5f41e7ab4059f37e40d334c05f4c1f9f0f28f1caafa
DIST patch-3.2.102.xz 1964152 BLAKE2B 92a9ddef295250db735f7212af956e47385818b1863b27f7852afc6c0a36b3cc1d1099fd3fa37f3de9a8668f4aa7250fbae467451eae67fa4371078dd0de2009 SHA512 15e17a1eb39cb73d0efb606d78a44c811fe83b24004ac45504b32531af1db29f1d333382fd5270c8ccc56d714cedb124a07f5e31b1eda93f45715154a721df4a
DIST patch-4.1.52.xz 753264 BLAKE2B 57e0d116ead0a994bffbe019f229c607c71201452d6a8bb57c9855b637b011471bcf383d51fd8f2222e725498210d3ddaba7a3a3f6af491effc909a15f902275 SHA512 0d18cb892b62edb42e48038125b74edcf13093cefe30616403f0e75d44974d57e569ad28a8c98d9d80b3fbc360f092b7c045778e17e28bbb9748528ed87df43c
-DIST patch-4.14.53.xz 1413924 BLAKE2B 6b643fa30b5d5e09ae01addcc6bc8a03bb24f92e75849d3f303a1a5ef54b3c3c6fe270874200a6eba0586d1cbcd61d4c709118eb96fb4a535d9373581621c2b9 SHA512 13184112b114b30d0c6a18a87e846650e0504e68d1be249f684828d2cbe9e5f3bfad919f3e2c9adc74afa77e15c5553b96490857eb0aca2e5f15ec63c83c702f
+DIST patch-4.14.55.xz 1444204 BLAKE2B 0fc797ba53ce213404691de477adfd40e29fbf82568362351b9efb040f2cb83e916e5311216e0bf4bf5d6b0b8a936ab023f76569c58cbe2f797851813831ddb6 SHA512 9801d5f197ca3db39f43abe2a8540d9bec92d19f31accc8017c9d0226d889b3da8765cde3268dab7cd1097cfd804d42482e5343f9429926fcbd9a867a038f766
DIST patch-4.16.18.xz 506924 BLAKE2B dc41b7247e58808e1827fda7b4236ccac1ef8150f4c200161f4a9cd91912a7cb8b72337dfd403c3b1d7bee3d2626b5d53e3c3d595d80418da57bc3f9b58fdbce SHA512 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
-DIST patch-4.17.3.xz 47420 BLAKE2B 889b1ce91cfbd1fd84096a855d90f6004e5625fc3f6adda953b21583bfce6637a355e928674e0fadf62689b060dacaced7c579c30ea826cc0910bfa29a09d31b SHA512 c0b3dfb1c1d64edc74cb3b35a4d6160ccf80b5b58d19e5a11dde372ab515c350576f8981b3816e4e8689da38b792eb85b3ef46581d65d7c51c72943dea7409f4
-DIST patch-4.4.139.xz 1991704 BLAKE2B a10a1c95053d69bbdcfccd26703f66b028e9f3286a99e0b2015ada9cc378cf69d67a18347e07671d8bcad1e129602dcd3cff260263ca92c30c235848968e2030 SHA512 2266cf0d636d81999abc23f9de1dbebf6d12c74faa0949166a88d6e2a753564407e19645d8aea2da0c48491cb976c135c573ea0ac046b974c92ff1e7ffd3123c
-DIST patch-4.9.111.xz 2042920 BLAKE2B f57dac60eb519d7b4f8b658cc80ef105d65d666d43337362fd0cfaf4a36402f83b7ce90450c9dd17db657eaa095b9e5d45ccf2f69e8315aaccbef2d1fe1f635b SHA512 fceecfede02356b4feee69dbf5668698941f3135c181193c1db062f94177baf12d28e27bd38d072f1cd7aedb47398184331ca222e4abd98cd1fbe5711c30c2e8
+DIST patch-4.17.6.xz 138580 BLAKE2B 7c1a94af15142d8728b3be91c480d73f8a500d2892c8447bab891d883c0acfbbc22927a3a5f91fc372c4975e735b0231494584c929b4a356f0b2e9a4c32c9b3f SHA512 4b791d94db704cbbe3dbf6b340735fe7999957741f116ca14060ced836aece1d4b51d0c3f376af1564e7379fbb9c9132a8e4d021fc74599f3ab037237d718651
+DIST patch-4.4.140.xz 2001088 BLAKE2B d95151c5552edc16c61f21220e7df0f5f29af9708831243814c5a2a57ef0033e9dac1454fab328daceedf3c45dd1c2b3638aedcf6a1a332ea770f284717b7f5d SHA512 5c9c726054fcd1abc6c52b86de62f721e9b7b2826e00e56db3fbd63870fd5cd24f946aadc10677de29888823b59bf0317d93872c14db477661186aeb94f67bcf
+DIST patch-4.9.112.xz 2053420 BLAKE2B 92b849ba7548a0913101911b2c75a7e66480e04d005deee885ab3ef2bfb0d0324d00d71d03519662c919d20bd7e973e4ba9ef6342eea8a45faf89bdb9be2a9fe SHA512 59d6d4cea19c087b0e69573fe1c53fb2c74b0b32e5faa357187436d292cc908abe5770e47f868c5b40dd2136e0e6298250314e5fbec00154bb8394bbdd512dfa
EBUILD vanilla-sources-3.16.57.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
EBUILD vanilla-sources-3.2.102.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
EBUILD vanilla-sources-4.1.52.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.14.53.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.55.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
EBUILD vanilla-sources-4.16.18.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.17.3.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.4.139.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.111.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.17.6.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.4.140.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.112.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.53.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.55.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.53.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.55.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.17.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.17.6.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.17.3.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.17.6.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.139.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.140.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.139.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.140.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.111.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.112.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.111.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.112.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index dc26e7f80630..1ff949a55575 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
Binary files differ
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 940be0a04248..a97800047de9 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,10 +1,10 @@
AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3
DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
-DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
DIST e2fsprogs-libs-1.44.2.tar.gz 715214 BLAKE2B 696702563e30f877f1ced23c116240b6f5314987858492908396a5190019df095165e3e2995bc00330a1a3c19052773c483928db93bb2f9f01dc73de69858edd SHA512 c133c779b7ad4f51977d5c5627810f3808b0e40559726e99eadaa7beaecf08d09c6da6041c376148e71f94c60c2be185c9ed0b1c3fbdeda5e113a32f10b1b6c3
+DIST e2fsprogs-libs-1.44.3.tar.gz 716297 BLAKE2B 1b0b3434aa05027d3722e14a5825219be91f017f539dd6c9842776a49d2903227fad81866c03582aa119670f4fd66103016d88d062c318b2cb6097219d166f1a SHA512 934d9a4c056f60029b93727bba2ac9def080ee2a6c308267676379fea77510d93f2cd41551e5ed3707cfee1fa8a9a1de8df0af1f5c00aeaa66074b1f07e8d23a
EBUILD e2fsprogs-libs-1.43.6.ebuild 1851 BLAKE2B 0681dd618ced1e9bff041865c4a6363c11f68b98aa9b9b816333d77d11478228ef6587e318c1760da8723c2488b41ca0267ba205fdd2147146c8bb638a392dca SHA512 74bee96a90b10ee3b3e5bc8f68e1756e8d1b87eaa6a0a111b03d36b6eaed06eadb6232f69799f8cbaa47fb1a6d763f87e500663035ea0a673da7799e88e71274
EBUILD e2fsprogs-libs-1.43.9.ebuild 1866 BLAKE2B c92a20a599c29fff87f918567fe30669aa752fdd10fc136df33a88eaf57ceeab593c20a1bae8d9d9a3ee37b3cead182bba56fe98b62296312d4a2ba68982eef0 SHA512 ae3af838f839ad0980b562d5e4b1611f871ce472c252b9db924db686843932bbf137a6458363cc025fb595a1f5dbfd886048b6cc888b5c9b587dba142408cc94
-EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
EBUILD e2fsprogs-libs-1.44.2.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
+EBUILD e2fsprogs-libs-1.44.3.ebuild 1871 BLAKE2B e6cd648fd65c989f3f3ea3ddfca981421214eea8e05faf37a7c36c90bab587ffe12371efd26db11b590415a2ea1fe5e663629c20c95614a5f80ab3ceeb6bf43a SHA512 58a2bbe5750472ce84e0dacd894db29d5aecefd7a153104e1676d49687e2abc05992b8588fc7f95ecd6d5da20dc8032e18f6c3ac6d5bb08548130c66ffcdf203
MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild
deleted file mode 100644
index 68c23f47263a..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*) UP_PV=${PV} ;;
-esac
-
-inherit toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
- mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
- !sys-libs/ss
- !<sys-fs/e2fsprogs-1.41.8"
-DEPEND="nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
- printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
- default
-}
-
-multilib_src_configure() {
- local myconf=(
- $(tc-is-static-only || echo --enable-elf-shlibs)
- $(tc-has-tls || echo --disable-tls)
- $(use_enable nls)
- )
- # we use blkid/uuid from util-linux now
- if use kernel_linux ; then
- export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
- myconf+=( --disable-lib{blkid,uuid} )
- fi
- ac_cv_path_LDCONFIG=: \
- ECONF_SOURCE="${S}" \
- CC="$(tc-getCC)" \
- BUILD_CC="$(tc-getBUILD_CC)" \
- BUILD_LD="$(tc-getBUILD_LD)" \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake V=1
-}
-
-multilib_src_install() {
- emake V=1 STRIP=: DESTDIR="${D}" install || die
- gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
- # configure doesn't have an option to disable static libs :/
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
-}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild
new file mode 100644
index 000000000000..fa94345c971a
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*) UP_PV=${PV} ;;
+esac
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+ mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="nls static-libs"
+
+RDEPEND="!sys-libs/com_err
+ !sys-libs/ss
+ !<sys-fs/e2fsprogs-1.41.8"
+DEPEND="nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+ printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
+ default
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(tc-is-static-only || echo --enable-elf-shlibs)
+ $(tc-has-tls || echo --disable-tls)
+ $(use_enable nls)
+ )
+ # we use blkid/uuid from util-linux now
+ if use kernel_linux ; then
+ export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+ myconf+=( --disable-lib{blkid,uuid} )
+ fi
+ ac_cv_path_LDCONFIG=: \
+ ECONF_SOURCE="${S}" \
+ CC="$(tc-getCC)" \
+ BUILD_CC="$(tc-getBUILD_CC)" \
+ BUILD_LD="$(tc-getBUILD_LD)" \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ emake V=1
+}
+
+multilib_src_install() {
+ emake V=1 STRIP=: DESTDIR="${D}" install || die
+ gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+ # configure doesn't have an option to disable static libs :/
+ if ! use static-libs ; then
+ find "${ED}" -name '*.a' -delete || die
+ fi
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2d32a47d25d5..fb2cbef2a9c3 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -46,5 +46,5 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff
EBUILD glibc-2.26-r7.ebuild 25619 BLAKE2B 46b2940a19af94728e94544243f12f0ae6eb2c4d7c0b82b9406ef0d4bfe3bd948f60ad605e01a092f6837f29b6ada840f8c70d0fb5adff4ba649ec2b49c52ee0 SHA512 7b6c0c2f844d782267de387e74ea74410b10ceccb6253c3906a7ca93b0fa69e85aff51ae6657a5933c771ab87516db1547c93648963ea7489008776d74265e73
EBUILD glibc-2.27-r4.ebuild 41434 BLAKE2B ad24af35925a429c5680824554f9b388fec11f574ec6be63a327aaca485a3d80c2656d29c25c6562634580ef1f22022fb748c794d8e1b7482cef404f4f7d1e4d SHA512 58b98614032c0a7c383a833dffdb93862b30c1e19dff8d0d62c4363c5f4d18ce7edc5b481ad5ee58d12511b682c962ed8db4e411a68d069dbf340f9a23f1a268
EBUILD glibc-2.27-r5.ebuild 41596 BLAKE2B adbdb3342101e38e4889f63fffab3ac76ac1e0356017281a036d699f937939e3a5686a6ab83c52e313b43af3043f50f0e3abd953d36800bf564f4d71c0b8cdc8 SHA512 fe028a242b7efe5847b00d35be9883385fd42565277d3bd193c7cc6813f5b3f9ad509ed724669ead8d8db55c0a7d6174862c9c6287761c18586f0f4939e56979
-EBUILD glibc-9999.ebuild 41675 BLAKE2B 0a29bde72aa5a1005cb53327ffcd9b0f562014bfbacf43d33274becda680733bf169126ef83d1b6837b4909c5a07f7a78facc08fc20994e0b1e7c53c758bdd26 SHA512 923aa805b438b3c105338cfabed3a6a50ae1451d920b1bf920db21a07c39eeb0895bf48fc30b2d2f1dc270b1b4d295d5442bbd7defc3e206eceed336a8140b59
+EBUILD glibc-9999.ebuild 41740 BLAKE2B 16a6bd98fc191faedbafc30bdbe19d3cd39a065d0f10129fdeffc7799bc28751a7deabb5024d09ab250e5648fe77f7d48bf77eff66e81191edee59d4df86b719 SHA512 e066a346324f5c7984e0e1c4905072725e636c94326d1bbfdc5d0f2d19d7df488ada4155f438c95653ed7d78749de96becef0ceb8ac1d10442c8284f2399e3cd
MISC metadata.xml 1149 BLAKE2B 653840c6693ac06ed5c45d826f0ac3b0007719883fdaadffb89ce7c87686562ad9e15ccdf5987bb78e616a07f989fdadc7db515b1e53c15af6685de042c2771c SHA512 9ba7c1143839e863347a834bf92d1dcef34ab08c22f962a02bc20068c3acbd58d3c2f6106895b194546c5d656d2720f89609c1e50651bcbdd1dabb3ceb8da997
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 8fe8178fbb4c..a0c2c4f3d45e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -684,12 +684,6 @@ sanity_prechecks() {
# When we actually have to compile something...
if ! just_headers ; then
- local run_kv build_kv want_kv
-
- run_kv=$(g_get_running_KV)
- build_kv=$(g_int_to_KV $(get_kheader_version))
- want_kv=${MIN_KERN_VER}
-
ebegin "Checking gcc for __thread support"
if ! eend $(want__thread ; echo $?) ; then
echo
@@ -698,21 +692,29 @@ sanity_prechecks() {
die "No __thread support in gcc!"
fi
- if ! is_crosscompile && ! tc-is-cross-compiler ; then
- # Building fails on an non-supporting kernel
- ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
- if ! eend_KV ${run_kv} ${want_kv} ; then
- echo
- eerror "You need a kernel of at least ${want_kv}!"
- die "Kernel version too low!"
+ if [[ ${CTARGET} == *-linux* ]] ; then
+ local run_kv build_kv want_kv
+
+ run_kv=$(g_get_running_KV)
+ build_kv=$(g_int_to_KV $(get_kheader_version))
+ want_kv=${MIN_KERN_VER}
+
+ if ! is_crosscompile && ! tc-is-cross-compiler ; then
+ # Building fails on an non-supporting kernel
+ ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+ if ! eend_KV ${run_kv} ${want_kv} ; then
+ echo
+ eerror "You need a kernel of at least ${want_kv}!"
+ die "Kernel version too low!"
+ fi
fi
- fi
- ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
- if ! eend_KV ${build_kv} ${want_kv} ; then
- echo
- eerror "You need linux-headers of at least ${want_kv}!"
- die "linux-headers version too low!"
+ ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+ if ! eend_KV ${build_kv} ${want_kv} ; then
+ echo
+ eerror "You need linux-headers of at least ${want_kv}!"
+ die "linux-headers version too low!"
+ fi
fi
fi
}
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 0c3a317b5405..9e42d8db563c 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,5 +1,3 @@
-DIST gwenhywfar-4.19.0.tar.gz 2362848 BLAKE2B cfdde7b26c9ab26d0ab8ce45ccb8da417bc118507e24d7c4315d0f0480deb92e60f331147cde2145b7b41e4764d18266ed221632b0110e3735a20ce6a6a674b2 SHA512 d05b230f7c00247301428046bf9ed643915d0939d804c78622892ae85c81dfe244832a8375820d489277251b407e424a5cf9b19224ad14f7fbfae83485e00da1
DIST gwenhywfar-4.20.0.tar.gz 2379537 BLAKE2B 7e3439959f61c28d8845ee8355b21b71446f3108f5e344ee600eda58cdccb31cfe93a45cdc9ef8b682fbb3171d20658766918924b48150fea5f2abc1eaa76af1 SHA512 bc1d47c39654940198396f1bdb9f4a87ff4e0e6b07cb4525c10f7f8e6ce93445d5b9d85586a47c93c558e86eb826f7006eca29b93fad6371dfe72830bf9b88e1
-EBUILD gwenhywfar-4.19.0-r1.ebuild 2801 BLAKE2B 7d542d3f8e6f51c2ec9ed90abb4e890b07f21f3bbed1e3abc46450d7ecf460eed2c83fbfd7f77fd6906726ed8d000c783ddcf461ae113c3ae3ebd8b836480cf0 SHA512 cd53962b1f7422c7c25259dcb1a5e20289de1b7d67db45f3e940d2d62c8b1757ea41d68a49615f207d189542e09e91cc1bfb92414b742f35477764016bfff485
EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
deleted file mode 100644
index 5509c4d393a1..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_beta/beta}"
-inherit qmake-utils
-
-DESCRIPTION="A multi-platform helper library for other libraries"
-HOMEPAGE="https://www.aquamaniac.de/aqbanking/"
-SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
-
-REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
-
-# TODO: not yet required by any revdep. Switch gtk when gnucash is ported.
-# gtk3? ( x11-libs/gtk+:3 )
-RDEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-libs/gnutls:=
- virtual/libiconv
- virtual/libintl
- virtual/opengl
- designer? ( dev-qt/designer:5 )
- fox? ( x11-libs/fox:1.6 )
- gtk? ( x11-libs/gtk+:2 )
- qml? ( dev-qt/qtdeclarative:5 )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- )
- sensors? ( dev-qt/qtsensors:5 )
- serialport? ( dev-qt/qtserialport:5 )
- test? ( dev-qt/qttest:5 )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-# broken upstream, reported but got no reply
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- disableQtModule() {
- local module
- for module in ${@}; do
- sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
- done
- }
-
- use designer || disableQtModule designer uitools
- use qml || disableQtModule qml qmltest
- use sensors || disableQtModule sensors
- use serialport || disableQtModule serialport
- use test || disableQtModule testlib
- use webkit || disableQtModule webkit webkitwidgets
-
- local guis=()
- use fox && guis+=( fox16 )
- use gtk && guis+=( gtk2 )
- use qt5 && guis+=( qt5 )
- # use gtk3 && guis+=( gtk3 )
-
- local myeconfargs=(
- --enable-ssl
- $(use_enable debug)
- $(use_enable doc full-doc)
- --with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
- )
- use qt5 && myeconfargs+=(
- --with-qt5-moc="$(qt5_get_bindir)/moc"
- --with-qt5-qmake="$(qt5_get_bindir)/qmake"
- )
-
- guis_config="--with-guis=${guis[@]}"
- econf ${myeconfargs[@]} "${guis_config}"
-}
-
-src_compile() {
- emake
- use doc && emake srcdoc
-}
-
-src_install() {
- default
- use doc && emake DESTDIR="${D}" install-srcdoc
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index c0d2f7a7c507..6bdf36fcd76b 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -10,14 +10,14 @@ DIST ldb-1.1.26.tar.gz 1262660 BLAKE2B 66dcc38eb97fe4357d06b301ed1de5cf868adc5f3
DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b8201948eabd440d164d182492002c1d92047d652105c2fb6a3e8383d4b75f45e38cc52efc5d9a0e2811113676203a SHA512 d37bbe84358e05d17483e2e963b8477da5ea351b855b454142c94af35f7987bede0f19faeaff17779efe04e3bb37c510437fcc59be99a17c826620fc25fd659c
DIST ldb-1.1.31.tar.gz 1337586 BLAKE2B 9454f91a621368cfc7cfdb709781653e947d63b275bb3b288049acb43ee3c02ae4f0be820ccf9e3bb32938d12598a91b7a6292b08c638ccfd59bd1be182f09c0 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824
DIST ldb-1.2.3.tar.gz 1344513 BLAKE2B 941174d6e2c51319c8690a8d8a87bea443d4fa4d738bd13243b502fdc9d590ba075fcf4a9920c38bb6fc15564f0b116089cd62d99e7cfe33649dc751910265ad SHA512 500ab069cf6cec39907300e3905d334163b5094087831708acc22c4199b006ef52af3b66aade7558a48fab7cd69be3af7883bda3816a83c576d01b36ab270247
-DIST ldb-1.3.3.tar.gz 1370823 BLAKE2B 1e00dca5cc66fc8677334e79d4e36efebad516775116ac0f06884a08197f9589056acc5bc377d6317dfd67926cb6bccbdfe18e1d259875cda4dde86251779fd5 SHA512 ad272a1fd82d5138d9a056c1d81cfcd6167886719852b41447b9e6fb6acd926b137fd76e16f476d68bc0991943142ea1482666dc48155e9a1ef09f13b041c350
DIST ldb-1.3.4.tar.gz 1373954 BLAKE2B fcd560089fdca9f983e017008173ff1bb04dc23d08b6eaf85f9568278856f5262d4df6a8defed22f8c052d57615787007cc80ebdbedb90462064eff7d3ec3488 SHA512 b02abbb3742711e8cce59099748ce223e0ef0fbfccbc1bc9fe161edae865ff7cc60b8a1c1c90892fa922261484a852ee2828da0f3e6fc6ecfe591c166f953e21
DIST ldb-1.4.0.tar.gz 1415607 BLAKE2B 1c61264040e5eddee092c95e4cfaeb53b9747b92ea6b2e62ae6a6c74980c4325de5c2aec085bde942eed871541bb90da91e0ac10635d0ca1690200ef922019d1 SHA512 95b024b5aceac0d6360f3c98e70e1f649c53fa0e849b0f3dbb7c46cf47fac718fd13c73dd1531cefaec19d3e6b0f6751b372d1fc814dd58dd288a6cf1dc57a6c
+DIST ldb-1.4.1.tar.gz 1427314 BLAKE2B bdeea064719be9de1dff87a11bdbb8d051d85c056fdd34210ffaf2e9a5652af1e8aba95ff110b92a443a4353457cf9a5ec0d68cdc6fbba7bd955ad6df1413dbf SHA512 0e5b3ad4fa49893c86ca422e44d53c0af062e85e5085de18cdcaf2f05f0769cb2ecb65bad20cf93c5c2e115116ac2e1ec7f2d767678a3fffc9591d9db25e6f61
EBUILD ldb-1.1.26.ebuild 2354 BLAKE2B d2842c0d9fab64092bdba589836f0e488ba3544bb4b74946c6aa881036dbcfba82ac94184ec04f3a12e752d065da61f3c1b2898b053dd260afec6cde14d2112d SHA512 195f61f5c6e120d159ec222105d2652b160a7a6c0aae1c6c97967a65cfca59acff8e895d121f375d3eefa7604e5b26fe84abc6136bf882ab6b100a838b44ee67
EBUILD ldb-1.1.29-r1.ebuild 2557 BLAKE2B 6f23b14f5c826708addf796e96a6513cfac6c8b06609e3335cc3ac0fc551dd68ebef6f3f08b6bfc272af68c32ffc98af392292e891ece3ec16dd11dc87e1cd38 SHA512 165ab8aa5d0fb02620de597488e48048de2250a264c72adb31f044543b301a2584b5eddb1b75e7788d2501af67d74b7eda2e223f2732207ff0d381a185c26edb
EBUILD ldb-1.1.31.ebuild 2691 BLAKE2B 240d2ccb3f152cbd134b3611d6db02185d6bddf7980b2a816d822fbb924817b798860edd08373d7eb452e451454591a7ce9db24a4475daa210b9e1ce014c14ae SHA512 368998dad5aa47bb8b971936aa5104d1ea5e7a594cd80af79f55e56cb49c2b28aa0322c15781f121bc4aef15d43e56690df324bb0900a7a15eac522b821d5872
EBUILD ldb-1.2.3.ebuild 2619 BLAKE2B 447fe4e7cfb1e1e9350f215f93a818d0251861e3dfbd00a2f866dadfe260a76beb14e489b91eac279c52e800e93ac680131d27fde26d4ea22ce18ec15bf270d4 SHA512 b937f76a1b04d68a2117a8097890a7bfcfb4ef1fdef03c3a4e47908ded9cd0404cc7b26b26e6989fff9076d3e482f6d797ff9249c93ab616acce710d2b22b0d7
-EBUILD ldb-1.3.3.ebuild 2572 BLAKE2B 2b1702de50c15c7b9f05fd9f630c805010a24b7b469a3cc1f969b63809c475af0dbcaf820d6182e48153cae4afa83a817c046db0fc78f62060d7be4954731a15 SHA512 d830c5c6b6d312a111485f76f5ec296fcaf52be3fa3fac34cc270caa9e61ef420f06382e309f1e5b933f7a5343de8adcb681c55ee8cf45113c9e2e0a8af36390
EBUILD ldb-1.3.4.ebuild 2572 BLAKE2B 2b1702de50c15c7b9f05fd9f630c805010a24b7b469a3cc1f969b63809c475af0dbcaf820d6182e48153cae4afa83a817c046db0fc78f62060d7be4954731a15 SHA512 d830c5c6b6d312a111485f76f5ec296fcaf52be3fa3fac34cc270caa9e61ef420f06382e309f1e5b933f7a5343de8adcb681c55ee8cf45113c9e2e0a8af36390
EBUILD ldb-1.4.0-r1.ebuild 2666 BLAKE2B e9d6cc2dd551d3219a099214892aaeaa4f27187d5ab121844fce0270a9f9c24b062549beeab863f9170b6d1c8856d7d21e43d0fdf8626656ce53d112b6294172 SHA512 ff0bcb83eab974e543d294bf874cb517c7b002948a331afc1e4bcae36d175fc2cf46575bdf422402ff4a10f0f5518715f86583863afcd360a8ed9013a822fa1b
+EBUILD ldb-1.4.1.ebuild 2666 BLAKE2B 2a516abf165389e8816f96078ea5f2d0588b36560e79398abf466373ff8f8885a415708642246e8849bc4e11d054213dae2763eee37b5b331c53d099f8cdf614 SHA512 0ac6f804a59452e1fd9a7300ef661ebf181366c356bd8e1c60e2fa646df1878cbb0bbcd9a71b695170a3c62130712ecca86bebe7a994b211bd6877f46b392a16
MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
diff --git a/sys-libs/ldb/ldb-1.3.3.ebuild b/sys-libs/ldb/ldb-1.3.3.ebuild
deleted file mode 100644
index 1b38c776939c..000000000000
--- a/sys-libs/ldb/ldb-1.3.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ldap +python"
-
-RDEPEND="
- !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
- dev-libs/popt[${MULTILIB_USEDEP}]
- >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
- >=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
- ldap? ( net-nds/openldap )
- python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
- doc? ( app-doc/doxygen )
- virtual/pkgconfig
- ${PYTHON_DEPS}
- ${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
- "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- $(usex ldap '' --disable-ldap)
- --disable-rpath
- --disable-rpath-install --bundled-libraries=NONE
- --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
- --builtin-libraries=NONE
- )
- if ! multilib_is_native_abi; then
- myconf+=( --disable-python )
- else
- use python || myconf+=( --disable-python )
- fi
- waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile(){
- waf-utils_src_compile
- multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- WAF_MAKE=1 \
- PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
- waf test || die
- fi
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- if multilib_is_native_abi && use doc; then
- doman apidocs/man/man3/*.3
- docinto html
- dodoc -r apidocs/html/*
- fi
-}
-
-pkg_postinst() {
- if has_version sys-auth/sssd; then
- ewarn "You have sssd installed. It is known to break after ldb upgrades,"
- ewarn "so please try to rebuild it before reporting bugs."
- ewarn "See https://bugs.gentoo.org/404281"
- fi
-}
diff --git a/sys-libs/ldb/ldb-1.4.1.ebuild b/sys-libs/ldb/ldb-1.4.1.ebuild
new file mode 100644
index 000000000000..0928dd65642a
--- /dev/null
+++ b/sys-libs/ldb/ldb-1.4.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 waf-utils multilib-minimal eutils
+
+DESCRIPTION="An LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ldap +lmdb +python"
+
+RDEPEND="
+ !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+ >=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
+ ldap? ( net-nds/openldap )
+ lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
+ "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(usex ldap '' --disable-ldap)
+ $(usex lmdb '' --without-ldb-lmdb)
+ --disable-rpath
+ --disable-rpath-install --bundled-libraries=NONE
+ --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+ --builtin-libraries=NONE
+ )
+ if ! multilib_is_native_abi; then
+ myconf+=( --disable-python )
+ else
+ use python || myconf+=( --disable-python )
+ fi
+ waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile(){
+ waf-utils_src_compile
+ multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ WAF_MAKE=1 \
+ PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+ waf test || die
+ fi
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ if multilib_is_native_abi && use doc; then
+ doman apidocs/man/man3/*.3
+ docinto html
+ dodoc -r apidocs/html/*
+ fi
+}
+
+pkg_postinst() {
+ if has_version sys-auth/sssd; then
+ ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+ ewarn "so please try to rebuild it before reporting bugs."
+ ewarn "See https://bugs.gentoo.org/404281"
+ fi
+}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 432d771aa97f..e11be64289eb 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -10,5 +10,5 @@ DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5
DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1
EBUILD libcap-2.25-r1.ebuild 2025 BLAKE2B 182c4466d857d61166cbce57c6ea3d5885ccd4678b62cb15825210e7994bf6a3a251d745ffb8734308772959b7d60c0f99268ce820345939572fbbd835897d53 SHA512 ee0dd155f13c0f5dc568d9b18ab1ac2ed7de80a15e72f24c033dafb6098ea26cf4166d6c38652a3afae094fe8f6e759eaef2ddc01c32dbbbc016a859ea01509f
-EBUILD libcap-2.25.ebuild 2005 BLAKE2B 7232168d084f724ce15d1668bad525690933567411221f8911ad5397772657ffeeabe4f2b080836022893914afad85a1d2cf2028ff3b2343ad1c2846c1ffe74f SHA512 0190561034775841a2b630a4f51e3f1c11663745a18fe4951f63e2424decb73a2011e83fdb39e78eb26a0ad7460261dec8a5c66fdd65d3d2a19cb64888e2d97e
+EBUILD libcap-2.25.ebuild 2001 BLAKE2B c633e223229a17a39f2e75febc44b5133f2b2256f73e0f3df6eff9f213f54c858e7b461f65576317ac2e354ba10eb0c8087d962089b26b5b5bf418bf3046a20e SHA512 c18bd6e725bb8549ae31ba4547f51a2bb8ee06271eb587aed96b7369d3bba48577736b59ac522cd69c8b5f402632ccec0e2b9b29f7f9d0a8e35707fca0d37dd0
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index 679ea2d23896..7d1cea10cba2 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
# it's available under either of the licenses
LICENSE="|| ( GPL-2 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="pam static-libs"
# While the build system optionally uses gperf, we don't DEPEND on it because
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 6f9be84940e3..429f5f3ba113 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,5 +1,3 @@
-DIST libchipcard-5.0.2.tar.gz 736107 BLAKE2B 0dbf58081930388da99a621e781c69a3258782bbdd9109df2a0cabf5d404e209e84bdf2d46d86210ce86358a43966d9d54106847aa3415963e564a7904f8e475 SHA512 82c9100b31086900d3fc66f9b04eb7f365cf09b65959e06dfc7927f2e8328d70d64ad33b40615cc382321dfd50720e721198c0308668a27f1a2db9ce46a292c9
DIST libchipcard-5.0.4.tar.gz 801499 BLAKE2B 7966002dbf5c9eb7a53490aa8df68765901d7ebb7c7a16d8b24bf087a9886883aeb8a5c4f4be21ca5740215ce4f1b8d0023409f7b0f843ce1ce894a2cc115f40 SHA512 3b5b049f8ed676994c00ca758248c842de1119a0cee9e55682971839dc72cca226910559763bf858ceb126d998284b0c9f37459e0c87831d52ac39b6c4317293
-EBUILD libchipcard-5.0.2.ebuild 1069 BLAKE2B eb4f9bdde27afa6848c6ce86fd489a4193c5a5d7c022686da6fe4908d2ef13ac03ab448661e9b7b85a225b48e7f24225ac0b9edd1c55d35fcc8395fc89d3a789 SHA512 5f19deb9a4d074cecb30040951191a63c54e863b01edcef811c3d25d1153f7ee43f59477380d0c0912cd6b33dc9fc9b72ef016ddf79ed8153eaebe970397ac01
EBUILD libchipcard-5.0.4.ebuild 1084 BLAKE2B 72ae66970873a1b840557c9c933c4fd7f530471f43f73f66f8926c8f6728e02e3a7d2f7a6b95d1ced5323af260a61343ca8390924e65fcc4aa1742fe0c4b2bcf SHA512 7c04abecae8f198ec389a5954a7e565fc501938d1796b4005b0273a0b76ed7c9b57e40e5a94d46b53b126356c36af5adefbe5588e00b9c54bf4a4f8b695dcf29
MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild b/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
deleted file mode 100644
index 8c2d65dcf83a..000000000000
--- a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Library for accessing chip cards via chip card readers (terminals)"
-HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
-SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file=01&dummy=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="doc examples"
-
-RDEPEND=">=sys-libs/gwenhywfar-4.2.1
- >=sys-apps/pcsc-lite-1.6.2
- sys-libs/zlib
- virtual/libintl"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )"
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --disable-static \
- $(use_enable doc full-doc) \
- --with-docpath=/usr/share/doc/${PF}/apidoc
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README TODO \
- doc/{CERTIFICATES,CONFIG,IPCCOMMANDS}
-
- if use examples; then
- docinto tutorials
- dodoc tutorials/*.{c,h,xml} tutorials/README
- fi
-
- find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 0cb14a5a01cf..7f977a831a82 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
DIST libosinfo-1.1.0.tar.gz 904154 BLAKE2B b34d1aaf2d53ac43613cfbdfd05bc12de505d37a743d64e43af379351f640759ad0ec2f30af74bf82a97b3e12b4a02b097bbdd6e0d3e83f7befa2af5340724a2 SHA512 c4f9e67bb5538e31e7d2ed3d764547ba0a2263da5bbf4d1ef930a32d5953fab59abc672e5f86a1f7f5ac1ebd0c5195986193f699a6b0efbcb6769917c0ed7102
+DIST libosinfo-1.2.0.tar.gz 916787 BLAKE2B 652910ca1e70071d88adb771e458f0c19159a772eec1178c94ea5f65c5045bb00e4b1354b1ce4229d28821b6b1557424e419c1505b721883731a36b0761a1b5d SHA512 d98a107a08c5e2cddd746631b3ceac4278184ea5561ad2372d772b8ae253dc1363f217778d105387e5b5c5e86be9607668aa94929ad9b4ee48ab7abf50fb6a01
EBUILD libosinfo-1.1.0.ebuild 1443 BLAKE2B 9ba19b6db773c95f760a7e34d98f3eff0e247b8f31bd1914973d0edfc838e0611ad630df2c9deadadb084041f472fd6c14a107bb7e45e9be5ff8f89997ed3b61 SHA512 7d12311500cec2646ca555203fa0c938fec1caae4cfe59069c1dfd7593fe7dbf222e2fe3b50c70f78f64725c4001f3be3cd8b2a21568763154598d87e84d760e
+EBUILD libosinfo-1.2.0.ebuild 1717 BLAKE2B 4da3a7a0f7ecf53265056c46ff914926e72701db6e31452faabd8a10a080e892d4f28f3872d7d1ff4cc9957c869e330a69d580eb65034f5a6a3c5de3289cd2be SHA512 141bb380806154be9cb72f7d8607e214bf23ed0608ee245b6015e83f49382f04c3c2d5a23af1fd1ec9fcde6278a4c7120c039140252030a45a7817ba11b10a5d
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
new file mode 100644
index 000000000000..e68d12de66d0
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 udev vala
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="+introspection +vala test"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+ >=dev-libs/glib-2.36.0:2
+ >=dev-libs/libxml2-2.6.0
+ >=dev-libs/libxslt-1.0.0
+ sys-apps/hwids[pci,usb]
+ sys-apps/osinfo-db-tools
+ sys-apps/osinfo-db
+ introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+# perl dep is for pod2man, and configure.ac checks for it too now
+# Tests can use net-misc/curl, but they are automatically skipped if curl is not found, and
+# if it is found, then those tests are skipped at runtime if LIBOSINFO_NETWORK_TESTS is unset.
+# Due to potential network-sandbox we aren't enabling them (and one of them fails at 1.2.0).
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-libs/gobject-introspection-common
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig
+ test? (
+ >=sys-apps/osinfo-db-20180612
+ )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-usb-ids-path=/usr/share/misc/usb.ids \
+ --with-pci-ids-path=/usr/share/misc/pci.ids \
+ --disable-static \
+ $(use_enable test tests) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ --disable-coverage
+}
diff --git a/sys-libs/libservicelog/Manifest b/sys-libs/libservicelog/Manifest
index e4ef23d86257..30790a6723ce 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1,5 +1,4 @@
AUX libservicelog-1.0.1.patch 479 BLAKE2B 1bdebaed553372f76e4d42c8299d42ecd23d88eea7165c6d36d67b156c92a59e4ba8477448d6e00ed452f82e2b67061282bc5cf81104d83a065d92d80a623bb6 SHA512 9c19ae05608a2fb2116a569ef50cb0b4831c3f3c346068ca7f1d9fb572b2fcc4af3a57e91c5848ae8a1a60e73d6c31c5963daddcfe3115338377a4fcdd36a0ae
-AUX libservicelog-1.1.11.patch 286 BLAKE2B 2e9068156c9de35b3fe0178f48696413e22fc1f54b7bd72f83f2da64ee3979d88d31b948309a327b9972b823c6a56bb56bef21324327691a901d1d237fe0dca5 SHA512 0d0786e33db00a7b3009609f63a00f8409f89f25827ae7dcda74e2520dd96b9945ee2873d933ec74bcd5a4c7b6641bc3dfada192f092ca6a399046a8177ddf85
DIST libservicelog-1.0.1.tar.gz 673264 BLAKE2B 4ea60f194513dd2aeeb0f8f6c991d85d0b00438beec58515866e93c85f28e148d3bb9b6dae69a8c156f9209b1ec26da3ca8fc72b18d10e2d6078bf3bd3e1a356 SHA512 a4b2eaad7d382440767f33aded804732acc2828466e83a4596cc66a98ccfd53d048e9af5984b71a45b937bebf3526062d96f5c10be27d44dbbc808b980c1d7db
DIST libservicelog-1.1.15.tar.gz 392259 BLAKE2B 886bbf4aa6d41b35fb978f2155a1025069dbffa98dc31add58687260ec503ebdd8b2d6802b473634a65dd9c429a4a307159a918361be057226b7ae9dc14422da SHA512 70cdf8340a8b0df39bc5669976feab022917b5884256370281ed3356633100cc9c7e69c6cc1bd0784bfedc65d388d9ecc50f6dd37e6ed19f796bb7f55bb436f7
DIST libservicelog-1.1.16.tar.gz 396055 BLAKE2B 2874acc4c6b405d5a16150de0d66f95e55d8ae375d2f8d3bda4daf4a9d7d34e7b2d52bc9c270880daf747664c740ee72d81d47978e73f2d7640efcb6b92a1e78 SHA512 7008a26c8b143b2e498b05cfb5da0c7b76b0ee56106e1d261e202b8ebc0c93abce719230b037fd6bcade078daa5c464428ea2adb466269f30951e909211ae307
diff --git a/sys-libs/libservicelog/files/libservicelog-1.1.11.patch b/sys-libs/libservicelog/files/libservicelog-1.1.11.patch
deleted file mode 100644
index 092ac15482ab..000000000000
--- a/sys-libs/libservicelog/files/libservicelog-1.1.11.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,5 +19,5 @@
- library_include_HEADERS = servicelog-1/servicelog.h
-
- install-exec-hook:
-- install -D --mode=754 --group=service servicelog.db \
-+ install -D --mode=754 --group=wheel servicelog.db \
- ${DESTDIR}/var/lib/servicelog/servicelog.db
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 26d8103e52e8..160d53c9f059 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -5,7 +5,9 @@ AUX libsmbios-fix-pie.patch 816 BLAKE2B 73d2e9611bd672332bed58adee52cbac6285d1e0
DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
+DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
EBUILD libsmbios-2.4.1.ebuild 1721 BLAKE2B 9283623af15e10736a53b0916159e80bc4539a838a0c352353a2e3d47797641a9dbfe0afa5750f3d550d571a219deaa4bba142193d1fd5d35b079efa33e5ce30 SHA512 92d3f1ff5b9ba0fb79321ba675689928a01f1fb97b8834f0360d4c34a7d305f5650f4947d64965c3936ea1fa307ad822bdb50710dbbfdaa10e550139cb725848
+EBUILD libsmbios-2.4.2.ebuild 1709 BLAKE2B 7ff457eea26d9910d155d7107e9db8afe46330af9d9543ccf5fb51d36c3fe437d3fcda72e6ce9131dcc07aac99d7550660b9fed337963cb5d77268a31bb6ac07 SHA512 5b2d13ff22e32fb18ba821e1f2e8e090fa695145be4e2c330d05fe562b6918145cb5084dde5e31811be21aaa771509a54a56189c8ce701022c8d2e7d78d613a6
MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
new file mode 100644
index 000000000000..3293aedcc967
--- /dev/null
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="Provide access to (SM)BIOS information"
+HOMEPAGE="http://linux.dell.com/files/libsmbios/"
+SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc graphviz nls python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libxml2
+ sys-libs/zlib
+ nls? ( virtual/libintl )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ graphviz? ( media-gfx/graphviz )
+ nls? ( sys-devel/gettext )
+ test? ( >=dev-util/cppunit-1.9.6 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Don't build yum-plugin - we don't need it
+ sed '/yum-plugin/d' -i Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ #Remove -O3 for bug #290097
+ replace-flags -O3 -O2
+
+ local myeconfargs=(
+ $(use_enable doc doxygen)
+ $(use_enable graphviz)
+ $(use_enable nls)
+ $(use_enable python)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+
+ if use python ; then
+ python_scriptinto /usr/sbin
+ python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+ fi
+
+ insinto /usr/include/
+ doins -r src/include/smbios_c
+
+ einstalldocs
+
+ if ! use static-libs ; then
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+ fi
+}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 03703b729667..19bbf8e912b9 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -5,9 +5,10 @@ AUX libunwind-1.2-ia64-missing.patch 3863 BLAKE2B 384d2afd7d725f0730207b5b32ff4f
AUX libunwind-1.2-ia64-ptrace-coredump.patch 1445 BLAKE2B 0b4b6b5d7b3cfc8be58c3973b096ceeb19faa84f175a23f2130588351e40f94abf5c53a4eb5813d8b9da7762f032671031d2d637bd2ec445f7e4f9ea9d276773 SHA512 0bab310ff16294d7617077ffa1261fe9c1a6aaeb4339c96918869c4dd9a2b1b73fbe2ebb5c895f1a420ff7922da85cbb44ccfcd69df6e2518c1f2ff64b7b2d76
AUX libunwind-1.2-ia64-undwarf.patch 581 BLAKE2B feed4d06edded9ed27721d3f9530d154d284410f68f0f00c7f8013d1ba506f9860c55707c3b03340eca4954ff63bcde74fe0b4a9c6c1d474305e74884df2653c SHA512 a83dd2d2bea706fb0f57b854015c6f1db882d649e931e12bb1a5524c8176e326d7d4a448f986c9475d1bd4c6e22a0e9a1c813c7a5b47fcd61457806c1f32fe85
AUX libunwind-1.2.1-fix_version_macros.patch 381 BLAKE2B 77b523a859a66297eb5677e0eedfc511b6e3cae7058b49da2da41b27d1d22d72b9a662f2b20338eaa5166bd5ae414531695f540098a1dfb674e668ed4c683079 SHA512 4178ed205046dbdf0cea6c7004b866f840e4e3b477a88c3a24f4178e4c642f9d0cfbe7c0f79c6408fad95d8f387f55c912022a78fae382d69e80cd4ff41d8bad
+AUX libunwind-1.2.1-no-PROTECTED.patch 539 BLAKE2B 86a65116d9179b33ea4737583683d1506072cbf162831ba3193c0c3ed74f7091dea226c2f9cf06387574ae1d15cc1db1627137f0f80adc542fb5534cf8f6254c SHA512 fe76aef28096ccfdb5c290da631efe8f7cbef13fddb415227f97cfe974162d757a3439b542bee0fe225950200f3cec5e7eecf60c60b2584e2a922618b73e2a7b
AUX libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch 1290 BLAKE2B eac40a5cb05fbda00e5dde5b4ecedfa21442cb5481281b8aac45b118d8b8d503bafe69aa9adb93cac9c7e89cb72f8b44bdb7018a09aa4c9d512e20a457c7d78f SHA512 36b76eefdff3ca832696c13b18d9153ca89d5b648c7df11d3c112a85e9ab92e9f124fdbd05d2d9017bd9c5cdc6bbb2de5038918c9f3a2695c8fa3a05835abdb0
DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f84d3173dc3a2e9fd54486a18d99713df152d810db4eb3e36df4afa7df1b544e6c9271479e2fcbffe473a17c4372 SHA512 bfe04f2bfac9f9e47c37f0b23ed2f264d8d3d3d6f1392fe9d794ee13cad216b3740979e922e4276fb65c1ccdc836fce48812cb5459ecdd2a89a621036a35d7c1
DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
EBUILD libunwind-1.1-r1.ebuild 2444 BLAKE2B ac2eb3bc33f80cfd82cb1600c1f9fff80d7ef7a824ecbd618c1d2e4416a5144b5beb47020e825a778d85ffb0e7f3de9b0909d07162b49ce7ec6e128247639b9d SHA512 d6c4099defbbe27c2a0c7df12299a21be655345b6480a61d3a67dea4dd3f732088b734f28eba4a5ee43ac7323ca6cef45fdba05e9c79d2d8e8b41ef5667299eb
-EBUILD libunwind-1.2.1-r1.ebuild 3124 BLAKE2B 9eb8470771ebf40b79fd2383d772cabdf3cc767243ec55ec1e1efd8c683076a92c91e3354fbda1768ba64ff61e172aef781a5e46c007de6703eb4b08d008853a SHA512 076bc60f0cfb890fe864c11da6118d6d2492fc674f9721e6062531c3e53fb0994c9a0a77d980e45a7b59e7b8e2e25ef7fb4a5f61d87f591da9648b315cf24ae1
+EBUILD libunwind-1.2.1-r1.ebuild 3178 BLAKE2B 1b1f0bb6fe7ba675455fcd33e72cc363aba56d20e0e5b77b338ad7d8ce933d6892e8c694776b30e5308972ce2058ccf6395f5c056731a52959aa9ff18ef902f2 SHA512 ba3e19612ce37a7e069605dd0e78696f39fbdcd7ec963721af9739b4fad00dab18bd6c65fddd5d91bbc25b1294a92caabcef60f53eff23467df76b8df385536a
MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
new file mode 100644
index 000000000000..6b12d9712ff8
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/659732
+https://github.com/libunwind/libunwind/issues/58
+
+From a1437a3d27924e17d00021df3cc659bd998e8580 Mon Sep 17 00:00:00 2001
+From: Dave Watson <davejwatson@fb.com>
+Date: Thu, 28 Dec 2017 08:26:42 -0800
+Subject: [PATCH] Remove PROTECTED visibility
+
+This only works on bfd ld, not lld or gold.
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -43 +43 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+-# define PROTECTED __attribute__((visibility ("protected")))
++# define PROTECTED
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index a4690fc050ec..8ab6cd4d1120 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
+ "${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
)
src_prepare() {
diff --git a/sys-libs/obstack-standalone/Manifest b/sys-libs/obstack-standalone/Manifest
index 56e631e2aa2c..6d74dfb0687b 100644
--- a/sys-libs/obstack-standalone/Manifest
+++ b/sys-libs/obstack-standalone/Manifest
@@ -1,3 +1,3 @@
DIST obstack-standalone-1.1.tar.gz 11561 BLAKE2B c6eba8ed7e235dcdefcfa7244d6318c6ac4d4b6d12a8f4778753bbc762ec98439724e1e8bbba4b1a04fbbafe56a1634bbb1c604c4d5f30574da39c82d52ca1c1 SHA512 e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757
EBUILD obstack-standalone-1.1.ebuild 765 BLAKE2B ced2f92e65ac03be6118ff6061f1a5b6c84b391015af8f47c3d00a60a2ec5162bb9b63bff9c84f007a1ef954afaf7051d85b6e8ed61bde62ef03cbe158ea10f3 SHA512 c2ce1847c1f8188646320c5d544ecf3f913ff4a3adb9ffb7210ad9a50e7db05cafd510c1175f1350fa173a6dcf51c416d6d5b68f944a4db7359e46516b601fc1
-MISC metadata.xml 444 BLAKE2B 108eb07f69efa77a9a3d03f018caca2f4b03205f0f4daae5e88e8c42fb6e0f79f9ea710fd6aba6a35e1073a61835953dc357cba28690e4e415706d51f863c2a7 SHA512 0d325102ff1f4f72cc29d1f9acdf176dbf9d4dd70e4880f96b865404512c42c9d99bfe689bf479e84549e6afbe1f9d9131e1164775c22818abde5028b29d9cab
+MISC metadata.xml 338 BLAKE2B 7bcad55fd6a890dfba57ca1939daf33f3c2ccaeb892534a737bedc18b2737111e448ff29d2e3e3df68c9ec33447bb5b636a7d89d000b782e16bcbbb3db76e89d SHA512 6f45a428f15b9409ed7870393cc691f816484c47852dc76dfe64a46e4261beaf3a88ecabf0e42679265fdaad5c5b7321ae19df762e213d0102dcead5d1ab0797
diff --git a/sys-libs/obstack-standalone/metadata.xml b/sys-libs/obstack-standalone/metadata.xml
index 2f10a3547c34..04242345d8eb 100644
--- a/sys-libs/obstack-standalone/metadata.xml
+++ b/sys-libs/obstack-standalone/metadata.xml
@@ -1,14 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer type="person">
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
<upstream>
<remote-id type="github">pullmoll/musl-obstack</remote-id>
</upstream>
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index bd76e8e8fe1a..6da68b8f228a 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,11 +1,9 @@
-DIST talloc-2.1.10.tar.gz 441645 BLAKE2B fdc1f6b4ab6c95b461652ac5138e8f4e0db7161792b4cd7af8d80178b99404f844dd8352fb8820dcaedd0d96251025a8ebefc6bd1cff451e6bdf559617c964e3 SHA512 215e70056f37ade8f67c20ab2b79dcb40f071989ec908de81144f8a0160637bbdec9a94123dea73475ba42425415df4c1eb8c1986485a00e2e03323719a03ce3
-DIST talloc-2.1.11.tar.gz 443320 BLAKE2B 6234808d3a37dd1b9cd29121c20e003637da460d652769f9e85356b66aee285f3706377de4f507adfaaf91243a452a27bdab2377749d43937e140c3f8c69c417 SHA512 e0c7e44f21b0b6510e04e09ce325d50323a0c6466acb6f301676e82f8812c61ed7f6faadac62380aa6338d54679fdf7afba7fb9ac774d0def96efbcf49d00523
DIST talloc-2.1.13.tar.gz 444608 BLAKE2B ac905d984e9ec438e8d7af473b37d7ccf8e4cf98d96b5a3b621f6c8203e7f5cd4d656602ac1fdfd22e0cab5853a8b54398c0c2ab4202517c4de73c5c90106d63 SHA512 003588fbcde340096b069ed4de0dc6c3e6a489b72abec83e9d3dedf40571a1bf07232d410cc86d8ca505ee49f7483a0043360e913de69106493346fae16a0e2b
+DIST talloc-2.1.14.tar.gz 444589 BLAKE2B 3e47126eb41dc08befd22d7d41443dc5502d0bed239fa0fd32d63fe5374b4422165a7b364a8ad4a9f6e2d73b2db1dd4bada6aec3271c7b264f148d32974adcff SHA512 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
-EBUILD talloc-2.1.10.ebuild 2443 BLAKE2B 39e7c6e9cf12095d28a79bd8bf1feb3496a654a717de88f0b452c779384cc11295ee7e4804fe998876200aae3c85eff1e8f799581ee0551ab5be28a4565ddcd7 SHA512 9b2505168c051eb44e4c9e628800859f729ea9bac24b0e4a6daa80cd5d5036e8ac0733c5ec47b070f59b9791d1e822e53ae6df8d3a91c99176b1cb01e670e1ff
-EBUILD talloc-2.1.11.ebuild 2443 BLAKE2B 723f4a38dc2f2b83abfeb2ec98751bf2fffb5e82083c69296a9c2a6d794172dcfb0b59e7de974746f8e0542e63db1bf3deb8d882743113222869326b9a64b026 SHA512 2a1d66cba8c387c9c5dda890b646fcc1bdf50eb84d199990ccc5a28efc0d3cbd63540809579a3036f1af43441b0655bd7ff94ae5b3e71008c7b3cee9536a093b
EBUILD talloc-2.1.13.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
+EBUILD talloc-2.1.14.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
EBUILD talloc-2.1.5.ebuild 2239 BLAKE2B e396e068f44c250ac72178473fd281541a903979c489d10ea66e997f5bee0bbdedc4d5b6e7c4bccdb799e7714190da85923702f27868a0f77dfff771b02c27f8 SHA512 ed9f0f10bd331f589b560c0563f1ca2b5e16fdf12121fca83a34cd2965b48f9d0f0374b12db9b655b5742839260d2fa794b70e6792402b4e0aac0e3ee0d72ed2
EBUILD talloc-2.1.9.ebuild 2422 BLAKE2B d2cfc6930fffc5ea5cca67418be4a3a0c891cfa1025e2c331a4e410cecfa2d11c76f89b030eec58bc5b7bddf05c19f6efca790989ed6f2e08ec7aa6f54befea2 SHA512 8b48f388e6760c09fa5e9487d089f0198aa17f086d7a9877eb508aee7a7fb9c2c181a94af01f2993b3a623819aedbd3b19e920b5e68fb0863457339c8b4a3822
MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.10.ebuild b/sys-libs/talloc/talloc-2.1.10.ebuild
deleted file mode 100644
index c1002e8e76e9..000000000000
--- a/sys-libs/talloc/talloc-2.1.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
- !!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-libs/libxslt
- ${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- # python goes only for native
- /usr/include/pytalloc.h
-)
-
-pkg_setup() {
- # try to turn off distcc and ccache for people that have a problem with it
- export DISTCC_DISABLE=1
- export CCACHE_DISABLE=1
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # what would you expect of waf? i won't even waste time trying.
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local extra_opts=()
-
- use compat && extra_opts+=( --enable-talloc-compat1 )
- if ! multilib_is_native_abi || ! use python; then
- extra_opts+=( --disable-python )
- fi
-
- waf-utils_src_configure \
- "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # waf is stupid, and no, we can't fix the build-system, since it's provided
- # as a brilliant binary blob thats decompressed on the fly
- if [[ ${CHOST} == *-darwin* ]] ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
- if use python ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${D}"$(python_get_sitedir)/talloc.bundle || die
- fi
- fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.11.ebuild b/sys-libs/talloc/talloc-2.1.11.ebuild
deleted file mode 100644
index e0ced08be51f..000000000000
--- a/sys-libs/talloc/talloc-2.1.11.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
- !!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-libs/libxslt
- ${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
- # python goes only for native
- /usr/include/pytalloc.h
-)
-
-pkg_setup() {
- # try to turn off distcc and ccache for people that have a problem with it
- export DISTCC_DISABLE=1
- export CCACHE_DISABLE=1
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # what would you expect of waf? i won't even waste time trying.
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local extra_opts=()
-
- use compat && extra_opts+=( --enable-talloc-compat1 )
- if ! multilib_is_native_abi || ! use python; then
- extra_opts+=( --disable-python )
- fi
-
- waf-utils_src_configure \
- "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # waf is stupid, and no, we can't fix the build-system, since it's provided
- # as a brilliant binary blob thats decompressed on the fly
- if [[ ${CHOST} == *-darwin* ]] ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
- if use python ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${D}"$(python_get_sitedir)/talloc.bundle || die
- fi
- fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.14.ebuild b/sys-libs/talloc/talloc-2.1.14.ebuild
new file mode 100644
index 000000000000..65fd07167cb9
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.1.14.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils python-single-r1 multilib multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ !!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ dev-libs/libxslt
+ ${PYTHON_DEPS}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # python goes only for native
+ /usr/include/pytalloc.h
+)
+
+pkg_setup() {
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # what would you expect of waf? i won't even waste time trying.
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local extra_opts=(
+ $(usex compat --enable-talloc-compat1 '')
+ $(multilib_native_usex python '' --disable-python)
+ )
+ waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ # waf is stupid, and no, we can't fix the build-system, since it's provided
+ # as a brilliant binary blob thats decompressed on the fly
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+ if use python ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${D}"$(python_get_sitedir)/talloc.bundle || die
+ fi
+ fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index f7b2a2429294..251843abc929 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,9 +1,9 @@
DIST tdb-1.3.13.tar.gz 498002 BLAKE2B bf29b535acf3838942820a7dc841f635c457999d1ab7456bc598d73c79404dea9ab397eec1725d739bdc9b4a46b6b0ad068ad36d0e7247afccb795d410b15b06 SHA512 d12382a2f75e56d62d151df3390b3ae41c7502d67582812ec6da30913b13feb7ee98572ab5ad5b5ed3bceb41666c3154855727cf5ce249ef583c033819c05f0f
-DIST tdb-1.3.14.tar.gz 500877 BLAKE2B f372c789184f1dbf0829c2e0b43c868a8a7c253b23a597b7695b07f92c1dfbd6978152e965702b0adab9e0a4b19be75ce120196e601314895a9f0be578f036d6 SHA512 776b736d5c61cb796e19731141a85606cbe90e09943d813e0b7bf45066656d4a92ba449d0116664f65b9d8e5729bde4526170bbb1b7b46fd7a2fac1508f3841b
DIST tdb-1.3.15.tar.gz 502627 BLAKE2B 44352033c421875f02491551dd8b1aa4a821a5e0070d6a32fc4f7a61535c98114325718c673fe163ad692f797aa2e9c26ca27a69a04459ba8340bbd8caacdfc5 SHA512 553246d5e7a7c22ea1b00962ac635d608f6d2344201862e796cad3b1a20610da1f5652ec9dbcb0187867fbd25f36247fcc34e9b4b2c3488c15d7202c9fb13bbb
+DIST tdb-1.3.16.tar.gz 504330 BLAKE2B 686b6b3d026094a0219f2c5d76f7258cf2f96538f614fa9078ca00368ad64c4e93f2e184c98f3d6f480fec909d94105fdf527d96f3b4ea291d81bb63420d2a99 SHA512 7b17852986e48a32f3f8f303dd2a26503a69fcf7849f22f51483334c9abda9f189b521679e51b4ee5a80197a8f304a084dde0f56d92cfe953d3a4ede557526d2
DIST tdb-1.3.8.tar.gz 494106 BLAKE2B 3ac4418b642472859c37c20477ffcc255be6e435b84f59ee634fb5b80caa38aadbcc761fd2daf7c797f9d9a120dcf6e597b31306f8c67d3e890570dd94e4263f SHA512 9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b
EBUILD tdb-1.3.13.ebuild 1348 BLAKE2B 3f03448b4519cb93c38320837ba0a81accc4f283050e1f1d5e1850e68021e4794c9f71df9f86e711f9b10a595cb1a0b07c91f6118b2aa60a7d6aa4a661148235 SHA512 836fee522b79ea761c0d88a3c124a179b109bed671ce33b17a6d4c79939a7825d76ee58ef993cea94b8fe5b99fa5dc54d90718b60a68f2699618f9abf893cabd
-EBUILD tdb-1.3.14.ebuild 1356 BLAKE2B 79e7cca1a3772b2e9d2bfcf7b2dcc5b25163461d2b868556436c401083e72126a5f9d53b3d2491fe147e35dc1874d694ad9834e795ab3fa689da2ac8e87a3631 SHA512 2582cc6f3e60166651b8b04d4ad47bf2b86b54fd9d952e7372eb88a55138b85065c82a2ceccf85ab31bb779689a6f709484a757f3b6fa8124411dd1ba90b95ba
EBUILD tdb-1.3.15.ebuild 1350 BLAKE2B 6453cdc1b94f1f3a00cd913f0db3d2327fee758fd78b9208318e2c7b836c591bf8d079a8cedb7db8aa4a5e117277b446727f6075ec4fe73968b3507932d6c5dd SHA512 4eec0eff750748e4d8e5b6f35559638d64c84b1f665070bf49cb509a1ecde1a303f0c7e6859a287e1ad5d0dc1fe1126d472915de94bdf50ce1532f5aa95520e1
+EBUILD tdb-1.3.16.ebuild 1350 BLAKE2B e4028a9107c0e5a0e3660c2bbb2dce94f62ab05ddda8c02d55312e9190c04aa10633d0842890f830fa1756aad6498c245b8c190da98cfbf93c9dff6af7e31cfc SHA512 080418b60b162ae3a23b1d37b2d667ffa6c1505f899137d75c709322a03a52597b735c354809c473712ecdfc46fbaa661e7a5770084b9a08c28e9f5fc4d7b282
EBUILD tdb-1.3.8.ebuild 1345 BLAKE2B 6aeeffdab16f4fcddf93a105df693afd1c24d7932f268d96a2055618258084411c5d2f8606d1a4f3e89c2d2d2b1cabf7651bda6475f56d12b759b7c706174a15 SHA512 aefa2e183f6b1e4af2e3bb359dd4920793c5fd518b8a9bd74186a546577bd124f7ccff58b0600a8c3b4d622593ca213d29996766d2b6ff5ec5ae5f61bcbbb2a9
MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb
diff --git a/sys-libs/tdb/tdb-1.3.14.ebuild b/sys-libs/tdb/tdb-1.3.14.ebuild
deleted file mode 100644
index 89160ea9081b..000000000000
--- a/sys-libs/tdb/tdb-1.3.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="A simple database API"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
- default
- python_fix_shebang .
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local extra_opts=()
- if ! multilib_is_native_abi || ! use python; then
- extra_opts+=( --disable-python )
- fi
-
- waf-utils_src_configure \
- "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
- # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
- unset MAKEOPTS
- waf-utils_src_compile
-}
-
-multilib_src_test() {
- # the default src_test runs 'make test' and 'make check', letting
- # the tests fail occasionally (reason: unknown)
- emake check
-}
-
-multilib_src_install() {
- waf-utils_src_install
-}
diff --git a/sys-libs/tdb/tdb-1.3.16.ebuild b/sys-libs/tdb/tdb-1.3.16.ebuild
new file mode 100644
index 000000000000..aca8bf7fb4f2
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.3.16.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="A simple database API"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+ default
+ python_fix_shebang .
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local extra_opts=()
+ if ! multilib_is_native_abi || ! use python; then
+ extra_opts+=( --disable-python )
+ fi
+
+ waf-utils_src_configure \
+ "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+ # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+ unset MAKEOPTS
+ waf-utils_src_compile
+}
+
+multilib_src_test() {
+ # the default src_test runs 'make test' and 'make check', letting
+ # the tests fail occasionally (reason: unknown)
+ emake check
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index c40ba8f73ed7..9aac7f31dee7 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,10 +1,10 @@
AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
DIST tevent-0.9.28.tar.gz 581522 BLAKE2B 95db3ed16b91673ee99fbf30d3c40dfceda080f428feb6b7bbebb0bfc4edc53a183affc8056d25fb05d11a37325b2854949ea5e2dcb170ad7c81e7a7bce62e11 SHA512 328d586a5891796a731e6f0d02e1a731d3541a977c16abca355359cd7f60bbdbb0baaad49c05eb42c3a44f97e57a775605974d22d46ca6c26f283c8ca1b5a909
DIST tevent-0.9.31.tar.gz 587784 BLAKE2B 0e562600ae8ba4dae194b1a28a020f5618b1566f65cf2b2f158cd44e6cb30c422086bd2ebfd65a03bc4d4b13de4ca833ff04ab1368255eb2181c148de3487214 SHA512 048e37a7f5d3b8e948215fdb909c9b6e94b915c9d4978a8e18c73c9d27d5b1f179c10d19ec90325f8250e7c177c28231ad116a2975caaa43312c383e75517258
-DIST tevent-0.9.35.tar.gz 591546 BLAKE2B d0df81dc1998ae5806f3f8b613c5640af56d52c0e6fdea8f57c95cf4ef5d8bf349992582b97da94cbcc048bc3f758ecb03e836847467588e7dbfbb1aef87b906 SHA512 935719382469a0f39764a7ebdbc0ee977ccca2fc55ff1e896ddd95ba2d065d989f0c366cb98be95ce87475e628b0de38b7138261717a5c2cee870e98339ed5fd
DIST tevent-0.9.36.tar.gz 592439 BLAKE2B b24dc37aaeb3bc08eb642c85cf34e4fbcf35fbc38421d3f5c3f03fe77ea8252e7a54a956a9c6750c78dcbb11a092e894bd24ea700acdd634edada1f930a67756 SHA512 bca9db9bcf142ba68b207180d19414dddb89a069a4f040383069c8af0df5bb184ca219293c4a1e7b0bc241b9a1ea3d414f8284278ad3a5f0383b9e432450167b
+DIST tevent-0.9.37.tar.gz 603859 BLAKE2B 2210416b09c3f83cf68a9f686d1d582891cd22b4547eb0e5237288dca6a0b94619769060c541e0cfc3ccce79246b1140875109934e009015b8e04a31a94d6792 SHA512 5d4833403e1c2f2749f00a389e4757261a4f22cd3a67c906001b36a8b622cc68a38e86d4eb475848a2121ebba054a7e7dac7f486d9f2906a401c3cc97fb447f4
EBUILD tevent-0.9.28.ebuild 1308 BLAKE2B 28b6ae3555c61e3297fbdfd544c86e573f494060d7f0634b28a5de2e559115fe5792473d757c79c37ce1a0be59fff5db68dc1cc14348192ba0385a58856866c9 SHA512 9bdc7903d5a99d3e82455598e9ad915fb1a48b0de0fb1e93b8188460f1ec432d451b9c9f7536a9917867939b49e4fa78e3bfdc4269eaa0736f488094e314b6de
EBUILD tevent-0.9.31-r1.ebuild 1387 BLAKE2B 6a557ea91f51912187a843d153bf54533c6275e062bc8dcc9a0089a5090b87cedf2c2eb42c0f54e20ec8665c5c0f48d288277762c44440e14a8fc0dd78637c60 SHA512 490a0fe32201715e0dfe71f308101b33cb0d5b82f314253934b685ff2123c9cd39960aa50d51d99f66f984d5b5bb96d1ed28224be0ae3023b6db78e30f9664c1
-EBUILD tevent-0.9.35.ebuild 1514 BLAKE2B 0ccb5903534c6feee6fe1acf70039e4355605c4ba4acbb8f7b345c0dc189f410c1685ba9d644e80891c3f250d063d56b3343b072ce7478ed0d51a02549b50685 SHA512 4b09900c94d3473dcc2a7d3344933a4cc8745d953a4ff8ac79d11f8d14fd42f18a9e72312f84c7bdc2daf8a2b9b328d35613ecf8f55f18a03c253712b5bff0c3
EBUILD tevent-0.9.36.ebuild 1653 BLAKE2B dc4d3fc496b1b4341ca3f380a91b520ad815e7b9ebe9fdbf958360e9e2415f2df7bcf2f2af897906e6800260b84ecb08b5db130cdfef1de09f86d311e791c0fc SHA512 59e8010af06791fe989e187cdd8b846dfcaec63e9e702966afec2d8d641b4a7353aba8d615b54b7e508410d936574917d27cc2ed875bffb75f56805908cad2dc
+EBUILD tevent-0.9.37.ebuild 1594 BLAKE2B 0ee5ebaa1318bbf3bc68d2507c0b92a234c2fbd87709de5eb84724f6bee76d02b9ddd6c729dac6602e44b10437a5dc446706dfbdd08b07349f59e215e4d08cba SHA512 f0951f7dac1f6d4b2f2a2c9e5264998b7e073f6581a4e3ac52f6ce303fcad8144936a3cbc1632bb46c08d6d85cb96ff7eb88af7dc1a98ba2865a64e52b73461c
MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.9.35.ebuild b/sys-libs/tevent/tevent-0.9.35.ebuild
deleted file mode 100644
index c2a8eb8ad787..000000000000
--- a/sys-libs/tevent/tevent-0.9.35.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="https://tevent.samba.org/"
-SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="python"
-
-RDEPEND=">=sys-libs/talloc-2.1.11[${MULTILIB_USEDEP}]
- python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- ${PYTHON_DEPS}
-"
-# build system does not work with python3
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#PATCHES=(
-# "${FILESDIR}"/talloc-disable-python.patch
-#)
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- waf-utils_src_configure \
- --bundled-libraries=NONE \
- --builtin-libraries=NONE \
- $(multilib_native_usex python '' '--disable-python')
-}
-
-multilib_src_compile() {
- # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
- unset MAKEOPTS
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- multilib_is_native_abi && use python && python_domodule tevent.py
-}
-
-multilib_src_install_all() {
- insinto /usr/include
- doins tevent_internal.h
-}
diff --git a/sys-libs/tevent/tevent-0.9.37.ebuild b/sys-libs/tevent/tevent-0.9.37.ebuild
new file mode 100644
index 000000000000..535a4e4d864f
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.37.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="elibc_glibc python"
+
+RDEPEND=">=sys-libs/talloc-2.1.13[${MULTILIB_USEDEP}]
+ python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ elibc_glibc? (
+ net-libs/libtirpc[${MULTILIB_USEDEP}]
+ || (
+ net-libs/rpcsvc-proto
+ <sys-libs/glibc-2.26[rpc(+)]
+ )
+ )
+ ${PYTHON_DEPS}
+"
+# build system does not work with python3
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ waf-utils_src_configure \
+ --bundled-libraries=NONE \
+ --builtin-libraries=NONE \
+ $(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+ # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+ unset MAKEOPTS
+ waf-utils_src_compile
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+ insinto /usr/include
+ doins tevent_internal.h
+}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 066b3c7348c3..2afdc891fd86 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -2,6 +2,6 @@ AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce1
AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
EBUILD zlib-1.2.11-r1.ebuild 3029 BLAKE2B 7264674176992d231b0e70a7511de1e44f29f57b4facf4c6774854235c0fa0c1a29b11aa8ca7dde025c1990a88489a620d1d012a9634d82d9b75353fd19b5845 SHA512 be364c4b76bbbfe15de428a72bad82575078e1e4ebbfbaecafe7c409bcaece2e03d85415364abc5e4cd959ef602189dc21433196ed94c301f47306afddb67af2
-EBUILD zlib-1.2.11-r2.ebuild 3111 BLAKE2B d529a61167ae3cfb8d385b57295e8bc3790c79976765020995a8b3305ff0efe0b4cc30479feede0d63833f8c72dfa41dbcfa0f58d6acfb0f2720420da3b4ec6a SHA512 407e8e58ffa1e92638fe25733b9ce8eeff906990e60fc4c0dd2a6f8bcf794420dbac2f5a2e989fe9ea962d76d0d9c19fd36ad7e1e6e24f499636d000da36865d
+EBUILD zlib-1.2.11-r2.ebuild 3110 BLAKE2B 4e799dbb6fefb00312eb99fc98901de21f26b85436d49019bfd947c10dddc7f7901e2b8fcc70433bc3f47c59e0e5f68d8636b57cafcef77998beb38753729e20 SHA512 1c7c8098cfaa4c30da615d2863ae317f572d1f51fb9d3252c9d541215a01f45317b2b1617698b5bf3a7ca6ad090b38352ff3fde90dc0455c50dfa8d6fffbf524
EBUILD zlib-1.2.11.ebuild 2963 BLAKE2B 73b5a86f22babd1b34c8f4a4941114094c948e52ea0e31b092878a5c566e931ecaada4344ba8f038fe7808f9949da32bd9bd5710025195343a650f36d2b0b912 SHA512 851835307c49a56e87c1b741b00a2c69d904978cccf0f236cf09c58169b7ee638e2694797a867825096f94eb77d96f400d6bdd01d78d767e3ec41e91ba3521e5
MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index b943b5f359d3..2b4538bfb3ef 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="minizip static-libs"
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 8a2c2cc453ed..478b52c19fa0 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
Binary files differ
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 1f861760cf9d..94b7f1be07b8 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -2,7 +2,9 @@ AUX numactl-2.0.10-numademo-cflags.patch 504 BLAKE2B f2346a298b86b9c667d0d9550af
AUX numactl-2.0.11-sysmacros.patch 1391 BLAKE2B f761353e82bbb79a70839c34f4ad0759c24b3671bfa8c8ba2869beff4528e9b0241d4b208097c5b6c381dbd4ee532fc6d3b8934f6cac70290ddd48217d0b9185 SHA512 39c5841000650af58ae4f6b15a2e2af7b4fb45e7514537f1d081cc0be74bf13aaa3d336a31ef15386b897cc3478ec58b8c194850e99ca2605f5f25be1650a63f
AUX numactl-2.0.8-cpuid-pic.patch 697 BLAKE2B 0446f983eab3eefa553027c70e373d6693cb7325979d5ca3cb9aaa2f9f00f5c6545fb2d949e0fb068a857b9cb41e2dbda176ba27e12eeeb664841b3fbaaec9ae SHA512 d9624110a7f8459c13b67eb990f05bc54ffe55818d586691b307dcc4ca5861f064a7269f1038cba5f8abf0f2b6d359d30e4f8d6e904a7e5c0da3404ef1bd4d51
DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88fb37422fd86443e53ee52faef4242ff21e6028bdb92c4e1fa7815cdb23e87cd084763539dc1d560097f43bd563f SHA512 1969d7ee0ff3de0d6f1fa42ec089a17cdb3f92cb35d453b8f8b2eec49724c43787ecbd213357013a8f2500a260b0df9844d515815ca3a0376314a0eed050a0d4
+DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
EBUILD numactl-2.0.11-r1.ebuild 1668 BLAKE2B 14394a9c9620741f45c43b11d8272253f3fb643626aa654edc5fbde9bbe1796e4fa48fc2d4248ff7fc2e6469f04658c0aeb2119de101d30208dd1f3e61c79fec SHA512 f7a4265e81b14d1d5b6814ecddc5640f30fb1ca9c7cf7e8750a754bd397e7327d9af00598a7c19b8906f405487205cbee62f1937faee83fb56a5d1adbe48d740
EBUILD numactl-2.0.11.ebuild 1527 BLAKE2B 64b4e024b16d1ba057f3bc61613229ff5659613149567ee52440205baac3a793a390724104883da1241daafaf11fccffd764ec68efef41c138b904be800f6c1f SHA512 0a0a6eff479e075be84a48dbe2994c1ce884ad3dee6da4d2d83c770ec7db42cdde077bcd3e17c23166bf19eb83eeecbeb86d1b7c48df34c3146bfece8db481dd
-EBUILD numactl-9999.ebuild 1690 BLAKE2B cf85c89004e9fe9a623cafba56475984e24a309ba67a9531c1f38c3cdf9fc9fff622e68d12eacbedb1d0f2fae530269449f8062e879d01b46c4af4ef3579bb3f SHA512 3df636c1a1a8f4a70d6f1b6abcd83e9d7102e8a66e28fcb07f8dcc779a72be23e7d29e9ffa2e3569d316c5b322f3578ff4e6af1ce44f44a530457b183ee7aa39
+EBUILD numactl-2.0.12.ebuild 1685 BLAKE2B 7cc6cb2a721489583a179a97b244a48c45f0767e44ed1d9f2fa9740e2eeb7eedd82031a86b60a1a0a9c2636228ef288c2d6bbb213f1972449a7db03ff57a201d SHA512 1e9d8b3863c12794f2fbd917d06e99e448a66e80de3a01f08dce3a6c290a806b2e24537876cd6792c278bbc35a2cd901b78ae5e972b02b14ae94dcc3d265b0ae
+EBUILD numactl-9999.ebuild 1685 BLAKE2B 7cc6cb2a721489583a179a97b244a48c45f0767e44ed1d9f2fa9740e2eeb7eedd82031a86b60a1a0a9c2636228ef288c2d6bbb213f1972449a7db03ff57a201d SHA512 1e9d8b3863c12794f2fbd917d06e99e448a66e80de3a01f08dce3a6c290a806b2e24537876cd6792c278bbc35a2cd901b78ae5e972b02b14ae94dcc3d265b0ae
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numactl/numactl-2.0.12.ebuild b/sys-process/numactl/numactl-2.0.12.ebuild
new file mode 100644
index 000000000000..312ab570210b
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.12.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+ SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
+ # ARM lacks the __NR_migrate_pages syscall.
+ KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
+)
+
+src_prepare() {
+ default
+ eautoreconf
+ # We need to copy the sources or else tests will fail
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+ multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi ; then
+ if [ -d /sys/devices/system/node ]; then
+ einfo "The only generically safe test is regress2."
+ einfo "The other test cases require 2 NUMA nodes."
+ emake regress2
+ else
+ ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+ fi
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" \
+ install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+ find "${ED%/}"/usr/ -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+ local DOCS=( README.md )
+ einstalldocs
+ # delete man pages provided by the man-pages package #238805
+ rm -r "${ED%/}"/usr/share/man/man[25] || die
+}
diff --git a/sys-process/numactl/numactl-9999.ebuild b/sys-process/numactl/numactl-9999.ebuild
index 3dad0c6eacec..312ab570210b 100644
--- a/sys-process/numactl/numactl-9999.ebuild
+++ b/sys-process/numactl/numactl-9999.ebuild
@@ -7,11 +7,11 @@ inherit autotools toolchain-funcs multilib-minimal
DESCRIPTION="Utilities and libraries for NUMA systems"
HOMEPAGE="https://github.com/numactl/numactl"
-if [[ "${PV}" = 9999* ]] ; then
+if [[ "${PV}" == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/numactl/numactl.git"
else
- SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
+ SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
# ARM lacks the __NR_migrate_pages syscall.
KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
fi
@@ -58,7 +58,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- local DOCS=( README TODO CHANGES DESIGN )
+ local DOCS=( README.md )
einstalldocs
# delete man pages provided by the man-pages package #238805
rm -r "${ED%/}"/usr/share/man/man[25] || die
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 8b3d059deb4d..aee9ee683798 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
Binary files differ
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 2a5498c86f67..22534ccd1c4f 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,10 +1,7 @@
AUX cgitrc 2632 BLAKE2B d806a93ed671a3dc8369067cd5af512f4d2653d8959d99dded2460f70f83f93b0297199fc839705591555b0b40ccbb477b0a114c4225c87375eea51580b321d1 SHA512 e54745599d14b595d83aa179dfcaa704d883c3513c77ff2c4eeb8d98a4c7955d9dd94b595b6a60382e8f9a3eb5460886395f858a49e888a8004a535efb759281
AUX postinstall-en.txt 1844 BLAKE2B ce765acde48fb3b1c95b8b773f20dd196507b7b6b908806f2b1dece5c9b4dbf5ca93a61331b5f69efa9dc9a9728761d432c6e54a3d767868046c4b9cbbf210fc SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc
-DIST cgit-0.12.tar.xz 85152 BLAKE2B 10a8432176ffe093c2615406285a9958147c1e33b9c98dc939493b5b107663dc1951d2ba7ea4464c27041f51c2f5dd874da9ed3de8b68da5316ffe1e9d9354f7 SHA512 59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34
-DIST cgit-1.1.tar.xz 86268 BLAKE2B c0fcff703378298b7075e2a55119a8c1adb34d8f86f11acaded775a6cd140fa8ab39c4f2623c317607722201f9f1aed94be4f068f72344b66b0c6ac33538f76e SHA512 8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051
-DIST git-2.10.2.tar.xz 4106108 BLAKE2B 34edc8a28df20fd4f4df8cee09c7c543968743827f263bdfeb60cff4802812cca060f829cd382d1bdc020004e14e083573c278cd706ff16008d77bf23e956a85 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a
-DIST git-2.7.0.tar.xz 3861524 BLAKE2B b5a3f42598b315db0799f3cb4f2285dd08805bb1eb8e4dcedfca2b51fcda2904cd6d46136c0091d90a0d23a80228015a33d709be787fb000713105cbe9a9ed3e SHA512 e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3
-EBUILD cgit-0.12.ebuild 2246 BLAKE2B 32a3f2330cfd765becfb312dd07b292ba89137cf6e8233c70ed6140d85a08b958b7df7220b79c53c114eeab877635cd55f3a744b952d7db0beb5ed10a5eec95c SHA512 0fb818e0eef5a05ae31f5172b4213da509d65499c578ccbea5b3987501e50aa0d3f89d859562c64eeb7335fb8bbb99560eef4f8a92ce8b87f904e342f4553d1f
-EBUILD cgit-1.1.ebuild 2249 BLAKE2B 01fc4f6aa5f194403734da94485b7282f51c44cb8e7aaec58d032ee9d435ed36a30c7370d2bc4a6db76da1e6128da10326eb33bf9c48bd7978ce85d2f32cf144 SHA512 200c71a7a1dd38fa05d0bc69f74ab57a18679ab9ce1464da16d1429a48ddb83c5524f46e7a53319f529005a3de107a0f01db9f95015f5b762fe29ab234842abd
+DIST cgit-1.2.tar.xz 88628 BLAKE2B 92d75aae276e566ca67ce84145a345df246900660210fbcb3093bb946d9bfc3505c11863fd282de4742cfbb371a48f9fcbb88b1e5a8f3536ebd1b1cb8919a841 SHA512 efcc99aa49851c4373065d1e5a01b9eb1df1f2f7cbf8bdfede2d8b76787735e94f157589a8dfe57eaf3057ad53a1b4ada2fb2f69332df2a3496a21825dac9329
+DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+EBUILD cgit-1.2.ebuild 2249 BLAKE2B ec42f974494f204b8c9b33c4b0134ec558b384d55f8968fb6ca9a3cd1f88bfcf0879c828f49d245510554618c7bc9b097df11bc5675bf0710b8f7f54cb4fbd49 SHA512 566caa7d80eec4454f84185fb70924bb284389693d017fba77717311c8883e73072c44b17077f2d92606279862d601b6056b499ab84163013160cfe4f2aade24
EBUILD cgit-9999.ebuild 2162 BLAKE2B 803fc4168ed39bca73ee63e33c9946ad272e440e79b24cc370899203e24b2ec255915d7a06fa9cc6b810ea66754cd06e42dfb3d6fa5516672f2db07eaa76cfe5 SHA512 2e4a26d903bab34cb4c9106f9d3d8b0957a66fa15dad668b4a764e030df3960b6f94f925e69cc339cae0396b77b1a34edbe5dd154404b70b408fc9ba2d9e3c5b
MISC metadata.xml 785 BLAKE2B 77499510fb3060d6e2317f9b83f3bdc1580bade8eb81d27febcdfbf1171fbb0266670a55b8f5cfd99cd748a10ee772946ff0178b0c1f2ba71aaee7af0c5ea4da SHA512 dd9913901422f70df64638a4e8244da670ac9708ea8a0027b2e6aab5b960e27c117f2c486e6ebede40f8c5f475eec054a2896c08166f38113e1ee3ab97694d90
diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
deleted file mode 100644
index 26c877f635b5..000000000000
--- a/www-apps/cgit/cgit-0.12.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.7.0"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
- https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc +highlight +lua +jit"
-
-RDEPEND="
- dev-vcs/git
- sys-libs/zlib
- dev-libs/openssl:0
- virtual/httpd-cgi
- highlight? ( || ( dev-python/pygments app-text/highlight ) )
- lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
- !<www-apps/cgit-0.8.3.3
- doc? ( app-text/docbook-xsl-stylesheets
- >=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
- webapp_pkg_setup
- enewuser "${PN}"
-}
-
-src_prepare() {
- rmdir git || die
- mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
- echo "prefix = ${EPREFIX}/usr" >> cgit.conf
- echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
- echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
- echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
- echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
- echo "DESTDIR = ${D}" >> cgit.conf
- if use lua; then
- if use jit; then
- echo "LUA_PKGCONFIG = luajit" >> cgit.conf
- else
- echo "LUA_PKGCONFIG = lua" >> cgit.conf
- fi
- else
- echo "NO_LUA = 1" >> cgit.conf
- fi
-}
-
-src_compile() {
- emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
- use doc && emake V=1 doc-man
-}
-
-src_install() {
- webapp_src_preinst
-
- emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
-
- insinto /etc
- doins "${FILESDIR}"/cgitrc
-
- dodoc README
- use doc && doman cgitrc.5
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-
- keepdir "${CGIT_CACHEDIR}"
- fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
- fperms 700 "${CGIT_CACHEDIR}"
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
- ewarn "If you intend to run cgit using web server's user"
- ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}
diff --git a/www-apps/cgit/cgit-1.1.ebuild b/www-apps/cgit/cgit-1.1.ebuild
deleted file mode 100644
index cb25cd8aa586..000000000000
--- a/www-apps/cgit/cgit-1.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.10.2"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
- https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +highlight +lua +jit"
-
-RDEPEND="
- dev-vcs/git
- sys-libs/zlib
- dev-libs/openssl:0
- virtual/httpd-cgi
- highlight? ( || ( dev-python/pygments app-text/highlight ) )
- lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
- !<www-apps/cgit-0.8.3.3
- doc? ( app-text/docbook-xsl-stylesheets
- >=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
- webapp_pkg_setup
- enewuser "${PN}"
-}
-
-src_prepare() {
- rmdir git || die
- mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
- echo "prefix = ${EPREFIX}/usr" >> cgit.conf
- echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
- echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
- echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
- echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
- echo "DESTDIR = ${D}" >> cgit.conf
- if use lua; then
- if use jit; then
- echo "LUA_PKGCONFIG = luajit" >> cgit.conf
- else
- echo "LUA_PKGCONFIG = lua" >> cgit.conf
- fi
- else
- echo "NO_LUA = 1" >> cgit.conf
- fi
-}
-
-src_compile() {
- emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
- use doc && emake V=1 doc-man
-}
-
-src_install() {
- webapp_src_preinst
-
- emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
-
- insinto /etc
- doins "${FILESDIR}"/cgitrc
-
- dodoc README
- use doc && doman cgitrc.5
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-
- keepdir "${CGIT_CACHEDIR}"
- fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
- fperms 700 "${CGIT_CACHEDIR}"
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
- ewarn "If you intend to run cgit using web server's user"
- ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}
diff --git a/www-apps/cgit/cgit-1.2.ebuild b/www-apps/cgit/cgit-1.2.ebuild
new file mode 100644
index 000000000000..cc4e2a139545
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.18.0"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
+ https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +highlight +lua +jit"
+
+RDEPEND="
+ dev-vcs/git
+ sys-libs/zlib
+ dev-libs/openssl:0
+ virtual/httpd-cgi
+ highlight? ( || ( dev-python/pygments app-text/highlight ) )
+ lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+ !<www-apps/cgit-0.8.3.3
+ doc? ( app-text/docbook-xsl-stylesheets
+ >=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+ webapp_pkg_setup
+ enewuser "${PN}"
+}
+
+src_prepare() {
+ rmdir git || die
+ mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+ echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+ echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+ echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+ echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+ echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+ echo "DESTDIR = ${D}" >> cgit.conf
+ if use lua; then
+ if use jit; then
+ echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+ else
+ echo "LUA_PKGCONFIG = lua" >> cgit.conf
+ fi
+ else
+ echo "NO_LUA = 1" >> cgit.conf
+ fi
+}
+
+src_compile() {
+ emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ use doc && emake V=1 doc-man
+}
+
+src_install() {
+ webapp_src_preinst
+
+ emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
+
+ insinto /etc
+ doins "${FILESDIR}"/cgitrc
+
+ dodoc README
+ use doc && doman cgitrc.5
+
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+ webapp_src_install
+
+ keepdir "${CGIT_CACHEDIR}"
+ fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+ fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+ ewarn "If you intend to run cgit using web server's user"
+ ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
new file mode 100644
index 000000000000..f3e02e3ea7f8
--- /dev/null
+++ b/www-apps/cgp/Manifest
@@ -0,0 +1,5 @@
+DIST cgp-1.tar.gz 139265 BLAKE2B bf0f18def8ac3c2117b951172d4150f0626e8dcbe22accbcc6ad156e5f9f5c21792e38fa1bf5a964d8b50cbc7ee9003e4dcdcd75730ba2b0445f4dcfeffdda6c SHA512 fc5bc6d39dac896b56579cb6ca013c81493b994a7a190e0c0eec8a64f7b87c6eb2e0ad5cc969b8ea03ca4b00eee212ccee5c8785c23f5656bff3fe5490ff8f75
+DIST cgp-1_p20180620.tar.gz 139549 BLAKE2B 2cc1a416ae1158b5788615b05bf43039049af52eb5296e7fd8136c9895e8ee0a9887e84ad37c6598a4c4387982a2860fbdb7cf9cdff39cfe5bbee598b9ace88f SHA512 acd09bb699af678347dacfc08fee60a86843874543851805f245952e538777d7ccd528c156f7a21b803503c7aac134013a4eb8200d5266cf35541b0dce5839e4
+EBUILD cgp-1.ebuild 1262 BLAKE2B a1a68c636ea31e13e1a62cca4522934276783d872c3032ce50581ff080cd0605c9a6ac4f5d467017480cc8a829309aa8b4c7d5de18a401cd87bb2a35391f8c14 SHA512 a23e7721c97d8c1d97f313e0474cbdffe69f2172de50be4406e0549d7299407bf77024e65261e4d09d9592c68451e5ee10be67f5f2fe0c80653dc66cbcfd36d8
+EBUILD cgp-1_p20180620.ebuild 1316 BLAKE2B a0a69092f89fad5b8b06b421a005f944a5f723a9da8259d7c3ee99f78a7d147093ee528d75edb580cc4c9db0eaf0ca6dbab870c30b36cd573390aaf6384fb1f4 SHA512 c76b4cafd07a56c68b50744cf5f15e0f0de8f734a8f6f30a18333996c8afa3672daba101564660deeb1dd8f024d433a554b01eafc30c07a54f257162342f4504
+MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1.ebuild b/www-apps/cgp/cgp-1.ebuild
new file mode 100644
index 000000000000..0d1bc985b145
--- /dev/null
+++ b/www-apps/cgp/cgp-1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN="${PN^^}"
+
+DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
+HOMEPAGE="https://github.com/pommi/CGP
+ https://pommi.nethuis.nl/category/cgp/"
+SRC_URI="https://github.com/pommi/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php[json]
+ net-analyzer/rrdtool[graph]
+ virtual/httpd-php"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
+
+src_install() {
+ webapp_src_preinst
+
+ einstalldocs
+
+ # Since the docs are already installed, remove them from htdocs
+ # The file doc/CHANGELOG is needed, as CGP reads from there it's version
+ rm -r .gitignore doc/LICENSE doc/nginx.conf || die
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+
+ einfo "The command shell_exec must not be disabled"
+ einfo "through the disable_functions php.ini directive."
+ einfo "It must allow execution of the rrdtool program."
+ einfo ""
+ einfo "An configuration file for www-servers/nginx"
+ einfo "has been installed as an example."
+}
diff --git a/www-apps/cgp/cgp-1_p20180620.ebuild b/www-apps/cgp/cgp-1_p20180620.ebuild
new file mode 100644
index 000000000000..6051624a6a90
--- /dev/null
+++ b/www-apps/cgp/cgp-1_p20180620.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN="${PN^^}"
+MY_PV="1920ca24a067ac157a6bd8f3c017f4c6244ae245"
+
+DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
+HOMEPAGE="https://github.com/pommi/CGP
+ https://pommi.nethuis.nl/category/cgp/"
+SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php[json]
+ net-analyzer/rrdtool[graph]
+ virtual/httpd-php"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
+
+src_install() {
+ webapp_src_preinst
+
+ einstalldocs
+
+ # Since the docs are already installed, remove them from htdocs
+ # The file doc/CHANGELOG is needed, as CGP reads from there it's version
+ rm -r .gitignore doc/LICENSE doc/nginx.conf || die
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+
+ einfo "The command shell_exec must not be disabled"
+ einfo "through the disable_functions php.ini directive."
+ einfo "It must allow execution of the rrdtool program."
+ einfo ""
+ einfo "An configuration file for www-servers/nginx"
+ einfo "has been installed as an example."
+}
diff --git a/www-apps/cgp/metadata.xml b/www-apps/cgp/metadata.xml
new file mode 100644
index 000000000000..10b010911e42
--- /dev/null
+++ b/www-apps/cgp/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Collectd Graph Panel (CGP) is a graphical web-based front-end
+ for visualizing RRD collected by collectd, written in the PHP language.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://github.com/pommi/CGP/issues</bugs-to>
+ <remote-id type="github">pommi/CGP</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 832f5e7d7863..e27e577be07b 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,10 +1,15 @@
+DIST github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz 2112 BLAKE2B 3b3a6de509b7e9a2f925252a28a93e4d94e68f81e10b6a39bcb8066984ceff1e2d898c0f726b85a6984a396e88b382f5b7488c79a1d8bf6ddb7bf6eaae3d889d SHA512 b6eaa606660ab6fd2a952a8ef727c830db859658636ee7b214014f2b4a1ec3c671d85745f94ed118ed9d2cc9909a15d26c6be72baed5b6e13eccb5cfe20e58bd
DIST github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz 42256 BLAKE2B 65fba0e39dbd7d9ffc5707379629ba9e8d91f186214afeb6b5f5960bd7d4b0f233247ecc1b23bff9c4ea8572f00b106ce5b833f88d975be5ffb29778fc18dcee SHA512 8a54f8b1f2fb9b5882d3c1498376c15aaf00eb8d9379090c38b03a6a291215923637dae9f36db1cca700687169cb08911e515222cd72fc153a5082ff4ddb5573
DIST github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz 11651 BLAKE2B 5303cc2264bc289d94cbe81766e12ce42e5ab59a5fedf3bb9b1fba76d0ab543af8f7c34b991837f9ed6270003b5e1eb2d94721c27dc409ad67472c8dc0315d82 SHA512 faf9ef8e24db59d477073fb8a06de337827f21b84a69c03cf47c6ddd8d3d67772319e261d98fe1fafbcc80c725db52541e02f8f2d598986246d02b8e381b4e6a
DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
+DIST github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz 71099 BLAKE2B 2894bc0568c3d114aff71724dade89c604d9f0528cbe8f5c644c4a850941f146eec9a862886cb3241b75212c6f2272efc50a6923166eeb571be26c8aded40e0d SHA512 182f141d83bb9b1d7d94cf3b1beb2e7c4074f9be3bd0250e3423fe64e6182f34b54b36e517397aa88440e42fe116973ed435bde6b8343df299db6ebb32591331
DIST github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz 301047 BLAKE2B 8d14d121cdeb160d3ed10d6b60a8d97897b0344c7c42e5a6546ef1996d32bc163ff650f0d74b9085635ac179fe14a672dff87fb4b3ae43093fd06ba660fc4faf SHA512 67f0d6f741fa07e9d6c3fdc92d0235ed70927b6fa85a346c8b7ecbf9b709e2b7810aaa8f625f5d528bb20d9f7118b4af1cb52fc7f4a5d3e7d1dbf05c0430d7ef
DIST github.com-alecthomas-chroma-85c342e3e3d715ad780edd0ba8728161e99cce24.tar.gz 298009 BLAKE2B e2c8e9e72c06d389c43f4040d652b8de27e9480d3dec27f1b76cee14e657aa10196cf42f42bb4a19d2982198e8a566598104fa14328f06bb12916f382e8bff26 SHA512 38d5c391aa9ec4b8c24bd18ec7bb9bd1dab9eb968689ca91635b9964e62d1c0b74c6d102071e48e461440e3f30f201a63bc3a8eaa9e200521c77d35ef4d8c655
+DIST github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz 3483 BLAKE2B e4ecc9503cc8c6053adb66f87ddaf1e9fb66fa18060c07a0e26c1fd8fa1b143d48345ea73c399571f787b8104a7522672a945d885f5e24dcf0718a995d6567f0 SHA512 e428ba9fdc2fcf097ec9892241cbca65631924dfe66a08ec4131e7cfba24125145600f03b753b7bc4452b06f0c7380560d9165ebeb7dddb30d35db512c825796
+DIST github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz 4609 BLAKE2B 4407439779e981b39d1926437aa67a8922bad0eeed8858b0888c53ee819c8551367e8f74d6d04854ce57dc45a477060461ebb79b30be6b8f6880dbc94f5d53c2 SHA512 f07fda8ecd0c653dfd0024eee9e33851572ee21a6aaa196d453825bc28bb92b3c80c0dc0aad38ec4e2158e7f22d7aa1166e4ea7aead713fa834c686cb98dc02d
DIST github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz 3494 BLAKE2B 3f8103b07b4d37c060d48739c6a6cfc9b585ea3fcf1b87aa9bfee44245b8f4067763567864903b488070a3ae43a30b7ed95dcaa12517d119af0c4bc6cf73303b SHA512 2636d6ef6cdb5334da0e6ca560e64e2e1880ed749b7abdbc6ac6f2eff125c7c40e4eda549273d68097789234dc7e4bba3cd5d07ea5147e9d28ee390c2fd0216d
DIST github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz 4602 BLAKE2B 5bd1389e89f3d7b9c423d5a3dc2c40b374acd71c5f71a1032184464184cabd67e4885afd4aafe82b0f8c4733389ea639aa5e9d3a71b86285cd6579cf3803b35b SHA512 a46602ae2651d6b21442e797658553b5e4e5f6226a772152fe690aabc0670ec3aa5d65dd9fb7e6fbac98a31b0e854cb5838c998ab47114499d65351760c87ffb
+DIST github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz 5373 BLAKE2B 63e63a26ffdeef5d27f5b39111b8b9e966982f4da720c9ff28f0b58517635319ae4fb1b349fa754a0a0ca01d8c3299d13f746a6ee920203c2837c18d064f2acd SHA512 e8f358a5007a5378d37489011beb6e178cdc864f195434f89295b09ff68ee79409ce0a062d4a0dfa1910e4f33201f04031b5a021aac5f40ce154de1f4da2ef60
DIST github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz 34326 BLAKE2B f8a163210623f8233f08b59ed62370640634d8c9a0354c972079efca4f15be3a3a0cd98b8e97145a8cf69a1a35fc28f4d801646c95b211c39773b8fd83007486 SHA512 07a4d649a7c6258fb4993b7a8dc7105ef649085612c9df2c72dc6b106ddedf7c0f9e7d3e729f01fe914bfb2ac4d8f225dbb04f96e7b56461ec8648f9c57f81e7
DIST github.com-cpuguy83-go-md2man-20f5889cbdc3c73dbd2862796665e7c465ade7d1.tar.gz 79347 BLAKE2B 4880f879d89e6e2e0e8b54fac3a5208f2b31a876d5d4a8566cfd9e83cb88c4edd355f1195cf8caeedd68a9f9f19be66e974b153504a7c6c7e455b648b83926d8 SHA512 15cf9697ab6771cbcad5a529f1d3362cb811b58662f10e352bf16530e22dd3dbfd5837cc0b587b049db03e7f813b855dc9d886f461fd5df45552d9813c35a9e2
DIST github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz 40238 BLAKE2B 857577fd1356fa1b6fd28f8a0c0cdcd1b29f6e9ad2fb8159d261071bab83ee791d6c457f1f2f0b3d36ffa2344940eeb7bd7f50bc79f84882de99497581585945 SHA512 b1ff0d3cb7c02aa9809b545226ec5b050e4883388272cd55606e285262014ebd6ca20c69a9d7b6e2cb395b8a688444a4b4e267f1adcab43ad1425b4ed2ed1de3
@@ -32,8 +37,10 @@ DIST github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz 32
DIST github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz 8767393 BLAKE2B 520a0b581b3567fc95ddef4a44157cbb0e1cec13d94b0c4ac0a6af29ce61bfe703b0d0e6178900a782532d161ffe98f650a498879ee31e5f9ccab81e6ef03328 SHA512 6c22de2dc7820ea60ddc26faa3590ba9a52877f6e84edc6685fca59e8138eebbb96fb14de8a2ccaf7a1c9d524afdef456f8e14106c4b30eff48766f47be84d4f
DIST github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz 28710 BLAKE2B d1f849b968e769f8ba3ec36a417bdd43eae79d4676b98092607330407c4ae79bb591822ea12cf7d4fc665c79e4018c52e6044ac1346afcdce9f7f1115142a23c SHA512 ba4d0cc293cd00f9f8c1971f0845fcf57d87507b60f2a4f4fb439baa34b47295f7b7da44c37dd447d8aab4a9b46901490999e8beced93f491c6a778dcedcb408
DIST github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz 10753 BLAKE2B ee2f15434c7cb9352a4acc1060a0eca725c32d4c127a68e0e5cec9dba8ee251d47ba7dab3b58a15a10e3cb5d3d47bd7051b2c879bfc27141a1b4168158f34310 SHA512 7af6f08396ab5777fa7c233d0bfbfcebf149a08dd17bca63c70a2d17027602ef01160e74479e8ac1ee529840211b849de46674edd32eac384f07dc7dc1158acc
+DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
DIST github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz 198941 BLAKE2B 31e691854ad8b4f697620d786027e29c8da6a63430033cf05892bb9846cd8202b9780037d31de7ac526db907b9a07b45ce09be814ed9106de2d266c94409333e SHA512 a027acbebd034e48be627d5a5aba1bef5becf702652595ca815aada5acc7a39d67dd05b1c23584a8d3a296bcfe267a507f9f1e690e7cc8f84b87ce462d0985cb
+DIST github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz 6461 BLAKE2B 6317479125515dcd18a7a5589bfccc44cd5bfb961da8004a4fbb336840fe22c2e8c765dffa587c41d75dec17b2c2e5ff324b95a9efad3326d9290280c4f60d16 SHA512 a818ebef810eccfdca70aecc1a19208fd6f1ee454fe3677249d43ff8a5a6d462f2b947a8fe5808cfc50f7387457e65581bb2ee45012e5e0df3cae541357d70d3
DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
DIST github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz 448097 BLAKE2B fc3d3963959f7a611bae7e6492f11fbbc3787de2b9302c2f739c754a9efa7215bf3c3edfa10f6a10bc504700ed5b4ffd29a8c427f6b0d998a23edc91eef388e6 SHA512 04b38117087f540a03f9da9070a16010d7ef4cb6c321c94df3d3dc95faf57dc3a44f5e36055ce0a6a1c3d924ba01d8bdee40b0c1b457e6f03c650f91663c91cb
DIST github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz 39654 BLAKE2B 35dbb1e468596499721693cccc2aeb8bb9aaaa94c6001f708b43e405ed6aafa90a40f8782c88de89c15c69bfa9e90036b87a9422ef6d5352f6076ee56d75ae1f SHA512 c0d0048da1755e9ccf4607851eb16ac95568f55131e3017af886442ebacdd71226eb3db5854261c2b6b39985cd09d24d37329280c13a72aa286cefcdaa01cbcc
@@ -43,6 +50,7 @@ DIST github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.
DIST github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz 75260 BLAKE2B 684fb920f0183b4fb6ef70a995f22efa6152fbd9bae5ffadb1ac67e97fef3f6b7ed7449c487f086a12a0e497a36ca050289a66ad3aa0105a5027800acb13dc12 SHA512 01b4ff8c392c2188c5d97a606fa74df132eb255df91a9b7a7a79416ddef23bf712526f771f6b5fb0713664714fa45961092e808dce68d733e9611118729b3918
DIST github.com-russross-blackfriday-55d61fa8aa702f59229e6cff85793c22e580eaf5.tar.gz 75172 BLAKE2B 90aff15badfdcb12c444f5c45d596ecbf483c2d63548dc8a8fe73a36f19806146dc29bd65f908cde49dc10635ea4d2c7ef6bc109f7496f8db918f9db3a214a1c SHA512 b51935e194057e93bf976f48165dfd0cdc3b2e9f175078c19e12ef39d1698e3a24f7f14741633b8526c5b6f79f236232b2910331d1ad43dd1f214bac636f04f4
DIST github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz 8787 BLAKE2B c8f9a9036996f23267f836e2ba223d63099620f368c8e3c50830b1b90d9f7ac8e681b96d66d49a14ffcb03b4acc3242171ceacba14693c3e0560dc0fe860edca SHA512 801e021148504b2bd96b8b1953cbab6d980febaa103fc1f7ee59a491eb151b6cecdd3bb4058ed471dbca0624f3cb92d439ae9b023ea81426506f5aa09f082936
+DIST github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz 41675 BLAKE2B 36459e76965e83a638d3cfe840eccae0c4d75215c9a2d87b770456671fff0d7a8d1aa26597391dba3f928af12414f5877219f78d18f8110f5287f47a02efe4d1 SHA512 680d572de0841900f6bd1938fc8c0ad6e2dcf21af493bc9ff81ebcb013a15d9439c00fc11048c5de5a5916f8bc3038fcebd80c8faf74161562f5e3d3f90b1e24
DIST github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz 2057 BLAKE2B 511fd36413822251b5a0aa08d632ca1e1564e4f6f9b49172a571e373c05298e24cf4720dc7005821ce94ce338a066b32e9e6cb19b70b2b2a652da3e9c91b5748 SHA512 1d53a83a293157ea42d4e1c7a1eb30c87eaa32cdc88521ebcfa3f94fa4ddcf35d1b839a16ccd00043ee59c113596d5048f88e5cf5f9e6ce6003c9d8faf837ad0
DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51
DIST github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz 45265 BLAKE2B 93c8cccaa4dea6f1a6a0b1ce2d326d1b4ea4cd1269c1ef6c74902c9713dfae73c5e24a8fdaf93a5f369d1706a92441c7504cdea325f75f1982476f6af401652b SHA512 94f0cbd5035b423f300fa82348a1b8ff52bfa7460b9adebe08b372c5a16c46b3ae9e3e3277b2b299c4da68b518a579dbaf512c1fac2198cdba8c1ebe7f00cd1c
@@ -54,9 +62,14 @@ DIST github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz 6750
DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
DIST github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz 32062 BLAKE2B ca08f97574d71f3e305ec52dc440c2293c23cedcff63f8297ba9352283375059700998b4f198b76e6903f6b8e1c32744b0c335d382bfc232f1038d527341c043 SHA512 fdf9358afc0bf3bc150d1340b65a9758b2c58d871cacb9e924a9501bca5980c86102eea6746ef5bce972bc3685759dbe5eadc8e82d8ccd6ccf56f73230686e63
DIST github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz 95392 BLAKE2B 7e6d970b409e3cc62ba24c5a8d132a7a871b66af4a287a217b40f19ea17b12ef680ff6ebd59c708acd5139f673b9ca8faef7e04c719939cbbd0e331f63eb22af SHA512 9924e8fce7ddfce9541f7da1dfec5a5f57a4d54261f3b16e4bd541a8fe4cb90d2900de24c6e9ae791df9264a27624d23c8b7a4d19a9974e2e2c83c68a0dd484a
+DIST github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz 2108798 BLAKE2B 0ccef101e941c6f57b9bd1e461ddeae5d15864e17ab686768d7b09680dda4c08068b31dff14e5d9ca57fdd38c465e5fda6007fe74e3826617ba75a055bee3721 SHA512 3e8c4b716885e25b5c171730031e1b63ea94a73f89290ea1fa2f38dd5eb7945e4320fd269147739403d19b69076ff693e422b4400a200381cc3017916b384b24
+DIST github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz 73581 BLAKE2B 20c061130798049e5f45bd0176e03fd5de9e9af141431ad475a74f8c788cd359f07ab33e10562e85d1b3eed7d98619f3b0c08427ad9486550ee9cb355c7b0721 SHA512 983f2239b394c67b0b4881632eb7885ce0a54788134619b07398778853bb2e0520049be45985976b16436beac1c69868b523cd73919339cf30acc81f2f1f8b40
+DIST github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz 333495 BLAKE2B 3f2e909feb68f0f673ef378890548dad3585fddb9e40bcc8b97418123a268ec875e0ffcd50b5fd83b4dac68431f24a2be471d416624c165b15bf64f2f7843821 SHA512 a3413cb8b861eb2f05ba01c6735722b68dbaec5d8a646faa7d6175de9c8831d7409e602f72e64fa305fb3f49056a237ce8219c24d149b5e27dc60e5d94a87ee5
DIST github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz 23279 BLAKE2B 227141f6cc7b950392ecbbe97f8b889f20e14544b7c80a0986c68dc997956db18d96297cb6e1a49a89fe851f76184f0eac446d2e0fe1c93d45526a9ee26102f8 SHA512 1220a31b92b1e0f76e1e04e7161ee977fd4e17374437ee807ae943a2970df7fb4551f68f4d2175db8f6d7b37d52b564dee75e6f1e84e8fd5939572c3b64bd87d
DIST hugo-0.40.3.tar.gz 15168823 BLAKE2B d3e057c6e2da074813691b01e1965fb44b4ae5ca9882fe58d67ba897f628ca2810317eef7ab0c6437ae48ea1136554995f97d8e4e581e26201d61515c9de85ae SHA512 903911fb268b79c9981020b1f7b24a34bfd608f89feb902d45050870f442587349bf029df95b95196bf3e777ff5ade2b372cdb899ec1020fa8ae0fd621b644d3
DIST hugo-0.42.1.tar.gz 16529961 BLAKE2B b9b16de707a1d9a17a42147451ce365453a927b772a3eb3f40c835a7d14b55e707cd9e312e8ce8d6f4805a691fba3c967d1e4c01fca2487731efb30d5da4ea0d SHA512 bf3cfe09adfd736cd2c25da1dabfedaa8e262a46d6ba8fc8253b5a4ab1204d82c1fd3337be00ec85f530d54e3a6e23078aee93b379e1a00bceb952c637a1603a
+DIST hugo-0.44.tar.gz 17634657 BLAKE2B 6f21af5003b6a082df3cc3a64a6013c78f7c9fc5f81d56c1925d8ee3092f3381129599e008c1c9ca752cb6b40f405a6893664bee508cf55c700f59e5a9461ce5 SHA512 0cfd399a18e21c0596095c8e6817cf953b142624a1661e0e95944fccd74ca8e93072694e6a340300fbc93a739e744276893f42fafa44983beb5f6e5b60437cfe
EBUILD hugo-0.40.3.ebuild 4846 BLAKE2B f25a8a07bc090313babb726945ca729a608878a7edd2524e156ef26f4ac75d17d95c36be641f9e0f64d55f4408760bd5f250ba84a54c30fb61b4e107c69cc316 SHA512 b2ddff47f6ce6e0267e0942600463680f4404c65ec26f137a55a71b22fd435a3651b17f0ee889d9a05ca9448bb257ba14d4d83793ede95efe6ddc61c4de9acd0
EBUILD hugo-0.42.1.ebuild 4846 BLAKE2B 4dcb40c1e84fc3206d3f8e386f1008fca5a271943162090d9bd801a909218a7e5ab10f1e209f0f6ffa2eb1f76c2495870f0c97a57aad946f488283210a78faee SHA512 9f063518751ab20af19ddfcaeb9fa496cec186f92ceef973e21d2d84273cc9d9a66d1b47b99ce542cebe62784e11393b77ed420af0922d1910c386ef7eaf8da8
-MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
+EBUILD hugo-0.44.ebuild 5683 BLAKE2B 8701d40f1afe753f44eddb09d7aba880842ab05065758772618ce7e0aaab914de40900b361d3d237ace960eafe75e758412fa65ec438c39fb4b67408cd15bda4 SHA512 83516f57af0f5c64e6268f8a321f48f0a4f1cbe7553ba63d24da8a7e0185d5abc0d492d8e7aa0d5cf4d494610600fafb58f5b208562004b5b5734c6c94d969e3
+MISC metadata.xml 312 BLAKE2B 461bb90ec180d1a09d780aee57523196d50b176b6bdd6645c75b878a72ecbe76f7e7a323d6c0ec300762e57be5ac4342c6f67a11f73088f55fb2b1bde17b5b25 SHA512 c7ab34fd5a378c5b82484b7637ab0fb598a64f61649d9b68726bc7cb9d5d51b7bd1f199f3f298d49dc7bbadfae9c3d692f45e878daa3e22ebfe4601b0d0f0c9f
diff --git a/www-apps/hugo/hugo-0.44.ebuild b/www-apps/hugo/hugo-0.44.ebuild
new file mode 100644
index 000000000000..3860c9f640a4
--- /dev/null
+++ b/www-apps/hugo/hugo-0.44.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_VENDOR=(
+ "github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
+ "github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895"
+ "github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+ "github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
+ "github.com/alecthomas/assert 405dbfeb8e38effee6e723317226e93fff912d06"
+ "github.com/alecthomas/chroma 1b755a90bd109f170385cb3964f0abdfd3451145"
+ "github.com/alecthomas/colour 60882d9e27213e8552dcff6328914fe4c2b44bc9"
+ "github.com/alecthomas/repr f49988b46e025398b9f834f7c726afe001ec481f"
+ "github.com/bep/debounce 844797fa1dd9ba969d71b62797ff19d1e49d4eac"
+ "github.com/bep/gitmap 012701e8669671499fc43e9792335a1dcbfe2afb"
+ "github.com/bep/go-tocss 2abb118dc8688b6c7df44e12f4152c2bded9b19c"
+ "github.com/chaseadamsio/goorgeous dcf1ef873b8987bf12596fe6951c48347986eb2f"
+ "github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
+ "github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+ "github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76"
+ "github.com/disintegration/imaging dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
+ "github.com/dlclark/regexp2 487489b64fb796de2e55f4e8a4ad1e145f80e957"
+ "github.com/eknkc/amber cdade1c073850f4ffc70a829e31235ea6892853b"
+ "github.com/fortytw2/leaktest a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
+ "github.com/fsnotify/fsnotify 629574ca2a5df945712d3079857300b5e4da0236"
+ "github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+ "github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+ "github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+ "github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+ "github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jdkato/prose 20d3663d4bc9dd10d75abcde9d92e04b4861c674"
+ "github.com/kyokomi/emoji 7e06b236c489543f53868841f188a294e3383eab"
+ "github.com/magefile/mage 2f974307b636f59c13b88704cf350a4772fef271"
+ "github.com/magiconair/properties c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+ "github.com/markbates/inflect a12c3aec81a6a938bf584a4bac567afed9256586"
+ "github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+ "github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+ "github.com/miekg/mmark fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
+ "github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b"
+ "github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
+ "github.com/muesli/smartcrop f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
+ "github.com/nicksnyder/go-i18n 0dc1626d56435e9d605a29875701721c54bc9bbd"
+ "github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
+ "github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
+ "github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2"
+ "github.com/russross/blackfriday 11635eb403ff09dbc3a6b5a007ab5ab09151c229"
+ "github.com/sanity-io/litter ae543b7ba8fd6af63e4976198f146e1348ae53c1"
+ "github.com/sergi/go-diff 1744e2970ca51c86172c8190fadad617561ed6e7"
+ "github.com/shurcooL/sanitized_anchor_name 86672fcb3f950f35f2e675df2240550f2a50762f"
+ "github.com/spf13/afero 787d034dfe70e44075ccc060d346146ef53270ad"
+ "github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
+ "github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+ "github.com/spf13/fsync 12a01e648f05a938100a26858d2d59a120307a18"
+ "github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+ "github.com/spf13/nitro 24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"
+ "github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+ "github.com/spf13/viper b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+ "github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71"
+ "github.com/tdewolff/minify 8d72a4127ae33b755e95bffede9b92e396267ce2"
+ "github.com/tdewolff/parse d739d6fccb0971177e06352fea02d3552625efb1"
+ "github.com/wellington/go-libsass 615eaa47ef794d037c1906a0eb7bf85375a5decf"
+ "github.com/yosssi/ace ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
+ "golang.org/x/image f315e440302883054d0c2bd85486878cb4f8572c github.com/golang/image"
+ "golang.org/x/net 61147c48b25b599e5b561d2e9c4f3e1ef489ca41 github.com/golang/net"
+ "golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+ "golang.org/x/sys 3b87a42e500a6dc65dae1a55d0b641295971163e github.com/golang/sys"
+ "golang.org/x/text 2cb43934f0eece38629746959acc633cba083fe4 github.com/golang/text"
+ "gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" )
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="github.com/gohugoio/hugo"
+GIT_COMMIT="4172a835e544b867f292579019d0597439e596ba"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Fast and Flexible Static Site Generator built with love in Go"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="${ARCHIVE_URI}
+ ${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="sass"
+
+RESTRICT="test"
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" $(usex sass "-tags extended" "") || die
+ popd || die
+ bin/hugo gen man || die
+ bin/hugo gen autocomplete --completionfile hugo || die
+}
+
+src_install() {
+ dobin bin/*
+ dobashcomp hugo || die
+ doman man/*
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index 97df2a00971b..dc988c842339 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -5,4 +5,7 @@
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
+ <use>
+ <flag name="sass">Enable SASS/SCSS support</flag>
+ </use>
</pkgmetadata>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 69b42811e552..a64364d8c402 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,10 +2,10 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-5.6.9-linux-x86_64.tar.gz 52381284 BLAKE2B 962891ada991f718bb3a1445ec369db0e71e27aa76fb0170d57dfa66ea2b3e14289412464ec6c6b687e09fb3cad77a7900985dbcbd7fb29e103b06ba6cc8aa9c SHA512 e30fd6735b5fa510b81ba70a66faf2ff57ea01bcc0b0379607173d7a8cef44628efcaa0bd055b3f6672f7874c616c0d99b353a0e14d354879a9675fd367676fa
-DIST kibana-6.2.2-linux-x86_64.tar.gz 83415765 BLAKE2B 86f7511c82b6954a8769673b856eb46f2b633490535a013d4e30138e8abee470776493de43284f2e68b2cac6b74ba2b76245fd35803b8b5834f79ea5f488dd6b SHA512 8d26eb8293028aa0c35942a7b5025401f9b717d5c548d6cdbcf2761c0d8cc1189fdbf12c6f39468d4c809a3975f5f3c817e0f02424b296ce36183e118b0c72c6
+DIST kibana-5.6.10-linux-x86_64.tar.gz 52586941 BLAKE2B cb4e1716c640c80be980541e5496a96fc6baa04152e11f754b46dc71a9995809038b8a82c3404d9d86d1bd0381e9fc55fca44c66f046cb41e005c760aa077092 SHA512 c56c600c79bf2f5d2991d6c1442db300c78dd4135bf8dec5b9f500d609e2f041d09649195cfdae2f6d30cf8de2c2c865ac607283f865c4aa8ec1d400af84c270
DIST kibana-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
-EBUILD kibana-bin-5.6.9.ebuild 1521 BLAKE2B f6deedf6e6bd6aa2c645bd0ce609b93a9dfd70cd795c3164c4f7f00ab757f3d97229a65b17f17332b2f1d78c0553e8cc1ca23047109705ca35e37e1165ba7f8a SHA512 c6b20242490afebfb80a9cda7b2444b4b6889ddfa44d2bb5c5a0e4ccdc1ed55cffc7b7bb5530d0e7f91e662209dea0a2ac35e23304dee76268de0a43391e5202
-EBUILD kibana-bin-6.2.2.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
-EBUILD kibana-bin-6.2.4.ebuild 1654 BLAKE2B 0d7112ba0229cd359d47ef9422e19fdebfc533cfaff331465496da16e9a41d43ee36e7c8762fda32610272a063b83ceda09767319ce081f960c2520be2e163f9 SHA512 64168cc84aa586b7cf96b448c0edb7b7181636d87af791d1fc1357ce51966638f18e25f71a3a5179e73f1505bff4d8b13ee5c7c38fcd8659ce7ffc5c860aef36
+DIST kibana-oss-6.3.1-linux-x86_64.tar.gz 89617065 BLAKE2B bdadf0ddecb060d64ed07f4f3f62934b4ae686f00d1dafbe8030acf95431b13049f53ffe7a6f8eb695d9cb1dc45151110f430c1953e1c0e1edd3656819ee0cb8 SHA512 6be02af23878dae1d48b81e8a46704f35a0bc136dd0952d997ba1f00d080868960fc3fc86d37e1e1fad5acb74dc2345e09ccc7d27862575d5783708d058c6831
+EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
+EBUILD kibana-bin-6.2.4.ebuild 1745 BLAKE2B d95296e03ddf57600d331095322c847d7bed1d078da13ba77ecfaf4d45ee6e3a6b148beb086eceaa998ee7f0b7bd0628b093d8eb5a819e470868a31fb0c75df8 SHA512 aad7d437c13a237f86a743f90f71cb8bfedf705eba09f53271c888cd191364e4c51f682b854a5515f9cc10623631f37b11d05cd8e85bd55384c02d1d9321d718
+EBUILD kibana-bin-6.3.1.ebuild 1756 BLAKE2B 270ab6f83343ac29f3cf73d58f4366e8d0ca47db163eea15c50609ff4b572a0b80e243d3e66c53f34c4f640158f841b8c2c53a5ac84c2e164a8b31418ecc0be9 SHA512 32c3779f96f42220a720ffd4d3107be8304f6cc80145b473d3cdd64fb6b9fd5eabf9ed73a5f440af963361db08efca21defb5a6056b4812480e695efd64f3fc3
MISC metadata.xml 462 BLAKE2B e46d1fa695c441eebcf417e41d8a28d04309768c8e91c97c3e5c6f7a165a284f229708c9d3b6860cfc5ee7b541cc77dae288a7df17468b30f7b2fda258b84359 SHA512 99681a4b9c1674467a8f4828246c0fc0a96d145c5c62cf751b8dbcc060a41b9327f58e5a53323454fa360bf4a5d576b3f01e7664cb0091f20c21b88d6a18b0a9
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild
new file mode 100644
index 000000000000..3a61facff7bb
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+ default
+
+ # remove bundled nodejs
+ rm -r node || die
+
+ # remove empty unused directory
+ rmdir data || die
+}
+
+src_install() {
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ rm -r config || die
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+ newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+ newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+
+ insinto /opt/${MY_PN}
+ doins -r .
+
+ chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+
+ diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+ keepdir /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+ elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+ elog "Node.js 6. Some plugins may fail with other versions of Node.js (Bug #656008)."
+ elog
+ elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
+ elog "in /etc/conf.d/${MY_PN}."
+ elog
+ elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild
deleted file mode 100644
index cb88e5913e4d..000000000000
--- a/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver user
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-pkg_setup() {
- enewgroup ${MY_PN}
- enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
- default
-
- # remove bundled nodejs
- rm -r node || die
-
- # remove empty unused directory
- rmdir data || die
-}
-
-src_install() {
- insinto /etc/${MY_PN}
- doins -r config/.
- rm -r config || die
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
- newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
- newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-
- insinto /opt/${MY_PN}
- doins -r .
-
- chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
-
- diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
- keepdir /var/log/${MY_PN}
-}
-
-pkg_postinst() {
- elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
- elog
- elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
- elog "in /etc/conf.d/${MY_PN}."
- elog
- elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild
deleted file mode 100644
index 8471d3d0b369..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user eapi7-ver
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-pkg_setup() {
- enewgroup ${MY_PN}
- enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
- default
-
- # remove bundled nodejs
- rm -rv node || die
-}
-
-src_install() {
- keepdir /var/log/${MY_PN}
-
- insinto /etc/${MY_PN}
- doins -r config/.
- rm -rv config || die
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
- newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
- newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-
- insinto /opt/${MY_PN}
- doins -r .
-
- chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
-}
-
-pkg_postinst() {
- elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
- elog
- elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
- elog "in /etc/conf.d/${MY_PN}."
- elog
- elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
index 481a185aa4b1..96789c5c5562 100644
--- a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
@@ -58,7 +58,8 @@ src_install() {
}
pkg_postinst() {
- elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+ elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+ elog "Node.js 6. Some plugins may fail with other versions of Node.js (Bug #656008)."
elog
elog "To set a customized Elasticsearch instance:"
elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
diff --git a/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild
new file mode 100644
index 000000000000..964f443c817e
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver systemd user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+ default
+
+ # remove bundled nodejs
+ rm -r node || die
+
+ # remove empty unused directory
+ rmdir data || die
+}
+
+src_install() {
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ rm -r config || die
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+ newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+ newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+ systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+ insinto /opt/${MY_PN}
+ doins -r .
+
+ chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+
+ diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+ keepdir /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+ elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+ elog "Node.js 8. Some plugins may fail with other versions of Node.js (Bug #656008)."
+ elog
+ elog "To set a customized Elasticsearch instance:"
+ elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+ elog " systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+ elog
+ elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 6b662a741791..314e0fce3ff6 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.1.12.tgz 38023724 BLAKE2B f6903d2603eaab37c2da3e53c00b942a00ecd28fc14b927dd3dad3785e1f64e71745ba207f9e12669b2b74c2406c314fd7eef4b61a9e9f7fe3b25f4657399854 SHA512 0c32fe968e2b676806e400bb57f0fc2cea29282ea27f8d13892ac804fbe77885afe83ccef9515224d1ee5f201de2bace620a5ff63aa94c9e5293e65a97608142
-DIST moodle-3.2.9.tgz 40333782 BLAKE2B 8ca8d01e2f15eafa11f06fa064e891f6d0669b788211c6b713c8dd73fd08eb6e728eced3d2f2d776218ddab1fc3e06797e9b6a05b6f63ddbd9ee6e2f9e3839e8 SHA512 983c7905123bb2c6a798ce7acc66f025e90fee937fa6d2811b56d3952e7a82daa3d9c6fb140deb525d931310f462d24b52bc7004ec8573ef920326058a59dfbb
-DIST moodle-3.3.6.tgz 44870790 BLAKE2B 4f603532043d853cc0bd95e77146487b279ac8957f807b7e386268a01e929385737d6995d3de9ffaf3eb8e94cf8abbed5494728d8d3fd3c2dd678bca3f945a2f SHA512 f0ef461b4863a03dcf258499302769a1dba807c9a5797c61f6feb8ed3e06cc9cff1ac2a8a17f48eb52084a91b0ecec18f45a10aa2197afc870ba8535b364193f
-DIST moodle-3.4.3.tgz 45524224 BLAKE2B fc4096875368b33774fb2751e91e32cb4c5796424c31f7fb3b6e547c6de051ad6ada4b0ea7b97d190830829e3e99eec105480d860b7d5caa98463c2450d40ec6 SHA512 c201f75584b39676d10e33c03a39fa7c73a757b8c6066df5299cdde9c9db68a4d58ebb98b6ec5b0d89b0c4f258a8114083b0bb71a32d04c55d1045dd66b9ce21
-DIST moodle-3.5.tgz 46268566 BLAKE2B 5bc4b309ab210942369d22c27cc3e79cec2d06e93a60b7977db9a493ec1257c877caea9b40f65c9151f1cf0e6356793fdd0843639819b77cb73db0cb3ab2307a SHA512 7c0b5a42f839953fbe9d90767aefb2df589b2ec67db3f99ef61d21e57282d430c06c2758a8153c58ff4aa7a5977618bac9bed47c2866b2ef33decfc08e68059e
-EBUILD moodle-3.1.12.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
-EBUILD moodle-3.2.9.ebuild 2940 BLAKE2B 8d5ae724882dd03edddcd58f582e3ca54426b9b5da1f75b3749a0eef4d83d305f4f4a30c4047313d8235470d6461eee1892b8b50ce552dee631244ceea30d255 SHA512 b48d12a304316cca3dfc2065f1adc03f5912af2ba78cce7e8c1af7c1016beabdddab620ad0a8f343e757a03abb141215ef2877107140afbdb10dc118639e6e08
-EBUILD moodle-3.3.6.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
-EBUILD moodle-3.4.3.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
-EBUILD moodle-3.5.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+DIST moodle-3.1.13.tgz 38042777 BLAKE2B 5454680057c83792340d553da198a0e4a607129cb951b0f00d298ff3838ddca4b3681d9d9d96f6f954c31df16aa47c80a564c56a7b4f271cff97cb8aaf1eb3d2 SHA512 f969842b7067ee24b34d4328f728da75ab8518916b2562f337405c34f3756e2b53f2710aab6e6623b3cd3487594116f3c0b85e33320d32361eb253801f347393
+DIST moodle-3.3.7.tgz 44868352 BLAKE2B efb6ff909996d58df055db437df02029246df7239649f728283c7a50a5a085e7c8902a2935f06baab09b8675ce6d5b399007c6dea737539d47e24465211c78d2 SHA512 b6844b4a4f13263cc56dd94137beb1ab314f3cbf6549061c4c48227710e6be4c838562651a41ed161f5ebebd611bfc7b3c29af49cf2501d0e568c5ae20e88867
+DIST moodle-3.4.4.tgz 45538017 BLAKE2B 720b9b26ae5140a975619ce638050f60ba4ae77e0a9370d2843d3d15b1c882019dfc0187d570f440e9d4f7261d29fa5b1853086270bca2ed0b5e980e14bcf12e SHA512 14af33e41276c070faf6b4ae38915826dd3c80ef9f248a8d00bcabaeb32740383939c9097d8ae1ceabf4f86e27d70548fa7a9e5a75275384a2eb6c17670bda1a
+DIST moodle-3.5.1.tgz 46387467 BLAKE2B cc05d51be7d8da8f3c3126c46094fe6c57f4c3f8664348e7e5d915cb5a297fe605b81422e226171edbf6bfc11cc9afaca9831fc9b24a7acf1893ab0cc9d7c9a8 SHA512 4e6dbf2140a40351ff3285e54f58f711d018f812a5885a3219d9e18abdc3232aeae71ac4bec9a26f78bbe8dbf78c121b6850c2254e9371dc34ed576e985eceb4
+EBUILD moodle-3.1.13.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
+EBUILD moodle-3.3.7.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
+EBUILD moodle-3.4.4.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+EBUILD moodle-3.5.1.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.12.ebuild b/www-apps/moodle/moodle-3.1.13.ebuild
index 0c8f962ab4a7..0c8f962ab4a7 100644
--- a/www-apps/moodle/moodle-3.1.12.ebuild
+++ b/www-apps/moodle/moodle-3.1.13.ebuild
diff --git a/www-apps/moodle/moodle-3.2.9.ebuild b/www-apps/moodle/moodle-3.2.9.ebuild
deleted file mode 100644
index f3cbddcacb6b..000000000000
--- a/www-apps/moodle/moodle-3.2.9.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-# mssql? - lives on a windows server
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server. These USE flags affect the configuration
-# file and the dependency on php. However other dbs are possible. See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
- >=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
- #if [[ ${DB_COUNT} -eq 0 ]]; then
- # eerror
- # eerror "No database selected in your USE flags,"
- # eerror "You must select at least one."
- # eerror
- # die
- #fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config-r1.php config.php
-
- # Moodle expect pgsql, not postgres
- MYDB=${MYDB/postgres/pgsql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo
-}
diff --git a/www-apps/moodle/moodle-3.3.6.ebuild b/www-apps/moodle/moodle-3.3.7.ebuild
index 2a3db73f4d01..2a3db73f4d01 100644
--- a/www-apps/moodle/moodle-3.3.6.ebuild
+++ b/www-apps/moodle/moodle-3.3.7.ebuild
diff --git a/www-apps/moodle/moodle-3.4.3.ebuild b/www-apps/moodle/moodle-3.4.4.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.4.3.ebuild
+++ b/www-apps/moodle/moodle-3.4.4.ebuild
diff --git a/www-apps/moodle/moodle-3.5.ebuild b/www-apps/moodle/moodle-3.5.1.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.5.ebuild
+++ b/www-apps/moodle/moodle-3.5.1.ebuild
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 24baa1fda25b..24ae6e7438a3 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,7 @@
+DIST phpsysinfo-3.2.10.tar.gz 1021435 BLAKE2B b9db266021c0392902d6de58492165a889151716484d23f99648e8322c7e76edfda17e8a7b8f415fcc42d5970a98603ea84571989c1168e10e8d87ee3a2f6927 SHA512 56954e64e6c267c2a60baaf91a9a218d2c81d99dc4f159e35d752328bdd38135eb4e9d91d09798b3822cdbf0d04a6169a46385c2d02a812b136fe115b7310a88
DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
DIST phpsysinfo-3.2.3.tar.gz 909045 BLAKE2B dc1f9d9f7cd83b60eb16f073607f5c7a5f5ad155b297d4defc9b1768c771cd12bd315af3e67f4c7a5f731ef66b8e9eb00da4083074f9cb3908ebbce9198a568c SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa
+EBUILD phpsysinfo-3.2.10.ebuild 1347 BLAKE2B 4ee01314100c6f87a1d869e47c3ddca3377700349b1ddf58c8c344112a4d455d76ad1183867a3a2ef8d8871fa64f6a24bbe2ea5f5642a6f45300225d3e1ef69f SHA512 34bce3d9f8e349ef8f01eabb41f3c63d8aa2b0353c8063fa8f3439bca1fa604643dc19bc3943206dc96f5a5e7d1e8b5833ece0aba5d140c96a8166323115e1e0
EBUILD phpsysinfo-3.2.2.ebuild 768 BLAKE2B 93aa4397be216ffd4e0b68d713343188beac30ed635931c93978747ec8fb2ea7a66b3bf5de1f7669c9fb280143425968dd9629e11b6f9c4ac2023cf251f1c023 SHA512 0d323edd89bc17bb949aa386505a2c5ad5e81f355f9abfe4d0d59009f7f62f94b156bd8d94a8bd0da7a9e2c2677bea23a4650357f8f75941fb49127f7c9370e2
EBUILD phpsysinfo-3.2.3.ebuild 773 BLAKE2B 3aef2f8cc844f30046b344153450f9910c0f08b8af5fb198db073eeff12df0000fd006322bdf0155682de301987891dd0b5cb98c2c98979afaa0b979a04b403e SHA512 a33a1ce86e6048ff9a768401c598999082554c8ffe37e64d128196f0cf8b988d83c2f82d2558023cc51cdcd046acc663d80041e6a544270041f003d4ae72b416
-MISC metadata.xml 331 BLAKE2B 277d3bd46d7c2343b444e37c097cbc7b05b7b388422ed19dd527c8ce028740ca26501203941a1c9ea932ebf60b2dab8b14c744ae292df0c57f5f1962d375bc78 SHA512 91c34c9422b5d175bd50aeab393cf68d50bde1081e4dc31b2c2e1454ed9f8f6c67c0e9c194f0a1625d1c68d9f7d62a599ce32d8dbd5a1cb47a4a1a2dd871518e
+MISC metadata.xml 1929 BLAKE2B 78edd070d0ab359a162a93d41f781eeb197a519d68f00115e4a3528370b292c765eff1780d45661b397415143a5bc48216c9b9d7733fa20d13726172f90d66ee SHA512 bc6621ead3fa65d5f8c6b7be58db5845d444490d4018eb888c30f7fd4756d752246b94d860a534d13d97cae23b7682f435bbc3da33dff38dc09d6d0e5422c465
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 15b8d1f6508f..f8482ac659c0 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -1,10 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="project">
<email>web-apps@gentoo.org</email>
<name>Gentoo Webapps</name>
</maintainer>
+ <use>
+ <flag name="apcupsd">Install <pkg>sys-power/apcupsd</pkg> to display those stats.</flag>
+ <flag name="dmraid">Install <pkg>sys-fs/dmraid</pkg> to display those stats.</flag>
+ <flag name="freeipmi">Install <pkg>sys-libs/freeipmi</pkg> to display those stats.</flag>
+ <flag name="hddtemp">Install <pkg>app-admin/hddtemp</pkg> to display those stats.</flag>
+ <flag name="ipmitool">Install <pkg>sys-apps/ipmitool</pkg> to display those stats.</flag>
+ <flag name="ipmiutil">Install <pkg>sys-apps/ipmiutil</pkg> to display those stats.</flag>
+ <flag name="iptables">Install <pkg>net-firewall/iptables</pkg> to display those stats.</flag>
+ <flag name="lm_sensors">Install <pkg>sys-apps/lm_sensors</pkg> to display those stats.</flag>
+ <flag name="mdadm">Install <pkg>sys-fs/mdadm</pkg> to display those stats.</flag>
+ <flag name="megactl">Install <pkg>sys-block/megactl</pkg> to display those stats.</flag>
+ <flag name="nut">Install <pkg>sys-power/nut</pkg> to display those stats.</flag>
+ <flag name="quota">Install <pkg>sys-fs/quota</pkg> to display those stats.</flag>
+ <flag name="smart">Install <pkg>sys-apps/smartmontools</pkg> to display those stats.</flag>
+ <flag name="snmp">Install <pkg>net-analyzer/net-snmp</pkg> to display those stats.</flag>
+ <flag name="uptime">Install <pkg>app-misc/uptimed</pkg> to display those stats.</flag>
+ </use>
<upstream>
<remote-id type="github">rk4an/phpsysinfo</remote-id>
</upstream>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
new file mode 100644
index 000000000000..9cc1c23ec996
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime"
+RDEPEND="dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+ virtual/httpd-php
+ apcupsd? ( sys-power/apcupsd )
+ dmraid? ( sys-fs/dmraid )
+ freeipmi? ( sys-libs/freeipmi )
+ hddtemp? ( app-admin/hddtemp )
+ ipmitool? ( sys-apps/ipmitool )
+ ipmiutil? ( sys-apps/ipmiutil )
+ iptables? ( net-firewall/iptables )
+ lm_sensors? ( sys-apps/lm_sensors )
+ mdadm? ( sys-fs/mdadm )
+ megactl? ( sys-block/megactl )
+ nut? ( sys-power/nut )
+ quota? ( sys-fs/quota )
+ smart? ( sys-apps/smartmontools )
+ snmp? ( net-analyzer/net-snmp )
+ uptime? ( app-misc/uptimed )"
+
+need_httpd_cgi
+
+src_install() {
+ webapp_src_preinst
+
+ dodoc CHANGELOG.md README*
+ rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ newins phpsysinfo.ini{.new,}
+
+ webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+ webapp_src_install
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index f8ffbaff0cfe..569b3055a5d6 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,7 @@
AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b4e7541d03f32dc397f86de694de73c5d9d8910e30a7f7f49f59b5f918b75ff16f537f9fd0931052e3e57 SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c
AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
DIST wordpress-4.9.6.tar.gz 8740389 BLAKE2B 827f4cf4e1c664ee04588e189bb744b10ab0abbee0434d64c2ed65cb0ec289869b26f5ef6ae067a67f308e8f3a5b139c2d905897c0ed5be40eb2166ec3939a61 SHA512 93b5c6373968925f4773b79990ee73508c4994dc5ef4387c8d88dc7d39ae3688d4e066887870731e0b4e1d84a1c027cdc62239b3e042c133eb32a03229d48335
+DIST wordpress-4.9.7.tar.gz 8742203 BLAKE2B 3cb3a5379e96bffa11efcb4c51f948332179334f50ee49860618c7ec7cc485af8dd497c9566bc6dbd4a7a3c8c0f38cd333f2b90c57fef1604af946113cd96564 SHA512 0a9a132d48081ef253122bd207dbf859babfd021ef3db90d486c92cde03727a74c5170a9faf80d46e8899472a703cfe91b24c04c1ea21f261dbd156bd691ad12
EBUILD wordpress-4.9.6.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
+EBUILD wordpress-4.9.7.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-4.9.7.ebuild b/www-apps/wordpress/wordpress-4.9.7.ebuild
new file mode 100644
index 000000000000..19231ee76d17
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.9.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+ || ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+ webapp_src_preinst
+
+ dodoc readme.html
+ rm readme.html license.txt || die
+
+ if ! use akismet ; then
+ rm -R wp-content/plugins/akismet/ || die
+ fi
+ if ! use examples ; then
+ rm wp-content/plugins/hello.php || die
+ fi
+ if ! use themes ; then
+ rm -R wp-content/themes/*/ || die
+ fi
+
+ [[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+ webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+ webapp_serverowned "${MY_HTDOCSDIR}"
+
+ webapp_configfile "${MY_HTDOCSDIR}"/wp-config.php
+
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+ webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+ webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index eb4611b0e120..804a8e2492ac 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
Binary files differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 59426afed141..8e646b1a6ceb 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,5 @@
AUX bug_1461221.patch 1077 BLAKE2B f492faaef59b3c3a83132ad552ebe21d93ca1afb521f0a1d8d347fe2a92831a2df3e48d7ac148b62f7f594f6f21831d91102d7d35ccff89b2a3fb31725b855b2 SHA512 f2a69e6e2c5d08f09fbc6bbe88fd26bc80a5fe38efd46bbcfcb88a33745ec184c602d1125d79020f948c3919c1830ee5a3afbe95dd378e5985a76ab4c73c4889
+AUX firefox-61.0-mozHunspell.patch 884 BLAKE2B 5c7da7e893b21744d991de2713f2f7d1d8840077d88cb51c9000295e8816cd476f16b98f8fdafd7ca99b35eba16a6b45436367440678b488a723da522486228d SHA512 db72555f1e24e768723343f49dc0662e3f2dd41b29ee55028b8dce8affab821e68a943e3fbc27176b2992f65e4da1d3028c49f1327e50f435a99a2f37049c69f
AUX gentoo-default-prefs.js-1 821 BLAKE2B 2af9a9e9f3a71fae918a4098397e931c02df5a8021d0bc87ebc4981076674aba99d88c5b8acf2380c915e92ad07a7636891ea8a07cfc850e9c4d15e58d0cd276 SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2
AUX gentoo-default-prefs.js-2 880 BLAKE2B 5a40aabaf6678b3c73f06adffebac3ebc9908da02e55250dc6a544f6dcda1b738d6e6f45dd84d08ad14f733fc313d7b2852160cc1a95ad290010f75d2d1286bd SHA512 d03da4b9692b5b71aa2a170093cff2e4f8e5e32e314f918b5aaeb5a07c3b5edf52e096ac60830ec54a0dfe50834218c899c262176c0719f81aa68b475bbeb87a
AUX gentoo-hwaccel-prefs.js-1 100 BLAKE2B 08be790b58524077a5681cc06e10890b72dc6e8155c9e03e6ef9165035087d4b8cbcac4a6b8997f61db3721895c9247a12171eec7d082fa15e1d5312bf51fbee SHA512 cf5385c793056e66b8853fd641dce2e7804d6878675afd24485487f2201801e1bdd5d27c15cb0d483eb34bfb75e7a21c01f1bbf701cb1c2dfa48f8f6422ed42c
@@ -470,5 +471,5 @@ EBUILD firefox-52.6.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc20
EBUILD firefox-52.8.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b
EBUILD firefox-52.9.0.ebuild 12941 BLAKE2B ee69c10083377e91ef76a31680994325b7ec0fde2e2f8702a51f540cd85a6d598ddc5b45286b31bd61dc0e9215a9deab19ca92bdd99f87e4c80083eaa916612a SHA512 9cdf9c6ef0f52b3b4732e7bfb2ab841077c17e5cd918abf50e4dea7064aa8eff1f8018f5be3659bd7ab9628d7b0335e7222d86350af9c96362e0ebc85a58fe33
EBUILD firefox-60.1.0.ebuild 11769 BLAKE2B 56eb54c81ddffc9e422f82131db355fb77dd72d9d50d9dd92030a0c8e4b22b84599d7f2d35292a5753bbbaec9ed8d67b3802c3f9ef9f220246a3385cc4ad80b9 SHA512 9f2da4ed851bb2e16c1c0b2210b2ff14507e9f99e07fb073b65174b3041abeb957231a9eae6e354fcd4d8869c25df437482d75832d60023366c37f79fdfc2d0d
-EBUILD firefox-61.0.ebuild 11540 BLAKE2B c48cabe96a770ed0ad29441923c6e8263241c9e870643066b2dab5303599281daaa74cf2fc098afad6003df600ce57d0f6559462180b7dfc2cb3ee1fe178b9d3 SHA512 440545f805a6c59ba5b0c175640b190aebbf78da57d37baf9d010ab839226976cc5c9c729018f36aead51d26d645dde38bdea8b88cdedf298707dd1b3a9a6136
+EBUILD firefox-61.0-r1.ebuild 11707 BLAKE2B dffa2142ba326aa936a21c1eee04a9de03e04ba37942dd98660686562a1ec37984d37ba0048ae726651263f6f561fb190476a26db098e03f8e5997d1ce93b472 SHA512 3c1ae1b241495c960022fb58b8944aa12eef151b090abfe7fe9e77ec461a6a9817006220d84383f31e14c57156fbd9423f44ee7045119647dd202592314467c5
MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2
diff --git a/www-client/firefox/files/firefox-61.0-mozHunspell.patch b/www-client/firefox/files/firefox-61.0-mozHunspell.patch
new file mode 100644
index 000000000000..2002bd1da50d
--- /dev/null
+++ b/www-client/firefox/files/firefox-61.0-mozHunspell.patch
@@ -0,0 +1,25 @@
+From 5bdc1dc7a4541338b13096ae52627ceecd0cca9e Mon Sep 17 00:00:00 2001
+From: nvinson234@gmail.com
+Date: Sun, 8 Jul 2018 16:52:04 -0500
+Subject: [PATCH] Add missing include of nsCOMPtr.h, bug #660726
+
+Signed-off-by: nvinson234@gmail.com
+---
+ extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
+index dc33fdfb3..415e00973 100644
+--- a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
++++ b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
+@@ -13,6 +13,7 @@
+ #include "mozilla/ResultExtensions.h"
+ #include "nsIInputStream.h"
+ #include "nsReadLine.h"
++#include "nsCOMPtr.h"
+
+ // Note: This class name and lack of namespacing terrible, but are necessary
+ // for Hunspell compatibility.
+--
+2.18.0
+
diff --git a/www-client/firefox/firefox-61.0-r1.ebuild b/www-client/firefox/firefox-61.0-r1.ebuild
new file mode 100644
index 000000000000..1d65fc4e1f81
--- /dev/null
+++ b/www-client/firefox/firefox-61.0-r1.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+ # ESR releases have slightly different version numbers
+ MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-61.0-patches-01"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+ mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
+RESTRICT="!bindist? ( bindist )"
+
+SRCHASH=239e434d6d2b8e1e2b697c3416d1e96d48fe98e5
+SDIR="release"
+[[ ${PV} = *_beta* ]] && SDIR="beta"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+ ${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+ system-icu? ( >=dev-libs/icu-60.2 )
+ jack? ( virtual/jack )
+ >=dev-libs/nss-3.38
+ >=dev-libs/nspr-4.19
+ selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+ >=sys-devel/llvm-4.0.1
+ >=sys-devel/clang-4.0.1
+ amd64? ( ${ASM_DEPEND} virtual/opengl )
+ x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+ GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ moz_pkgsetup
+
+ # Avoid PGO profiling problems due to enviroment leakage
+ # These should *always* be cleaned up anyway
+ unset DBUS_SESSION_BUS_ADDRESS \
+ DISPLAY \
+ ORBIT_SOCKETDIR \
+ SESSION_MANAGER \
+ XDG_SESSION_COOKIE \
+ XAUTHORITY
+
+ if ! use bindist; then
+ einfo
+ elog "You are enabling official branding. You may not redistribute this build"
+ elog "to any users on your network or the internet. Doing so puts yourself into"
+ elog "a legal problem with Mozilla Foundation"
+ elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+ fi
+
+ addpredict /proc/self/oom_score_adj
+
+ llvm_pkg_setup
+}
+
+pkg_pretend() {
+ # Ensure we have enough disk space to compile
+ CHECKREQS_DISK_BUILD="4G"
+
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+}
+
+src_prepare() {
+ eapply "${WORKDIR}/firefox"
+
+ eapply "${FILESDIR}/bug_1461221.patch"
+ eapply "${FILESDIR}/${PN}-61.0-mozHunspell.patch"
+
+ # Enable gnomebreakpad
+ if use debug ; then
+ sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+ "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+ fi
+
+ # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+ if use ia64 ; then
+ sed -i \
+ -e '/^OS_LIBS += no_as_needed/d' \
+ -e '/^OS_LIBS += as_needed/d' \
+ "${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+ "${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+ || die "sed failed to drop --as-needed for ia64"
+ fi
+
+ # Ensure that our plugins dir is enabled as default
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+ # Fix sandbox violations during make clean, bug 372817
+ sed -e "s:\(/no-such-file\):${T}\1:g" \
+ -i "${S}"/config/rules.mk \
+ -i "${S}"/nsprpub/configure{.in,} \
+ || die
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+ -i "${S}"/browser/installer/Makefile.in || die
+
+ # Don't error out when there's no files to be removed:
+ sed 's@\(xargs rm\)$@\1 -f@' \
+ -i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+ # Keep codebase the same even if not using official branding
+ sed '/^MOZ_DEV_EDITION=1/d' \
+ -i "${S}"/browser/branding/aurora/configure.sh || die
+
+ # Allow user to apply any additional patches without modifing ebuild
+ eapply_user
+
+ # Autotools configure is now called old-configure.in
+ # This works because there is still a configure.in that happens to be for the
+ # shell wrapper configure script
+ eautoreconf old-configure.in
+
+ # Must run autoconf in js/src
+ cd "${S}"/js/src || die
+ eautoconf old-configure.in
+}
+
+src_configure() {
+ MEXTENSIONS="default"
+ # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+ # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+ # get your own set of keys.
+ _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ mozconfig_config
+
+ # enable JACK, bug 600002
+ mozconfig_use_enable jack
+
+ # Enable/Disable eme support
+ use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Add full relro support for hardened
+ if use hardened; then
+ append-ldflags "-Wl,-z,relro,-z,now"
+ mozconfig_use_enable hardened hardening
+ fi
+
+ # Setup api key for location services
+ echo -n "${_google_api_key}" > "${S}"/google-api-key
+ mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+ echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+ echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+ # Default mozilla_five_home, system-hunspell no longer valid option
+ sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+ sed '/enable-system-hunspell/d' -i "${S}"/.mozconfig
+ sed '/disable-stylo/d' -i "${S}"/.mozconfig
+
+ # Finalize and report settings
+ mozconfig_final
+
+ # workaround for funky/broken upstream configure...
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ ./mach configure || die
+}
+
+src_compile() {
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ ./mach build --verbose || die
+}
+
+src_install() {
+ cd "${BUILD_OBJ_DIR}" || die
+
+ # Pax mark xpcshell for hardened support, only used for startupcache creation.
+ pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+ # Add our default prefs for firefox
+ cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+
+ mozconfig_install_prefs \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
+
+ # Augment this with hwaccel prefs
+ if use hwaccel ; then
+ cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ fi
+
+ if ! use screenshot; then
+ echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ fi
+
+ echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+
+ local plugin
+ use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+ "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ done
+
+ cd "${S}"
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ DESTDIR="${D}" ./mach install
+
+ # Install language packs
+ mozlinguas_src_install
+
+ local size sizes icon_path icon name
+ if use bindist; then
+ sizes="16 32 48"
+ icon_path="${S}/browser/branding/aurora"
+ # Firefox's new rapid release cycle means no more codenames
+ # Let's just stick with this one...
+ icon="aurora"
+ name="Aurora"
+
+ # Override preferences to set the MOZ_DEV_EDITION defaults, since we
+ # don't define MOZ_DEV_EDITION to avoid profile debaucles.
+ # (source: browser/app/profile/firefox.js)
+ cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+ else
+ sizes="16 22 24 32 48 64 128 256"
+ icon_path="${S}/browser/branding/official"
+ icon="${PN}"
+ name="Mozilla Firefox"
+ fi
+
+ # Install icons and .desktop for menu entry
+ for size in ${sizes}; do
+ insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+ newins "${icon_path}/default${size}.png" "${icon}.png"
+ done
+ # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+ newicon "${icon_path}/default48.png" "${icon}.png"
+ newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+ sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+ "${ED}/usr/share/applications/${PN}.desktop" || die
+
+ # Add StartupNotify=true bug 237317
+ if use startup-notification ; then
+ echo "StartupNotify=true"\
+ >> "${ED}/usr/share/applications/${PN}.desktop" \
+ || die
+ fi
+
+ # Required in order to use plugins and even run firefox on hardened.
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+
+ # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+ # doesn't need to be forced into the LD_LIBRARY_PATH
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+ einfo "APULSE found - Generating library symlinks for sound support"
+ local lib
+ pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+ for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+ # a quickpkg rolled by hand will grab symlinks as part of the package,
+ # so we need to avoid creating them if they already exist.
+ if ! [ -L ${lib##*/} ]; then
+ ln -s "${lib}" ${lib##*/} || die
+ fi
+ done
+ popd &>/dev/null || die
+ fi
+}
+
+pkg_postinst() {
+ # Update mimedb for the new .desktop file
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+
+ if ! use gmp-autoupdate && ! use eme-free ; then
+ elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+ elog "installing into new profiles:"
+ local plugin
+ for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+ elog
+ fi
+
+ if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
+ elog "Apulse was detected at merge time on this system and so it will always be"
+ elog "used for sound. If you wish to use pulseaudio instead please unmerge"
+ elog "media-sound/apulse."
+ elog
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/firefox-61.0.ebuild b/www-client/firefox/firefox-61.0.ebuild
deleted file mode 100644
index e3945abf8ec5..000000000000
--- a/www-client/firefox/firefox-61.0.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly different version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-61.0-patches-01"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
- mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
-RESTRICT="!bindist? ( bindist )"
-
-SRCHASH=239e434d6d2b8e1e2b697c3416d1e96d48fe98e5
-SDIR="release"
-[[ ${PV} = *_beta* ]] && SDIR="beta"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
- ${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
- system-icu? ( >=dev-libs/icu-60.2 )
- jack? ( virtual/jack )
- >=dev-libs/nss-3.38
- >=dev-libs/nspr-4.19
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
- >=sys-devel/llvm-4.0.1
- >=sys-devel/clang-4.0.1
- amd64? ( ${ASM_DEPEND} virtual/opengl )
- x86? ( ${ASM_DEPEND} virtual/opengl )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
- GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- moz_pkgsetup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-
- addpredict /proc/self/oom_score_adj
-
- llvm_pkg_setup
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- CHECKREQS_DISK_BUILD="4G"
-
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- eapply "${WORKDIR}/firefox"
-
- eapply "${FILESDIR}/bug_1461221.patch"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
- if use ia64 ; then
- sed -i \
- -e '/^OS_LIBS += no_as_needed/d' \
- -e '/^OS_LIBS += as_needed/d' \
- "${S}"/widget/gtk/mozgtk/gtk2/moz.build \
- "${S}"/widget/gtk/mozgtk/gtk3/moz.build \
- || die "sed failed to drop --as-needed for ia64"
- fi
-
- # Ensure that our plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/browser/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- # Keep codebase the same even if not using official branding
- sed '/^MOZ_DEV_EDITION=1/d' \
- -i "${S}"/browser/branding/aurora/configure.sh || die
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- # Autotools configure is now called old-configure.in
- # This works because there is still a configure.in that happens to be for the
- # shell wrapper configure script
- eautoreconf old-configure.in
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf old-configure.in
-}
-
-src_configure() {
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # enable JACK, bug 600002
- mozconfig_use_enable jack
-
- # Enable/Disable eme support
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- if use hardened; then
- append-ldflags "-Wl,-z,relro,-z,now"
- mozconfig_use_enable hardened hardening
- fi
-
- # Setup api key for location services
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
- echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
- # Default mozilla_five_home no longer valid option
- sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- # workaround for funky/broken upstream configure...
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- ./mach configure || die
-}
-
-src_compile() {
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- ./mach build --verbose || die
-}
-
-src_install() {
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Add our default prefs for firefox
- cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- mozconfig_install_prefs \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
- # Augment this with hwaccel prefs
- if use hwaccel ; then
- cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- fi
-
- if ! use screenshot; then
- echo "pref(\"extensions.screenshots.disabled\", true);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- fi
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- done
-
- cd "${S}"
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- DESTDIR="${D}" ./mach install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon name
- if use bindist; then
- sizes="16 32 48"
- icon_path="${S}/browser/branding/aurora"
- # Firefox's new rapid release cycle means no more codenames
- # Let's just stick with this one...
- icon="aurora"
- name="Aurora"
-
- # Override preferences to set the MOZ_DEV_EDITION defaults, since we
- # don't define MOZ_DEV_EDITION to avoid profile debaucles.
- # (source: browser/app/profile/firefox.js)
- cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
- else
- sizes="16 22 24 32 48 64 128 256"
- icon_path="${S}/browser/branding/official"
- icon="${PN}"
- name="Mozilla Firefox"
- fi
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}/default48.png" "${icon}.png"
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
- sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
- "${ED}/usr/share/applications/${PN}.desktop" || die
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Required in order to use plugins and even run firefox on hardened.
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-
- # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # doesn't need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- einfo "APULSE found - Generating library symlinks for sound support"
- local lib
- pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # a quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if ! [ -L ${lib##*/} ]; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- # Update mimedb for the new .desktop file
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- if ! use gmp-autoupdate && ! use eme-free ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index ee2f04476567..5b200b3a3e54 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_68.0.3440.42-1_amd64.deb 55448010 BLAKE2B 0dbff58261b700e18a0e65f9f01bbc3aa40cc2e2749f6b16ffc4c0453588eaa78878c55fb86ba4d4cca593371acb6763b13f01a41aea9d1b202021cf9c976517 SHA512 c2b871dc251f9f30916e58e2408ce019a2901aca23b03cd5ea4bd0d8974af93a909ecb945e7b1d649ab3023141bab9ebad2000db75835b8e2f79756912f57133
-EBUILD google-chrome-beta-68.0.3440.42.ebuild 3618 BLAKE2B 388e439777d19e67a1c45c7cfc3a6b0c10d61a88619dd857aeccea6bff32a6702bbc760dc45568c60a7584c80097a63325a6a811cc329290a70a69520402cb9c SHA512 4316b0e80e4ecd731fed2936379333996a3fe752f129e916fae03634567ef3897061d691ce83334067b4f60457c4c10bd10523a9de3aa31561d25792c450e668
+DIST google-chrome-beta_68.0.3440.59-1_amd64.deb 55308360 BLAKE2B 275ac7be290dd2a81a2756f5598afd998521297ff9c36a33efb5e6e3cf6802b66b0b52510a4c382c2ddfd51eadb218c0b14d084f92f594f8652835aae337d7c8 SHA512 387694d29e63c819f963a4bcb4404d2147f3eb36867c5754813bc70f4cd18007539bfa3cc598886d961211f1b5a67548592db1f55ca6799f7fcad1be498c5ba9
+EBUILD google-chrome-beta-68.0.3440.59.ebuild 2705 BLAKE2B 0cf0e9848ec37120787e04c9d9da56c039548e21c0945104ed6bee30f6bacc62725a422900102d5d512a646e01e2cec024f1d0d152ec7819c6fecc4f04c85c8f SHA512 734bdb01f0289da14867f7a611651bd1900f59d399909f05fcd26f4760885cc7b2a050ed745c2b7cbb89782e0d17a0c063a1a6f1707a30967c4b33b15b3f6b7b
MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.42.ebuild b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.42.ebuild
deleted file mode 100644
index 338f440cd709..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.42.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
- MY_PN=${PN}-stable
-else
- MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-arch/bzip2
- app-misc/ca-certificates
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- >=dev-libs/nss-3.26
- gnome-base/gconf:2
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype:2
- net-print/cups
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- >=x11-libs/libX11-1.5.0
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- x11-libs/libxcb
- x11-libs/pango
- x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
- eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
- # Protect against people using autounmask overzealously
- use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
- :
-}
-
-src_install() {
- dodir /
- cd "${ED}" || die
- unpacker
-
- rm -r etc usr/share/menu || die
- mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
- pushd "${CHROME_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- if use plugins ; then
- local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
- sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
- -i "${CHROME_HOME}/${PN}" || die
- fi
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
- done
-
- pax-mark m "${CHROME_HOME}/chrome"
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild
new file mode 100644
index 000000000000..5a6e7f384b95
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.59.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+ MY_PN=${PN}-stable
+else
+ MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-arch/bzip2
+ app-misc/ca-certificates
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ >=dev-libs/nss-3.26
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype:2
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[X]
+ >=x11-libs/libX11-1.5.0
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ x11-libs/libxcb
+ x11-libs/pango
+ x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+ eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+ # Protect against people using autounmask overzealously
+ use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ dodir /
+ cd "${ED}" || die
+ unpacker
+
+ rm -r etc usr/share/menu || die
+ mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+ pushd "${CHROME_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ if use plugins ; then
+ local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+ sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+ -i "${CHROME_HOME}/${PN}" || die
+ fi
+
+ local size
+ for size in 16 22 24 32 48 64 128 256 ; do
+ newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
+ done
+
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index ed0b99607a34..8a6228e96e03 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_69.0.3472.3-1_amd64.deb 56008578 BLAKE2B 2e1b97b650fbf31609c2d84cba39c5d4679601db06ee3878b20878ae757ec0211a9bb426c1dd50e32814f6550c345abfa96002f657376a798c5dd5c8ea99ae9b SHA512 db0d984d78280f6959f1ba3e40d7f6a877163865de463b1d3262da9337404e41f5602d38385c025f6281cdb673ba46af6963aa4eccc74e5bcce47c30a2f3f199
-EBUILD google-chrome-unstable-69.0.3472.3.ebuild 3597 BLAKE2B 59aaf7430ea9e46fc3dfaa087bf33b5600e7648caf7aeb679a68a204c4f5bb90b5144f2cd5757674c1695f6dcbb3736b8715bfe4a08d26fef026cf93fac618ba SHA512 46c696d5b1d1fcc0c9ee6431b77911960d8a8143140949d08d4209e93652f68433783aa926a648a9abd28dbaa2e1ea983f09d8fba3c885d54bf841f7c1b0a231
+DIST google-chrome-unstable_69.0.3486.0-1_amd64.deb 56203802 BLAKE2B d73fe08d1c2046a362029f0b5c7bda3263e3eb76bdda9f8ac5fec8290fcd96af9d018875510efdf2ed25e62add464ce33cdf210348074d4c461fb55e387ff833 SHA512 5b0e33c2ca34347227fe6ccc85c611e4b970bbc85fb1bf1b979a2af11aaf723896e6d9e1ecaf19cd4cbd7b794426eead3d4800853707b126c0730de1aa47864c
+EBUILD google-chrome-unstable-69.0.3486.0.ebuild 2694 BLAKE2B 2bc43982ec155ed3e7b416348d7a58227b2d326f2bab4349d6cdfa216e88c4bd78529301e97ad16a36dd9226d71ab0b748ba262f3e80cbef26fbbd8525c3c286 SHA512 25c03f363aa887f119c763528698b5b370196897ba3344cca4334ef0f232f29a57137fb21fef3e9d5fd696988eefb853a3b0dcbfdd023a57773d940bde4c547a
MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3472.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3472.3.ebuild
deleted file mode 100644
index 4a04a9ba7e78..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3472.3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
- MY_PN=${PN}-stable
-else
- MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-arch/bzip2
- app-misc/ca-certificates
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- >=dev-libs/nss-3.26
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype:2
- net-print/cups
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- >=x11-libs/libX11-1.5.0
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- x11-libs/libxcb
- x11-libs/pango
- x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
- eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
- # Protect against people using autounmask overzealously
- use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
- :
-}
-
-src_install() {
- dodir /
- cd "${ED}" || die
- unpacker
-
- rm -r etc usr/share/menu || die
- mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
- pushd "${CHROME_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- if use plugins ; then
- local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
- sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
- -i "${CHROME_HOME}/${PN}" || die
- fi
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
- done
-
- pax-mark m "${CHROME_HOME}/chrome"
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild
new file mode 100644
index 000000000000..550065b04c3e
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-69.0.3486.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+ MY_PN=${PN}-stable
+else
+ MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-arch/bzip2
+ app-misc/ca-certificates
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ >=dev-libs/nss-3.26
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype:2
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[X]
+ >=x11-libs/libX11-1.5.0
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ x11-libs/libxcb
+ x11-libs/pango
+ x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+ eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+ # Protect against people using autounmask overzealously
+ use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ dodir /
+ cd "${ED}" || die
+ unpacker
+
+ rm -r etc usr/share/menu || die
+ mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+ pushd "${CHROME_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ if use plugins ; then
+ local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+ sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+ -i "${CHROME_HOME}/${PN}" || die
+ fi
+
+ local size
+ for size in 16 22 24 32 48 64 128 256 ; do
+ newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
+ done
+
+ pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 091a03caf329..da048d867724 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
DIST google-chrome-stable_67.0.3396.99-1_amd64.deb 52522834 BLAKE2B 07a67973bb85fbf8f32e90a9d4c5600413c4be8e334dd2a9e41999e8e5c8527a1db888744532b6dbe548eff7af42d73532fccd227d041fe69367f0cf803181ee SHA512 d0758ef190b63a03f410ac62aa38486d3f98795b7f42a8a187b03d7038d6b7488af0073d5c35df222006f74de7ef3457c836dafb10efc674276e64dba305c8fc
-EBUILD google-chrome-67.0.3396.99.ebuild 3612 BLAKE2B 2750c1acb658f0ffa641fd30ace02c127bba5d5e7ccd67eb8b14b64b04e05199c675423ef345aab91e68d58f1969d62f157d8dbd797337d902f263866e6e8871 SHA512 ece3f6b49ed18368f183dae48be54a773724199f4751879abec20ffa6e9f386e3d8d834794a156f27b7b65617308628dc7bda59f487aef17355dd468eeef020a
+EBUILD google-chrome-67.0.3396.99.ebuild 2709 BLAKE2B 1d0e19dba3750d8f89e3b7fd99f3d3f353e183c466bcbe0db4a9f83453dbb3da18829973eece4311a22cf6f8d2e83d311bef9c379101632910e847e6226d7bc8 SHA512 10f86cdf637aa0489c6fa90de462309419085d86b7cbf0634c5baa60a4d764af7064dbc4d5338c4cfe8c137345478e4023f7e1adafca91f66c7a2977256a0aa2
MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-67.0.3396.99.ebuild b/www-client/google-chrome/google-chrome-67.0.3396.99.ebuild
index a9c0a7367a18..806c156e4b16 100644
--- a/www-client/google-chrome/google-chrome-67.0.3396.99.ebuild
+++ b/www-client/google-chrome/google-chrome-67.0.3396.99.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
sv sw ta te th tr uk vi zh-CN zh-TW"
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
DESCRIPTION="The web browser from Google"
HOMEPAGE="https://www.google.com/chrome"
@@ -69,33 +69,6 @@ QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
S=${WORKDIR}
CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
pkg_nofetch() {
eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
}
@@ -137,8 +110,6 @@ src_install() {
done
pax-mark m "${CHROME_HOME}/chrome"
-
- readme.gentoo_create_doc
}
pkg_preinst() {
@@ -153,5 +124,4 @@ pkg_postrm() {
pkg_postinst() {
gnome2_icon_cache_update
xdg_desktop_database_update
- readme.gentoo_print_elog
}
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 704e69129080..737d2d511efe 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -3,4 +3,4 @@ AUX luakit-fix_tests.patch 3877 BLAKE2B a4d1f05a961034ae5b78c84758ffe3cf85978654
DIST luakit-2017.08.10.tar.gz 399564 BLAKE2B e7efad1e3e2e34971811c2b1fcccf48caeadbb5e87d09bda2835f00cb075ac499b9c7121c7b805acd14f5cae297c16b59fce75fc5dd1c07fa461ed7ed0fae17d SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
EBUILD luakit-2017.08.10.ebuild 1497 BLAKE2B 1207cd0cf28753a35a4309287a39eeaa4ec82046a97e4b1e71c4852f9bcc5512579a2eee6c01be48d1ee3d08e831f1a80d60a09b32d161ef3f5da6bec4e70388 SHA512 d0e86580d33030d4dff9d197292b6f676e8e3c210edbf5312d54430c8baa3a5c1c34bfe8222115dca114c5865f3d9b26fa7b15bba41971e23d6df3036d3c8d62
EBUILD luakit-9999.ebuild 1457 BLAKE2B 3c55ff25e1092cd22235f4eb31c99d4038feb8425c71fbceef90542caa318651314dc7dfff7f46cd8d014a7f7d030e580946467d16f66d83953506ce697b9ea7 SHA512 ff0201e0e0e76d62791a601a8225dbbf5f2d8585f6ac8d2f8af0a89aedde6b093410d70298c6fa653641e5ac6c65a32ce9e37a8c10813110864a32e2755edd87
-MISC metadata.xml 375 BLAKE2B 278d7d51e48bb08165eb277b764431961cab1018c4735ece440f3751af6f4fe6b5b37d17aca36eee94fb83d8553008a8c6e372af496566957b2c9b84b229afd6 SHA512 cf991c6f3e52de4fd74b75d002c6695f88b02f5d83296fe8188a5596d867a8fb22c0dbb652fae455c778ca434fdb17cd2c2af819a205b0c781d73ad08a0cfa57
+MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index 6db627700829..91b52104f179 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" >
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+ <!-- maintainer-needed -->
+ </pkgmetadata>
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 99682b99764a..f3c890515edd 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,4 @@
-DIST qutebrowser-1.3.3.tar.gz 3536053 BLAKE2B 6adbf010a4f8377476f254a81868296a689148df0901653f2f7cbfd683a842cca842c3e40169a1faee88bb5e199762cab89820b89fd2be8558fe213b54e86509 SHA512 db34f8e559471f43f2d567ade36595504c4d1dc804230fae30bdb29a6af9b306e570d9f5b91bdc166ee78367d48912229c46bb48e917ead1e51258d8af18cf39
-DIST qutebrowser-1.4.0.tar.gz 3550874 BLAKE2B 7e2b97faa8220d40d4a85cef11fc7baeb91e02fdfdbd3fdab3aa9e4c944e59687d6274b254f2551c00a38466f63b88942d46fa063c11377843ceac14462ff2a1 SHA512 0d89b859c09c3cee711d739b5f1584bea5b25ad29b18091b69e58b23b33c9c8a62c46df2f455c66ecfbf6617a10088251cb80e29e1ad3ebf8f7e8b7b34ecc482
-EBUILD qutebrowser-1.3.3.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
-EBUILD qutebrowser-1.4.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
+DIST qutebrowser-1.4.1.tar.gz 3552660 BLAKE2B 66398ec5480cd229b6ca00ac46b5cea0476c58c00335c68167bb62981a040ce91c0f3ab83bdde19ba0d35cbc5e791ee070fc992f8aba71cb4ceb644203330594 SHA512 a77b786980326f67ffb933d019438933de3a6f43244bfc0f42f22a8f189480b093757b2d5d81de58ab774f39ee4442c2482be4f78ffcad7b73f03d028e2b455d
+EBUILD qutebrowser-1.4.1.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.4.0.ebuild b/www-client/qutebrowser/qutebrowser-1.4.0.ebuild
deleted file mode 100644
index e7535337c44e..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
- dev-python/attrs[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
- >=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
- >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
- if [[ ${PV} == "9999" ]]; then
- "${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
- fi
-
- a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
- py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- doman doc/${PN}.1
- domenu misc/${PN}.desktop
- doicon -s scalable icons/${PN}.svg
-
- distutils-r1_python_install_all
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- optfeature "PDF display support" www-plugins/pdfjs
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.3.3.ebuild b/www-client/qutebrowser/qutebrowser-1.4.1.ebuild
index e7535337c44e..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.3.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.4.1.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 20bec9f3a4a4..bea7c8689060 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -58,10 +58,30 @@ DIST seamonkey-2.49.9.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805f
DIST seamonkey-2.49.9.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
DIST seamonkey-2.49.9.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
DIST seamonkey-2.49.9.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
+DIST seamonkey-2.49.9.1-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
+DIST seamonkey-2.49.9.1-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
+DIST seamonkey-2.49.9.1-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
+DIST seamonkey-2.49.9.1-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
+DIST seamonkey-2.49.9.1-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
+DIST seamonkey-2.49.9.1-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
+DIST seamonkey-2.49.9.1-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
+DIST seamonkey-2.49.9.1-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
+DIST seamonkey-2.49.9.1-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
+DIST seamonkey-2.49.9.1-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
+DIST seamonkey-2.49.9.1-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
+DIST seamonkey-2.49.9.1-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
+DIST seamonkey-2.49.9.1-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
+DIST seamonkey-2.49.9.1-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
+DIST seamonkey-2.49.9.1-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
+DIST seamonkey-2.49.9.1-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
+DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
+DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
DIST thunderbird-52.8.0.source.tar.xz 230380780 BLAKE2B 6bb13abbbfc6fbb9eba6bbc9a66b891bf463233ff875b4bf0b877c3ee8c6b868e964381cd7904ff91027189ef05bf11eae90791612cee66720c0713930594df0 SHA512 ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03
DIST thunderbird-52.9.0.source.tar.xz 230441012 BLAKE2B d39dc94f4e46af1b651e2b4139738a2bfc11a76506847bbf5b2340c96a300d7ec9534c38faf6f2fc6a574c186334dc92ff9057d92c560a8d1e4620138e64721e SHA512 2142ba7cc04f48a9ffa17ad8f3a0d761f90416c9e6a7066be662a09b19846f13f0fb9669356ccbbf576744a83143cd659c28ce034679c4d6377004f428932dc1
+DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
EBUILD seamonkey-2.49.7.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
EBUILD seamonkey-2.49.8.0_p0.ebuild 12774 BLAKE2B 008d1a377595b6d66f4fb4ea9b9266da771cda3cd4bed5f098a52c156d98bbec748af843f1c03401159027ad969823696fc619f239beff3413a70413388fcc51 SHA512 17f5ba03be6fc1e8d7c037e059c7d46cd26f48e13806c857b8d98a014748aaf9319ee62026ba4f411777edabe768c8a0dc318f17324b303bc6dd8ddd5794aba4
EBUILD seamonkey-2.49.9.0_p0.ebuild 12774 BLAKE2B 008d1a377595b6d66f4fb4ea9b9266da771cda3cd4bed5f098a52c156d98bbec748af843f1c03401159027ad969823696fc619f239beff3413a70413388fcc51 SHA512 17f5ba03be6fc1e8d7c037e059c7d46cd26f48e13806c857b8d98a014748aaf9319ee62026ba4f411777edabe768c8a0dc318f17324b303bc6dd8ddd5794aba4
+EBUILD seamonkey-2.49.9.1_p0.ebuild 12774 BLAKE2B 008d1a377595b6d66f4fb4ea9b9266da771cda3cd4bed5f098a52c156d98bbec748af843f1c03401159027ad969823696fc619f239beff3413a70413388fcc51 SHA512 17f5ba03be6fc1e8d7c037e059c7d46cd26f48e13806c857b8d98a014748aaf9319ee62026ba4f411777edabe768c8a0dc318f17324b303bc6dd8ddd5794aba4
MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
new file mode 100644
index 000000000000..ad42e85496ba
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+# ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+ ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+# the following are for upstream build candidates
+ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+ MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+ SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
+ S="${WORKDIR}/${MY_MOZ_P}"
+ # And the langpack stuff stays at eclass defaults
+# the following is for self-rolled releases
+ #MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
+ #MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
+ #MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+ #SRC_URI="${SRC_URI}
+ #${MOZ_HTTP_URI}/${P}.source.tar.xz
+ #"
+elif [[ ${PV} == *_p[0-9] ]]; then
+ # gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
+ TB_MAJOR=52
+ SMPV="${PV%.[0-9].*}"
+ MOZ_P="${PN}-${MOZ_PV}"
+ MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+ #MOZ_GENERATE_LANGPACKS=1
+ #https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
+ MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/"
+ MOZ_LANGPACK_SUFFIX=".xpi"
+ S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+ CHATZILLA_VER="SEA2_48_RELBRANCH"
+ INSPECTOR_VER="DOMI_2_0_17"
+ SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
+ https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
+ https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
+ "
+else
+ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+ MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+ MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+ S="${WORKDIR}/${PN}-${MOZ_PV}"
+ SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+ "
+fi
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCHFF="firefox-52.4-patches-02"
+PATCH="${PN}-2.46-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+ https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+ >=dev-libs/nss-3.28.3
+ >=dev-libs/nspr-4.13.1
+ jack? ( virtual/jack )
+ crypt? ( >=x11-plugins/enigmail-2.0.5 )
+"
+
+DEPEND="
+ ${RDEPEND}
+ !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+ amd64? ( ${ASM_DEPEND}
+ virtual/opengl )
+ x86? ( ${ASM_DEPEND}
+ virtual/opengl )
+"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+ GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+ if [[ ${PV} == *_pre* ]] ; then
+ ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+ ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+ ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+ fi
+
+ moz_pkgsetup
+}
+
+pkg_pretend() {
+ # Ensure we have enough disk space to compile
+ if use debug || use test ; then
+ CHECKREQS_DISK_BUILD="8G"
+ else
+ CHECKREQS_DISK_BUILD="4G"
+ fi
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+
+ if [[ -n $TB_MAJOR ]]; then
+ # move the irc and inspector code into the correct locations
+ # when we are building from a thunderbird tarball
+ mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
+ "${S}"/mozilla/extensions/irc || die
+ mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
+ "${S}"/mozilla/extensions/inspector || die
+ fi
+}
+
+src_prepare() {
+ # Apply our patches
+ eapply "${WORKDIR}"/seamonkey
+
+ # browser patches go here
+ pushd "${S}"/mozilla &>/dev/null || die
+ rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
+ eapply "${WORKDIR}"/firefox
+ popd &>/dev/null || die
+
+ if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+ sed '/^sdkdir/s@-devel@@' \
+ -i mozilla/config/baseconfig.mk || die
+ else
+ einfo "baseconfig.mk hackery no longer needed."
+ fi
+
+ # Shell scripts sometimes contain DOS line endings; bug 391889
+ grep -rlZ --include="*.sh" $'\r$' . |
+ while read -r -d $'\0' file ; do
+ einfo edos2unix "${file}"
+ edos2unix "${file}"
+ done
+
+ # force a version update that matches the minor and patch version of thunderbird
+ if [[ -n ${TB_MAJOR} ]]; then
+ echo ${MOZ_PV} >"${S}"/suite/config/version.txt
+ fi
+
+ # Allow user to apply any additional patches without modifing ebuild
+ eapply_user
+
+ local ms="${S}/mozilla"
+
+ # Enable gnomebreakpad
+ if use debug ; then
+ sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+ "${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+ fi
+
+ # Ensure that are plugins dir is enabled as default
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+ -i "${S}"/suite/installer/Makefile.in || die
+ # Don't error out when there's no files to be removed:
+ sed 's@\(xargs rm\)$@\1 -f@' \
+ -i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+ # Don't build libs-% locale files for chatzilla if we are not building chatzilla
+ # (this is hard-coded in the build system at present rather than being based on configuration)
+ use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
+ -i "${S}"/suite/locales/Makefile.in || die
+
+ eautoreconf old-configure.in
+ cd "${S}"/mozilla || die
+ eautoconf old-configure.in
+ cd "${S}"/mozilla/js/src || die
+ eautoconf old-configure.in
+ cd "${S}"/mozilla/memory/jemalloc/src || die
+ WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+ MEXTENSIONS="default"
+ # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+ # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+ # get your own set of keys.
+ _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ mozconfig_config
+
+ # enable JACK, bug 600002
+ mozconfig_use_enable jack
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ if ! use chatzilla ; then
+ MEXTENSIONS+=",-irc"
+ fi
+ if ! use roaming ; then
+ MEXTENSIONS+=",-sroaming"
+ fi
+
+ # Setup api key for location services
+ echo -n "${_google_api_key}" > "${S}"/google-api-key
+ mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+ # Other sm-specific settings
+ mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+ mozconfig_annotate '' --enable-safe-browsing
+ mozconfig_use_enable calendar
+
+ mozlinguas_mozconfig
+
+ # Use an objdir to keep things organized.
+ echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+ echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+ # Finalize and report settings
+ mozconfig_final
+
+ # Work around breakage in makeopts with --no-print-directory
+ MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+ if [[ $(gcc-major-version) -lt 4 ]] ; then
+ append-cxxflags -fno-stack-protector
+ elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+ if use amd64 || use x86 ; then
+ append-flags -mno-avx
+ fi
+ fi
+
+ # workaround for funky/broken upstream configure...
+ SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+ emake V=1 -f client.mk configure
+}
+
+src_compile() {
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+ emake V=1 -f client.mk
+
+ mozlinguas_src_compile
+}
+
+src_install() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+ local emid
+ cd "${BUILD_OBJ_DIR}" || die
+
+ # Pax mark xpcshell for hardened support, only used for startupcache creation.
+ pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+ # Copy our preference before omnijar is created.
+ sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ # Set default path to search for dictionaries.
+ echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+ >> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ echo 'pref("extensions.autoDisableScopes", 3);' >> \
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ local plugin
+ if ! use gmp-autoupdate ; then
+ for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+ echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+ "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || dir
+ done
+ fi
+
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+ emake DESTDIR="${D}" install
+ cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+ sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+ -i "${T}"/${PN}.desktop || die
+ sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+ || die
+
+ # Install language packs
+ mozlinguas_src_install
+
+ # Add StartupNotify=true bug 290401
+ if use startup-notification ; then
+ echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+ fi
+
+ # Install icon and .desktop for menu entry
+ newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+ domenu "${T}"/${PN}.desktop
+
+ # Required in order to use plugins and even run seamonkey on hardened.
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+ if use minimal ; then
+ rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+ fi
+
+ if use chatzilla ; then
+ local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+ # remove the en_US-only xpi file so a version with all requested locales can be installed
+ if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+ rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+ fi
+
+ # merge the extra locales into the main extension
+ mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+ # install the merged extension
+ mkdir -p "${T}/${emid}" || die
+ cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+ insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+ doins -r "${T}/${emid}"
+ fi
+
+ # Handle plugins dir through nsplugins.eclass
+ share_plugins_dir
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+ doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+ MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+ if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+ rm ${MOZILLA_FIVE_HOME}/plugins -rf
+ fi
+}
+
+pkg_postinst() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+ # Update mimedb for the new .desktop file
+ xdg_desktop_database_update
+ #gnome2_icon_cache_update
+
+ if ! use gmp-autoupdate ; then
+ elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+ elog "installing into new profiles:"
+ local plugin
+ for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+ fi
+
+ if use chatzilla ; then
+ elog "chatzilla is now an extension which can be en-/disabled and configured via"
+ elog "the Add-on manager."
+ fi
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 357d68855184..1eb3613c6c21 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
Binary files differ
diff --git a/www-misc/multisort/Manifest b/www-misc/multisort/Manifest
index 359fbed97367..24d953204e4b 100644
--- a/www-misc/multisort/Manifest
+++ b/www-misc/multisort/Manifest
@@ -1,3 +1,4 @@
DIST multisort-1.1.tar.gz 3520 BLAKE2B 8fcd797abb9649b21d80bd964a2f82b05f0bbf4b5b0f263b156d8b90ab36f87009199aecbf19b495e7c56415e707cd675cb7b73346a233a6a52b9b66ea223a21 SHA512 346be785a223814086536bfc8aacb11122ca91cf6cb63c8bbe2ae70f323bd36812f25575114c1422c431f658328bbb7fc75b839e74b7f37c12c4a3f179e05e1b
-EBUILD multisort-1.1-r1.ebuild 601 BLAKE2B 1c7b293b69e72b7e39e63e12295795b9984b606c9d71f85144e1fd06ed3801f24ef60c8e4eabea18fc4edd50b920c91d6ee65dcf2b1c1b498898595ecea77689 SHA512 161769135f8db803012ea97a1758e95dea391f05354440fffcb9cab9d83c0cbdc2528c1e101ccd8aa53b768fe1c694f2954dc1ac77cbe08eba55b0e00e6284fc
+EBUILD multisort-1.1-r1.ebuild 603 BLAKE2B 768cfd4805c32ddcc00134ac03c5e220d6041c962e8905b0544984cc243a33b5384b45a54a0bbdb7f58160094938f583c2c1380f9bc498f54ab114cadbc5dfc2 SHA512 bfe9d2d2603b5aa909a9209129aed78c6bfec6ce6c90b9329186c7031d8f3de1b11bda1f53259b6855e916cb5a5834b227c2e8431b2692a233a72b949c2f2062
+EBUILD multisort-1.1-r2.ebuild 601 BLAKE2B 3c8f5f2d1aa0ffa717f3d0e4c9d9df0a1c3a601311424afb2c72d0a1ce034220e456b5333bb347a384db9898e2a2c8fc9f17e3b9cd1125e4381def8cd0fc9d3e SHA512 2054e3055d1fe1b69af55b862398a42069908562e803660d73cf28b4658825a50f67e072b054670f5d401d7923a820727e6282606776378cf025560a4aea0b7b
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-misc/multisort/multisort-1.1-r1.ebuild b/www-misc/multisort/multisort-1.1-r1.ebuild
index b64e30c6c887..7a1f5d15fff7 100644
--- a/www-misc/multisort/multisort-1.1-r1.ebuild
+++ b/www-misc/multisort/multisort-1.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=4
inherit toolchain-funcs
DESCRIPTION="Merges httpd logfiles in the Common Log Format"
-HOMEPAGE="http://www.xach.com/multisort/"
-SRC_URI="http://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
+HOMEPAGE="https://www.xach.com/multisort/"
+SRC_URI="https://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/www-misc/multisort/multisort-1.1-r2.ebuild b/www-misc/multisort/multisort-1.1-r2.ebuild
new file mode 100644
index 000000000000..2e91afe31e88
--- /dev/null
+++ b/www-misc/multisort/multisort-1.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Merges httpd logfiles in the Common Log Format"
+HOMEPAGE="https://www.xach.com/multisort/"
+SRC_URI="https://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ default
+ # respect LDFLAGS wrt bug #337359
+ sed -i -e 's/$(CFLAGS)/& \$(LDFLAGS)/' Makefile || die 'sed on Makefile failed'
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dosbin multisort
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 91832518ce74..9658610406df 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
Binary files differ
diff --git a/www-plugins/browserpass/Manifest b/www-plugins/browserpass/Manifest
index f853482345d9..17e6dc9660dd 100644
--- a/www-plugins/browserpass/Manifest
+++ b/www-plugins/browserpass/Manifest
@@ -2,4 +2,4 @@ DIST browserpass-2.0.11.tar.gz 176787 BLAKE2B 271c3cf340ecc78c3358f21bc0e6bbcaf8
DIST browserpass-2.0.13.tar.gz 180424 BLAKE2B e2a1796edf3b037553cb9bd33f072cd25953d8262fa584c371c3df638c77fc352953c698963325a5cee9b29c81cc010ded72bb31abac9460603796f4a95267ed SHA512 8d28144aef061770f11d7ba288dfa82f8873a263b8ccff235e26e83c55700e5ed0210dec2c2fb45751f3ad15d1894503407ec901d272783b98c466d74d9156f0
EBUILD browserpass-2.0.11.ebuild 1225 BLAKE2B dc24b26dd3d0ae9e99b1ddb6d2355c4d4642f3a9372f4c4c167dd95a1f97d476d0038b9f737b2ad2d6549aa9f379a24f34c877380892d3a97b22c11952e367e0 SHA512 465b10576f8edf09bc606ba6285fd4d11180a8cbfbfae021a1cb73cea700d7a9abfa420c38e0fab8adfbab0537e1ceecb64b2e3857564348b8a28804e75f4b11
EBUILD browserpass-2.0.13.ebuild 1267 BLAKE2B 1e6c1480fd6d34c5e7c3f29fe81e354c69d3772f46a286e533341a5b67bc0417c28d80d0d8e714ff0003eda2f059d212264d088b8616f239a8de2471d584d60c SHA512 ccd9d82e7bd208b1149c08e599bd17cead1dfe65fc6614475e9a08196b96e00294d3c9e56690126716a6c6be15f49889f6dabefdad33bca6115b07bb6f0281b8
-MISC metadata.xml 363 BLAKE2B 8aa3ed7df03a148ce1d425366aedf96f517c8c8580e03df2040e870130fc77367a1cb67b4b93356f20931288e03d76913642cf0688154b4ba4b7af7cf44a6a7b SHA512 66b9bcae2be1aa69dda2374f2c4c4c02d6c1194dcd7750573323b66d6f266a52ed738a89091582864eaa0a0a494bc6e4a16c5d30008c65634cb9c8a368d917a2
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/www-plugins/browserpass/metadata.xml b/www-plugins/browserpass/metadata.xml
index 004ae50f4a5f..585b0dc75dda 100644
--- a/www-plugins/browserpass/metadata.xml
+++ b/www-plugins/browserpass/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" >
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+ <!-- maintainer-needed -->
+ </pkgmetadata>
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a1e20f41aea6..7b4b5111d787 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_68.0.3440.42-1_amd64.deb 55448010 BLAKE2B 0dbff58261b700e18a0e65f9f01bbc3aa40cc2e2749f6b16ffc4c0453588eaa78878c55fb86ba4d4cca593371acb6763b13f01a41aea9d1b202021cf9c976517 SHA512 c2b871dc251f9f30916e58e2408ce019a2901aca23b03cd5ea4bd0d8974af93a909ecb945e7b1d649ab3023141bab9ebad2000db75835b8e2f79756912f57133
+DIST google-chrome-beta_68.0.3440.59-1_amd64.deb 55308360 BLAKE2B 275ac7be290dd2a81a2756f5598afd998521297ff9c36a33efb5e6e3cf6802b66b0b52510a4c382c2ddfd51eadb218c0b14d084f92f594f8652835aae337d7c8 SHA512 387694d29e63c819f963a4bcb4404d2147f3eb36867c5754813bc70f4cd18007539bfa3cc598886d961211f1b5a67548592db1f55ca6799f7fcad1be498c5ba9
DIST google-chrome-stable_67.0.3396.99-1_amd64.deb 52522834 BLAKE2B 07a67973bb85fbf8f32e90a9d4c5600413c4be8e334dd2a9e41999e8e5c8527a1db888744532b6dbe548eff7af42d73532fccd227d041fe69367f0cf803181ee SHA512 d0758ef190b63a03f410ac62aa38486d3f98795b7f42a8a187b03d7038d6b7488af0073d5c35df222006f74de7ef3457c836dafb10efc674276e64dba305c8fc
-DIST google-chrome-unstable_69.0.3472.3-1_amd64.deb 56008578 BLAKE2B 2e1b97b650fbf31609c2d84cba39c5d4679601db06ee3878b20878ae757ec0211a9bb426c1dd50e32814f6550c345abfa96002f657376a798c5dd5c8ea99ae9b SHA512 db0d984d78280f6959f1ba3e40d7f6a877163865de463b1d3262da9337404e41f5602d38385c025f6281cdb673ba46af6963aa4eccc74e5bcce47c30a2f3f199
+DIST google-chrome-unstable_69.0.3486.0-1_amd64.deb 56203802 BLAKE2B d73fe08d1c2046a362029f0b5c7bda3263e3eb76bdda9f8ac5fec8290fcd96af9d018875510efdf2ed25e62add464ce33cdf210348074d4c461fb55e387ff833 SHA512 5b0e33c2ca34347227fe6ccc85c611e4b970bbc85fb1bf1b979a2af11aaf723896e6d9e1ecaf19cd4cbd7b794426eead3d4800853707b126c0730de1aa47864c
EBUILD chrome-binary-plugins-67.0.3396.99.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-68.0.3440.42_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
-EBUILD chrome-binary-plugins-69.0.3472.3_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-68.0.3440.59_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-69.0.3486.0_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.42_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.59_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.42_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.59_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3472.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3486.0_alpha.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3472.3_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3486.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 3e5592422677..b983d0bf280f 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index ec1d0712bef2..cf7e5bc6662b 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,11 +1,11 @@
AUX h2o-2.2-mruby.patch 2532 BLAKE2B dc12356bb1e4685ee88a8a1aae1d70d6555225413649b252840dc5a572fced7f818b8439b8480ec2a1b2bf9a0ddf62670f21ee1b7f42f2b877e711cf3a22048a SHA512 9c3b5d3bb18bba55019a305346211e1784c83c6c21dfb1c086169e49afd423f7be71e0cbc05703199423bc56e892b9e653e9df43e861208033fb7766ab2a59d5
AUX h2o-2.2.4-libressl.patch 1946 BLAKE2B 6acaf45e7db2faf4fa09aa2214f6389e7f5b421c9bae8ae10dd35569d609839c2d9a7e8ca1c7057b37812d7b444406c86fae496084665e57d0688c76cf095b68 SHA512 63558d53fe52deaa54976fe33346708ed9b3c59588930ef463ae9d9f89747acc66038d3105dec1b72051715ba523323a6cb7c4bdbb445d521f23d9682ca4717f
AUX h2o-2.3-mruby.patch 2993 BLAKE2B 5da06fa53d67a201e468b56aa78136edea305bc79d9d645da5a12ca54a4d633e821312e0bde382ed07229ee173ab02df8bcba592e076a8b39a199a8a7e185393 SHA512 de2e98103cea6337f68d31c8600de37ff5cf8163df824a19d1879c0a60e603773d4e9a42b926b94156ad0743e67ce630e73e9e81e86dc192d51656f595d26790
-AUX h2o.conf 673 BLAKE2B 2e7a51fa8ba766df6d3542e434c786e9ffcb4016a1ff9b3a1f065592eb559b90706e927ac8063b5f95f0aa78eb247b366d2a7e69226f261d11a5d610a8c11eab SHA512 48ab93dd7aee65f88bb12bc270f0ba0edf31bcb4610bb4b648936f8ffca47b30a3aa2aec129aa3c985f476450dc47305bd111f326715941f84e54bbc66f1325a
+AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e
AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88545064767e7059cd9b3ec60b7cb70469b403e0927dbaea4e9f7b7a00979b4f036f945585d5 SHA512 9fdfde2857d97937939b1dd591b94f26f77b6fd6061d385c807738be508f1df740acf36c38ca95c22a36f13caed5d537b6fc1f6cceaf1beda8f8f48ef452c177
AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd
AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
-DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
-EBUILD h2o-2.2.4.ebuild 1852 BLAKE2B 3c34435df69fbd852f5d3a0433180c08af9766bbc026c487fc2c7a7df48bc1738badcb803366990361be7c24b9cb8aee02f368714b0b5709ec1ce765313f180f SHA512 45091b92f662b04f6825e0ecd616e8d881966ddb0cb2ca07c660ef4552908de1ca10543c278211ad545b1e2f83a2b56e1d6066aeea95ad159e01211afa5b81cf
-EBUILD h2o-9999.ebuild 1785 BLAKE2B 65b7e61dc2142221a62615a7ac2d7072f0d9923b1b7c386b7e2aec896be70c1270d6f6e3e2bd2353826b8670a87ada5b218862fa8be9930cf16e46592e63c5ac SHA512 fccb2195da0b1abf236cc44fca72ee81e224a7ae23b93442cfecbd57012bc9c79d1957f250986915309f600d016fe6dcad5c1c329ffcd8bb19328d7f2d38adf4
+DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
+EBUILD h2o-2.2.5.ebuild 2102 BLAKE2B 991f1077b60f0127b846bee2b35e929d99286844ece16a26bcaa4a665537d53d0766850ffaf87f57ae528d70df52f2e09eb1603439a4f6b18fe7b73018626b28 SHA512 26f87505e1f23e1a9da6f55b830cf6a0564c33f331102bcb0e6692e1619baa9ba536a628a3517cd8e21374695d68791c25f2689465a828388f9d3911f2e91f3b
+EBUILD h2o-9999.ebuild 2071 BLAKE2B 5c242fe70d411b615fa99a746d5566ade617bece72c5ed8ac84a4b5f3afbcf9f107aba51c4f2a9febdfa5ca99ebf6ae0cb7007204f5a85dc441206b388d98f1a SHA512 42fdc9a672a79bd4e4bb9bd523b041910e550252b2f53cd410503783d5b9b607e51eee13b9b1df58baf36b37cc1533e2d21607339e80c4435490b6f391422351
MISC metadata.xml 610 BLAKE2B ada180731f691d3937d481e71f704b3ad47212114b170420f58e82e4163e4ca388c4f88c1b0760de4fa87e839b5485855f4a23f5fc57f305bd14dcd4b2c54405 SHA512 91c163c3d59c8797d6fac98c20c6bb888cf547e4c6d71090d0556e49b46ec23a44ffc116230621262aaaf0e9cd9aabc1c0b250b7d8e435c42ec01fae5a0d913b
diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index ccca5dd2de51..23f2d76d51ee 100644
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -1,30 +1,17 @@
-# see /usr/share/doc/h2o/index.html for detailed documentation
-# see h2o --help for command-line options and settings
-
user: h2o
pid-file: /run/h2o.pid
access-log: /var/log/h2o/access.log
error-log: /var/log/h2o/error.log
-# httpoxy mitigation (https://httpoxy.org)
-# see https://github.com/h2o/h2o/pull/996
-setenv:
- HTTP_PROXY: ""
-
-listen: 80
-
-#listen:
-# port: 443
-# ssl:
-# minimum-version: TLSv1.2
-# certificate-file: /etc/h2o/server.crt
-# key-file: /etc/h2o/server.key
-
hosts:
- "localhost:80":
+ "localhost":
+ listen:
+ port: 80
+ listen:
+ port: 443
+ ssl:
+ certificate-file: /etc/ssl/h2o/server.crt
+ key-file: /etc/ssl/h2o/server.key
paths:
"/":
file.dir: /var/www/localhost/htdocs
- "/doc":
- file.dir: /usr/share/doc/h2o/
- file.index: [ 'index.html' ]
diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
deleted file mode 100644
index 25c1690eeeb3..000000000000
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-USE_RUBY="ruby23 ruby24"
-
-inherit cmake-utils ruby-single systemd toolchain-funcs user
-
-DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
-HOMEPAGE="https://h2o.examp1e.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
-
-RDEPEND="dev-lang/perl
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
- mruby? (
- ${RUBY_DEPS}
- dev-libs/oniguruma
- sys-devel/bison
- virtual/pkgconfig
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-mruby.patch
- "${FILESDIR}"/${P}-libressl.patch
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- local ruby="ruby"
- if use mruby; then
- for ruby in ${RUBY_TARGETS_PREFERENCE}; do
- if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
- break
- fi
- ruby=
- done
- [[ -z ${ruby} ]] && die "no suitable ruby version found"
- fi
-
- sed -i \
- -e "s: ruby: ${ruby}:" \
- CMakeLists.txt
-
- sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
- tc-export CC
- export LD="$(tc-getCC)"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
- -DWITH_MRUBY=$(usex mruby)
- -DWITHOUT_LIBS=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- keepdir /var/www/localhost/htdocs
-
- insinto /etc/${PN}
- doins "${FILESDIR}"/${PN}.conf
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- fperms 0750 /var/log/${PN}
-}
diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
new file mode 100644
index 000000000000..91c20bba627a
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby23 ruby24"
+
+inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
+
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="dev-lang/perl
+ sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ mruby? (
+ ${RUBY_DEPS}
+ dev-libs/oniguruma
+ sys-devel/bison
+ virtual/pkgconfig
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ local ruby="ruby"
+ if use mruby; then
+ for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+ if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
+ break
+ fi
+ ruby=
+ done
+ [[ -z ${ruby} ]] && die "no suitable ruby version found"
+ fi
+
+ sed -i \
+ -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+ -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
+ -e "s: ruby: ${ruby}:" \
+ CMakeLists.txt
+
+ sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
+ tc-export CC
+ export LD="$(tc-getCC)"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+ -DWITH_MRUBY=$(usex mruby)
+ -DWITHOUT_LIBS=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ keepdir /var/www/localhost/htdocs
+
+ insinto /etc/${PN}
+ doins "${FILESDIR}"/${PN}.conf
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 0750 /var/log/${PN}
+}
+
+pkg_postinst() {
+ if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+ install_cert /etc/ssl/${PN}/server
+ chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+ fi
+}
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 89f63062ca99..e1d9604c4b44 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,9 +3,10 @@
EAPI="6"
CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
USE_RUBY="ruby23 ruby24"
-inherit cmake-utils git-r3 ruby-single systemd toolchain-funcs user
+inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
HOMEPAGE="https://h2o.examp1e.net/"
@@ -50,6 +51,8 @@ src_prepare() {
fi
sed -i \
+ -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+ -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
-e "s: ruby: ${ruby}:" \
CMakeLists.txt
@@ -85,3 +88,10 @@ src_install() {
fowners ${PN}:${PN} /var/log/${PN}
fperms 0750 /var/log/${PN}
}
+
+pkg_postinst() {
+ if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+ install_cert /etc/ssl/${PN}/server
+ chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+ fi
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 7ccfebb0d12a..2fd9f6c0b8eb 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -48,7 +48,7 @@ DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e3
DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
DIST njs-0.2.2.tar.gz 253349 BLAKE2B 1ca508677a251ff38f5bca01292f2c7d2c41ac1c5d2cffae8b565694cbed9ebb2811b7e8893ea03384810e169ebb0cccfbf51d36166fcbc32e77fb30ba90d664 SHA512 e309b06b66e955873b82ef6c8881c3a98e0cf22e379b292c7561947db34c28990ade5461f42561e73c79c8e1e7914a990a003926054f884551edc16015ac4792
EBUILD nginx-1.12.2-r1.ebuild 37150 BLAKE2B 65fed3395350ccd46c82c77e42ca5b0407127832fae1b3a3b660fd5d6f13adc6aef65cd340d41c5a0212241881f23843f1cf849dfc46c972f3741e0facc2d5a8 SHA512 59897652e9dfd97468de4b447cbd080917f65d12507ffd2ec0037227c69b029242c8710aa20c041a6f3abe93d8ffd1e8678c131059b612697e1af1d6b702b31c
-EBUILD nginx-1.14.0-r2.ebuild 40277 BLAKE2B 4f35c3626042d642f2c2352cbafaea15c4b0111b13114dcd3b29ccc0c1d21764edbe40b9f8d0f6ef6d90dfee9725094d3bcfd5d7b559bc3bfb7c7ef916c3475b SHA512 2772477a40247ccdb7d2f2273d84916e64639ba8d3fd00fa0c6bfdbcb30b76eddfc6918bc939cebe9b5ec787904bb2382027d3d7ca3c7db116e9e66ef35519ce
+EBUILD nginx-1.14.0-r2.ebuild 40276 BLAKE2B 4b7fddc3b817e9ca09ca54d5e2dae1c55f01d67647cac6e273afef97981bd9ef20a366475ffc246d8fd5e9c3a8460c0ba372090262b71e8c3e971ea281fa97da SHA512 6ea5e5f876331ed22faeda24d0147505cc5861af845fb45bf4c83d8633dd7beeb05394faebc86425ca906f82659a154b66d7d1a5409b77ddcec41e4625036ef3
EBUILD nginx-1.15.0-r2.ebuild 40280 BLAKE2B 845639f3598f198e429217c7fad6e7fb42f2d152c8b3e9e713616ee85e0d0b10a85f6bbacfbb63cf45e71ae64163a0985ccb9eb7e0786bb7697bd3ff0b67ba28 SHA512 abb4b16b2f18491c146ee4f8da04d2c7dfa41b1c5d66bdd115ea8a693336d9959576df88d3844358776395152d77b424d36390a43fc1419c88a0bd676b565c16
EBUILD nginx-1.15.1.ebuild 40278 BLAKE2B 8de00b6addf8957495de879195e0f012484ce8ffba25002186f879b52d8eea9fab9b23d654f642140b56aea70b76da891def4200f49e9cb3061743afcff45d2c SHA512 dac22595fcb2406fa456547b4ae9b83157ff71ac2b53c7dfa2a7bff158e076866596ff5c7f42ed27e0b754072be688c3f0a5cd4e03800b61849463da6cb1d770
MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
diff --git a/www-servers/nginx/nginx-1.14.0-r2.ebuild b/www-servers/nginx/nginx-1.14.0-r2.ebuild
index e5f31a751e84..a4c3f22ec716 100644
--- a/www-servers/nginx/nginx-1.14.0-r2.ebuild
+++ b/www-servers/nginx/nginx-1.14.0-r2.ebuild
@@ -202,7 +202,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
nginx_modules_http_push_stream? ( GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
# Package doesn't provide a real test suite
RESTRICT="test"
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index d706080a270e..f202e436b407 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,9 +1,7 @@
DIST puma-3.11.0.tar.gz 207387 BLAKE2B b95af60358a9e6877eec34b4cab80c00512e6f9c518f302d6373eee3042b4f439d655aafc719461f7d286fea565e82e6f7ad541a7b0a17d3c2f49067f3e11dd1 SHA512 55e7be6a6c8abc7c8bba4c793b9515150d989358259bbd6546cd8a52d9e6cfb0b7e20c3f813790359ae141865f991d0daadf043e884e2cbc1a1bdfabadca8a16
-DIST puma-3.11.2.tar.gz 207895 BLAKE2B f7a36112f70e63467569354f5ee5e81e1a62ab457099228f7c43c25bd51a8f8aa6de7e02c71222d23c3dc6b5e726c3210e46052d03ae376d533332942b1daa2f SHA512 a10fc17585f38ea31c213cfde109fb21415257d2a6ab8863091baee49e94916b20ffc47f8aa961ab2b2d5d0672a0ad4a279bc9b2549062842accb6cd39cf922c
-DIST puma-3.11.3.tar.gz 207993 BLAKE2B a1d46e531664e04b738840ce8f393721a9a0af113b4796ac24050859973e04f1d36a5494c1245ad24fbb3de54fae00caf908357114499db808342c471a73ccf3 SHA512 315ff78e302fcee5ac404167d40d7a831b584c21aa34cce55a13cd4f2beeafa62a4ae68b2e394f3f4d0ce50cf680bdf8437e5fe6cd541964db2d5838bc8c8469
DIST puma-3.11.4.tar.gz 210324 BLAKE2B 16c01182f4a3adad026ab4f214945b1c5e002d2d99ef965947d982b488c3d080f50d41b175cc69181b2c953d32df6dfb63253dbd0312d594a2472f69f01aa30f SHA512 4c32c7587cab7ae0afd1e90d3de00db67fe314a700240d295303549905e3c556cba06ea41fbe6230f50328769d47272c52f9eb6460b0653fa14e336bacd120ea
+DIST puma-3.12.0.tar.gz 215213 BLAKE2B 1b142e6cc135021eccb01b2e8643d8d22f1c535723a943ae996c6607c7e771d8990ae2132fa2aad8ea44eceaf8c8f586fbb3d61a9aa2963a02d9f54c76773f5e SHA512 e8f0383de24e452735dddaf80e997cc428af2de767be31db6b47fdd5d09268fcb7ca139233311dda83c7a70db6646109e04308c076ac2bf2510766791171ddc5
EBUILD puma-3.11.0.ebuild 1992 BLAKE2B 37ba17dfaeb4269c59a9fa5b71450a531558fd395845fd53451c9bce9777a16b98df166b5dc33716a280df9c9324c546d3f10f5b18c92d4926d761bf46751482 SHA512 1d845a3bc23a9a32a8f239658920abfbc003ab59fbeb87407df71b15a951b94e4bd5061e5e1dd8aeac8efc60deba66f3a1edc39601be5aa21b511965ee054b5f
-EBUILD puma-3.11.2.ebuild 1993 BLAKE2B 22ef34098bef7d3e837faab92ca16e266f4f7b4ec354d9fb8a7e26bd11d9713712280dbc0c2a0795ac583bd54e1a624ddc85c33eca8a2c6bcda6611666de0fe6 SHA512 d43a62d30611d11ac967161e0dc6add0d9313ddbd1936b8dde69221a83e55985d27728278c9d73af95d29fcd50c6ab96b2084703bb3ea0d27e641420b0ab6699
-EBUILD puma-3.11.3.ebuild 2001 BLAKE2B 12ce0f4efe4c597ad012bf305443db4131e5131e43edf712a7a54377ace48f92f1236991cf5fb3270f3cff25a746c9ccc2f6541bd2dadd345d7966415198d32f SHA512 2595f9191b181ed667d8819970c905f1aebf5bcd8d55135f358e1cc7e4896a41b4b95ca92fca0e66e410218eeb602196895a53b16b3d09feb8f976ad60acc985
-EBUILD puma-3.11.4.ebuild 1913 BLAKE2B 85137b67a2595179b7ce2ceb6364f16cf4e767ca609bb2b3b2ebf37ddbcf8af08d4e6d6f1df1a16fc60709c3cba55d9bcf62eafbf18ab9853e7edd09df48015a SHA512 ecfe233a128ca019322141d428c912e73aebf784436e38f0af23c8e7cd82cd04afa106cfd9fc88614031fd01e7c64698d00b8428e6fbc293629c815c5c39f515
+EBUILD puma-3.11.4.ebuild 1912 BLAKE2B 3b230f35f65f74e07adaaf85c979e823281920def719d056264e718f823878c7c8cefdf2d08f5146c57067e3c0932379415566730bb5f21dbca5980198503560 SHA512 568ecfb914f2d0ccb3896fe3c3a1d6d1a18413b992f72a2e1b67373194f8ca6072da937d09cdeabfc0f6971cb2b0ebc887922c00554ef7dd526082f2280b5573
+EBUILD puma-3.12.0.ebuild 1906 BLAKE2B da2ae2247a595e4aea93ca80d26c21bba1abc0860104587ee3d5a9b30d06f3865b8923b1582a1cf5b8c59da17d583b68a50f08aac99367fbdfec58a49dadc3f0 SHA512 713ad314051ceaca1234f591c4a498d7edffcb4c28dbf02f50da83cf3a6ef738b19b74720c26ad40894d7f333101ced5795dc55d05e5e7a3f13a029aefe2de69
MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.11.2.ebuild b/www-servers/puma/puma-3.11.2.ebuild
deleted file mode 100644
index 7bac95567283..000000000000
--- a/www-servers/puma/puma-3.11.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="http://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
-
- # Avoid test failing inconsistently
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die
-
- # Avoid test we did not run previously that is failing
- rm -f test/test_cli.rb || die
-
- # Avoid test that trigger a bug in ruby very easily and lead to
- # failure. This affects all current puma versions in combination
- # with the latest ruby versions, so we add this new version anyway
- # while allowing these tests to fail.
- # https://github.com/puma/puma/pull/1345
- rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
- -e 's/localhost/127.0.0.1/' test/shell/* || die
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/puma_http11
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
- einfo "Running test suite"
- ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
- einfo "Running integration tests"
- pushd test/shell
- #sh run.sh || die
- popd
-}
diff --git a/www-servers/puma/puma-3.11.3.ebuild b/www-servers/puma/puma-3.11.3.ebuild
deleted file mode 100644
index 745ad159b3e7..000000000000
--- a/www-servers/puma/puma-3.11.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
-
- # Avoid test failing inconsistently
- sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die
-
- # Avoid test we did not run previously that is failing
- rm -f test/test_cli.rb || die
-
- # Avoid test that trigger a bug in ruby very easily and lead to
- # failure. This affects all current puma versions in combination
- # with the latest ruby versions, so we add this new version anyway
- # while allowing these tests to fail.
- # https://github.com/puma/puma/pull/1345
- rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
- -e 's/localhost/127.0.0.1/' test/shell/* || die
- sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/puma_http11
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
- einfo "Running test suite"
- ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
- einfo "Running integration tests"
- pushd test/shell
- #sh run.sh || die
- popd
-}
diff --git a/www-servers/puma/puma-3.11.4.ebuild b/www-servers/puma/puma-3.11.4.ebuild
index 2b93a7e41f32..6d2b52c564be 100644
--- a/www-servers/puma/puma-3.11.4.ebuild
+++ b/www-servers/puma/puma-3.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
IUSE=""
DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/puma/puma-3.12.0.ebuild b/www-servers/puma/puma-3.12.0.ebuild
new file mode 100644
index 000000000000..cba158bd16e8
--- /dev/null
+++ b/www-servers/puma/puma-3.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+ test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
+
+ # Avoid test failing inconsistently
+ sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die
+
+ # Avoid test that trigger a bug in ruby very easily and lead to
+ # failure. This affects all current puma versions in combination
+ # with the latest ruby versions, so we add this new version anyway
+ # while allowing these tests to fail.
+ # https://github.com/puma/puma/pull/1345
+ rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+ -e 's/localhost/127.0.0.1/' test/shell/* || die
+ sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/puma_http11
+ cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+ einfo "Running test suite"
+ ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+ einfo "Running integration tests"
+ pushd test/shell
+ #sh run.sh || die
+ popd
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index e1770a85cb10..4f6e51f69902 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -5,8 +5,10 @@ DIST tornado-4.4.2.tar.gz 460193 BLAKE2B 4586397e8899af19582e07ac9ecdf56980a552a
DIST tornado-4.5.1.tar.gz 483225 BLAKE2B 261a5da8a7cc43b11b8504162a030fdad9c3c1409d653f86ab37deb5e4398f39ac05bee1da58944c2d1a2fa92dd5894256b748910f90926834305d6c6adf7ab4 SHA512 b31b3572bf58df8b758694c32b2233c547d6600b0c27f56cff3521abaad38a1646a528d2c2dfcf13214159bf5ba0f59470ba3d538edf16dc014a8b03f0d3bb87
DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
DIST tornado-5.0.2.tar.gz 506544 BLAKE2B 616298761f5e0cdcacfa96c3a14efaf2cc1d7579d582dc8b2fae2a3a3e45405804aa2a1409665a9af38d2f415908b373c1c34e4ff5868f989bb1bd29fe81a569 SHA512 fbd360df34fe29ed3e5f406992923e2af2815f93446fb9d9810f7575fe06300a2cb15c3f36bd93150284ba297772f94c94a4227acca2dc65c94cf7d100cb5974
+DIST tornado-5.1.tar.gz 516359 BLAKE2B 1ff6e6ced124b7b0df0e476eac555de20e4ac86f01369ee484e33bf5d749c269a81dd11a0b4c8b3169db6fd9f7a1b4e3c3551d46474c53a1fed8e342660c57f9 SHA512 8f45e5bbee5453a4225f05840a9fa80dd574c5a9cac9ec4d787f11c3f86f347c66d39c984a8bbe96dbb41f599e25102f1a3dad1c55b479bebee7d856aaca764a
EBUILD tornado-4.4.2-r1.ebuild 1859 BLAKE2B bdd5e41507e83ebc9e2ce2d81e81363b316772653c4faeeda7768cdf75803b025b27d599a5d90a0c314c3fa0569756bb3d1a390d3fea8a70fecdc24e58ae0423 SHA512 138be95d29e4e2185a9212ed108d4236a70b207256a861b1d9b654977f2b051332b12e4a2e9f1b93e1713c1574d64ad9e5a4b6d4db0d73ef42f5919acc159765
EBUILD tornado-4.5.1.ebuild 1868 BLAKE2B 722e23f6ecdb3d110a61cb074933b2b61b080bc21948fd42fae4099275f8c4114aeed18c6635aa1c569581c2364105c86278f31769dba27dd9d826aa95c29964 SHA512 a844f5b5b52ae13ada511f50c3979b1a96683bb81f52c93d71d89d38da98817e677bccc41113941d996594622e4dd312254a93c636c77d951f31c5b900312447
EBUILD tornado-4.5.3.ebuild 1859 BLAKE2B 9dc760d484e1b2742a68aa734f7cefe49a7ba4f4988cf9878584b54e19d9ef589d031255d847fa67ef1e45e0032e4bdc80f3351ae345105d040cdaca176af2bb SHA512 dd46fc428866b8f717adf6cf0c3421a6cfb8d33850fe902bf4babac59c82c46b62b2314685721b1f4d9c3a5eb68798699f142b2a0d4acc4830ebc867230a6354
EBUILD tornado-5.0.2.ebuild 1791 BLAKE2B c5be3458eac03a96dd4bdd248c6548aebd0eb03e2363c2cf2de79311e8f51d290ae320f97a7b9eda1e42fd21ea97b3e58b362883289e87bd6b3797bee1730b04 SHA512 7541ae290aba4adc0e32ed771ac3a8567a091a6dc000d1a76d829d895ba3fb2e793b2f0f084e975618c9ac0495264ce96b474cfbe8a1e2a6a5ebd9860c056ad1
+EBUILD tornado-5.1.ebuild 1612 BLAKE2B 6a56f2fd42d54c65af03d6380790dbb367e6869b049c0cfdb9b72064946b41e808b8f351028ed02bae7352a4b873d1ef789a22cd981dd9185600c757579163a7 SHA512 9a08d95d33cd9bc892fa509c5fb1fd53d6f3951d8ae87c83f3fb39eea34784f8edb4561e8d62e99d59f0b502b0c3b5dc235119a6fcd5d436069b4c1a5fdcbd55
MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild
new file mode 100644
index 000000000000..7b99b382e3fd
--- /dev/null
+++ b/www-servers/tornado/tornado-5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+ $(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
+ >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+ >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+ virtual/python-backports_abc[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+# doc without intersphinx does not build (asyncio error)
+#PATCHES=(
+# "${FILESDIR}"/4.5.1-drop-intersphinx.patch
+#)
+
+python_compile_all() {
+ use doc && emake -C docs sphinx
+}
+
+python_test() {
+ "${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r demos/.
+ docompress -x /usr/share/doc/${PF}/examples
+fi
+ distutils-r1_python_install_all
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d8223681ec7f..27bd65b54f00 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 480d256b1fd7..9afc395c7e32 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,9 +13,9 @@ DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5
DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
EBUILD gtk+-2.24.31-r1.ebuild 9847 BLAKE2B 8cbe3d26447c8ab931c65275248227ad64acc1031a4fb77145d2c59b538c88710015f2a54ebee0903329685c8a966bb93449914db73d6439312044a319d03e1f SHA512 9dbf16c997fee138a096639b6c259680495c9a8155ba12e6cf8598d46212a32f3542e4c4d04aea9ed42ac9ddd2cbf75cabb6f9677a0d17c69e4214ce966ed74a
-EBUILD gtk+-2.24.32.ebuild 10007 BLAKE2B 774688ec17740d6cf7db4ac968c12a50b0a03d7c582224fe85ca555e3890cb9e71a58418726c87b56dbddd2c6c31a17b0c1fafd3e6cdb89778657fc9a36b8e90 SHA512 883e6c7e29261ec36188c490419387d1ddc458fc19cd4407183f6d04f01b5480383fe4841ee0bd1f1298f39a97a0c13500327c5a72300e8ec83a26723a745240
+EBUILD gtk+-2.24.32.ebuild 10005 BLAKE2B deed3f3eeb7b396ba2f1c221ecfaff3accfa65ab1296ef82bb46b18664a5774fd1956dfe0fc3eef8863a4ac623b6a450d7c01646a667928594f87d351d52db7c SHA512 6fb69629423892a67fa05cdfd29a7c28583d847b455c6d15281d9f8d76bc80fd75fc2804fc13dddc4cf0a48ccd57aea7e26df7f4d1c1f33a0a19ea6107c79551
EBUILD gtk+-3.22.19.ebuild 6570 BLAKE2B 595194b0e88c2812b45d9399214eb7a436d7248572a4cb72bd742bc45e4a81e4b7e1aa8dd7eb548d410d3901bb9a439c98a12159125056084b08bcb10da11c33 SHA512 f94a69a2b44d3238211e63cf7f72e335d425b8d8d8577f963831eed39a893d558648bba9c3bae3c202c2d26278a7d124e61cc426ff4837d3c1933e9d70b99686
EBUILD gtk+-3.22.26.ebuild 6752 BLAKE2B ad8b163360e8b06de6d14617f602c32280c624b0dcb524d3d8a5b1f130400ac2e99d664c1793c8360fd66438969f8d0b228f35d1a0e57ab1632fea6b8089583b SHA512 13acbfc400ba56edf340c159df6043c34fac8f316e565aa0dc594400a1438e8f8f2f814333d1c5d175ffc67180c8dcdeff6f958314f87841322cd7d4f0225c4d
EBUILD gtk+-3.22.29.ebuild 6745 BLAKE2B 2bfa5e1527c0383bdcfeea71f6630fda658fc74ec4f345b0226c905ea78bee90d06f5eb8180db0e1484721500717cad853155668ba3e5bf9cbd524a669e42985 SHA512 d783eb50a899e9cbaf4b7363c46e3a660783107caf6b119c71ea727df3dfc690766d283e93d57e6747e1178a5dc9a34283d4d1b0456f4b0b1568fa9b631f7438
-EBUILD gtk+-3.22.30.ebuild 6751 BLAKE2B f44c4b0da1b47f090a0773eeb74b8a2fddb6aeb5ef699c0c236d2611a0d8ceb63532a42ab1e0027c29c7d675c4d82cb10d10249a3e604f6c0b2d34a9025351ba SHA512 0720ff935c6b6e758f4030931e9b9368bcd479e18b2434c42dba7c619ec7d03b40759dc1e8e1f1e093dc00368c6567fa2462e48c3850caf72546c45b1419a9b5
+EBUILD gtk+-3.22.30.ebuild 6749 BLAKE2B ce3e85dadfa309088872909e51e0341c38a9382df2d5f31b755c0d62cdca49fb3e8b535a8e24bae53f5d573d802c4698a6e50fb214499350e7456a4b5282f544 SHA512 8a7db1cac93daf9a7bd9345689cd6b478eafd7d9b9b692556bc80577cd65ac03ab99087759872a3e5f5da58da85ba8e86a017fcc48ace6ab2e37197701885dc3
MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index c378616f951d..ea3cd170c69d 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 7f3853feafa8..9da8f0d30bfd 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 4127a3889950..f6b48bb9c49e 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -7,5 +7,5 @@ DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4
EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
EBUILD gtksourceview-3.24.7.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
-EBUILD gtksourceview-3.24.8.ebuild 1329 BLAKE2B 3ae7b83048fe9007a9ea8f16e3206f119886735ce80f871bb88674651de95b5fd7fecc8efafb2a5bb2a78e5acd064fc4dc9ba283960faa9a7141ee62a6987d59 SHA512 d745d31131a22e9fb9f94f369fe40ba49c2ab42c2497f38b7999cce5adc49ef0b4e1626d058bf83608db9c5ecee679469d3e93c151e2cf1fd9f831550b584580
+EBUILD gtksourceview-3.24.8.ebuild 1327 BLAKE2B 9529674cf02d832782a27f24dc5d8f7e446f569cb591d4cad96eddb7f3fb2510953c19aadcf0bdabbb20c8d7b19768a44499d60335abff9749b492fd684a307f SHA512 25026157b2e70fdb7787d40320af80187598cdd425ebaeaa8ea398deece79c66e0a1cd190530c06eb7f7711234afed248aff430f6944ca6ca89a63897f1681ba
MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index a1510fb96e97..264ff9c5d555 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index d36e21bc3877..1d9674462664 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.4.ebuild 1794 BLAKE2B a5243bc6a5134aa5486859fcd16a2b99f58063bcb3fba5363174218898ce8d6b54e0f88900b027d0e3204e595f69cfbf5d89f6fb1629d893d7bc87296c7af19e SHA512 cbd2d7a6098a7c43ef560b82361bef6da484b966437df0139071755974846d1873fa9bfca658d040ffd2a0b67fca6048e3b5158875f85bb6206faf244a82679c
+EBUILD qscintilla-2.10.4.ebuild 1793 BLAKE2B 1972dde3e7161b985c329e54afeb22f19735af3cf207f506df08329e25b66f6a0bb8048cfafc9777975e0957c9e317af7d48ee6d958bcc54bd4962e6ac14b8b6 SHA512 dc28d37297321c35131e096f47ad972b13e2bd7e8a24f6637890d1b6f1a375438c01ec14dad391775ddbd361faf23e637fff32e64613bda06cbaa44d7f0a29f6
MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index e21f66bf7606..29852a22c94b 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
IUSE="designer doc"
DEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e9df618f4ecb..22e984d2ddcd 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index ec5e8da43c0d..ffee4150fa7a 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,4 +1,5 @@
-AUX bbweather-asneeded.patch 1099 BLAKE2B 491bce274c38df908a2737ee4cf0507ea7060ebdae748e8fde759ad9e8a29cc70157ddaf7c62eddf2dc70e6b6b7d220eebd691b381d4de62ee4139a06768afa4 SHA512 3e96d0210053de4a321a28064824dbd69635e6fffa72c2c335c8b1f66c8c0de9e2700f183e74803011036c285fcc43ff8b01ed156d21f36c0165874fc8f96287
+AUX bbweather-asneeded.patch 1107 BLAKE2B ce0f6ec1dc6cb740c37b200dbb92af8e5c9f0219010d7c2b0da1f189089e9e2cd250aeb0bc86b2cecdc7dd386366f0f978f926de3cb3d5a5ff27b2d61e8b01cb SHA512 872b6bfe7020ecef20eb9180535561f3ac6d2d8f1db67cd3ff82bbf3e1a4abbb27ed864dd88af88fa32ec73850a7d0a599ed29e3cf430499c5924288936efc8c
DIST bbweather-0.6.3.tar.bz2 80631 BLAKE2B e95913c0a95043ca9620beb470d2684540bac95f010e6f75256a1f8758bdd359f303a1117680cd256a25fdac06b24bb4d47707568c4f19a67b3cc9f3c0a5ef7e SHA512 e5bd4febf119c0f81a64fb5ff4cf3b526a84e8fd26005ff04c6297f9b50963d2d710227469f9a1cf2d1c51f3524a2bce544a07c70ca4e5beff64c954768468a6
-EBUILD bbweather-0.6.3-r1.ebuild 1098 BLAKE2B aadecf6847d0b5c40c48e2c3446fdd5cf06c03f19fdd90b5214c2acf0d202ab4dec5171beec3ca1cd48944e1c45d59c23d0a24d1ea68851c7f76944be71dc93a SHA512 27287cbca8b2fe676e2c3f7449de243d8a6644971652baa632c90142f2b7362e3aa598e144d8794f19a17c97eba7d568e53038d5c9aa5fb550ab6ff8e37e3e30
+EBUILD bbweather-0.6.3-r1.ebuild 1100 BLAKE2B e92f93ed982542ab3a3b34760d969cd965290f878602334ce4d179842f63ecd844fc5f009a85df8474867f8ef1060740e60bd3fb10bb517b3ca5c2e72131461e SHA512 e59d69eaa41dd263a9a68810ad53667af88fc2cb7e3af1d8d4c773714dd72d3ea9800bcd79787bc55f1a3ef72eb6cc4c7ad271e192f7bd5bde162f84c6acb890
+EBUILD bbweather-0.6.3-r2.ebuild 1101 BLAKE2B 4096210f8c61c383c4ed6d095a52a3276391cc450ad2c13681edcd31b6526afceedf255a03b65977b4c69ea19a2c662cec0f63afb8f85d22b28d8d7ac8ba6929 SHA512 aac8d1e99158a61414bc63597e4f9f6c720c3b2cde5440eee8715954a8e36a42477b4c2320087d5d371e0ef123f8cf920b292c58d2c09e4f7e2fbae4f3394401
MISC metadata.xml 235 BLAKE2B 98da1c6c200d6499159312f849450787965bb58e754b40a6ab0d91ad58b03962d995be60011407372bf089ffa12a8c79c753e62b07680bb52a0ab3868f0d0498 SHA512 f520eb76104c5ac22c816c755cc7772547ba7030326fef24077090c8d01f602839df77838373247f5f8ce5f94b6043c2a5f6a629991f265d802db39352765063
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
index bf4468aec901..9bca5ba8d11f 100644
--- a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
+++ b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -6,8 +6,8 @@ EAPI=2
inherit autotools eutils
DESCRIPTION="blackbox weather monitor"
-HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
-SRC_URI="http://www.netmeister.org/apps/${P}.tar.bz2"
+HOMEPAGE="https://www.netmeister.org/apps/bbweather/"
+SRC_URI="https://www.netmeister.org/apps/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..1de14db362e4
--- /dev/null
+++ b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="blackbox weather monitor"
+HOMEPAGE="https://www.netmeister.org/apps/bbweather/"
+SRC_URI="https://www.netmeister.org/apps/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ x11-libs/libX11"
+RDEPEND="${DEPEND}
+ net-misc/wget
+ x11-apps/xmessage
+ !<=x11-plugins/gkrellweather-2.0.7-r1"
+
+PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
+
+src_prepare() {
+ default
+ gunzip doc/*.gz || die
+ sed -i \
+ -e "s:man_DATA:man1_MANS:;s:.gz::g;/^mandir/d" \
+ doc/Makefile.am || die
+ sed -i \
+ -e 's|-helvetica-|-*-|g' \
+ resource.cpp data/${PN}.{nobb,style} || die
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+ dodoc README AUTHORS ChangeLog NEWS TODO data/README.bbweather
+
+ # since multiple bbtools packages provide this file, install
+ # it in /usr/share/doc/${PF}
+ mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+ "${D}"/usr/share/doc/${PF}/bbtoolsrc.example || die
+}
diff --git a/x11-misc/bbweather/files/bbweather-asneeded.patch b/x11-misc/bbweather/files/bbweather-asneeded.patch
index 593e471641c8..001ac112720f 100644
--- a/x11-misc/bbweather/files/bbweather-asneeded.patch
+++ b/x11-misc/bbweather/files/bbweather-asneeded.patch
@@ -2,8 +2,8 @@ Fixing build with as-needed
https://bugs.gentoo.org/248556
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -56,15 +56,10 @@
AC_PATH_X
AC_PATH_XTRA
@@ -22,8 +22,8 @@ https://bugs.gentoo.org/248556
dnl Checks for header files.
AC_HEADER_STDC
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,5 +1,4 @@
-CPPFLAGS = @CPPFLAGS@ \
- -DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 2d600587469f..17d256c955fb 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,4 @@
DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B 0318edda3df5b9aafd34e683f3f6bccb23748d5512131d22bbbaa9a40bacaca31aa531489b71f7749903b2fcfaa618f1ecad9fa0f68ebdabab7052ab6836de0a SHA512 8bf2b00a9d1404a03e7f268325b938c0acc50e665cbb9380d935c8445cff14ded66ecf81e851a949efe75f9049a357e0790fadb4d2d12b4c1b5a85f932a298a0
EBUILD compton-9999.ebuild 1537 BLAKE2B 2e7c807a0ddfe672a3946394ed3bc16288ec72a050a2f0f0c30829d2283737e39ebb3bbdcf047c71ef478d23e7f2566372ff17f07fc41822f3ce5ee25156a678 SHA512 8b8aa77c5357b2d2c6627223d3a942388c22245646c035fff599b33e1b6df6494dfd1ee4d9cd0d9ecd5c1681510f30602f028e436104cd752762bb02b23c43c2
-MISC metadata.xml 417 BLAKE2B 4d9c38f837302c887a12fbd6a283c4bd7a75dee9a73096b08f53913398d22a67b0e975db1266341125b149ae2c490de2e7d96077fc1817f28405af27ad2f2a67 SHA512 3220e8f0f2d71f507df50bdd8a7837042ba8ad98ae9c06b3834ba72be6e346d3af614016e657313a55b7c93351a36669c4bb5b35edadb0284a71076192ea53c2
+MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index 4260d05bc29e..c269c6f6ad71 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
- <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
- </use>
- <upstream>
- <remote-id type="github">chjj/compton</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+ <use>
+ <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
+ <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">chjj/compton</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 0f1d5ad8a62a..fd8f5d52193c 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,5 +1,3 @@
-DIST dunst-1.1.0.tar.bz2 79032 BLAKE2B d0c0550a7bc2da5ba5f3fdfd04d06c03e70cf3bc4b69dc69071667a885a361fbb9564dc02d6a0530b85eea2df845b8b5f917ceef0dbe5159f968f20ef50762f6 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b
DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
-EBUILD dunst-1.1.0.ebuild 1193 BLAKE2B 22be8ac22df55546417fd0afbd6231b9b32ca1f4f95e20729219681a00e397d7a3a13f7499f0d05d72037413fb00dd45a7f2f6ec35a505695087fc6970dd22ea SHA512 3dae12bba3ee11392cb59428164543d36280a256f359041bfa575b26622615c5211370888d7fd12640bcbedddcac60179b630d7485e8783532926ba423d791c4
-EBUILD dunst-1.3.2.ebuild 1076 BLAKE2B 31fdc961a7e7d5898982b93e050118049caf7834225c3eb9110d4fd4127ee556d6ad83fca2875dd4eb6cc3bbcfe83a7cf172e2c1cb387110f3a5731e0d80aef7 SHA512 d1e2deb0a6aca4ac22854de18745e81e4734443eec88f2de3e4de9234fcfe768614c550409e044dd9870e46c7e49f3a2abedcd57bb337821adbc2a77def2000f
+EBUILD dunst-1.3.2.ebuild 1075 BLAKE2B 89736d9a5e43f9e4fc19161b5de87c95c118da9dfb9dce9c3d3abe7fa1337ea875b01510eb8e640d7a20248cee14284f5f3fb6a53a832944797cce6d0c9bf56e SHA512 d947586261ef7f110c1aec75f73de72071f45ec90be1732c8d3ce586fa47e365e878555567144497f954272989ddb3d03632d8e765bc539b09fe4b31439dd3c2
MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild
deleted file mode 100644
index 1ce9d2c4edbd..000000000000
--- a/x11-misc/dunst/dunst-1.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="customizable and lightweight notification-daemon"
-HOMEPAGE="http://www.knopwob.org/dunst/"
-SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dunstify"
-
-CDEPEND="
- dev-libs/glib:2
- dev-libs/libxdg-basedir
- sys-apps/dbus
- x11-libs/cairo[X,glib]
- x11-libs/gdk-pixbuf
- x11-libs/libXScrnSaver
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/pango[X]
- dunstify? ( x11-libs/libnotify )
-"
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
- sed -i \
- -e '/^CFLAGS/ { s:-g::; s:-O.:: }' \
- -e '/^CPPFLAGS/ s:-D_BSD_SOURCE:-D_DEFAULT_SOURCE:' \
- config.mk || die
-
- sed -i \
- -e 's:registration_id > 0:(&):' \
- dbus.c || die
-
- sed -i \
- -e '/g_print.*iter->data/ s:iter->data:(char *)&:' \
- dunstify.c || die
-
- default
-}
-
-src_compile() {
- tc-export CC
- emake V=
-
- use dunstify && emake V= dunstify
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-
- if use dunstify; then
- dobin dunstify
- fi
-
- dodoc CHANGELOG
-}
diff --git a/x11-misc/dunst/dunst-1.3.2.ebuild b/x11-misc/dunst/dunst-1.3.2.ebuild
index e4b9b064c4f8..0bd294ebd432 100644
--- a/x11-misc/dunst/dunst-1.3.2.ebuild
+++ b/x11-misc/dunst/dunst-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="dunstify"
CDEPEND="
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index bd512f9cdf5f..391b22ea2a8d 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,3 @@
DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
-EBUILD gigolo-0.4.2-r1.ebuild 696 BLAKE2B 63254c84c821bb92b0ae7144bf1a9d821e1b938b5adc913506042eea649ce0aaa388be9d6ac75effbd80ce960c1e3d8f81b16e9753b8928e9f043ab730a387f9 SHA512 9f89293852bf9ebfbdd8a62047a5a6b0fec965cffffc522283dcb3313debb24326d289e6a9e0683d7ed4eaec18c948f38416f866bb87ed71dac87d69b35b472e
+EBUILD gigolo-0.4.2-r1.ebuild 707 BLAKE2B 3e9ff659fa2c0c36ef33f71d62c4a706917e3d6e2074fe77644b283b7052d2ce0635a31d50686b4915efd1b2a18e161edc60c5b82f36a71e51d9db8e1ed2241c SHA512 f342f5f9aa1bc19757f599aa4dd78047d37bb0ef1df172b8f9139ad92a4e52386b22faa42cec253c6e11df7d88f18335de0c122daffd8034242754b7b1bed053
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
index 0f8a1215a551..9a5f34798f14 100644
--- a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
+++ b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit xdg-utils
DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index c2e5f132f54e..a33c66af7f59 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -2,5 +2,5 @@ AUX i3status-2.11-pulseaudio.patch 1085 BLAKE2B cbef3ee6b008773aff92f629468bf543
DIST i3status-2.11.tar.bz2 54970 BLAKE2B bbf60250b3f86fafdbd40ad33d1a07783e461e2193392acaa51ebd435ad7cb85d1bb8f4819d61018f65ad99fc52e93b474484f80b24f3d96df067d8b39dfd934 SHA512 37d2549649178122fab7411a3c714ae041d9c726c140002ec6ccd1a4f2e28af618ca28af9aa3bc45d0cafda0b25dd438c9ed4c3739ddcc0511e19305657730f0
DIST i3status-2.12.tar.bz2 57162 BLAKE2B d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749 SHA512 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
EBUILD i3status-2.11.ebuild 1034 BLAKE2B f1850568cfa5b59dccd170280995af09c92a053164a5a223d47d4099b8ae4cedd436ef8c5d582aef4ecd12d374db4cc8c844f9e8218e2e14200706e087ee8c72 SHA512 68196c29876594a1749a8caa2d443ce0bba0c3637704bb1d0dae00a98a3fe710165b69571c7e6c7345e33619b0e8a33fa331d1659e9c2bf551f809b5ce339ba3
-EBUILD i3status-2.12.ebuild 1041 BLAKE2B 39f42cf74d14170c88f6574e236efe3253c10784b6e56f88813e550839df8694d166ce629a834b8d4ee850ef87746808d16d118b2dcaff2ce9bdf73d2216aeec SHA512 3ccd703468d53f0a9703fe19362e73198a0fd8313924a0089b854b7105536d6ed6da57c15cdb7033398a06beda7ef1b4806df05744c26ec9cd82cc99d682f12f
+EBUILD i3status-2.12.ebuild 1047 BLAKE2B df289865197722316fb4d1148196fe51e947004b9791c099c73f3f4afb65e812d74d6d1eb079c043884986cee8f1144bb52766201f31afcd1ce488565d61bb8a SHA512 46cd0b4cce5dc7bcca347c687144112d28297508e672e357fc6e27e2c4dd382c4c01681cbae8856a77c616705bc53bae65e4cd24e537900a4c633c77a05a4afb
MISC metadata.xml 923 BLAKE2B 9c815212a4cf22f000c66829c287ce86f55f9271b7e74ab55231eace1cb435092ef4539946ae598d741c34a1032f67ae23f29667499707a051fca604683c0b5a SHA512 767566a72041c13afd546301ad688053e7855fa90c036d381eb03ba4d53caa573809b9ba7433c4484004f3aed800a0b9232c6861e347a1b75ed04f56cb37240b
diff --git a/x11-misc/i3status/i3status-2.12.ebuild b/x11-misc/i3status/i3status-2.12.ebuild
index 15cff5b780de..f50925e34309 100644
--- a/x11-misc/i3status/i3status-2.12.ebuild
+++ b/x11-misc/i3status/i3status-2.12.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit fcaps toolchain-funcs
DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
@@ -13,20 +14,17 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="pulseaudio"
-RDEPEND="
- >=dev-libs/yajl-2.0.2
+BDEPEND="virtual/pkgconfig"
+DEPEND="
dev-libs/confuse:=
dev-libs/libnl:3
+ >=dev-libs/yajl-2.0.2
media-libs/alsa-lib
pulseaudio? ( media-sound/pulseaudio )
"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.11-pulseaudio.patch
-)
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.11-pulseaudio.patch )
src_prepare() {
default
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
new file mode 100644
index 000000000000..db0f598bb36f
--- /dev/null
+++ b/x11-misc/mugshot/Manifest
@@ -0,0 +1,6 @@
+AUX fix_env_spawn_args.patch 1542 BLAKE2B d106f8c488b5a5a7343ce822d8e6dacb1e2a0c9c09b56548e7eb0dc40e6e7d9d6c2192abd80a748e724194001b8e2b6e78465e5652e70306293e4c33f85fb4e1 SHA512 83018570ac1663abc5f7210075bfaf9d9220bf32d516e34b0146adb589964f0bdcbbc9fb4d8cd8f9f535bf766a87d47682bb8e3196edd4a7039793c811fc6677
+AUX missing_default_face.patch 785 BLAKE2B 43646f826480e6def661ff7dff3aa84d8b2b789ce977a9f321b8f66dce4e0a3a4c822e91d341101ce12a6df9384268156d14badf5b57bc5cb638d661a27c6749 SHA512 e855d9491a2d45322041de653cc3d852d79b80e27ea0c7064f65d61d9c69a001602f63043ad847ce399f80e2afce662874aeeaa09b47fe41e2af8cb797fbcd31
+AUX use_office_phone.patch 712 BLAKE2B d94a87060e67be5b82ee97266fb0300d14b42932657db332a8d73b5cbd6ac82df989b6a24ed2d774f3e7eaf64efe80934e12aff6bd8577a654e510e0c26f6735 SHA512 7d8ebd02d5472d08b73360744b13dab238dbc15d8a5daa31c5458c09ee7d74210be9be2f36446f6c71d3765a041c72f2b449cffcf6655944d2246559f45909a3
+DIST mugshot-0.4.0.tar.gz 126101 BLAKE2B be0d84fd09a1ff6477d32a77d979b1606597b2ca38524b9cc65c254dd9d5d43697123b10d2b836c1193a9ba0f3dadebb15d1fe89ab7fb1743cc7b4d177ace65d SHA512 5936ec3def5a70db21f9bcc7fce873ce374f8df0795fb944593f398704dcba8c81be30393603e1753e176da87f4a6fd8a3218de2aeb7f33ea6018735ce1b2c09
+EBUILD mugshot-0.4.0.ebuild 1499 BLAKE2B fc7340c94b69abc32bb530b55bfbd8e947445cb8182e407484df3ec24e0053e45339b7e3b0b10e7b3820f39a6ac74ff81b2fcc02f917f9f68b4aaaf5e37568ed SHA512 0dd112ce2a18517b9c9ed374e74367abfce0e0a509f937c52055fc5510f39095fa4f5bc022775332bf1a5c963fde2ed0e0dd68cc354adc5402d40384ad0472d1
+MISC metadata.xml 1139 BLAKE2B 761c09b3f9f3f81667a253876b89dafc107f503cbc9ca20242e3974c011077bdbabe0206d59cf4504328c49ef4f87c0716330e78ff1f0b953b9bb380c5820d06 SHA512 7ac0a6925a7b55f59410444537ee944c5491204f7257eaa215b599dbc31e1a183c124815a3761295058aa5a61dafae2b4bd9bf4659e76cc3deca5690e7f70cb1
diff --git a/x11-misc/mugshot/files/fix_env_spawn_args.patch b/x11-misc/mugshot/files/fix_env_spawn_args.patch
new file mode 100644
index 000000000000..bb24418a7dbc
--- /dev/null
+++ b/x11-misc/mugshot/files/fix_env_spawn_args.patch
@@ -0,0 +1,47 @@
+--- a/mugshot_lib/SudoDialog.py 2018-04-12 00:23:21.000000000 +0200
++++ b/mugshot_lib/SudoDialog.py 2018-06-22 22:21:10.876589365 +0200
+@@ -48,7 +48,7 @@
+ return False
+
+ # Check for LANG requirements
+- child = env_spawn('sudo -v', 1)
++ child = env_spawn('sudo', ['-v'], 1)
+ if child.expect([".*ssword.*", "Sorry",
+ pexpect.EOF,
+ pexpect.TIMEOUT]) == 3:
+@@ -57,7 +57,7 @@
+ child.close()
+
+ # Check for sudo rights
+- child = env_spawn('sudo -v', 1)
++ child = env_spawn('sudo', ['-v'], 1)
+ try:
+ index = child.expect([".*ssword.*", "Sorry",
+ pexpect.EOF, pexpect.TIMEOUT])
+@@ -76,14 +76,14 @@
+ return False
+
+
+-def env_spawn(command, timeout):
++def env_spawn(command, args, timeout):
+ """Use pexpect.spawn, adapt for timeout and env requirements."""
+ env = os.environ
+ env["LANG"] = "C"
+ if use_env:
+- child = pexpect.spawn(command, env)
++ child = pexpect.spawn(command, args, env)
+ else:
+- child = pexpect.spawn(command)
++ child = pexpect.spawn(command, args)
+ child.timeout = timeout
+ return child
+
+@@ -304,7 +304,7 @@
+ Return True if successful.
+ '''
+ # Set the pexpect variables and spawn the process.
+- child = env_spawn('sudo /bin/true', 1)
++ child = env_spawn('sudo', ['/bin/true'], 1)
+ try:
+ # Check for password prompt or program exit.
+ child.expect([".*ssword.*", pexpect.EOF])
diff --git a/x11-misc/mugshot/files/missing_default_face.patch b/x11-misc/mugshot/files/missing_default_face.patch
new file mode 100644
index 000000000000..0d25fb610137
--- /dev/null
+++ b/x11-misc/mugshot/files/missing_default_face.patch
@@ -0,0 +1,18 @@
+--- a/mugshot/MugshotWindow.py 2018-04-12 00:23:21.000000000 +0200
++++ b/mugshot/MugshotWindow.py 2018-06-22 22:27:05.515588012 +0200
+@@ -257,10 +257,11 @@
+ logger.debug('Found profile image: %s' % str(image))
+
+ if os.path.isfile(face):
+- if os.path.samefile(image, face):
+- self.updated_image = face
+- else:
+- self.updated_image = None
++ if os.path.exists(image):
++ if os.path.samefile(image, face):
++ self.updated_image = face
++ else:
++ self.updated_image = None
+ self.set_user_image(face)
+ elif os.path.isfile(image):
+ self.updated_image = image
diff --git a/x11-misc/mugshot/files/use_office_phone.patch b/x11-misc/mugshot/files/use_office_phone.patch
new file mode 100644
index 000000000000..bea3f7ce4dae
--- /dev/null
+++ b/x11-misc/mugshot/files/use_office_phone.patch
@@ -0,0 +1,18 @@
+--- a/mugshot/MugshotWindow.py 2018-06-22 22:33:03.980586645 +0200
++++ b/mugshot/MugshotWindow.py 2018-06-22 22:41:44.120584661 +0200
+@@ -614,10 +614,14 @@
+
+ logger.debug('Updating Office Phone...')
+ command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
++ command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username)
+ if self.process_terminal_password(command, password):
+ self.office_phone = office_phone
+ else:
+- success = False
++ if self.process_terminal_password(command2, password):
++ self.office_phone = office_phone
++ else:
++ success = False
+
+ return (success, response)
+
diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml
new file mode 100644
index 000000000000..9e143660d318
--- /dev/null
+++ b/x11-misc/mugshot/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Mugshot is a lightweight user configuration utility.
+ Mugshot allows you to easily set profile image
+ and user details for your user profile and any supported applications.
+ </longdescription>
+ <use>
+ <flag name="gnome">Add support for <pkg>gnome-base/gnome-control-center</pkg></flag>
+ <flag name="libreoffice">Add support for <pkg>app-office/libreoffice</pkg> and <pkg>app-office/libreoffice-bin</pkg></flag>
+ <flag name="pidgin">Add support for setting the avatar in <pkg>net-im/pidgin</pkg> </flag>
+ <flag name="webcam">Add support for setting a profile photo in <pkg>media-video/cheese</pkg></flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugs.launchpad.net/mugshot</bugs-to>
+ <remote-id type="launchpad">mugshot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-misc/mugshot/mugshot-0.4.0.ebuild b/x11-misc/mugshot/mugshot-0.4.0.ebuild
new file mode 100644
index 000000000000..23ceab58d94c
--- /dev/null
+++ b/x11-misc/mugshot/mugshot-0.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eapi7-ver gnome2-utils
+
+DESCRIPTION="A lightweight user-configuration application"
+HOMEPAGE="https://launchpad.net/mugshot"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome libreoffice pidgin webcam"
+
+RDEPEND="dev-libs/gobject-introspection
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ sys-apps/accountsservice
+ x11-libs/gtk+:3
+ gnome? ( gnome-base/gnome-control-center )
+ libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) )
+ pidgin? ( net-im/pidgin[${PYTHON_USEDEP}] )
+ webcam? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-good:1.0
+ gnome? ( media-libs/clutter-gtk[introspection]
+ media-video/cheese[introspection] ) )"
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ dev-util/intltool
+ ${RDEPEND}"
+
+PATCHES=(
+ # https://bugs.launchpad.net/ubuntu/+source/mugshot/+bug/1443283
+ "${FILESDIR}/fix_env_spawn_args.patch"
+ # Both patches are taken from Arch Linux
+ "${FILESDIR}/missing_default_face.patch"
+ "${FILESDIR}/use_office_phone.patch"
+)
+
+pkg_postinst() {
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 39291ec5c0eb..8b1fc88c8699 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.10.tar.gz 268960 BLAKE2B a9f6a851a14f2deb17d8fce10821053c680bd7f4251bf54fceae092d53bda136ee461b8f9e2849957db1183cdd89841c0173785fff7dfeb94ffdd415f044802a SHA512 96cf90117a6ef49a1cf1b1528d45fd8c9f6c124ad1d8840e519e56a913689cf1e216d09f4e890a0d557d261342d88e751d563aae55bf0c5f940280d9df885e67
-EBUILD py3status-3.10.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
+DIST py3status-3.11.tar.gz 276522 BLAKE2B 1ffc3f1fe4c64aac5a4c9d6964f8e45acb3610dadc492a628d01010b155be6da847840ccae919a7d09299328374a52ad5332a572afdbc26b8c598eb875b32401 SHA512 af30317625118e06318723d1c2cda881f2bf39617f2ea4eb34b2d465c95e98aaa13ee32dcec240bcdb1fcd595cfe00dbd6b3afd61b8674acbc8b73cf2ab2b9f7
+EBUILD py3status-3.11.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
MISC metadata.xml 491 BLAKE2B 867cd38781b9fedfbeca476c0905193823ce4a1ff99b259fa53a098dbb67ff6f1a0cd29aa19e5c6752052bd3a0a8fc96a8764e9868017d4d5ef14d4d765ca212 SHA512 24fdcee0d026225e8965b62bfc5d1c1be0f0d4618e0bb9f5ad58dcb5ffdf372696ebe035d15f5208bc310c969ef93b89d9d643a6bc9abc0f6103810abff26bae
diff --git a/x11-misc/py3status/py3status-3.10.ebuild b/x11-misc/py3status/py3status-3.11.ebuild
index b555901801d3..b555901801d3 100644
--- a/x11-misc/py3status/py3status-3.10.ebuild
+++ b/x11-misc/py3status/py3status-3.11.ebuild
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index e28e3e80263f..76dec17d68c7 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -2,6 +2,6 @@ AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629
AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r1.ebuild 3728 BLAKE2B e955979aab325e5bc073a572214bd8539d203a8eaf199a4074efdc17495a26b120ff7ccdc71c1c680ce0f471711c2375df40bc53d67fce0ac0ed72f805fa6ef6 SHA512 a0f7436e6b476d47c5abf71edd481478a106ec1e83752c1073f2129d83ed01193cb684983fa388624c4af24a58a1979feac50cb670fe295f11bdd1460facc96d
+EBUILD rss-glx-0.9.1-r1.ebuild 3727 BLAKE2B 29ca700f51e3f37072e8f427a0c5c6271a0f88cbe96af2b2e4ed7ea6dec438eabba005264ebdc747249f04a8dabd1c492db9f4b767512731780d05c49ced1894 SHA512 d5de768a3dc6a8f1a89dde65cb05d057868fda01a7e3d7cb326501135f5ba1e5d0902aecfebf8d78c9912b7337307cba573befd01a22493959a9a9f68a4d76ff
EBUILD rss-glx-0.9.1.ebuild 3690 BLAKE2B 582a7fb11166b5a06024ce0993e45e8fa8c2c6028d26215df84cf82dfd3822abd897d519d1e860467f5022b0e74f68a3e18a15ce2b5d7ca3cf2dc5b0fa607b1b SHA512 0ed2be0bd6d23d9093beae568cab1f312a9dd140816f726ca84e8d5e145775c10b6c7ab359a0c303e3449f999ba7db9771c73621baf10abc2acae373c8c28fc4
MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index f9ae27770ea4..0e1a4f94e36b 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
IUSE="+bzip2 openal quesoglc"
RDEPEND="
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 80fcfc72910d..cc3535490609 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -2,8 +2,8 @@ DIST safeeyes-2.0.2.tar.gz 204210 BLAKE2B d2871b694c66746e7c931bad052fe48edfcda4
DIST safeeyes-2.0.4.tar.gz 215936 BLAKE2B 5d605319abfd3437e4a00814273d4911ff332f4ad87c9b079e67ee7dabf32773bbf6dbdd65118d323a30c80b19d93d3018f5a765bc396cf9f443830c666f0f41 SHA512 592e68396a2e3f77b0a26ab7480c14654748385b487228ed92a66422e223140c178261d4b72d99ad537d44c02c21b05e531e4e867c2c0e6b12dd62a2988465c6
DIST safeeyes-2.0.5.tar.gz 220601 BLAKE2B 2e6df2eef91d588955632d6c82a8e1af019f5a06006dd00b338986060a9e7c568b1f4639450aabad67148cf2f3a2e7e2018b259bffac55c0bacd503e810a0d41 SHA512 ce9f5ffa828aa579012ef3855ac8676ff512a3040e77badcbb962d1ce8d4ccd568a9bab13f00df4f74c07eec6e5651c3e849f035cacca35f07c08f939a0255d9
DIST safeeyes-2.0.6.tar.gz 313974 BLAKE2B 6ee2c0bd7b6c3c4de4213b30b6dc445ae04ba1919d2675d3b06d5e7b699641dd82404a7a0b44ed311a5f24cab7be0a37fa1262aef3de3f1fd98c66b098c20df8 SHA512 864aaa94d43e5595623b6fbe9c8408e27be1b7ece0192daf22b3d6886064ccb20caefbde035cb12fbf8d612d1c2535f9db24d2025b1747ef4a72733881440dba
-EBUILD safeeyes-2.0.2.ebuild 1038 BLAKE2B 38462f89636802722a414108f73fa548c840b2f7ec63b40244f2aec8d4d3b6019c5515cfd47e83bd3ef6f4ce300f2a3785c50196601eb071941d8be0a162ef7b SHA512 8d3cff54a9b5d87fd78708106c330977c193a3e7bc355363f7bda30442ff6121528645758950d3d779cb0682655abcea454aebd0fcbd9d48990b0bbd7ccf05c3
-EBUILD safeeyes-2.0.4.ebuild 1038 BLAKE2B 38462f89636802722a414108f73fa548c840b2f7ec63b40244f2aec8d4d3b6019c5515cfd47e83bd3ef6f4ce300f2a3785c50196601eb071941d8be0a162ef7b SHA512 8d3cff54a9b5d87fd78708106c330977c193a3e7bc355363f7bda30442ff6121528645758950d3d779cb0682655abcea454aebd0fcbd9d48990b0bbd7ccf05c3
-EBUILD safeeyes-2.0.5.ebuild 1038 BLAKE2B 38462f89636802722a414108f73fa548c840b2f7ec63b40244f2aec8d4d3b6019c5515cfd47e83bd3ef6f4ce300f2a3785c50196601eb071941d8be0a162ef7b SHA512 8d3cff54a9b5d87fd78708106c330977c193a3e7bc355363f7bda30442ff6121528645758950d3d779cb0682655abcea454aebd0fcbd9d48990b0bbd7ccf05c3
-EBUILD safeeyes-2.0.6.ebuild 1047 BLAKE2B 5c8ff5f566f72f47fd2a74a240630d2300ee0644c7ac094ef79614aed0c332d54e89c4f7e641d3793bed0a1f2bd62bf6e0101253520d6bda221f66d374c33c1d SHA512 7aa9275c80ec024f636f728282ff37c46f7d1ea89a157a42a202bbb2dd3daeeb5385571166a2fcda15a0fbac3340030bd886d586c4fe7e96e1205089b3ba00c3
+EBUILD safeeyes-2.0.2.ebuild 1000 BLAKE2B 8c1c736b52e848743f45ecae54b66b434107fcd4fd1f13379b29163a0341bc9576b1b76ec7eb0835f78e1e84bc6554aa203ee70bac7ab9d49ca673119c3c8286 SHA512 c6eb32068396c1a8bd791a4f549ffb5fd5a620caf44294e6f3f86a22716afebd1ab49db0e8e570c43856c9d6f2702ea442484e3ce791c075744058d94db0755e
+EBUILD safeeyes-2.0.4.ebuild 1000 BLAKE2B 8c1c736b52e848743f45ecae54b66b434107fcd4fd1f13379b29163a0341bc9576b1b76ec7eb0835f78e1e84bc6554aa203ee70bac7ab9d49ca673119c3c8286 SHA512 c6eb32068396c1a8bd791a4f549ffb5fd5a620caf44294e6f3f86a22716afebd1ab49db0e8e570c43856c9d6f2702ea442484e3ce791c075744058d94db0755e
+EBUILD safeeyes-2.0.5.ebuild 1000 BLAKE2B 8c1c736b52e848743f45ecae54b66b434107fcd4fd1f13379b29163a0341bc9576b1b76ec7eb0835f78e1e84bc6554aa203ee70bac7ab9d49ca673119c3c8286 SHA512 c6eb32068396c1a8bd791a4f549ffb5fd5a620caf44294e6f3f86a22716afebd1ab49db0e8e570c43856c9d6f2702ea442484e3ce791c075744058d94db0755e
+EBUILD safeeyes-2.0.6.ebuild 1009 BLAKE2B 12072d1c0a98ad65cbc4c62cb0e49f37306334739f152d22eaccb2ded8714b54306d1cf944a9af4a7e13ed84bea86da1d998e6c6dc82d2861ba2f276b8975421 SHA512 360fa7e1b0f63254325c6d00f146dd399fb7c89743162d00d37df7137d11872230c802bb5db74408ad5cd25b48d47c5432191a000ba0ccd1b08effd6538045a6
MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
diff --git a/x11-misc/safeeyes/safeeyes-2.0.2.ebuild b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
index ebf1e7c73477..e071dcfa59fa 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
+IUSE=""
CDEPEND="${PYTHON_DEPS}"
DEPEND="${CDEPEND}
@@ -24,9 +24,9 @@ RDEPEND="${CDEPEND}
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
- portaudio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-xlib[${PYTHON_USEDEP}]
+ media-sound/alsa-utils
x11-apps/xprop
x11-misc/xprintidle
"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.4.ebuild b/x11-misc/safeeyes/safeeyes-2.0.4.ebuild
index ebf1e7c73477..e071dcfa59fa 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.4.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
+IUSE=""
CDEPEND="${PYTHON_DEPS}"
DEPEND="${CDEPEND}
@@ -24,9 +24,9 @@ RDEPEND="${CDEPEND}
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
- portaudio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-xlib[${PYTHON_USEDEP}]
+ media-sound/alsa-utils
x11-apps/xprop
x11-misc/xprintidle
"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.5.ebuild b/x11-misc/safeeyes/safeeyes-2.0.5.ebuild
index ebf1e7c73477..e071dcfa59fa 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.5.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
+IUSE=""
CDEPEND="${PYTHON_DEPS}"
DEPEND="${CDEPEND}
@@ -24,9 +24,9 @@ RDEPEND="${CDEPEND}
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
- portaudio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-xlib[${PYTHON_USEDEP}]
+ media-sound/alsa-utils
x11-apps/xprop
x11-misc/xprintidle
"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.6.ebuild b/x11-misc/safeeyes/safeeyes-2.0.6.ebuild
index 9aae9642548a..f240b0ed0b01 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.6.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
+IUSE=""
CDEPEND="${PYTHON_DEPS}"
DEPEND="${CDEPEND}
@@ -24,9 +24,9 @@ RDEPEND="${CDEPEND}
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
- portaudio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-xlib[${PYTHON_USEDEP}]
+ media-sound/alsa-utils
x11-apps/xprop
x11-misc/xprintidle
"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 0748eb89d15a..9fe1e1d920c5 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -5,7 +5,6 @@ AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db
AUX sddm-0.17.0-consolekit.patch 1192 BLAKE2B 1ab5dfb6995fffa033990380c2a82baaab77de8f95c9b28b301b7e6e4db0de0dcbf84e0767fc404d75361d6171c566c9c44cc52c741f884fe7cfc93f53d42b9b SHA512 f05b88d8faf63dc492e0177cc1f7296074738470172fbf9b97929a035fecc4116388d839a8ec504a02008a3f14be1a4780f8796e3dec2269ef8d59d96282a7f6
AUX sddm-0.17.0-logind-race.patch 944 BLAKE2B b92897b1d1de88de5f6edf9862221bfa56c1d5294177651431099dd09c25435037e03095ec2fb3f776cb190ca16808a9caea35282045ca9e353176dee75883b8 SHA512 4e4c388529dc898da2b8983f46e809bc2939cef02d4aa605761cc9978b4946121cd2d949353bed3d19a14cafd1628fdae3eb928dd56f81ddc976005cafb4a939
AUX sddm-0.17.0-switchtogreeter-r1.patch 1891 BLAKE2B 1d06c1fbca6d7c0af8bfd4cc0f4cdd1bd1f60fff32626fe74763bd6c3a3cff30d13588471ae3377db8b272233592250079dfec2150e62f30f2ba385451044701 SHA512 c8c1f11b82521343422e1d792c53ad2a9f101210df5e2bbd4767c1c5d7ef637d750fcc8e9e00544f8260c522d7a8463e2b1f4996c611accd0b66a73fae4b5232
-AUX sddm-0.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a6436187fc684e347b00fe6141e0b30e580d04e722f96b320677f7b8f7dd5f5bf91492b05f04a81e4ef564c831d9bd84de2ea68988 SHA512 f50b3c23baaaae6bb605cb7b4eb6ff24bbfd3e5771e44a24d54f1843b727f9f02cdd2cb0aacd832e110e4350870e76bd4727492d0b0f58145d739181a1815963
DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
deleted file mode 100644
index 22d2fa4ae9be..000000000000
--- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Subject: [PATCH] Fix switchToGreeter not available without logind
-From: Alexander Miller <alex.miller@gmx.de>
-
-Seats can't be created until SeatManager's signals are
-connected to the DisplayManager, or the latter won't see
-them and switchToGreeter doesn't work. So split SeatManager
-initialization from its constructor and call initialize it
-only after all connections have been set up in DaemonApp's
-constructor.
-
-With logind there may have been enough delay before seats
-got actually added so things would work, but it's still
-cleaner to fix the order.
-
-Fixes: https://bugs.gentoo.org/644718
-Fixes: https://github.com/sddm/sddm/issues/824
-
---- a/src/daemon/SeatManager.h
-+++ b/src/daemon/SeatManager.h
-@@ -31,8 +31,9 @@ namespace SDDM {
- class SeatManager : public QObject {
- Q_OBJECT
- public:
-- explicit SeatManager(QObject *parent = 0);
-+ explicit SeatManager(QObject *parent = 0) {}
-
-+ void initialize();
- void createSeat(const QString &name);
- void removeSeat(const QString &name);
- void switchToGreeter(const QString &seat);
---- a/src/daemon/SeatManager.cpp
-+++ b/src/daemon/SeatManager.cpp
-@@ -93,8 +93,7 @@ namespace SDDM {
- }
- }
-
-- SeatManager::SeatManager(QObject *parent) : QObject(parent) {
--
-+ void SeatManager::initialize() {
- if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
- //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections
- createSeat(QStringLiteral("seat0"));
---- a/src/daemon/DaemonApp.cpp
-+++ b/src/daemon/DaemonApp.cpp
-@@ -75,6 +75,9 @@ namespace SDDM {
-
- // log message
- qDebug() << "Starting...";
-+
-+ // initialize seats only after signals are connected
-+ m_seatManager->initialize();
- }
-
- bool DaemonApp::testing() const {
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index 1f2c12504bc6..c02d08506dd1 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -1,6 +1,4 @@
AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353
-DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020
DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d
-EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 9cfed25400cfb29c5e6872ca44ea82ca8471147e254ca7416fbbb234820080960127fe6a3b23c5c136e2e50481da0be50366d855e7081f719af7de8931fda28c SHA512 3809f6987afd72c29d175fea3230b0cfe22ddc88ae8e4fb825692aaeef77671b1306b493f043b08346bceb6587fb2c50541b802c95d787864ee56624370bda39
-EBUILD xbatt-1.3_rc1.ebuild 862 BLAKE2B 1383a6116b2f4ee37bb9b0520f4f9de3ba098cad15ca5f239816b2e3f2dfff67806e4292d9a1c0969cb123b659f6ba894f0b0294be51786f3a5ab2113f717eae SHA512 030d0616482a2ce7802d1bd65c799864149ddaf06d3c22318fee561a4d2890695e0c25ae0d98ee1073b08ae4f0b2b621db3670d2a7ea40b7df180f1a788fc8da
+EBUILD xbatt-1.3_rc1.ebuild 861 BLAKE2B 41fce4ef7cd38f4861736e812f8a04588e2df60ed33c708c8dacee05edef4e30f18d95bf25cb476007576b064aa6096d873705dae1ce22d34489e3233ba62a7d SHA512 8fc04e1f7fee3ff633e7c673d8ca2d219702549cdb4073c16b6d3e1cc7b5f72f43032b1b84c0b881a6179bf6cae0750afdc063abc497d902ace1a796d3581976
MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
deleted file mode 100644
index 49c4acc7577b..000000000000
--- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Notebook battery indicator for X"
-HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
-SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${P}.tar.gz"
-
-LICENSE="xbatt"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libxkbfile
- x11-libs/libXpm"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-misc/imake"
-
-src_prepare(){
- epatch "${FILESDIR}"/${P}-implicits.patch
-}
-
-src_compile() {
- xmkmf || die
- emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
- EXTRA_LDOPTIONS="${LDFLAGS}" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README* || die
-}
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index 58ae09abe576..75a3899848d4 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
LICENSE="xbatt"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="
x11-libs/libX11
x11-libs/libXmu
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index df465afd3942..8deca2aa5154 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
Binary files differ
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index b06786f87959..9a1c703f7362 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -4,4 +4,4 @@ DIST purple-hangouts-0_p20180328.tar.gz 149992 BLAKE2B a9db51f236859806625ecaa70
EBUILD purple-hangouts-0_p20170209.ebuild 1015 BLAKE2B a3fcd6c45af0492d1233147da2409609897a1d85d37fa11eeb43370e0481bdb5e7376a8c1f6924448b34f0f5133bb0280a7379e9f170a4ba9e50970cf2938f06 SHA512 09f723c5e6a72596ee4e1a231928ad1a9edb0bc021cf09f3367449332240c28ed58a759bb244f3acbacfb2e969e0b50bab1c02570584297176a1bd763a20c640
EBUILD purple-hangouts-0_p20170714.ebuild 1011 BLAKE2B b568a827ca99e1e42ec3f28fffb5da7d96828bb84cd3e3434f40571555d747a7b3c6adde943e79293e358da4fedf19ba515b133d47a7a273df4c633e73bb5ab5 SHA512 d1282849c7c6840194a0b54535a81682bcd130ca472681ec19afe8f8f29da37fd24078545ace929b47a67bdb8f20a2c75b5e8d63dad3d1dfa4228aade76bccd1
EBUILD purple-hangouts-0_p20180328.ebuild 1011 BLAKE2B fcdfa1998875f84f706e096b0aeaf7417ae0e36be53de0f60228e8935e1f2a6235d4dc6c6d68370bbcb2c5e3fba2a3ffc3e6d47b75aa6acb3328d3eb5d83e5ef SHA512 9391ccf695bf4656f03ed64ca065069f90b0145fb2243cfd0e212b2d70ca80e5f6ba0fafe78f9ded0f66cd628de67f7a6d89f2a1ce1be332d986570f4409be14
-MISC metadata.xml 470 BLAKE2B a42244cfde442d588ffb8b23deaa92433fedd6e2b79070e306b064fb32de6095576d389c705073ddc31bb8224dd87ffa5f38a29cb4e9a27b249a44cae4942ba6 SHA512 72f1c82216845e3b90ff499c12651f42d432b5765af83a5fa513df367d7a47d50acd5069437b896f61979979a8a077fcf91f64b32c91e5425864f0a66f035fc0
+MISC metadata.xml 264 BLAKE2B 85dada98abdefab04b759e2d9b9283f0e7ce51004efd5b11459b53ceed2465a864668d9a6b4f458039c4c7be75105170993d6bcb5fd026386ef00dc20b08e917 SHA512 c34e7ca664e98ccc80b9980da675d09b6752b0497f3dbaa707a7ccf5d7033cd54194cda48767de3a1be912378d2117e2c7c20acc618aab3e9659372dea0643ce
diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml
index c0019dc7a103..03d729b8c798 100644
--- a/x11-plugins/purple-hangouts/metadata.xml
+++ b/x11-plugins/purple-hangouts/metadata.xml
@@ -1,14 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>lluixhi@gmail.com</email>
- <name>Aric Belsito</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
</upstream>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 96f9bbc12e5f..aeffb81b3f10 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
Binary files differ
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 802f08f087ee..a080c52083ca 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,9 +1,5 @@
-DIST terminology-0.9.1.tar.xz 4961876 BLAKE2B 03aab7c5c0740bede4c06b90721d96c121500009b6dd939387e8bd3dae160b4c705cf95a724dd8cc404badc9b9d5f22a5321312f229dd488331e4c4c1e2b0844 SHA512 c6db9fa62f3f168be635da1e3ed7a13deba13cbfa5bed75e3f97ee6e13837ca9cb5facab48c44f200baed34b8f32f852eadd9844de648795733602602fae32fd
-DIST terminology-1.0.0.tar.xz 4979420 BLAKE2B cbc78b751a2e6812ab31c69a62ea4abe2bb53f12b647cea7adae03e54fe0a238c56c5c029c43057c3a1326c7c8af0412574a85a404896554a142ed068ab581ab SHA512 5c99e1e1eea0de24d67779059d3ba65a8fbd1fdf63d9f22099e38defc11fdc8923fbe50a7276bc483ce5ee7527f665e3f2c48358d85c3a06f33e551bd8ef2320
DIST terminology-1.1.0.tar.xz 4989512 BLAKE2B b2bcc22a63d25517aa4dd223b914a784d8c4c87ce9d971dff20b9f66b3ff0d2667babc053f3e1923d0bcaa5508902b824302420c0731173c96136d2071400f61 SHA512 ad4ecc6d51a6a124e90eb63d887d5f742500944747b469239366732587510717a227aa41a90089911cf1ac5b289228880619726ae95688de9a92972d554bf95d
DIST terminology-1.2.1.tar.xz 4858528 BLAKE2B 953917ed9dac9d17048d19394e6d8b38fd1673bc618cd1ecb596eee7b889f973b5622ef9d3424bc9f94928f44129062a7a4f88cdb2af519b87aeb141661902bc SHA512 8485d38a5426ac0f32b3cb049170bfa015a9f648134973462d72412b291b160f05b6ccfb3ba47115740946c8d87160401d55672a6853027d0cc216bdc7cc659b
-EBUILD terminology-0.9.1.ebuild 506 BLAKE2B 3097c37a90df56759cbaf924688fdfa0d54ae3f66ca0081fccde7a7f6a5b1d0555f93dd7ca5920079f5490a45f73792c7d24d9de709fcd7ddd55be8982213a93 SHA512 caff7eac7a6502dbbe1141f46ebd187979ff4c68660dada0e6f887a7415c178d53667d3d12486ea12350b9aacb9058e85bc251215cce0b10049c5b8ab585717a
-EBUILD terminology-1.0.0.ebuild 588 BLAKE2B a750d055620ae81bc6c700dd1878078383542bbc90a32c052a85c78a9e5755909ea77b5ab746d71cc1c7d11fdc9ebee789977c9efe7d3ed53fe2e0eaa32ccc9c SHA512 a68f7ecc0f45cfd251bd45b7d7363c89ab2f321f38480424106a8cd1903894c88fb4a5a506c585cf4002ed380261fdfb56f301522de3ffda7993e291a3b81c57
-EBUILD terminology-1.1.0.ebuild 589 BLAKE2B 9901c1608d2b7fa8b9d9f4f9d993391316f4fd901764064c4860d016a729d51c449671b06e4a3a53a0b105244789b7ef795cca8a6c5c985a2bc9691cf5937940 SHA512 d2fba97aaf09e16f20f3b126a4d8c1c6d6a18b01a5158ae4baa90d689dc2bd8e534d68d609ba2ae2ffa130e8259211b78dc78dd08c3e969911f9f5ede28e37db
+EBUILD terminology-1.1.0.ebuild 600 BLAKE2B 8311f2356fcf22ddce03adfc341dea0a4e0c00ca112a6019c5335c68ebc5b14dfea5f7a77ef38a19f1e39fe7d76c6d348a0dfee9bdea7dfbdb34eedc49327e88 SHA512 c251bcfad8907496aead3efb018fb65c2beb7e220839ac1cf596033a6220c6d44cc3da6edcfa1f8dff75e3d1be6cb2ab6837b9ec60487e00d04fa8cb57fa4258
EBUILD terminology-1.2.1.ebuild 700 BLAKE2B f0c11e7f43f92092af3c9b018e060dc571bda815d6c72cb4ee7b7768a22bbb54bee0cf6b74baac73b914cf338f2c96d2ae181edb2ab5e265827b348b9e41afb0 SHA512 084aae49a9b8c1a69c2df6064c5b9cb2b8a7f0e9fed8241d1166cae0e0479faa8ca29b5f24f822c9bcf256533a7fca24de112e7e3faa4afd3d9e1bb4b68e73e1
MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-terms/terminology/terminology-0.9.1.ebuild b/x11-terms/terminology/terminology-0.9.1.ebuild
deleted file mode 100644
index 9b08d95ad0d7..000000000000
--- a/x11-terms/terminology/terminology-0.9.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/efl-1.15.1
- >=media-libs/elementary-1.15.1"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-1.0.0.ebuild b/x11-terms/terminology/terminology-1.0.0.ebuild
deleted file mode 100644
index dc28f45542c1..000000000000
--- a/x11-terms/terminology/terminology-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="apps"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
-
-RDEPEND=">=dev-libs/efl-1.18"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-1.1.0.ebuild b/x11-terms/terminology/terminology-1.1.0.ebuild
index cd65d6cd9025..bcf5de53d091 100644
--- a/x11-terms/terminology/terminology-1.1.0.ebuild
+++ b/x11-terms/terminology/terminology-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="nls"
RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 4ef8c1345465..bd5b6ed0eef9 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -2,8 +2,8 @@ DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af754
DIST xfce4-terminal-0.8.7.2.tar.bz2 889974 BLAKE2B cf3aff96e0038f77fd40dcfd6dcfad898a85bd607ec6726606f4537864d4d222b7171675872e40a8c8133aafeedefd9fb9dfb5f3bfa3f2cae490dd68b1ccde13 SHA512 adcf43c6f9c8512ef82548347af985a2e23a7d88a2aea51eb48a483108cb23fd5fee7736b4cf85a6eac6911e063ea4d395d8cc25feee153ecd83250fb139ac5f
DIST xfce4-terminal-0.8.7.3.tar.bz2 867967 BLAKE2B eaabf7ceefad7b9dcc79ce034fce3066cc2601c0cdebaab9e8c52688652bc49c6114dc2af735ac4bce15a8651f2fecd7a159ebe5f013b0c185b526f681a6871f SHA512 e7ff54c877d5ca20820210125b13fdd1bc6323ff8d56400ea284e1968eea6a907392e1a1edd78b06b5cf4595d1562fa1f86fce6d5f0c8cb09ba4857e1587a4a6
DIST xfce4-terminal-0.8.7.4.tar.bz2 884272 BLAKE2B 563223180cf781fa1723821c3851e60e15fc59473bf8608f781b8dffac052b90fbe4be672d4d878ffd00686ad992e2d5c53dbfdc80539e7197dcb631314f3370 SHA512 de56c08d5be47583484acf9aa5b3c0a0f14b1ac2790e0f6b59db61f80d71f871ff87e94f9353a0cc187cf1d9dff643e40ce15ed60a24d550843d898eee3d62dd
-EBUILD xfce4-terminal-0.8.6.ebuild 745 BLAKE2B dab102d7822ec3369d8cc09e97b2e5b45fef2f92a21e004cce4d748e2513d30cca8d769fb22b620866512f9d6994bf22fcea9a39cc760a77268adee1e9b14fc6 SHA512 c0304379a586baecb4953c9cb10bb72f8a3474e180332b30a030590d8211012584b4cadc1c7dbd471ad57e13e05e6ff4dd735fe5479f3d3d0bf82e78974525cc
-EBUILD xfce4-terminal-0.8.7.2.ebuild 905 BLAKE2B ac01f1882764a6215aa233a2a79e1959df12b6203fb82521484f42afcf91b14fd79087c097d7b38e09d6a425432d3e77e8723cf466af935fa8eee08a0acd5af3 SHA512 14ec7b83e6eb753599c3978d8be448b66e08baca19d066965b47ae7932a60291fefd4fe44addc4914fc6348b6c2499b0a5dfbcb10ac5fd0dffb53de3335ff833
-EBUILD xfce4-terminal-0.8.7.3.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
-EBUILD xfce4-terminal-0.8.7.4.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
+EBUILD xfce4-terminal-0.8.6.ebuild 756 BLAKE2B caddd27cd22e501a13913de350c7e5ef33a3b1c5df248306767976a360fdd84f5c5adffa3454532972a5856c7f04c697c68e80540a9f37083b283c9b72cadafb SHA512 399cfb8395511940f73fdd9ec9f5a99110c6297de94b648e02e4f767bb251cbad8a3df113a0f671bf2d0093d98a2c62eed3158301f8953a8b52c8404620b81cb
+EBUILD xfce4-terminal-0.8.7.2.ebuild 916 BLAKE2B 4bf540b1032e08a7812369783f8c1bfad7fe8c4aeb1203c84713bd9b656ea82fc2056c1f4750dec9ac0fd20cf3a74dc6b8d4bc419e8ef4bcfb99f43f6979a3e2 SHA512 19c0fdda62023d982c3e818c184471472a43605e0cca4a2bf80bab90adb0a4b6a647b8bc054c559a93a6b3985a4c966464f7bd5fcc205c5a03d38e851f7b045a
+EBUILD xfce4-terminal-0.8.7.3.ebuild 923 BLAKE2B 241fb14226549b3a57c4a228a17619ad3e58ef8ffb83a774da658c82648bfba55de37be2829b3d9ddcf587f5834a8d0eca4aec34c64e53893d0e321ad33386c8 SHA512 faac66d049213d220bbcd73c6911cb9c1237ecae99f24e879aab888e44e5ebaf972ab29399ca50a8a25c57f057875e947507e81a4ef26db5cb9a490c9636e0b9
+EBUILD xfce4-terminal-0.8.7.4.ebuild 923 BLAKE2B 241fb14226549b3a57c4a228a17619ad3e58ef8ffb83a774da658c82648bfba55de37be2829b3d9ddcf587f5834a8d0eca4aec34c64e53893d0e321ad33386c8 SHA512 faac66d049213d220bbcd73c6911cb9c1237ecae99f24e879aab888e44e5ebaf972ab29399ca50a8a25c57f057875e947507e81a4ef26db5cb9a490c9636e0b9
MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
index 04c29e9dbcdb..ddfe33c40c91 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A terminal emulator for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
index 4e2bad9bc191..1730de65cad0 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
@@ -7,7 +7,7 @@ inherit eapi7-ver
DESCRIPTION="A terminal emulator for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.3.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.3.ebuild
index 4ed3b8ddca72..a17111ccbe3c 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.3.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.3.ebuild
@@ -7,7 +7,7 @@ inherit eapi7-ver
DESCRIPTION="A terminal emulator for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.4.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.4.ebuild
index 4ed3b8ddca72..a17111ccbe3c 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.4.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.4.ebuild
@@ -7,7 +7,7 @@ inherit eapi7-ver
DESCRIPTION="A terminal emulator for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 86715dc71c60..5e5ed8010542 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
Binary files differ
diff --git a/x11-themes/experience/Manifest b/x11-themes/experience/Manifest
index 57f70f1d4c4c..d3590bedace8 100644
--- a/x11-themes/experience/Manifest
+++ b/x11-themes/experience/Manifest
@@ -1,5 +1,3 @@
DIST experience-3.04.tar.gz 108140 BLAKE2B 0909eb0a55fcc27f806ccebcf4ebfa8fef53e753227bf04accd4460c0ea4507d9627c7a2796a4fb6fad1841b9c032de0397e72ce62a623a0cd6756578340ddce SHA512 528c282fae43da76d88401dc1225cb8ce357e3c2786d5848bfdc3560692939837a813d7689f2136ef1cf8f832390a8619c4736c0ff99ea5a2c1818be2cd47a81
-DIST experience-gtk-3.04.tar.gz 108140 BLAKE2B 0909eb0a55fcc27f806ccebcf4ebfa8fef53e753227bf04accd4460c0ea4507d9627c7a2796a4fb6fad1841b9c032de0397e72ce62a623a0cd6756578340ddce SHA512 528c282fae43da76d88401dc1225cb8ce357e3c2786d5848bfdc3560692939837a813d7689f2136ef1cf8f832390a8619c4736c0ff99ea5a2c1818be2cd47a81
-EBUILD experience-3.04-r1.ebuild 951 BLAKE2B 3a53c8fcf8e8759c8400af85f65195087d7c4233521093cda3afa112e137f63c73c615d1e032ca8933c8f5fd123012e760a295f675c9e3b75f00d8501e5421a0 SHA512 971afbd4226ea80e869ae9f9bf5e8b811e1c5d6832f21687755dd7b6b9b59ac4c1fe921b41afaa7cbfea33e887fdb6584154be42dc92617a51e50c58fb329cbb
-EBUILD experience-3.04.ebuild 981 BLAKE2B e1ff9cf7ffaf5182e3e615e1436b6f6817aece92bf76038145bf0b844625681fde5b2756c1fe95e91535d696df7dff89300a0cbfedd45b2a179663661a00b4f8 SHA512 16f8d237087be52f33eebea4a5232fb63829cb0785955dc77ab4e2bc5fa47e68287d75e81100277f3ee73c813fde187e13eed6123245aebd0690ed4019e96819
+EBUILD experience-3.04-r1.ebuild 950 BLAKE2B 7e0ebdc0b6fadd242e75316007611c6ec76c7ccd97281252d9f6a65394320b83e6dc9cadbf538df95213f3bae686801731f673df0a8390db226362696edadc20 SHA512 9b39c0b87ce382dfb763682a93cfbbaf426affe49e1972644f353373100f86d8d8b4b7fff0ad9b8af3912a3fc08e87d9726715a8623aa60756f9254009ca357b
MISC metadata.xml 331 BLAKE2B 683186b8efe651ffac30992e60113dcc94e5f89edbc0f9ba2fc426641f6342b655da48a358d0dca02fa81184bd5b4e46366672cfa1539a21e0c4e4b6fe971bbe SHA512 4730233c5d83eca88c8dd674e421d3fc04eb65c94f5a64aca8273410fdd8b670f2a88f155ea26ec029538940c0e896c504f5ded9b8a526b60a729c2427dc6ecd
diff --git a/x11-themes/experience/experience-3.04-r1.ebuild b/x11-themes/experience/experience-3.04-r1.ebuild
index 5e5f3ebfcf1a..2c334ee3a0d1 100644
--- a/x11-themes/experience/experience-3.04-r1.ebuild
+++ b/x11-themes/experience/experience-3.04-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnome/teams/art.gnome.org/themes/gtk2/GTK2-EXperience.tar.gz -
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
IUSE=""
RDEPEND="x11-themes/gtk-engines-experience"
diff --git a/x11-themes/experience/experience-3.04.ebuild b/x11-themes/experience/experience-3.04.ebuild
deleted file mode 100644
index dce8d130b177..000000000000
--- a/x11-themes/experience/experience-3.04.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="GTK+2 themes which copy and improve the look of XP Luna"
-HOMEPAGE="https://web.archive.org/web/20130730053042/https://art.gnome.org/themes/gtk2/1058"
-SRC_URI="http://freshmeat.net/redir/${PN}/50795/url_tgz/${PN}-gtk-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-themes/gtk-engines-experience"
-DEPEND="${RDEPEND}
- sys-apps/findutils"
-
-src_unpack() {
- unpack ${A}
- cd "${WORKDIR}"
-
- mv "eXperience - ice" eXperience-ice
- mv "eXperience - olive" eXperience-olive
-
- # Don't install index files, since this package doesn't provide the icon
- # set. Remove cruft files also.
- find . -name 'index.theme' -o -name '*~' | xargs rm -f
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- cd "${WORKDIR}"
-
- for dir in eXperience* ; do
- insinto "/usr/share/themes/${dir}"
- doins -r ${dir}/*
- done
-
- dodoc eXperience/README
-}
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 699e3acf2c13..af6af33443b3 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,16 +1,6 @@
-DIST greybird-1.2.2.tar.gz 112022 BLAKE2B 9353a38352099fb8700e2a4e575c8e46cfd04bb5722869cdb64f864f33dc7965dad596b4a780faa6015bb8bdab16a32290c74f18462aab3fbe5e34705889deae SHA512 0384647c51e6b473f104c10d5418f8d1e465190dcbfdaebc9946f47cab77e90d7c81555cf94c47298a053e150c6b92adfd0d5c84f20f2b5f2ebcc0e12cdb444e
-DIST greybird-1.3.4.tar.gz 116901 BLAKE2B 57bd83de788899eff18bb019eb79e1e270c803945701b20fa950f914208ef3142845c3ab358ec126a57a8e15fc08cd75588be3c7d7c96896afc10052108302ca SHA512 78bb9372d9c05c7c83ae130a3559f7b1f413bb0519d5f626d477bef917ca35892c7b0235872a084720fdba5aa5b381401fb36f7fa11dea00bc0986c76670c286
-DIST greybird-1.5.3.tar.gz 118732 BLAKE2B a084aee7520a5d9861a631ccbeb667669bb66c59906a6a6bf8a2417dc059aba91eb91724794c0e41b55f5fcd458ab6626e1c8bfc389629256bdd2e0621be9c87 SHA512 1010019b1341cf1c0d48d15d0bc371bbe62e3b6d4aa5d8feb6998093487f465c7dbe42133753a6ca74a01e351ce7b15fcc14c4e194a97034e2e4c171885accae
-DIST greybird-3.18.0.tar.gz 133088 BLAKE2B ffa7cd5cd444219fea5db3a2755c4d9e4f7b9ed1bddcea6a5f19167a0c89547a14c18edde26907887aff82e7235026f7d3f7e590dc26e49fa552d3ad0e4938af SHA512 0f4e9161a8c99dfe2569ba755af819dbb14a75ca11816deccbcdb057469e697e0adbfe8af6deafadf629425b83d96ccfe0c979cde0733e516d9203061700820d
DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.3.tar.gz 194488 BLAKE2B 7c6f6510723cc2f96b2fe878e6ad8304accf89b34db7ed56fa2ed45234e880c6fc8a5b9c82e6c58400174d0db3e4352785fea06c0124ce5ff24ac6a69592e88c SHA512 2a36f8eeddf95ade7d91b882e80475f7db840bd749ba76deb2bc223868ec0c0020ddfc60b0055091478f5a8313f545f5b44088ba3bdf8213ec82924c8affc90b
DIST greybird-3.22.8.tar.gz 211084 BLAKE2B 958b1dd837bbf91c40ef9ec3e5944d24d83d984e46b53cee8297dbf93931efd3f2efbda496929c3ced875f7a1d9046804b48b870bdca37a7bcffd57271e80470 SHA512 c6ac0dafc926ec2a0b01b4d44f602e533f97f806be32096208c08461502cadcda3f1e63012ad78ffaaa9c791c5af72ce2b7e0578b1f7c0d3ab407763bc40f94b
-EBUILD greybird-1.2.2.ebuild 885 BLAKE2B 509cfe380945c9a7882155bebc5ec03c17f374b2ace8c7f9625869103df50aa6d082f0636879e6fcee72eaff15185c69146d2ba4f1f5256a4c18d35fdd762492 SHA512 acff693b4476810cd25fd2c299be0c0c00556d7dc6b75d8d91bc1c224da942b0f97ea1dbccfa98cd652fb142ed911b98e57b8bcb30de3260c6dcbd977325ff28
-EBUILD greybird-1.3.4.ebuild 946 BLAKE2B e976312d446fae0cb920bf49f5aa71dadde2cf0d2b14eebc4e3f769348fa5cef1169a9c7bd2e4394f2ddbc557b27b96d486466866c4f380f9c995368d04e8638 SHA512 71d8d90c95400cbf588d290f0ed58935b36ec6480878737d232d7ad5ed76091778474657e28f22c166923fa3dd155eecbb6586c54bd775d7aedfe851ab4151d9
-EBUILD greybird-1.5.3.ebuild 944 BLAKE2B 2ef6b96d4c87082b86db66e9c905f333e6efb63e6a4f3296c7365c63ca55e330c70e995789cd7dfe02b0a7062c0c5662f7004cc09866240afd4159a4b330fe83 SHA512 92890d3329ea1151b933e0ccbe4ea33e3f2dce4689272c3a289ebe05e585a308b74a16017fbc51fa3801aa2d36152599f658dee8042dad9ca0aad99da372e971
-EBUILD greybird-3.18.0.ebuild 1149 BLAKE2B a7cc7bd66b2a0456c78616d7a790fa06c84d82846e2e370720d01e043852cb4d2d6d28f65a6bb9f55d942a4878a5d4b55572af57e76723f08976f4ee3446a165 SHA512 85195bf47f633d8153b6187c0e914eac62cbd6456670605407b5ed8f54e66484402b2c94fcc40a7e3e9ff5a5a1d5f7b06c70c7944e4f724d4c0a1664fdb59523
EBUILD greybird-3.20.1-r2.ebuild 1334 BLAKE2B 9345926c3d85689c910c590ceb36a5368129c09790adcf091bd8cc358a9696706490451294149640a5d127c0167e01252f1c36687074103dd4a1af140b96a455 SHA512 3334a278c7ab07961de8e545aa75355136dbe770c1240ccd3ffc15bec2fe0498083a4e6566cfab9e5296993eca9f37fbc1b0b65e7b36d1bfe8ac29175150b783
-EBUILD greybird-3.22.3.ebuild 1334 BLAKE2B 3c752c9d3f62dd441a139c89045fde6e788f23a4d3e6dc141ce2bce83e4e0dac4aa651c7932180ca50360dfce2b9b0f2aa747d96d4f8c9cda9200e783df5b26e SHA512 42835eff7af784a67c1d24bb6a66535fa43f3f13d95af1ac548135f5d8976afe9afa71d635b61ca93acfefd6aedfbddc9d82c702530cc4ad0d35a52513d5c542
-EBUILD greybird-3.22.8.ebuild 1334 BLAKE2B 743d33fe01a1b098231289347b19693fcca7d3cc02786fc210e852223139ee6e73ce6ed6ba119cdc23d4369cd9281ca8fcda6aa5e82eda66d5eb7d26527af773 SHA512 7a7ede31ca25a85ffc9288263c1fa7bb360e1fb3b441b741542fb755220ab20379ce88f8af1d49746e680b4a608b222dc1b38cc1fcd8c49a722d0923c243830a
-EBUILD greybird-9999.ebuild 878 BLAKE2B 20ae797da9569039a2c37839b9bb43e4e5eda87fa0b4944d88a287c18ed6c9698036cf6ab42cc7fce2c77cd381d8df7d2a67e7d8fd42c544014cd387521192ad SHA512 534763be5f8ca2de8af0ab7ea606a0d043d9b9b30e33e6d5fc62c637d36bd59e08247b409f9cd9459a507544b4553b81e43ca4e15edfb1729ca8d3e3cd1e9b2e
-MISC metadata.xml 374 BLAKE2B 0aa19bbf371e3bc39e050647220cb73eaca379b266c55c220713eb4bcf1c41a6142a5264d90e2e8723034506d12c373e191766805883f3ef5c7a9dc536dcc436 SHA512 b5267663c1c10dde8dad040af61482e50646f583cdd696e06e97f52d6ae28ed4d2e302179646d2eb4f7c3fda197b42238de50d55738048439643ddddc1b01d9a
+EBUILD greybird-3.22.8.ebuild 1338 BLAKE2B 5acae1774de4ca86032452f47d41f9cb5765b8895b0ea0d56dd9c65edb2968f29d425d930707e0b387b656671835f66f5ae9291324a3b85644ec20e6f83e2e09 SHA512 cae81741dad1726a8d50d543f0c19415b9a1f7651fb57c135f98a95fcf22afa21abab2f2addb19fefbed4adc1a984ae2e18a3d9684deebf32be249f50c0b5f17
+EBUILD greybird-9999.ebuild 1234 BLAKE2B 8c91cdbccd7d64115727444ac89de4b05775abe1835c57658bd30c8782e93489e6ddc1198e52820937425c11e19b4a428f4b5e9af20245aa75f0b6e7913d4bfe SHA512 e2199ba7670b80c6156412b3b5d5923e528e95dfa60078f3cbdd5587d6ef2064617d906391403b7cb3daac0de22add53839100eecbf5e1c149f7c75dbed01494
+MISC metadata.xml 364 BLAKE2B 8282ff88bef556b0960a4892d8daeea81ee1dfa2a893668ba1f28a6edcdc931a668136461d7ec56a205f636fae9dda3cdd93b68e4a62c7ce1e856b4b03549b67 SHA512 e111800ac19d8e86381866fd00115a67d11c33eb35871a7fcf50beecebabf9eee26290b32c3928126f5f8c8a8a530c5f2afac301464c193429cfe1504af8b44b
diff --git a/x11-themes/greybird/greybird-1.2.2.ebuild b/x11-themes/greybird/greybird-1.2.2.ebuild
deleted file mode 100644
index 7f1d7f47c190..000000000000
--- a/x11-themes/greybird/greybird-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-NC-SA-3.0 || ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
- unpack ${A}
- mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
- dodoc README
- rm -f README LICENSE*
-
- insinto /usr/share/themes/${MY_PN}_compact/xfwm4
- doins xfwm4_compact/*
- rm -rf xfwm4_compact
-
- use ayatana || rm -rf unity
- use gnome || rm -rf metacity-1
-
- insinto /usr/share/themes/${MY_PN}
- doins -r *
-}
diff --git a/x11-themes/greybird/greybird-1.3.4.ebuild b/x11-themes/greybird/greybird-1.3.4.ebuild
deleted file mode 100644
index bb3735b637ab..000000000000
--- a/x11-themes/greybird/greybird-1.3.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
- unpack ${A}
- mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
- dodoc README
- rm -f README LICENSE*
-
- insinto /usr/share/themes/${MY_PN}_compact/xfwm4
- doins xfwm4_compact/*
- rm -rf xfwm4_compact
-
- use ayatana || rm -rf unity
- use gnome || rm -rf metacity-1
-
- insinto /usr/share/themes/${MY_PN}
- doins -r *
-}
diff --git a/x11-themes/greybird/greybird-1.5.3.ebuild b/x11-themes/greybird/greybird-1.5.3.ebuild
deleted file mode 100644
index e4902bb200e0..000000000000
--- a/x11-themes/greybird/greybird-1.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
- unpack ${A}
- mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
- dodoc README
- rm -f README LICENSE*
-
- insinto /usr/share/themes/${MY_PN}_compact/xfwm4
- doins xfwm4_compact/*
- rm -rf xfwm4_compact
-
- use ayatana || rm -rf unity
- use gnome || rm -rf metacity-1
-
- insinto /usr/share/themes/${MY_PN}
- doins -r *
-}
diff --git a/x11-themes/greybird/greybird-3.18.0.ebuild b/x11-themes/greybird/greybird-3.18.0.ebuild
deleted file mode 100644
index b88c112859db..000000000000
--- a/x11-themes/greybird/greybird-3.18.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# IUSE="ayatana gnome emerald"
-IUSE="ayatana gnome"
-
-RDEPEND="
- >=x11-themes/gtk-engines-murrine-0.90
-"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
- dodoc README
- rm -f README LICENSE*
-
- insinto /usr/share/themes/${MY_PN}-compact/xfwm4
- doins xfwm4-compact/*
- rm -rf xfwm4-compact
-
- insinto /usr/share/themes/${MY_PN}-a11y/xfwm4
- doins xfwm4-a11y/*
- rm -rf xfwm4-a11y
-
- insinto /usr/share/themes/${MY_PN}-bright/xfce-notify-4.0
- doins xfce-notify-4.0_bright/*
- rm -rf xfce-notify-4.0_bright
-
- use ayatana || rm -rf unity
- use gnome || rm -rf metacity-1
-
- insinto /usr/share/themes/${MY_PN}
- doins -r *
-}
diff --git a/x11-themes/greybird/greybird-3.22.3.ebuild b/x11-themes/greybird/greybird-3.22.3.ebuild
deleted file mode 100644
index 8f8ce5e67bfb..000000000000
--- a/x11-themes/greybird/greybird-3.22.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gnome"
-
-RDEPEND="
- >=x11-themes/gtk-engines-murrine-0.90
- >=x11-libs/gtk+-3.22:3
-"
-DEPEND="${RDEPEND}
- dev-ruby/sass
- dev-libs/glib:2
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-#RESTRICT="binchecks strip"
-
-src_prepare() {
- eapply_user
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
- use ayatana || rm -rf unity
- use gnome || rm -rf metacity-1
- popd > /dev/null || die
-}
-
-pkg_postinst() {
- if ! has_version x11-themes/elementary-xfce-icon-theme ; then
- elog "For upstream's default icon theme, please emerge"
- elog "x11-themes/elementary-xfce-icon-theme"
- fi
- if ! has_version x11-themes/vanilla-dmz-xcursors ; then
- elog "For upstream's default cursor theme, please emerge"
- elog "x11-themes/vanilla-dmz-xcursors"
- fi
-}
diff --git a/x11-themes/greybird/greybird-3.22.8.ebuild b/x11-themes/greybird/greybird-3.22.8.ebuild
index 0e52f4581388..aa8b49e170fd 100644
--- a/x11-themes/greybird/greybird-3.22.8.ebuild
+++ b/x11-themes/greybird/greybird-3.22.8.ebuild
@@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="ayatana gnome"
RDEPEND="
- >=x11-themes/gtk-engines-murrine-0.90
>=x11-libs/gtk+-3.22:3
+ >=x11-themes/gtk-engines-murrine-0.90
"
DEPEND="${RDEPEND}
- dev-ruby/sass
dev-libs/glib:2
+ dev-ruby/sass:3.5
"
S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index ab2fb8815922..395fa8e0a143 100644
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ b/x11-themes/greybird/greybird-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,12 +17,12 @@ KEYWORDS=""
IUSE="ayatana gnome"
RDEPEND="
+ >=x11-libs/gtk+-3.22:3
>=x11-themes/gtk-engines-murrine-0.90
- >=x11-libs/gtk+-3.20.0:3
"
DEPEND="${RDEPEND}
- dev-ruby/sass
dev-libs/glib:2
+ dev-ruby/sass:3.5
"
src_prepare() {
@@ -38,3 +38,14 @@ src_install() {
use gnome || rm -rf metacity-1
popd > /dev/null || die
}
+
+pkg_postinst() {
+ if ! has_version x11-themes/elementary-xfce-icon-theme ; then
+ elog "For upstream's default icon theme, please emerge"
+ elog "x11-themes/elementary-xfce-icon-theme"
+ fi
+ if ! has_version x11-themes/vanilla-dmz-xcursors ; then
+ elog "For upstream's default cursor theme, please emerge"
+ elog "x11-themes/vanilla-dmz-xcursors"
+ fi
+}
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 1f60df2aaca7..be797ac505ab 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">shimmerproject/Greybird</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">shimmerproject/Greybird</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index 9c3c9727a702..dd70af0a23b1 100644
--- a/x11-themes/gtk-engines-xfce/Manifest
+++ b/x11-themes/gtk-engines-xfce/Manifest
@@ -1,6 +1,6 @@
DIST gtk-xfce-engine-3.2.0.tar.bz2 376203 BLAKE2B 700584aeea0708dfc1cbad521ba96578141eeb21bbe23f48ad36917476b32bb97b9ff60537a5a372fbb48a805fb002128215a9a9bcb71422641c0ab2a9d12154 SHA512 c965e597c1b4aa04f3b474f3c4cea249aa6e753be697d5d3d7a19184adca650fc084f39acbd357f53eaf4180d96d5d3499866367e221ae445de4864fc9487012
-EBUILD gtk-engines-xfce-3.2.0-r200.ebuild 961 BLAKE2B 1a7d185cc5c4e88856079d341003cf1e3b1ae56ae0f8d662cd01df16c018ce98a8dfb870a3e52ba1d2ed56c2d5f1a23093360e95e8623c0bfe3b43fe04db29ac SHA512 8661f3184a06031c0e0272e87df374905ba0ff0b3bcff96bee86a309eb9ef9fd27c09be669beeba3cdcaafa265d0ffdf364eb2367f7105a50ce049681ca555d8
-EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 916 BLAKE2B 3ad59b3cfc89d65ce828199e32265add62586dd5801e692dba42d2c8d83b88c57e75032a31aafd2cabef86afcd806e816e640f3f59fa7fe73eca4593c46d06d0 SHA512 ed72186dcfddf937944398610603327e4ee8df57d2ef8b085fc917d75ab2153b969025d5dc426b744137deb4bb146859e095c0c2f720df2bc40e4bd57539276a
-EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 952 BLAKE2B 9f113b6a6e015ceb950c4335e158f5744e8dd63ae5800383ef53c6a8b7d4d143bea4ef19271ae9aae6ab47b5734c709b7f775239f1e8259c36650c3032cbebe8 SHA512 c31ce787a2bfbf00b51aade21bf0a13e1490e7844f28d626453c4acba871bf14f07d28ed0e0c31f545e553340fe634ee791c1cdf34f3a9f5585e5da7b75ef905
-EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 891 BLAKE2B dab50b81e2636caaf64eee1d061be1ac81811264bc583383fb854f06e6c14d74f8354d562dcb7c057b1c0c5e177602fd7a6c1812896b3aa4ba486fde3a111272 SHA512 38059ef0ab86203e0874e2c8aa97d634501ee51df1eebdaef2ef5718fbc4820df9ec7974b1e934a05a1b526772d6137c99f153da449e4cd0206a2fc8e8b10739
+EBUILD gtk-engines-xfce-3.2.0-r200.ebuild 972 BLAKE2B 7e66efd9f398928f235ae696813e64baf79b22b66c0b09128475b99329608513031c2cb7285c36a3009d3efdc1f10e96755af2fe72d89770ae84b3ff0331d841 SHA512 06ef08131e8a543f426f8a3d26eb8781ee6fbb74b5e78c848db9598ccc2f8659eba90cedde064d05490d21af1722684f44352aba0d0ac745c28d1a34faa3f13b
+EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 927 BLAKE2B 390f01f310391b2c9b8abc7830faf0a7c5e8e180b7b87268c1b318bc2b1e9f0a44eee2a675b92d4ba3feff2f51aa2c0b4544bfc6888af8c681ac4d2c901ea01b SHA512 0ec27229322c13f6de71030699be150f7937da3e6a887afc5f4ec85fcf12448651cfbadcbdc3ee05da265eef98b1856dd82287d25989a19e5e65ec9aada5333d
+EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 963 BLAKE2B d5ea466648cdcb7d376a16f58bedf37dc76902a734b272bf8e70fdba689f63e5c50b89bdff7fe0d20fd5658c5dcfc3f9430f2d8b03f361d1801db3397273037a SHA512 ffef8d32f14efc88be776723c97aff5854cca4dbb8d7cdf0c044e9ec2a5883d94a163c44a48f30307dd0617cbe61c19b36ab252a092c1aa0619f2541306e3057
+EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 902 BLAKE2B fbf1455e965c78a369aa06d77a507d2a214a722d0ce9eb3db8c755fdee62f6c5f4d14b810d08e47f32cd012086792af5d4a88935807f0d96215a0ecb7461d8c2 SHA512 d8431b720c39700e236d51d720000921887acc37098bcf83cb03dc84d91cc5755bc866881fb0cf2c525bda28258336a12d9f37a34110c2f6349f389d16c994d2
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
index 637b867fef9e..f50cddd2a1ff 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
@@ -7,7 +7,7 @@ inherit xfconf multilib-minimal
DESCRIPTION="A port of Xfce engine to GTK+ 2.x"
HOMEPAGE="https://git.xfce.org/xfce/gtk-xfce-engine/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
index 87d432f8a438..b81e0cf61d5d 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
DESCRIPTION="A port of Xfce engine to GTK+ 2.x"
HOMEPAGE="https://git.xfce.org/xfce/gtk-xfce-engine/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
index 4002d528b706..18c83efc8449 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
@@ -7,7 +7,7 @@ inherit xfconf multilib-minimal
DESCRIPTION="A port of Xfce engine to GTK+ 3.x"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="3"
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
index 784947e3a22a..b0a291857673 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
DESCRIPTION="A port of Xfce engine to GTK+ 3.x"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="3"
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 07e60725a1f1..37ec56c3d5ed 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,6 @@
AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1960 BLAKE2B 4587c07047c0f21fe3f63d95eee9cb771fe453e51aa4c7cc6a10ffd456b5fa1f11b9308e35410b9a3ca003066481cb107aed1652f6a6486411431075d83aa1f2 SHA512 e406769e290be4e2bc1a2589b164d0d72cb532cce33804a331b948e0c4d0b01c58a14fb83e6ca01b449ba30793a1c7ab504a1e41669b7d0db2731f4fe4cc71d3
-EBUILD qtcurve-9999.ebuild 1912 BLAKE2B 5995c2956da4675290c0b4d688dad677b58c9616d48b32413bbbb44c4f41ea3119d73685775309074f528b237f01b78bb9994587af11681cd09aa9095f332ddd SHA512 2b4a358871d1ed0daf8d8769301edc6c0735a3f6039a168a92db40fa8e357c20b3c8b7ffa6a247d41551062415c3955751bb75dd01b92bd051c80d05c8232fae
+EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539
+EBUILD qtcurve-9999.ebuild 1939 BLAKE2B cc64e737f57f494291cc957c4e23dbbf5f0c034f01f9340a77934f84cba43b8352e8d004889b344a7821aa3db3eda1bb8ca5707b9bea2044c41810cd8489794e SHA512 9ff4d5abf4d4d53136f4fc38b780ebe334a91d11eb2f334f4d1081844ed4012263d2ca70650375cef32721b743d9c48927a39f9fa4ca0ab43768b88757e502a6
MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index e795ba2ee0fe..752def4b821b 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+ECM_KDEINSTALLDIRS="false"
KDE_AUTODEPS="false"
inherit kde5
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index d5f28086e7cc..9a99d8eec626 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+ECM_KDEINSTALLDIRS="false"
KDE_AUTODEPS="false"
inherit kde5
diff --git a/x11-themes/xfwm4-themes/Manifest b/x11-themes/xfwm4-themes/Manifest
index 5380126278a9..d8160a9e9126 100644
--- a/x11-themes/xfwm4-themes/Manifest
+++ b/x11-themes/xfwm4-themes/Manifest
@@ -1,3 +1,3 @@
DIST xfwm4-themes-4.10.0.tar.bz2 621206 BLAKE2B 42cc46f8b3ac4584f33273373a54f3b31a5ae7c3dd3ae0bee97b2d6e721fd1d6263964c90fdfb5f53fc1c8c138ff07b7c0b4000661ceea4f074a23788f74886c SHA512 5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305
-EBUILD xfwm4-themes-4.10.0-r1.ebuild 535 BLAKE2B 17841945968fb5b9621915d0ad47d289b77babfe116354b78722fbe3af7a5b89368ef0eaee5a021709f02da565b826b8cf082ea78f69810283bc958c1163a96f SHA512 4254b7d652d763039ab2748b9de65ba9bfa34520297e10909e19a148e379503a7ea042e529e7e15677e828f79850946047100fa64c084792c0671a0b5a1ec7cb
+EBUILD xfwm4-themes-4.10.0-r1.ebuild 546 BLAKE2B e5012514c2e9d8861c9a4b4f172ebdd010b584601c215e12c598ba508a5ed74f6e672c15b2d9fdd7810c2d7268d7365e8f7085bc8dc05fa2d87722cccd4fb7f2 SHA512 239d31163fd3908973f7914a4ec0a35c9bb0545eeac60f21dcdb11735bfa667a75fd7f1d1861b15b5590816d8fd53f9d416c73db7576a92c8f21b9a74aed17b3
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
index 1f1f4de7069a..566ecfa1a40a 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Additional themes for the Xfce window manager"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/x11-themes/zukini/Manifest b/x11-themes/zukini/Manifest
index 3c546b4372fb..c59c86c64df3 100644
--- a/x11-themes/zukini/Manifest
+++ b/x11-themes/zukini/Manifest
@@ -1,5 +1,3 @@
-DIST zukini-20120806.zip 195927 BLAKE2B efca985f735de11b2a8681c139a8df1dd6c3b5b58cd9dd0e9043c25d449d29dab6397e4d9cbb42cd7be7aefc7bc1eb37cb05c8c65f7abe7fbb49b7df565a4a17 SHA512 90e663645ec2c867b88a8d02d940bed70270a940c7162ce761c5d7018a1ad9a2f11c3b547ac1d470f19a3729533836cef8cc53bdc18ea89eb293265c51f37083
DIST zukini-20120817.zip 195930 BLAKE2B 78ba7fa7fe5d21add63f1f5028d1616ea8a9cfbe885ea1b373a60ebc6c9acc1d0b7798a585c958ba092f52b6fc05bcbab8550d7524828983c665060cfada689b SHA512 0ea42bc729100018acc16405283d41a10381bbcc411ea1b473880b7fdfe6785d6b7ae409959bdfb4f86c6081ae5fd102701efff793ea852c9c9913a03805e5f0
-EBUILD zukini-20120806.ebuild 780 BLAKE2B ddfe09e122f894255a69baeedec59215fc5298583c76bb6949f3659d1d5bc3c02fc53e5f7dac5586fc5573025204d02a92d30e620f553a9a4102c012c9fa297f SHA512 74a9d7594f9f5539b88b899a89a62d32ae0375ef4837ee400b9a5b2eb92e81a2f09b7997fa6be115bc3829e39f37fb674bdb1961097a642959f4b649a6ec4fc6
-EBUILD zukini-20120817.ebuild 796 BLAKE2B 1c5df4597f859ebefc88147d09567924e3a8fbf0287eb16426f7dd24f4a70ebc479cf6b17070fb1f61a4a788d9db0d87f224ebc4a3aa41195d20156741d43fef SHA512 720b9473a5861179483c6c49ce4557779325aaea88a4b736ce328d6c5339abc1ebbf53ea1bfdecac64c36bf8e7a8959171061e1abab044d92570c1609e2e5bd7
+EBUILD zukini-20120817.ebuild 795 BLAKE2B d1bb86f5edf20b2e4fe6dd7b76531bcaae2c083f746aebd4108824d000b9ea1c9845266b61edb18efc2b7f29f3f918f6251d7ae473976606af79cd3fdc6fdda5 SHA512 1ecfe10844466fb86d1e2a10f9eaf467fe62d428d44923472fd6e96d11ae6a479346a6d7eab7b078ba5ed5a5e74a2951940924f8fc67557e8ec68afe4cf7ddb4
MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/zukini/zukini-20120806.ebuild b/x11-themes/zukini/zukini-20120806.ebuild
deleted file mode 100644
index efd943153294..000000000000
--- a/x11-themes/zukini/zukini-20120806.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Unified look for GTK+ 2.x, GTK+ 3.x, gnome-shell, metacity and more"
-HOMEPAGE="http://lassekongo83.deviantart.com/#/d4ic1u2"
-SRC_URI="https://dev.gentoo.org/~sping/distfiles/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.98.2
- >=x11-themes/gtk-engines-unico-1.0.2"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- local x=${S}/Zukini-awn
- mkdir -p "${x}"
- tar -zxf Zukini-awn.tgz -C "${x}"
-}
-
-src_install() {
- insinto /usr/share/themes
- doins -r Zukini
-
- dodoc -r INSTALL panelbg.png README Zukini-awn # Yes, we want INSTALL!
-}
diff --git a/x11-themes/zukini/zukini-20120817.ebuild b/x11-themes/zukini/zukini-20120817.ebuild
index 1830c71ba052..86d498ceec3c 100644
--- a/x11-themes/zukini/zukini-20120817.ebuild
+++ b/x11-themes/zukini/zukini-20120817.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sping/distfiles/${P}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 58689cd2d254..03a7f75a9f34 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
Binary files differ
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 2acd54e22a70..53386fcda600 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -2,6 +2,5 @@ AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad
AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
EBUILD dwm-6.1-r1.ebuild 1498 BLAKE2B 54aaf754eb62d86e365512707ffc47fc69da3198e82050b0167fc49fd046115989c89c89a5a5704e490e101f0b9d802f2530d19437da34f537f12e3275ecc54d SHA512 c37b1663c8381ddaf5d6c9215da1691f7ac4e2a02579e6b6ac2a88399261b7891dd1d2492e3864367654815a368abd32fd4b6912b4b53e40cbf20ce4ed6a41f0
-EBUILD dwm-6.1.ebuild 2134 BLAKE2B 5ea7c1a9f34dc10ec36d8d7fa824bf8171b640ac4e6070bf942bbc0f8ae644fa9f0831b3d1ceb2df7da52c28cd94dcc8a96202fa1d8389ad86b89484df3be035 SHA512 6ecd18bda9707fb5c3d8b740eda0d6e86b7fd517f7030e59e42629b91f9f954e3000f0e429f576dca92a9ed83b73a16639144a394327e454a36a6bb27e328872
EBUILD dwm-9999.ebuild 1403 BLAKE2B abc9035e7132ac3daef3452c0b3e0a33e401091c799c242f118871507a771d1519ed531ff62408f9757bd075d1544d78d342f181498f83c2f08a43135ffd70a2 SHA512 7cc1fbdcbaf9d78cf099d3da588c8523c551bbd8cede13bc7d54e29fe0978ceee9bc5f286c27495851dbc8df9b690bdac2ca8d2b24f202e2fa582f19d665c06a
MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
deleted file mode 100644
index d8a03b2546df..000000000000
--- a/x11-wm/dwm/dwm-6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="a dynamic window manager for X11"
-HOMEPAGE="https://dwm.suckless.org/"
-SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND="
- media-libs/fontconfig
- x11-libs/libX11
- x11-libs/libXft
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
- ${RDEPEND}
- xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
- sed -i \
- -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
- -e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
- -e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
- -e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
- -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
- -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
- -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
- -e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
- config.mk || die
- sed -i \
- -e '/@echo CC/d' \
- -e 's|@${CC}|$(CC)|g' \
- Makefile || die
-
- restore_config config.h
- epatch_user
-}
-
-src_compile() {
- if use xinerama; then
- emake CC=$(tc-getCC) dwm
- else
- emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/dwm-session2 dwm
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/dwm.desktop
-
- dodoc README
-
- save_config config.h
-}
-
-pkg_postinst() {
- einfo "This ebuild has support for user defined configs"
- einfo "Please read this ebuild for more details and re-emerge as needed"
- einfo "if you want to add or remove functionality for ${PN}"
- if ! has_version x11-misc/dmenu; then
- elog "Installing ${PN} without x11-misc/dmenu"
- einfo "To have a menu you can install x11-misc/dmenu"
- fi
- einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
- einfo "the ouput is redirected to the standard input of dwm"
- einfo "Since dwm-5.4, status info in the bar must be set like this:"
- einfo "xsetroot -name \"\`date\` \`uptime | sed 's/.*,//'\`\""
-}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index e2809154495d..fafec8a3602f 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,14 +1,10 @@
AUX enlightenment-0.21.11-quickstart.diff 478 BLAKE2B 5352107aad73aff99689cea903f0b7075bbf92623907e573f0be65a00e28654e0ba8f4e00557c01a163df97e96911c0a8cdaf6f2cf4623bc73ac66dce60a6458 SHA512 ca90e65aa3d4b6baa328c9fa6d3e912573ac049ec38cd0074ba7dc64efcde8ff51bf428534bc48d53834bdd49f42739272c68e685c908b0786ac3aaf1cb64c27
AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
AUX quickstart.diff 474 BLAKE2B b5b46ccf535f08e1a7d8be64f2d548148efc24c5c9af31a1f0bfd67a94948eb535265d9b13d8fb65047ec9f22d924d16268bb2fa8ac03855e5513b0c60f771db SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c
-DIST enlightenment-0.20.5.tar.xz 25039672 BLAKE2B b9f18ecb5afbd4f8675d0c5e9315173d6980e98d77e09c1e818161a92be727a504081c9944dd78519ff2eb02a146b8c3db276bd9a568f82c1584b74c4c7e7d07 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911
-DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c84ef89b53e7201723f0d74c99b006957f8c26cd8d4b914015aa7956d23f83beeb2ca2a0e9e145d9b2038a6a337acccd43bd SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29
DIST enlightenment-0.21.11.tar.xz 25313532 BLAKE2B 3128137fe81a5b3dccc909eee8aac6845648c088b4cc8de9965408445579ed6aa01bdd879b726d21449c674f07a78386348525d61c0c0d786493d638ec4ae2b4 SHA512 3dee0f7a49fff992a81ce82a730cf8f0cec52a9805dcdd643a35a0bb8c7a27c6af82c136219553684c24c8e2ee2e8623f04858fddab56cdff7477ed2c9cc0ddf
DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
-EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
-EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
-EBUILD enlightenment-0.21.11.ebuild 2968 BLAKE2B f73ab1346145ebb965a40e2c912276aa358bdb99084e2df173abc050700d1674c7994189b1a1091bb558b6b67ee08ad4bae06dca9d9682874cfe68c88530b28b SHA512 c1b49f18124ee44a338f2a04a86eed8239f8a82fa562e0d7c64b06d56e89f86be5c47a9801648ed5f9e04bcb0a87c030c34904479d98c38996cc0778c495780a
-EBUILD enlightenment-0.21.7.ebuild 3550 BLAKE2B ca84756e5a169d8c6586ce3ba4fce7bb69b2229d98fd6ee996e2d0589d8720c1fc00cdbbff0d784d80c32e25414bdd12ff4d5e52981295bfe15d2a46586de2d5 SHA512 1c53877dfa557b3798d20921fc5272fed16920e56933e5c1b20188c415806306ea251fda3f26b11d675a8659ac316b95f62c3bebb31aeabc16eb026906f82b21
+EBUILD enlightenment-0.21.11-r1.ebuild 2934 BLAKE2B 6da33bada30368794b68fe9cc3b23269f29d4fd6e43b5fd1b6f4104f47d632111ae0c3d2c94a16aeb88b68a07231038346ae2ed293709f630edfadd71501ad1e SHA512 a85dc19c6c67611365489854f104f0fc640835c86014dab396a2f3e3b55bfd33f3861e4140c7d637683c71a02162fc7948d16ebf85c402c5fd99ca17b3d22670
+EBUILD enlightenment-0.21.7.ebuild 3549 BLAKE2B fc55bb1649adbbc9392b9191127935ddc296ec74713190568454815ab38dd5b251176047ca485455757f70bffaa85be93871229c01ea2d54ef8a675ed6ebd092 SHA512 e5aa1003f2fc30c907d856a2b691686d260acf6c4e3fc3406542e46b197042c338866d23ff8241a02fa80341349b732387985427637c6866d6a5013b937df305
EBUILD enlightenment-0.22.3.ebuild 2756 BLAKE2B ee14ee71677234737634adfef3bcfa7c34baed7d39751523c4aacc47c09eb1a8a9c1e4105abf06f2dd9adcd61e6160a4893fb9dd3c635404e2971af9a96127b1 SHA512 a8275b72598cfc2dae651c1eda4e3ea91d53897862787a1f2b9bb3df32b3b04571231c7861d0abf8c946409a84532056bd64993fb16fc2ce68c2e1a49092baf2
-MISC metadata.xml 6673 BLAKE2B 44881a9e8c5d642e1fe30ada0af18325d1cb39b6f793d3c8c9d243fbb4789b29818bdd36c22d1f6e7dbc7d04a7539de81a8a1506a35c809c140246142997cb23 SHA512 8c860fd1efa5f17399d3a261f5f2f7759b65127ea2bfe6f5dcc489d04261e855b4e7b4869d7a292fe3ce4f9edb1847ce46bce435ec0da1d6e5b5fee0b53d58fb
+MISC metadata.xml 859 BLAKE2B 265af2c39eeabf8258dee417bb364125df91585b97219914f56f9d1214866de51ae0aba91d75183d33960a5ca62f8c124374279fc0e27ee2a6bee6eb9f1f6b47 SHA512 c1c22af63670478cc4cb8e24c544bce45b2fef0314be7d9c5ee6b16d5ca3e2fd447ce0a26d68d860f1ad0384829fa5e28b716180fec3e92848ab84330711b211
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
deleted file mode 100644
index 9d9e764576ef..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment xdg-utils
-
-DESCRIPTION="Enlightenment DR17 window manager"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-__CONF_MODS=(
- applications bindings dialogs display
- interaction intl menus
- paths performance randr shelves theme
- window-manipulation window-remembers
-)
-__NORM_MODS=(
- appmenu backlight bluez4 battery
- clock conf connman cpufreq everything
- fileman fileman-opinfo gadman geolocation
- ibar ibox lokker
- mixer msgbus music-control notification
- pager packagekit pager-plain quickaccess
- shot start syscon systray tasks teamwork temperature tiling
- winlist wizard wl-desktop-shell wl-drm wl-text-input
- wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
-)
-IUSE_E_MODULES=(
- ${__CONF_MODS[@]/#/enlightenment_modules_conf-}
- ${__NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd )
- wayland? (
- dev-libs/efl[wayland]
- >=dev-libs/wayland-1.8.0
- >=x11-libs/pixman-0.31.1
- >=x11-libs/libxkbcommon-0.3.1
- )
- >=dev-libs/efl-1.17[X]
- >=media-libs/elementary-1.17
- x11-libs/xcb-util-keysyms"
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.15
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-# Sanity check to make sure module lists are kept up-to-date.
-check_modules() {
- local detected=$(
- awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
- configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
- )
- local sorted=$(
- printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
- LC_COLLATE=C sort
- )
- if [[ ${detected} != "${sorted}" ]] ; then
- local out new old
- eerror "The ebuild needs to be kept in sync."
- echo "${sorted}" > ebuild-iuse
- echo "${detected}" > configure-detected
- out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
- new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
- old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
- eerror "Add these modules: $(echo ${new})"
- eerror "Drop these modules: $(echo ${old})"
- die "please update the ebuild"
- fi
-}
-
-src_configure() {
- # sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
- # see #648896. Can be restored with future release
- # check_modules
-
- E_ECONF=(
- --disable-install-sysactions
- $(use_enable doc)
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable systemd)
- --enable-device-udev
- $(use_enable ukit mount-udisks)
- $(use_enable wayland)
- )
- local u c
- for u in ${IUSE_E_MODULES[@]} ; do
- c=${u#enlightenment_modules_}
- # Disable modules by hand since we default to enabling them all.
- case ${c} in
- wl-*|xwayland)
- if ! use wayland ; then
- E_ECONF+=( --disable-${c} )
- continue
- fi
- ;;
- esac
- E_ECONF+=( $(use_enable ${u} ${c}) )
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
deleted file mode 100644
index 130c64f8a4c3..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment xdg-utils
-
-DESCRIPTION="Enlightenment DR17 window manager"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-
-__CONF_MODS=(
- applications bindings dialogs display
- interaction intl menus
- paths performance randr shelves theme
- window-manipulation window-remembers
-)
-__NORM_MODS=(
- appmenu backlight bluez4 battery
- clock conf connman cpufreq everything
- fileman fileman-opinfo gadman geolocation
- ibar ibox lokker
- mixer msgbus music-control notification
- pager packagekit pager-plain quickaccess
- shot start syscon systray tasks teamwork temperature tiling
- winlist wizard wl-desktop-shell wl-drm wl-text-input
- wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
-)
-IUSE_E_MODULES=(
- ${__CONF_MODS[@]/#/enlightenment_modules_conf-}
- ${__NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd )
- wayland? (
- dev-libs/efl[wayland]
- >=dev-libs/wayland-1.10.0
- >=x11-libs/pixman-0.31.1
- >=x11-libs/libxkbcommon-0.3.1
- )
- >=dev-libs/efl-1.17[X]
- >=media-libs/elementary-1.17
- x11-libs/xcb-util-keysyms"
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.15
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-# Sanity check to make sure module lists are kept up-to-date.
-check_modules() {
- local detected=$(
- awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
- configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
- )
- local sorted=$(
- printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
- LC_COLLATE=C sort
- )
- if [[ ${detected} != "${sorted}" ]] ; then
- local out new old
- eerror "The ebuild needs to be kept in sync."
- echo "${sorted}" > ebuild-iuse
- echo "${detected}" > configure-detected
- out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
- new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
- old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
- eerror "Add these modules: $(echo ${new})"
- eerror "Drop these modules: $(echo ${old})"
- die "please update the ebuild"
- fi
-}
-
-src_configure() {
- # sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
- # see #648896. Can be restored with future release
- # check_modules
-
- E_ECONF=(
- --disable-install-sysactions
- $(use_enable doc)
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable systemd)
- --enable-device-udev
- $(use_enable ukit mount-udisks)
- $(use_enable wayland)
- )
- local u c
- for u in ${IUSE_E_MODULES[@]} ; do
- c=${u#enlightenment_modules_}
- # Disable modules by hand since we default to enabling them all.
- case ${c} in
- wl-*|xwayland)
- if ! use wayland ; then
- E_ECONF+=( --disable-${c} )
- continue
- fi
- ;;
- esac
- E_ECONF+=( $(use_enable ${u} ${c}) )
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild
new file mode 100644
index 000000000000..6924bb9aa531
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+E_CONF_MODS=(
+ applications bindings dialogs display
+ interaction intl menus paths
+ performance randr shelves theme
+ window-manipulation window-remembers
+)
+
+E_NORM_MODS=(
+ appmenu backlight battery bluez4
+ clock conf cpufreq everything
+ fileman fileman-opinfo gadman geolocation
+ ibar ibox lokker mixer
+ msgbus music-control notification packagekit
+ pager pager-plain quickaccess shot
+ start syscon systray tasks
+ teamwork temperature tiling time
+ winlist wireless wizard wl-desktop-shell
+ wl-drm wl-text-input wl-weekeyboard wl-wl
+ wl-x11 xkbswitch xwayland
+)
+
+IUSE_E_MODULES=(
+ ${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
+ ${E_NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="acpi connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+ >=dev-libs/efl-1.20.0[eet,X]
+ virtual/udev
+ x11-libs/libXext
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ x11-misc/xkeyboard-config
+ acpi? ( sys-power/acpid )
+ connman? ( net-misc/connman )
+ egl? ( >=dev-libs/efl-1.20.0[egl,wayland] )
+ pam? ( sys-libs/pam )
+ systemd? ( sys-apps/systemd )
+ udisks? ( sys-fs/udisks:2 )
+ wayland? (
+ >=dev-libs/efl-1.20.0[drm,wayland]
+ >=dev-libs/wayland-1.11.0
+ x11-libs/libxkbcommon
+ x11-libs/pixman
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.15
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/"${P}"-quickstart.diff
+
+ xdg_environment_reset
+
+ sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
+}
+
+src_configure() {
+ local myconf=(
+ --disable-install-sysactions
+ --disable-policy-mobile
+ --enable-device-udev
+ $(use_enable connman)
+ $(use_enable egl wayland-egl)
+ $(use_enable nls)
+ $(use_enable pam)
+ $(use_enable static-libs static)
+ $(use_enable systemd)
+ $(use_enable udisks mount-udisks)
+ $(use_enable wayland)
+ )
+
+ local u c
+ for u in ${IUSE_E_MODULES[@]} ; do
+ c=${u#enlightenment_modules_}
+
+ case ${c} in
+ wl-*|xwayland)
+ if ! use wayland ; then
+ myconf+=( --disable-${c} )
+ continue
+ fi
+
+ ;;
+ esac
+
+ myconf+=( $(use_enable ${u} ${c}) )
+
+ done
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ insinto /etc/enlightenment
+ newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+ if use doc ; then
+ local HTML_DOCS=( doc/. )
+ fi
+
+ einstalldocs
+ V=1 emake install DESTDIR="${D}" || die
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
deleted file mode 100644
index e9327acd31af..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-E_CONF_MODS=(
- applications bindings dialogs display
- interaction intl menus paths
- performance randr shelves theme
- window-manipulation window-remembers
-)
-
-E_NORM_MODS=(
- appmenu backlight battery bluez4
- clock conf cpufreq everything
- fileman fileman-opinfo gadman geolocation
- ibar ibox lokker mixer
- msgbus music-control notification packagekit
- pager pager-plain quickaccess shot
- start syscon systray tasks
- teamwork temperature tiling time
- winlist wireless wizard wl-desktop-shell
- wl-drm wl-text-input wl-weekeyboard wl-wl
- wl-x11 xkbswitch xwayland
-)
-
-IUSE_E_MODULES=(
- ${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
- ${E_NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="acpi connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
- >=dev-libs/efl-1.18.0[eet,X]
- virtual/udev
- x11-libs/libXext
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- x11-misc/xkeyboard-config
- acpi? ( sys-power/acpid )
- connman? ( net-misc/connman )
- egl? ( >=dev-libs/efl-1.18.0[egl,wayland] )
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd )
- udisks? ( sys-fs/udisks:2 )
- wayland? (
- >=dev-libs/efl-1.18.0[drm,wayland]
- >=dev-libs/wayland-1.11.0
- x11-libs/libxkbcommon
- x11-libs/pixman
- )
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.15
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/"${P}"-quickstart.diff
-
- xdg_environment_reset
-
- sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
-}
-
-src_configure() {
- local myconf=(
- --disable-install-sysactions
- --disable-policy-mobile
- --enable-device-udev
- $(use_enable connman)
- $(use_enable egl wayland-egl)
- $(use_enable nls)
- $(use_enable pam)
- $(use_enable static-libs static)
- $(use_enable systemd)
- $(use_enable udisks mount-udisks)
- $(use_enable wayland)
- )
-
- local u c
- for u in ${IUSE_E_MODULES[@]} ; do
- c=${u#enlightenment_modules_}
-
- case ${c} in
- wl-*|xwayland)
- if ! use wayland ; then
- myconf+=( --disable-${c} )
- continue
- fi
-
- ;;
- esac
-
- myconf+=( $(use_enable ${u} ${c}) )
-
- done
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
- if use doc ; then
- local HTML_DOCS=( doc/. )
- fi
-
- einstalldocs
- V=1 emake install DESTDIR="${D}" || die
-
- if ! use static-libs ; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
index ce5aacf8041c..6b17730274f5 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_URI_APPEND="${PN}"
else
SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
inherit enlightenment xdg-utils
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index d01bc2f6aaeb..4b927b67c714 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -11,74 +11,11 @@
<use>
<flag name="egl">Enable EGL rendering</flag>
<flag name="ukit">Use upower/udisks to automount devices</flag>
- <flag name="enlightenment_modules_appmenu">Gadget that holds the menubar of the foreground application</flag>
- <flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
- <flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
- <flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
- <flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
- <flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
- <flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
- <flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
- <flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
- <flag name="enlightenment_modules_fileman-opinfo">Allows EFM to be placen on the desktop or in a shelf</flag>
- <flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
- <flag name="enlightenment_modules_geolocation">Geolocation information</flag>
- <flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
- <flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
- <flag name="enlightenment_modules_lokker">Screen locker</flag>
- <flag name="enlightenment_modules_luncher">Iconic application launcher</flag>
- <flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
- <flag name="enlightenment_modules_msgbus">DBus Extension</flag>
- <flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
- <flag name="enlightenment_modules_notification">Notification-daemon alternative</flag>
- <flag name="enlightenment_modules_packagekit">Package manager integration</flag>
- <flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
- <flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
- <flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
- <flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
- <flag name="enlightenment_modules_start">Enlightenment's 'Start' button equivalent</flag>
- <flag name="enlightenment_modules_syscon">Provides a unified popup dialog for all the system actions in Enlightenment</flag>
- <flag name="enlightenment_modules_sysinfo">A gadget to visualize your system info</flag>
- <flag name="enlightenment_modules_systray">System tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
- <flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
- <flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
- <flag name="enlightenment_modules_temperature">Temperature monitor</flag>
- <flag name="enlightenment_modules_time">Time related gadgets</flag>
- <flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
- <flag name="enlightenment_modules_vkbd">Virtual keyboard</flag>
- <flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
- <flag name="enlightenment_modules_wizard">First Run Wizard</flag>
- <flag name="enlightenment_modules_wireless">WiFi monitoring</flag>
- <flag name="enlightenment_modules_wl-buffer">Wayland buffer</flag>
- <flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
- <flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
- <flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
- <flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
- <flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
- <flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
- <flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
- <flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
- <flag name="enlightenment_modules_conf">Settings Panel</flag>
- <flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
- <flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
- <flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
- <flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
- <flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
- <flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
- <flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
- <flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
- <flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
- <flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
- <flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
- <flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
- <flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
- <flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
</use>
<longdescription>
- Enlightenment is classed as a "desktop shell" as it provides
- everything you need to operate your desktop or laptop, but it is not
- a full application suite. This covers functionality including
- launching applications, managing their windows and performing system
- tasks like suspending, rebooting, managing files and so on.
+ Enlightenment is classed as a "desktop shell" as it provides everything you need to
+ operate your desktop or laptop, but it is not a full application suite. This covers
+ functionality including launching applications, managing their windows and performing
+ system tasks like suspending, rebooting, managing files and so on.
</longdescription>
</pkgmetadata>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 120d7e2750a8..2f32a8b3fb80 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
Binary files differ
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 3c3bb57892a5..e46aed78c80e 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,5 @@
DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
DIST exo-0.12.2.tar.bz2 1321379 BLAKE2B bf17b8dfb6489b5c168893599e67bac603e6915e78930d0d460e94d23a60b53e720439653358c2566083a3773cd5bb898da5210200a2c6dfac7ca9b730ca4aaf SHA512 771c4e3c09683ccf2d028a5203d4b2af0da38e6ae97baa7825714ad6e2e81d128d9238d060cdd80c95660a0394b632caec3e31df1f2cc28b1fed8ef19ee2011a
-EBUILD exo-0.12.0.ebuild 963 BLAKE2B a32cbf86a3ccdd2e58bb43c5571351186049862393cdf570ef6c5d8427b7ea5abe13544d73a2f7065441a07f1789e249d3b918ebb39b424f01f76dbeb064e74b SHA512 0627ecf7f0c795afafa54b19c2e090236d5842d105e45068c697d32b5b40b123a53fadb1f00d62da9d5557a961a7b14317323618029c3ee25f20117c91983c68
-EBUILD exo-0.12.2.ebuild 970 BLAKE2B a190fe9e1304fffac4c0957f83364d1be961cdd7b1f567e5aa15b50559f3c9ba39ecd168bfd3ea332c858bc794747bd9ca31b1d3de540037871535a095446b99 SHA512 14acbe8df6cb3fa1e3d5fedd36121de002e892fee67a2c55ab37dd36e06c1bebb43a0f21c4b2527de79321e4584e26c2a8f14566785e8144d980813fda66a3de
+EBUILD exo-0.12.0.ebuild 974 BLAKE2B 41181a6cdeb7163c0a85dfca00214b9f4234a48b93264fb8fe284a3a86fff516a1286b0a0045389f5e2e76fff364d07011f82c54d54bde844823157870ed1b99 SHA512 3e6cbbd1e1ad33c5b0dca9013bf449a3ce88a11a8aa9b278b65e3bec6eb8b7d8c56a81dc29e4057a38116adf9c8595156675385e6dc10153a076b4c31e5d2a83
+EBUILD exo-0.12.2.ebuild 981 BLAKE2B 2bd59fef6efbcbd3cece52cc786a273a9780cd494a449899afcefa9351f40ce15fff26d8c9b5d4f5c36816c8e42a19cc792cf27317a04f94f313d6850d443313 SHA512 21c17ba439953fb6b4456e9535723fcce794c8fb766d5b3cbb4e1be06c1e5556c0e627119f4a7f6c216c370beec67560118613648bdb013e673caef82fdc24fe
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.0.ebuild b/xfce-base/exo/exo-0.12.0.ebuild
index 01150c7574a2..124892995415 100644
--- a/xfce-base/exo/exo-0.12.0.ebuild
+++ b/xfce-base/exo/exo-0.12.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/exo/exo-0.12.2.ebuild b/xfce-base/exo/exo-0.12.2.ebuild
index 40a8273b293e..5d80d9847c26 100644
--- a/xfce-base/exo/exo-0.12.2.ebuild
+++ b/xfce-base/exo/exo-0.12.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index be22cf89bee8..88a78e625453 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,5 @@
DIST garcon-0.5.0.tar.bz2 456940 BLAKE2B 1e2eb7351fc63c3dcaef358174f38e6da308141923474ad215309304644db85112d7f1edfd258bca5bca3c596f8e98c5d38cc830bcc11e91d5fc71e4c1c956d4 SHA512 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5
DIST garcon-0.6.1.tar.bz2 511415 BLAKE2B 03c9076d8507737ed64b48597ff53c4cb3ae9beafd14b28d4d61fc29fa007f5ac4757f96ba0dc56c8b069a4eebd5d38202862856f96a1b08474de2aa93d518ca SHA512 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
-EBUILD garcon-0.5.0-r2.ebuild 883 BLAKE2B efb17cb4da1265e5ee57c8b81b1b4daa8aac343926f545d0673892e4252439aba883fa3fd3ac20e566ecf35fee1fcc27adb238a61a881f8621bb6553cc51e08a SHA512 7a016fd17c6ba43bab7eaffde25d81d653c82495ad34096f41e64c854176c307364c91703ed3e8337f7152f8d044404881914d8a58647e904d368506fe60e726
-EBUILD garcon-0.6.1.ebuild 1011 BLAKE2B da70ee5d266837b68970d818937c482497278d44beb0b03a06a1af71991b867b273d2a7611cef019294c576a18da5a29ae652052da6b54b0dc2b7680c7d02ee6 SHA512 e217b113af2043476ef6426a739fa3caeca3310409f968eb288e600108ab85cebe3254d5fec3f8b0b82750e1a17d98aba8c58f38176c9037cb44cd7c27f77184
+EBUILD garcon-0.5.0-r2.ebuild 894 BLAKE2B 596f95f6cb42333a7345352f39d2a2c1ffdad669d9a36ebf23ac1f053f43790101c5b1908208ac70ef6e32e34984731bd421e22befe12f61bad3540559a3c7de SHA512 ab5e6a3f8f7eb0af2a0ce525b66b954fe063a3d21f0ffbd67c894fca045f9cfc529f9614e4db2ac755aa29578fc1aad74f4e509713b6507e0e384cce56fa2b7f
+EBUILD garcon-0.6.1.ebuild 1022 BLAKE2B 8461ab1ab40cba155a5471fa97bee5fb5536a3cc401072ae444a145392b58b6902c9f1e39165c144d67cad7aae27e1ec58663c7ed0a400e4c677f86040e99a67 SHA512 62f4ddfbd37f8b1ddd01ba977dad268071a639191c3b9116c34a82c71a10c5c5faabc98084d0ccf79ddd7675a8b0e0312910aaa05236ff9ae7a399bc6e520ccc
MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.5.0-r2.ebuild b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
index 0d87c4d1dc9d..0e3a12f8750e 100644
--- a/xfce-base/garcon/garcon-0.5.0-r2.ebuild
+++ b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="mirror://xfce/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2 FDL-1.1"
SLOT="0"
diff --git a/xfce-base/garcon/garcon-0.6.1.ebuild b/xfce-base/garcon/garcon-0.6.1.ebuild
index f53fdece55a7..f2bd18b89cf8 100644
--- a/xfce-base/garcon/garcon-0.6.1.ebuild
+++ b/xfce-base/garcon/garcon-0.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2 FDL-1.1"
SLOT="0"
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index d46d2e94990b..e01f019b0452 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,3 +1,3 @@
DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
-EBUILD libxfce4ui-4.13.4.ebuild 1726 BLAKE2B f72e2bdce59bb4f67782f563a3af04c279e9620b4c03d35630d8cf36f9db36c20c07a201cfc9dbbeb31ed6b79f3553b2593c107b7ad320198e4fadb75788f618 SHA512 10c927a8db466cc4e0dc01db6356f85d3db47d6f8de67079e10de9e7853371b544c9794381690739695941b491337c5f308d45806eba1e2c7a8971e6547bedcd
+EBUILD libxfce4ui-4.13.4.ebuild 1737 BLAKE2B d6afb27abf1c7d16dbc2b36fed86a627e67d75aa5ea6e228fa63ee9e32b4e4c8bf8ffd1e44b474118ec3ca02fd09a00f8ae6146f8f5aeb7fcc681ca7aa628a55 SHA512 65fc6d9ecf0607ccc928e8e461c9e379e7a0b3c5720e0e44583d4e1f62c046231ccdef9ef599a6c043a89aae8a9a0a79eeb2f7105ede81effec997933e16742e
MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
index 95c4cf18b766..df96178f0f2a 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils vala
DESCRIPTION="Unified widget and session management libs for Xfce"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index aa039043ca81..3763e18286f6 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
DIST libxfce4util-4.13.1.tar.bz2 497192 BLAKE2B 56ec5929df43e2c430c45298a2f7634a539ef1f32598ce4cd038659c93ed5de4f28472f744ab03e3cefd040266c1e1bd415c8b4e9489be8f3930bd6df8d1c5c0 SHA512 1667cc22ff72920d3280725cb40c41f5fba9dcfcba8e357ba85548c7f254a67a3ef942c1b71f0ac5c3a7fe46c8c4cb559a06a8111aa71ce1f6824d1a1c2b5063
DIST libxfce4util-4.13.2.tar.bz2 509280 BLAKE2B 40f1fb95abff4857e976dd5f3ae8c8ad5e66e2c1c49723735e85124db71d30f204525cd74baf22e31bf405718f378b0c9ac37ec4189e1f4b9941d0eb6fc141ce SHA512 3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4
-EBUILD libxfce4util-4.13.1.ebuild 844 BLAKE2B f471a8a51b57b9f4ef8ab3d8861bf7640fe3f25dc1ddf9c43955185b6c10ab05e3e7cd7b49c8516f0a5b6a6a9ded3cbf16e928b113aeb4f82b91839c951c0fed SHA512 7a93bbf44afcf3fc24452d905535996e0a0ae6af27f9a7da06e61ac847de4a9ae75cbeeccc36b49ae55f03b27f78317f29489a36df1a5e789a8fd72e7db8706a
-EBUILD libxfce4util-4.13.2.ebuild 1040 BLAKE2B c52757969560b71249b0441467635b31ae8fbafee578d074599a2f0f3c50e262067560f37d834b9d4e71124a7a0e54cc14043b5bc0c5f0b0a3dae9d79ef2fe05 SHA512 755727b0dc33ebc56ff1cfc68ecb53876f7ee6a0876b1aaa42f40d7be70ad7e7d6c6d34ef261dba8161ce6ad811265d83c3eb8bb9d3148bd5d1e8d9be29a7f1e
+EBUILD libxfce4util-4.13.1.ebuild 855 BLAKE2B 5d068475a5308444ca458473055b89405219724e488a68e87f3f7424fc8d4af16be61bab01c4f3275ef611cf312128bd693cef4915f8e6d7aedbb686be014dc7 SHA512 1552c7de2a1f63c48de4f4ad7eddad4f8dcbe0d98f79693aa3970fadfb8cf980672d60b44b26e146a2a6e0dc875c3c39bcaa2665eb4fe302bffea4e1ef2af7cb
+EBUILD libxfce4util-4.13.2.ebuild 1051 BLAKE2B 9867429304e18f2e814a11954fd76973a211a71dc68eca6e95cc66e0da7b824681cd9ce87e54fce5c6d09a1ab10577cda131d1331e74b62cd9be275844a5afd4 SHA512 6028211ae25b8b3150c3a09060a017ea54f20beecbea7c39cd98128bbe5c173367162a47b2822818fa275394eec15db11c0440eb5115f0e0432ff88ac32359ee
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
index 42096b8caacc..0c4f2b0bc59b 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A basic utility library for the Xfce desktop environment"
HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/7"
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
index 6686fd3a1762..9073774a0740 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
@@ -7,7 +7,7 @@ inherit vala
DESCRIPTION="A basic utility library for the Xfce desktop environment"
HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/7"
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index cefb84f92c2f..f0f2f68e88b9 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,4 +1,4 @@
AUX libxfcegui4-4.10.0-no-xfce_setenv.patch 311 BLAKE2B d9f36277d02adf9fbef96bcabb70d16f85a1e6ac13f8134d89456fb3e49cfe1b7688091bdf215aaef6f2a9298eca115496ab509d566440e442f9533cd4dd8a55 SHA512 f8d12be9e9d126d3a3a822cab872fb9dbfe2d5e23e40b529c2a637e0365e5b481ff44d564fcda5de60948342b9c1367d51ae20ae7e0e5abd69296f7dd3ea3f31
DIST libxfcegui4-4.10.0.tar.bz2 691012 BLAKE2B cce4f0a9587c10c1a226550ddeda8a9f00b5c1306ce11c329c914e4f3240f4fdb390beb7a1aa7049076767c26707b2570c801ebb9d78504694ee3542477882eb SHA512 32fe3be287c84d1816154c7632a87025324c2cb9d9524ef3d7813c3b3619ca04e4b70aeb47a3e0fb59090e43e124476988774a0dc5186ebc1a0ccdfe635cbb45
-EBUILD libxfcegui4-4.10.0-r2.ebuild 1267 BLAKE2B 9ab5500ca6d8f4bedd1cb78a687814368c451ee516fd065dc0c0acb7c4ca032cbd6d97c943460088de2dc164f94b3369258ad6ad03c9e676d61d4bba70321b59 SHA512 7819b8a8e76ec374c2fa0b8a6784f80e868ed53ec5d67375b9a06d4a157f4ef7b8f9c88abebe8ac04b0951192c8eefb5ce78c194680b38b45e35b658d6b69af7
+EBUILD libxfcegui4-4.10.0-r2.ebuild 1278 BLAKE2B 168462badaaba6caabe20fc865ff78be16bebc1e7d3875842bc4be89dc76ab666a20031cd5b79873d0e0d2ac8e9f6a168334dc1fd9e5c02c502b9d5fa7a6346a SHA512 ec2b6c8bee46044427e0f28e76305dff9fd45e22fb4a8c6afb86fc3412a0ad9facfe7775886c7d5d5363afcc07496ee63425ef00ec72383a12b6bc405b6e148a
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
index 1339e1943055..2539c18be2cc 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A compability library for unported Xfce 4.6 plugins (DEPRECATED)"
HOMEPAGE="https://git.xfce.org/archive/libxfcegui4/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index b90f598766a8..e079b8a97516 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -6,11 +6,11 @@ DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90d
DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
DIST Thunar-1.8.0.tar.bz2 2240878 BLAKE2B 03b77fe7f7695eec3430c7c6350825b9fcda76ffab408461bbf6e7f21f76bd8cbab05caf144222471ab7225086a2a7e541bc4777593abfb6bdcd9bb0c22db287 SHA512 4f0cc00904e9e7f02d2cf79fe36bda4857c1354917f656a2376c73bb755c3dc359e277f3a050fa60754f9adfadb75cefa9287334f6a97c1b4ebdf1f63545da4b
DIST Thunar-1.8.1.tar.bz2 2289891 BLAKE2B 79ccb1408bcacba7ed50536f0a8e622d2e251fedf4b0ffef425f1e0926dbaa93ccef0fa751c8362cb420eef013f9f442de3fe58d411558dd7b9cb5751d2e89f4 SHA512 89aa29af5e272d58c7de02ba1c96d7f0c32eed49cda9621ef863dd679712cc653f58e729e49b9dc3d1626c9b8ebe2b18a2307e00c7ea1d1d2b42fa71272aced7
-EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
-EBUILD thunar-1.6.14.ebuild 1959 BLAKE2B 0efb287771c2dd2b78562b29e5e8767104837f2840b08e08fe9a533c1604346e2f723dd8e955bddec165762fe93e84ef620c2e42087ebad7d8de871e43f80c6e SHA512 4dfdf6ba9f10d23e5104a7a7c1f0ea4d81a85756605c4f925a9d6e471fe5bf96cc1b3b47a7374031228ba57e4d281e6d4ce972af9963a24e5c6d2d893b5ad7db
-EBUILD thunar-1.6.15.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
-EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
-EBUILD thunar-1.7.2.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
-EBUILD thunar-1.8.0.ebuild 1995 BLAKE2B 6378212643bcc55285a5cc9bc7a7ccdc7a2605d2bfcdc32c30db03c5b79e7d9f45c3954391e499444eb747e1cca6355f8aa9e7bf3f4dd3e1ab27922df7c82466 SHA512 ad9e50839f59b7ccb8398cc7bb6e00f753109fd7a91dfb2ba12c5d2e5ee224f1e34627f17b6f39bb4d96db77c772ff5b8dc5e1c964509e20865f4598c3a37a66
-EBUILD thunar-1.8.1.ebuild 1995 BLAKE2B 5cf34cd7ffde72b943e72a51305ae1234c776ace2a9a77bd20828588f3c225dc502071623b82bec665dd769367210830b78ae44c0231af6ed920aca5efb07e41 SHA512 88f81d19207215b9f14b53bb39be1cda22ba4bc1a1da71feaef5771f1c9e07b9817ee45919922b1bfa757703814e864e20ab2bd2bbf927ae59dbbe70d1ec5e6f
+EBUILD thunar-1.6.13.ebuild 2034 BLAKE2B 47a2c733f4cfab37cc48c841446f04220862e33a6eba127b92f9ca0857625bbb62c2d2e6424fc33cf07b7bc7bcf355462a12a53790dc88b8ee466a2255617358 SHA512 4effb6533683136067c9eca7cff896bb19efcc452924a664c91dd0e6eabc6507f59cc845bc7383c04b2d334b8c81819f199f9a250f816c62259f2a3ea0671a35
+EBUILD thunar-1.6.14.ebuild 1970 BLAKE2B 83e3ce6a0c069817781c5f62d32cfe60c255aadce6686821e1bc42190089a57a05b86bb2d0aeac07a6877b97ae9aceaa2690628aa2bc620c810bde3289b5903d SHA512 5bdf24285de7371faf55ffae6a820c40af03a77aa5e4abdf2c1c359efb7bc8440ccec58075a70aade6689d1f2e63f7deb285635665882f93df4e347ae624f2b0
+EBUILD thunar-1.6.15.ebuild 1977 BLAKE2B 9776c8cf558e86c8945d2c6b7d3545a27fc3823703954370ed8eb3a6790ccdac2b1c5ef11ddb497b6ca166b602e0998a74b239be6a897b18ab094f39ebc29579 SHA512 db1fa4fbd51b6e6305026a669711b2e2854e0e077623a10fcf323f3746d64c87491146528714acfd9ab4a537100cb395ec6183227fe8fa92e091f06f07006397
+EBUILD thunar-1.7.1.ebuild 2004 BLAKE2B 8452b4a373125cf16c212c74af3b35a6d491d0f91a43e6120aa4aad685b2f702e69f74b9cd15d3c3de2e17e1b5aed90957ac5edff1ae8c2d805ffa4d455ad0b6 SHA512 0d18b2f25503c899e1ae9067350265e1a9e2f67a023b7855edacf821d81161e02589bdaa97f7169930218c159a5011ae42752321a82fadbe5753f10e7ecfcf35
+EBUILD thunar-1.7.2.ebuild 2004 BLAKE2B 8452b4a373125cf16c212c74af3b35a6d491d0f91a43e6120aa4aad685b2f702e69f74b9cd15d3c3de2e17e1b5aed90957ac5edff1ae8c2d805ffa4d455ad0b6 SHA512 0d18b2f25503c899e1ae9067350265e1a9e2f67a023b7855edacf821d81161e02589bdaa97f7169930218c159a5011ae42752321a82fadbe5753f10e7ecfcf35
+EBUILD thunar-1.8.0.ebuild 2006 BLAKE2B 97c3ec416c5d85973297d1ed4dbf9fa645db00cfc032be34637c718c1142900a9066ea2153b3e093cc36ea5d8f2489ef6309cb9a06cfc747e9094d41fbde7196 SHA512 8499161ea154008a5aa7f3bf0ef4ec7667fbdfbbceaa8bf64864f3f37fde74390314f60dcd47902fe850e8520b60986bd4971237fc8c9d0a24908669f7275b7a
+EBUILD thunar-1.8.1.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.6.13.ebuild b/xfce-base/thunar/thunar-1.6.13.ebuild
index 623fe7fac618..ee453bbf483e 100644
--- a/xfce-base/thunar/thunar-1.6.13.ebuild
+++ b/xfce-base/thunar/thunar-1.6.13.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-base/thunar/thunar-1.6.14.ebuild b/xfce-base/thunar/thunar-1.6.14.ebuild
index b1cd672dc9e5..39fb985e181f 100644
--- a/xfce-base/thunar/thunar-1.6.14.ebuild
+++ b/xfce-base/thunar/thunar-1.6.14.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-base/thunar/thunar-1.6.15.ebuild b/xfce-base/thunar/thunar-1.6.15.ebuild
index 39633fa570c5..6b8669db163b 100644
--- a/xfce-base/thunar/thunar-1.6.15.ebuild
+++ b/xfce-base/thunar/thunar-1.6.15.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-base/thunar/thunar-1.7.1.ebuild b/xfce-base/thunar/thunar-1.7.1.ebuild
index fb1e05deebaf..0246378c765b 100644
--- a/xfce-base/thunar/thunar-1.7.1.ebuild
+++ b/xfce-base/thunar/thunar-1.7.1.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-base/thunar/thunar-1.7.2.ebuild b/xfce-base/thunar/thunar-1.7.2.ebuild
index fb1e05deebaf..0246378c765b 100644
--- a/xfce-base/thunar/thunar-1.7.2.ebuild
+++ b/xfce-base/thunar/thunar-1.7.2.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-base/thunar/thunar-1.8.0.ebuild b/xfce-base/thunar/thunar-1.8.0.ebuild
index 06c8c90c8f87..bd9b4cac0754 100644
--- a/xfce-base/thunar/thunar-1.8.0.ebuild
+++ b/xfce-base/thunar/thunar-1.8.0.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0/3"
diff --git a/xfce-base/thunar/thunar-1.8.1.ebuild b/xfce-base/thunar/thunar-1.8.1.ebuild
index 56c3d89950ef..dc5dc32391c8 100644
--- a/xfce-base/thunar/thunar-1.8.1.ebuild
+++ b/xfce-base/thunar/thunar-1.8.1.ebuild
@@ -8,7 +8,7 @@ MY_P=${P^}
DESCRIPTION="File manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0/3"
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 1be81747dcd2..51bcd6d5b25c 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,6 +1,6 @@
DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
DIST xfce4-appfinder-4.13.0.tar.bz2 476547 BLAKE2B 179f77efcbb3d24982fd0598ac840a2f60bbd5cc95275621f2483da23557cd5175c7a348467d67f8b029eed62cf7035567ee433f8560ee535bf1148a30ae22a7 SHA512 1efd2dcedeadd6e14ee7db9defbec3c8233a5634a38b0c6274b9a858cfebaff815dc0095515866b83aad1981a363e6ca4b3c12190faa64f485421d570c5155b2
-EBUILD xfce4-appfinder-4.12.0-r1.ebuild 892 BLAKE2B cbbc5414ad1b57a76116338a59a9d6a5841304fff38121be78ed2c659b3ccd77fcb738d69276a12a1c0ea5ed5d01af3b61666890be2c9c7c36ec2beb869731de SHA512 bd8709b8860f703cba2e97948384774341276c24398a441e982d28d7ceb2d70ea5662458c9a051951a8835f2ecaf4b3ce8651c41376dac2d952c3698d698952a
-EBUILD xfce4-appfinder-4.12.0-r2.ebuild 855 BLAKE2B 8a1cf1fefe340c48a45e85d0d0a579ddea6edc46055c37aacbfe71b6cf93740278dd47ac263ebb8b48063de9fba0dbb31cd8128606300963150ff0a171f39c3f SHA512 840e68deab778027c7380b85a2f5e7f7d65ccab2c25669ecbbc3c3202f57ba0e0097b2056cec023c6173f60584c1883e199d94cfb7400c8841d893879716bff3
-EBUILD xfce4-appfinder-4.13.0.ebuild 778 BLAKE2B 2cd6f18622c0a444965e5e3b32070f4f5f825cec44080007917bcef48d13c63f97d024cbbae4cb09db8ccbec1ca518e3b5d737eaf486eb4cfe7df2207f146d12 SHA512 28e21845b501092b09ade6c778724880c773abb215336017fd1ddfd814549c585993dc58509381d031a03296ba9409592001a33453357f7124c46b66c5357226
+EBUILD xfce4-appfinder-4.12.0-r1.ebuild 903 BLAKE2B e6e8737c441cb539b18879439a5229d571be89dfc681d36bb762dbf9f3097168662ccbdd2e59510875777df5e25cb0c8e26ab47d3011d0b8157c644a0c8755c3 SHA512 d021368df87e09a97a5bd7d570541a12518af7600732839590dc9c0fb38d6d2090bf3be98f688f51193759f9e67d2c0a21f7bcea5a095375a9f5317a7911c1f7
+EBUILD xfce4-appfinder-4.12.0-r2.ebuild 866 BLAKE2B e556da74d3bde21a66a964b4a40695291871e4ccf48a870631deb7788d8f8299e41bfebfae5518a5740e53ae8fc3b7eb58285ed7c47101d6d6d3157e4a6fda9f SHA512 6463736248650bbb0127148ebecf79d15ebfc7d2c8a7338a27bbf3ee272dc727ecc25f1bf31204dd5fdcf125657bf7737a90ba6a3317cc7d7254b816b17443f7
+EBUILD xfce4-appfinder-4.13.0.ebuild 789 BLAKE2B f5cb3ec554ebb7db9a4637cebdadcd6c47d20e242f38e10174d8765be7c1f88d9639e2d8179548a180adb3480797a4764b3853c0c624392c93a342ca4719f848 SHA512 0403dcf2c578136bd81c8289923b81b8c1c8df05fbb1db2c867ff3a1f6073e98a674cf6df086d983a909c369251a7a19c75b8b85184fb0babbfce460c6c5d937
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
index cd7ec6c1723d..ab8cbc464458 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
index ab9caaa97bfc..0257a3ab9b31 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild
index 63fc046da116..6ab6b0d8e9eb 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index fb289a809ae3..b219907ab0a7 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
DIST xfce4-panel-4.13.2.tar.bz2 1231467 BLAKE2B 994aa5daf3e2c09c96dfda82a67bdd5f28dad1edb2ed85fc5c9ac5c314eb426bb6431f9ae9e3fc5b5ee49fd818255c7c2f6abd58bf323a1ac92d2ca520a5224c SHA512 d26ffd904bc2dc1e8b866215c6c07e1c4052d8c46378c33dd45c90833cb4e80c452b7dc5f8d7dab0cfe28657c3eb0f4cb620b823938f54f8eb1ae1e4f8077ed0
DIST xfce4-panel-4.13.3.tar.bz2 1239212 BLAKE2B 8bab0c2f291874064ec8684ab8ada8177cca3f6ad163638bb57b02d0e0f77ed484ecb71bd9a4e54a63d75a572db260d6f92b755d413e1c6c111aef613ca2c2cd SHA512 99921ffc295b0e00689df50946ea326496c6fca68d6dfc6a563c0fb9e18bef1e537659963e3a0e6ee83756417565ac3531bc43e0e909dbb369068e4905bde045
-EBUILD xfce4-panel-4.12.2.ebuild 1492 BLAKE2B e06ce9d0a77b4e22095f72f20289d1f68c971c5d499df2a42297557532cc8692798ec2c6a2444857e472dbc6081b2e98eb4d5a2e369381f899ba6a40081618f3 SHA512 3a2e2208121b7255918faa1d3d2f535f69f9cab92e2e59c3d6d58dd006f92d087fca3aa378f105e642e694e6c299b010f531843717aee147562e6cd2d71e1d76
-EBUILD xfce4-panel-4.13.2.ebuild 1332 BLAKE2B 5613eabebe9bb123d89daf27f0472089c98920b24eb918a2170cca61ee308c97663d9d852ff3011a8757c6e5232ecc1fb8f893efd5316236fbfc85f25c7832cb SHA512 30cc1b1f72f05c7ecf489ae451900c6fec6dde9540e176549d373b2f67673dce674beed4eded84fefcfbe195684d87c7c22b9ee57dadc32e67de380d94edb404
-EBUILD xfce4-panel-4.13.3.ebuild 1332 BLAKE2B b48e1734ad43630418d41dfb853b753e697c75bc851dd404fd48650f42b2d80741da9c21c77d6f241570770487a1d2020969bcc03ebea42549c024f7d3cfa9d2 SHA512 166037ea6a7ba0765286620aeca0164d3ff9498645338783f1397480b62e8e7aa470aa078580bfc837eef1fb7dfc93e58b1319d96065dcaa8d8b66b0d52825da
+EBUILD xfce4-panel-4.12.2.ebuild 1503 BLAKE2B 29250232c73abbad889c3d1b86360e7401efaaf99f95ca8bd3f59b33065c42f4d63ae1b887cd538f180014514a37fb1d804fd696931b1e3c2bc49776f44e5c2f SHA512 bf46894dd6479d4521604c0b5e57d9fbd2d598c757dbd1004e63449a2f36d0bc088c7cc9f404e9126d546692ca7ffd6b98d06432575334ed72591e7d9eff637b
+EBUILD xfce4-panel-4.13.2.ebuild 1343 BLAKE2B 8f6afca190ca1f99fe096ff3e544b656d22999e353d18868adb72354be95bc3ee9f5e033307b6a73d1c06adee53c5d0fef5e625cae90c1b928c01f4cb64e9d83 SHA512 904bf031fd0d2eaf6900650a11cb5117de7557d0279d6010663fde9045af2b651c98e5ea9da02d5f0354ffc8fc09ccad0af74fec9e19c4a4eb5f972b5ef5ebca
+EBUILD xfce4-panel-4.13.3.ebuild 1343 BLAKE2B 268b496bbe6d1d39869d7ed9320465d7ca2f988d326fd3814ef0726401a00705953acb67a4435e29cb2b033570497328a74fc292d0e6683032347bcc5875c8a7 SHA512 26cbe2d4ed4a9055f0d0794f92566cb9c7dcdb5672fbed3786a6d146a006fddd6537f8e9800a78de35f485ab46e40c6e411941f55895346af944a9d53e193823
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
index d088b44e45b5..0f3a55f3d1fc 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils toolchain-funcs xdg-utils
DESCRIPTION="Panel for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
index c6c34ed7b47e..abf6ac482c15 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="Panel for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild
index 14d2d259061a..3aae4328d6aa 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="Panel for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 5ad261e60654..67b77cd786a7 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,7 +3,7 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
-EBUILD xfce4-session-4.12.1-r1.ebuild 1907 BLAKE2B 71cc1a811ca6c1eebad8598743fa1b78ef2a013b877e018fc034be9cbbd269637002b7d1639fc4c10bc4a8bf6d8477956c5c70118e05bae144c2440b5461b46f SHA512 dd2555e54e6c8d24e30e2889eefda9402b6a540bcc01347a3bc3f96bc0930f255b85e5a0332e5b72757e27122a68802ae5175e741f86cc238720e522431e3698
-EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B d5ad58e4c6003ec6f76539196f46b8e1ed5e56f5292f2d08c99ac45e09ecf5abbd3339b10f36af84ec3643b83e9ce2536f39f8be152d4f0a22d2513b1c393644 SHA512 c97415b3f4dcb3eb0aa59e0c48c69301e23a8bda51295ca2db6ef5ab3c44500c681ddb33f49ec5c42b3a04719d0d0cfd4b00161541bf18dc8c6936ecb405429a
-EBUILD xfce4-session-4.13.0-r1.ebuild 1833 BLAKE2B dd046f6f515a107bfc74fe19403c57f91f7db6e8a7e9a5a93fda610052e1f6943b3123ab723adbbb3965846257f44dd870d958dad96cfd8feda3582adaeb01e5 SHA512 92a5933023c5f6a3243f7cd845a1c4f14c6da4fa1aaae4a6f9fdd52eaca9d10226744ae4b5679c2c824b6d57f895c7add1c2dc1e32fd4a57340a05f856d95c33
+EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f
+EBUILD xfce4-session-4.12.1-r2.ebuild 1893 BLAKE2B 767bec90fd2e60d63c6d83c35104178505bdca2c4e79b342271cf73f6c299c32fbd3ad8d32ed61952a38757eed97f58e7916a197f6a21a4551ee69b459d726d0 SHA512 0e8a76a1d685b980aaaf7d837926dd22d6e8281f764744c5e9cb85fb06128876e8adf74bd127bf612a6dbd939c02e6e99240981d56cd80769b31ce84d6f84160
+EBUILD xfce4-session-4.13.0-r1.ebuild 1844 BLAKE2B 17b11f96ee1c96b40424ff00404cf60fac155d8ce365058de7e32ece7276dfec3e9e7f2ba682a85a9819bbf3c63506deb8fc657a0d312d208d4d5fc2b3944678 SHA512 49fee7228a301a1aca8c4249151d0286925ac99c4ebc7f15d468469debe5a7f44b1a3f0fb1ac206b3af5604182b4fde4b8d8c0fd8e66d223a379f1b1a7c0a8fd
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
index a34ac02f6aea..384a9d6c6bc2 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xfconf
DESCRIPTION="A session manager for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
index 19efc8cad645..bf59c0c7e889 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A session manager for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
index 2d045a1e7c0e..b615b4a2efab 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A session manager for the Xfce desktop environment"
HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index b79bb6aa7f5b..61d0ed8000c2 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
DIST xfce4-settings-4.13.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
-EBUILD xfce4-settings-4.12.3.ebuild 1527 BLAKE2B bb69fa67131a081117931aec36501ff7fc15fb82735f14acf281e58c4d396e67972442fa6f1734cf30c65a97db1ef43a0aab2f19fdec2a4a77d8e0b03a6ca340 SHA512 d0849b13ef3be178469e9fc505f16d156a4a01f6448b29810d9b3fec614d4710b788750de1105f0ea78a69f20274ff4dceda0c95451c516988a9709acea82b7b
-EBUILD xfce4-settings-4.12.4.ebuild 1534 BLAKE2B b59609f030b4bbaee835e5256af079eaf127ec934c2d06a31c7a8a9f1d3e2882ae744635509194e9408960c8a5c7348b9843a8eb35f8ca588a3aaa647d21905b SHA512 c1cad13e57e3555df0f9aac83c003103c5a971553496e07f27f9b22d62c5e43af975acf9df3860eb018874b0a422ab23c88b4f3c87b02df1c5d2ac07480d6f30
-EBUILD xfce4-settings-4.13.4.ebuild 1526 BLAKE2B cbbc0aff77bd2988097901f46cd55905e5361e2fe1008fd1ff7d61678b2fdc50cc035dd4a87849a5bcdfea2ff01e9e2b24f1e30fa51a726772ac5ae28390cca3 SHA512 9b96f377cedfe112f55f22a8d45632e3f91eec08b8b2cca14e0d49fb60a83d109bd026056218b7191a291af3f75770671628841d1808f0ef206f030587d75e43
+EBUILD xfce4-settings-4.12.3.ebuild 1538 BLAKE2B 837b802a9ab371d5254cd614a18f5ed302fb9e5ad00292b8e32a5a6c317a8e3addfdf09f9b650644d5eac79eeb6545a6d2044e078f567c922a3bb5d69f4a3ab3 SHA512 eed0caceb050be9531554027ef3cd2c8565faab86b6c9179b18d74cf8602f0076968bedcdcb81bf3644a3e0276dcec4d79133497dca72a75b8b6a5764fef3571
+EBUILD xfce4-settings-4.12.4.ebuild 1545 BLAKE2B 73ba84e843636cb6e94a6f6dc1831b1c1437a6a77b8c740f404f9abc023579f8eab0f906cca2e9de8dd03c3929c75fe7008291e78777c02c6a6ffcbd55da2c05 SHA512 4b34b89e69a4b32a50372303b4c5d289f007f75b83233efba43ba40dfc4e079739d4d13f665b1bdc849a78d9054a7cad87c4ccac2513b6ccf9961a5a89142119
+EBUILD xfce4-settings-4.13.4.ebuild 1537 BLAKE2B 8df96eab92c84ffee72c62cec458c91ee387f9b60c090cbe111d4e95708bd2841f3ebf8a4cd2e37fd38f9d60e946660ace933f25a64a3aad50c3e0a414839593 SHA512 b47ee676ddac58d4ca54386edadfd9c247e81b3fd472f89857b441574e2ee3b1a42c5b8af214035bc73bf5c094d4515852587e999d1015475f8d5039741f6715
MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
index 0c1537f2c7c7..3c312a717241 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="Configuration system for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
index 553d8cc61269..a4d3a291064f 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="Configuration system for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
index 0d6ecd2df123..c72c06e61b71 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="Configuration system for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 06b31bdc482a..c239ba681d24 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,8 +1,8 @@
DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
-EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B efb440814d76cda63c879f32a9476fe3982b649b80667acb909830259c83dcb154c189979244ea5764d4946cad6c90f9281716d2febdc6e34cf86c6c9ef737ad SHA512 be35dca28ac0c084195fc9f6ff6cd30634593cbe7f23437d352dca00428480b57bf2244830d76b39ff27632651f010753266f231002dbd45a5bc7138a6dd526f
-EBUILD xfconf-4.12.1.ebuild 1496 BLAKE2B d5f1e391025f6339da53bf505ccafc5bb29ea057d294134a0169541d8983ff3d780e9cd1d6c6cbb49fce41716b741920fbc8cfa103f86f9af817dc205e33a341 SHA512 9b5165e8d4246cba0eb0d3c37f1dbc363385bd14f24f06b4159cae98169c924a60563ba897ec6891bd860c8f93cc1ec67f154cae2158311a6b20bcc8a21d41db
-EBUILD xfconf-4.13.4.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
-EBUILD xfconf-4.13.5.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
+EBUILD xfconf-4.12.1-r1.ebuild 1833 BLAKE2B 9bca9d31e9c753fefff39b9265b24cd21c6f1e6760c748f6074e96e930e665f138d5a30ee9443526d407321017417dd0d400909e73a438fe8ebbf8762e3d49d8 SHA512 0588601a0cd15eebc6405d6bb4b5a1cdc6dcdaf33b5cbe36313b64741563da57f068674e8367f1734cf61161bcbd02b60e87585a868b0eaf5e284273e3699dbe
+EBUILD xfconf-4.12.1.ebuild 1507 BLAKE2B 03e1ea51842ae97a8bace0626ea2057bec514205c8e08034d5728ebc66601596506a677dffcc15271896fbc6b77e10b0883f4fff2b0952a976e8a347b18f69db SHA512 d3d6c22b4cc9de16056580a81faddba0c1629b711a389ecbfbe10313273bfb2d558a97c06e39e546183580ed7525257fa791e3162c355e7ac5dde71154d8e703
+EBUILD xfconf-4.13.4.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
+EBUILD xfconf-4.13.5.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
index d95b921ef80b..0a9248e0894f 100644
--- a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit virtualx xdg-utils
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfconf/xfconf-4.12.1.ebuild b/xfce-base/xfconf/xfconf-4.12.1.ebuild
index 87e7dfcd2f09..e38db0fa9701 100644
--- a/xfce-base/xfconf/xfconf-4.12.1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfconf/xfconf-4.13.4.ebuild b/xfce-base/xfconf/xfconf-4.13.4.ebuild
index d82d16a974dd..39a35ac7568d 100644
--- a/xfce-base/xfconf/xfconf-4.13.4.ebuild
+++ b/xfce-base/xfconf/xfconf-4.13.4.ebuild
@@ -7,7 +7,7 @@ inherit virtualx xdg-utils
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/3"
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
index d82d16a974dd..39a35ac7568d 100644
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ b/xfce-base/xfconf/xfconf-4.13.5.ebuild
@@ -7,7 +7,7 @@ inherit virtualx xdg-utils
DESCRIPTION="A configuration management system for Xfce"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/3"
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 346fc0572a6e..d01d20bcb029 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,7 +1,7 @@
DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
DIST xfdesktop-4.13.1.tar.bz2 1485914 BLAKE2B 2b991b40317c9d92b53f357d674078598a7b17dd870155de8eb360fd9998d5376582909b57a93e00628a7dfd7e65bfea22b7f57b9373bab869296ef9b2973af5 SHA512 efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
DIST xfdesktop-4.13.2.tar.bz2 1486455 BLAKE2B 38ba5da7172212f74281f60688a581e525dcbb91ea381f8fcbdef57f90b54b9c21d08f20f3b1da5c91dcab158c2a7ba415822ec7b1f92f1cef80e53624a1f741 SHA512 0002ed639f8554144d8c921ca5bd9d1c2ed634baa11c98f95685c8a636ae6bdc87f8df19aa138fe4eda591facba964451a10aef6ba303be1fad66013bb06ae13
-EBUILD xfdesktop-4.12.4.ebuild 1293 BLAKE2B afee7c95eb813c38c160599c78a894870a18c3bd3b52030bbf568efaec03f627457ff8b4062c16f4e7e5baf7755647f7ca843e6a194a8d8161ee7cac7771373c SHA512 f310a9dae888e03bc2fb487eb24d4ae2f305aa91a5d14758d7af2f9b00254bf757d8005baedec59181014def8353b1ebde0825f45d615c062c5dee7c0e8f6dcf
-EBUILD xfdesktop-4.13.1.ebuild 1269 BLAKE2B 154710d7f9b611dfbd98ce74090ac9b95a65da9a716c63b18e283c3d1b1026a24b2811aa866cf06390437eeb09b03c941ab3502902511b0d2fb62cad47f71c16 SHA512 9c73c11f37312317b3f330f91ef062ca645f9db4d15ca55e9abe1b8e2b975be0a7a21fb1f2af81d4f6a59de2938b20bdb66956b681ae47bb3f1012ab319c83c1
-EBUILD xfdesktop-4.13.2.ebuild 1200 BLAKE2B ee9fab8f3f3490b4f0d83664b928de46900dfe9019b1567264e16781f01bd98638d702e655eb2e1ebade3d3d32ba4bc38d23d2dcb334241f69d312ba03f90486 SHA512 7f1cb8f934aefddf39e76b8f9ae867f691172166bc16e7a427af354022ffa5edf8c5c86c8749a449bc70d31da408607a4d490b549ffa1c3edff3ab0ab5ab9cf4
+EBUILD xfdesktop-4.12.4.ebuild 1304 BLAKE2B 694689d44b083df8e79f3d3c0666c1e17d8dae958c08b6cab9180925d15852a555f99b62364dddc6c8eae7075fd457dfbe6292a1fb94c61edb4feb1f8d1f4e73 SHA512 9ddbcdd35ed2d9b59c0c99eb4f909f0315d89c32749514ba1c59b98edf295554e364bc28d6459722d7941a67d55ea2484e48fa668bd334fc378ec609d2ca60b4
+EBUILD xfdesktop-4.13.1.ebuild 1280 BLAKE2B 6eee55154454d4801622c4eb508d6321e8c36b3f6142ed4f5d570a0154b408d849f9d3f7e8b29d0ff0b127ba6bf58bbd2ea8b254843d5e3ae628be571a9d8191 SHA512 716247c2a28fbaeed8f6c546f10b4fb6299557481d07112c1f1fc4c83b3e5dca3e3dd9fe0101fd1de1a0e99c78b33e7153f9ea1018d48db9c2156300ab6857c0
+EBUILD xfdesktop-4.13.2.ebuild 1211 BLAKE2B 58a338a3daf13ed88f5601c603510906759fbde4d8859eea998713c860c60d9e28f371383161ff0bd7f0c979e1cb76fb0f004ba7f91d8337876e54bf9f384820 SHA512 8cafa8e3b5429c15832c6b329f431e7bdb79a48f7d0ca5d5fed1668af1d543db98da1cbc62d25e21fba30dcc96675bb943ae4371fc482b8af38bc3a49cb36372
MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
index ddd5690a79af..4f680e1def32 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Desktop manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
index 9eb738e9029b..3741432d8dea 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Desktop manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
index 87c12c2ee90d..b8a68348084d 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Desktop manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 4b3512b1d92d..18e42c24be45 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,6 @@
AUX xfwm4-4.13.0-ctrl-f1.patch 998 BLAKE2B 9124fb6d749875de12cdc4794e923c621a6dbd7d6ee01ccbdaa876a72f41ce1fa2f5dff1ab4b718aa400c46f5a0c65c9d193c413a6ca78d07e99a077ac683134 SHA512 266977cbbedb5656196276c9441922346d936f1cdebdcfb24253add1c4d643344e00046e5574a534a5b5b70ca13826797f6202700b4aac09e0281e5c518428ba
DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
-EBUILD xfwm4-4.12.4.ebuild 1515 BLAKE2B b774428b6c7ec3578b2ce679a48aa2861cabaebcf79502950ff6604cc60bbe4fe82fd95d69e86da64152e3bc774c7adcc9102b00b6ad41024bc2cbde00b4f2ce SHA512 b8bc401ab7767cc5a5598dc0a0ff367954326d24958243ca20f04c3d9588a7c9c0f91e5adc0f8d2d7449815767bc4e73648f7ada150a55549183f3381602bdf6
-EBUILD xfwm4-4.13.0-r1.ebuild 1741 BLAKE2B 4dad9fb930616e610be3a16b466fd5505e40be94dafe393d17e3412d27495c3119349422823761ea77c9876764f6ea8456b45b3afe6a71d0b72032126312eb1f SHA512 9dc3905aeaecff14847b34fd4d2f04e932688aaed8d7244ae9f3eaf5a6e2bfdbddd21ee66547c209f0ed787ab778590d90261b2766d25fb267d106d65894f440
+EBUILD xfwm4-4.12.4.ebuild 1526 BLAKE2B fb44b379be5c8e5420d2b58b8754f7accbe518442c48b707a36e10ce62220212ea5c6b005d5c3abe3082d24108689adbaac03cb412138983de73c308dcd2da78 SHA512 87d67c9e6ff47c4b785fcbc8e71007ed5af134552fec9616b41bc26a81b72428314999d9969ab261ddd88c1bef4184f78d17a4a9f06970c1ec4565089de1a390
+EBUILD xfwm4-4.13.0-r1.ebuild 1752 BLAKE2B f35aca2c13b7104805d4bac0787c6b03b90bef02ca32bdf306f98bda1ec00d929b3066d8158b400cadb6e011cebd003ebe7c6a777fab0c9fc851a2f55db4a447 SHA512 62821ac7e4454357071cc1953e47d05b3f5d84b367e5d3856ddf726120e692b0e4161597c8046ae32732ae395b891064d66b2efabf497652f3b9adfda9786700
MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild b/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
index 4fb2281e6dc7..53af72fbcb4e 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Window manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
index 93ce8eda7722..398cd2db17a7 100644
--- a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Window manager for the Xfce desktop environment"
HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 6562ae7de7e5..bfdab49e05e7 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
Binary files differ
diff --git a/xfce-extra/eatmonkey/Manifest b/xfce-extra/eatmonkey/Manifest
index 679b419251d0..620fae51a237 100644
--- a/xfce-extra/eatmonkey/Manifest
+++ b/xfce-extra/eatmonkey/Manifest
@@ -1,4 +1,4 @@
AUX eatmonkey-0.1.4-syntax.patch 267 BLAKE2B a0e534be04ea83c55ffa073911e173c48ec1c4060b6b3ee263cf4d11b393b53997af715803ce8c2fd398230d7a5ec782b658cca78803eaa28e2a166f205aaadb SHA512 1f2ab3c62ac18e9e93caa62d99b8deb39303689b1de63845e9994cd81b223c924f6c8257affa66da9b539c0f74bd7364620306239a4d55a8539df92f19980ed6
DIST eatmonkey-0.1.4.tar.bz2 181996 BLAKE2B d9272cd62dea09e44c9f8cf20055d68a6f0e0eda29ac89ab450b9b60ed4fa511c6661b2a38811fac86c0203b119c1eb07a886b11ca7ad0f48db6e0fcb6431848 SHA512 95bd0bf46588151398fba52b01309f9df1cd8ccce046a2b81f7167adafc4f1cd1b217deb27c0ec91429a6cdcfb807bbaf7e00fcd7b31414316dced7a2c0d4a15
-EBUILD eatmonkey-0.1.4-r1.ebuild 989 BLAKE2B 92f4344fb4cc05f38e105f682186a88945d4964a6d935b7aa3220a15fa0465c99e0e1b692b2ffc76c9de2380fa028980e193fe3f208627d49e8926ccad4c4acc SHA512 9b7df605fd255b651dbbd6dcb82599c77d02902ca1b9881c79c31e8dd671349041e01e6a3204bd74e7b10e40d33a7991e498a1cecd17866bb1d6720804a55903
+EBUILD eatmonkey-0.1.4-r1.ebuild 1000 BLAKE2B b016df86d6410103b5f39cd62d14ae20fee332a3ba77c771e7da9cbcbcde6bd38cc120ecac2635f97c56689b0d62d3cf471e8261a99701564f4964db0cc2c05d SHA512 6f517ab8e45055405dd6c9cceb89136c39e6f36c3abdbcf606aaf9e8828b4a2e959f2755a1463d0eb97d6bd0766726b39bae4bad0165370fed261f89941e87e0
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild
index c7f2c0b86a33..d1eafd4d35b9 100644
--- a/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild
+++ b/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A download manager that works exclusively with aria2"
HOMEPAGE="https://goodies.xfce.org/projects/applications/eatmonkey"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index d4bb60c3f23c..a035ca108627 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -3,6 +3,6 @@ AUX 0.3.1-add-support-symlinks.patch 684 BLAKE2B c35eb501afdf20bea96f45ce766763a
AUX 0.3.1-fix-kde-ark.patch 609 BLAKE2B db06f3ac161da82e534b60570a0890f1b2df96ea061430b6ee04d37e22daff8ac4a4bbf3a0143ead2c9643fc6d560f77ac486e2c1d21612069e6696cdd7f1d0a SHA512 43433f9022b1659eccca84d48555f5be997772873aaaeb2fb46fb89904d0d993aff7bd91d850d437ac33c85405ea8e09a05e035547e5d8bce6b9fbb27dea9702
DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68
DIST thunar-archive-plugin-0.4.0.tar.bz2 350011 BLAKE2B aebe828396e75701b788dd22266ed154b3a8296b8f6a912fbd99d4ebda1db2ed2a5cbf957a381523194270b5f1ea8ae6af24ca61e35b3953de54b0477bffd6cf SHA512 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44
-EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 1173 BLAKE2B 1de7a1657bf9a71e26308f719931f7860234e477cc2c7bb6557b3fdaeb0e25a62f3b83b54183211dd21ca68ea6186b1f74c6e1c9b77ee6a596b5e8fcc61359f8 SHA512 900817fd4ff5c636e73e7f13d763920a4fbdf2287c9f6338b229ad17133f6c35e1cac1a32643d8804cf4a88624136ba3dc3b8c2477c26828ed951d6fe9712142
-EBUILD thunar-archive-plugin-0.4.0.ebuild 858 BLAKE2B 1d42764967223557d411f9b958a9b1581b93fc935e79eae1585bc2728ad96cb3ff1f1d8b1c8a459b44b7c9198c5614d543089822eb1ff13c219f59f8b46e89b3 SHA512 bb7a8a18f967f8a6c83c04046a5899e980e8dd55375e725e4f3e353362ffe217e72d1dfe384d446fe1fb347f6ec5a2de3ce5c5c4edf2287fd8f19076be503d55
+EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 1184 BLAKE2B 0bb8786998992b461acf4b53b6f247333cde7b62cf32e5bf3a744ca62ee98198fd301fb2d4f4310aa5937ba671d3bb0b9ae4c54b14d2b607fdb643386596ddc8 SHA512 6f9cf536783a86609902e8cfae67f71a379a0196bfeb2f323c46690868c403ca2ab0619bbbe2ae48b4788363b41ad112ba994179f3b998752e8608250e954887
+EBUILD thunar-archive-plugin-0.4.0.ebuild 869 BLAKE2B b9c8d6e3ecb38c6249617030d79ebfd3b8bf875dd4fd4d65a469e77e999cda67fb048107c2242095550544f74f5c7885e658266f97d7c517674ad471575bc8f0 SHA512 5c4fff79abfb1db19f9d4456fb9b51b1b2a777272839d35567d3b8df7d5267dec74d4cbc279ca14843e97d3d922f4d23186c2213b515e1f0570a8e9f48c8069b
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
index 965402869e1a..8b7b9632d7da 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools gnome2-utils
DESCRIPTION="Archive plug-in for the Thunar filemanager"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild
index 4e609144392c..501d31c528d8 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Archive plug-in for the Thunar filemanager"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index b20e1beccc1f..b10af62b787b 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,5 +1,5 @@
DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 BLAKE2B 1f985fadaa58ebcf516c6f57f429d3a0c96161572a9829b7240e1f5550ad2cc5ebb121cb985f1680440ab4fc8be68be8f5ee3c5557d8f95aa0c23b3572514ec1 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d
DIST thunar-media-tags-plugin-0.3.0.tar.bz2 378993 BLAKE2B 9ddb44862808eab8e836cd85ef9afd6b04a96d1b1b98a80bddba85c1544e91a563b3d40ede04035de50b032c01623d574d818cf19ba60483432a78a61e772c21 SHA512 f7c13acb1d9936676e22fdb2d6c1def5ad651ab104110559817fc51dfad845823de4ba724054a7e99a4af980e62e05db750097c32018effa29cb5f56676d9eaa
-EBUILD thunar-media-tags-plugin-0.2.1-r1.ebuild 691 BLAKE2B 6befcf59d65329f4005dc53b448221d364feb83bcc6afa83da9360e305d64fab8fd16bb5612fb1db4c1e360df2bf0afee964e3656f2f215de110596f92d183c8 SHA512 84576893cf4c2f06b09c2b6338bcf57bde40e60911498081e51dd4fa099674caafadf49b42ea06c43652399ef690b36534ab44fa7ffdcbb8c5b20ef066db4c25
-EBUILD thunar-media-tags-plugin-0.3.0.ebuild 654 BLAKE2B 1ab7984de05d51f6b79d95955e0280cc95f7bc4a6c4fa142458367e3ac200d5025e50ce9e4e26af779586fe30bf072838697c7755fdc441466684be083971b96 SHA512 d3b8ca9b6d023e619e83945f8d1570b9289fa7f27669b7974763229605f1429081d1fda87ea27a5c55cfd8bf825cef0e0bb5a9020d17306ee1fa5aee5db8b568
+EBUILD thunar-media-tags-plugin-0.2.1-r1.ebuild 702 BLAKE2B 0db4842f414b2f38394e654120a5b97553338242a22f2f449a7552b0dbc0d3089323601905142290fdf2bae4249faa235a7ed5e5f9ba986156e022f2f49ecbbf SHA512 21788443a8458fa30a9c700a3f063f596a2570e5851d3cad4a498a0051b0e54893ea723e7f196eb0ebd15750df172a2b2982fd09a6c84bd36d74befc872ecea5
+EBUILD thunar-media-tags-plugin-0.3.0.ebuild 665 BLAKE2B 3e22a4b80a78f9efaea114557cdf0497171328da0efb0858fcd1d9fd601fe6a3101f94757a79ade3553a394580ae4f11450e2ba2eb5f6aea4c27110d8fc04b55 SHA512 95c7582219ac67362e04cfd457b7658294c9f355e4ad5abe906e82db6606fdc2527b0caa1a6b59bcdde2e26bbb28530a2528c027f92d4ab497558bf4de59840f
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
index fa7ee8863df6..e4a4a3848669 100644
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Adds special features for media files to the Thunar File Manager"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
index d8c77e9ad0b6..d9e374f94d67 100644
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Adds special features for media files to the Thunar File Manager"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index 620c3a6e7199..2e172fa9c063 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -2,5 +2,5 @@ DIST thunar-shares-plugin-0.2.0_p20101105.tar.bz2 686286 BLAKE2B 2b4977cd6c0a407
DIST thunar-shares-plugin-0.3.0.tar.bz2 340867 BLAKE2B c648b9855a9627c0659087b55f8f45d36f998c11504d32be7bf18abb40ad0dc1124ed710f55c12b35978e5727ef6a4706c1415dbb04f2d5f6259fc6dd1f06f3e SHA512 20432990c6ea241d24fa8fd1b94990ec25a5ff6213361599936f1bacf86e323c8cbe868491ff600ef8c11dff86dfdf9773258b9c5e7919bab50f332cf4a7797c
EBUILD thunar-shares-plugin-0.2.0_p20101105-r1.ebuild 1046 BLAKE2B 07df3fb6beaee1de3f04d62d146f9fe2c4df299b7ede22f6d11c3cce3b2c7c1d9c47e3be03ce861e598d518c16be5b294226f570fb76e08cd301356a68ee9779 SHA512 cc332c4f49c1a27c4585ae104627775186b587cefb5458108f929a9c994abb951362b6c1ae174770501ab51c43082415b5c338e757134e8c2f66f1a9d0eae8ba
EBUILD thunar-shares-plugin-0.2.0_p20101105.ebuild 884 BLAKE2B 1085473fa070dcefbb6befe79cf8c2feb5530c28c2200ac58b10d8a52de5e3cd9dc05e667cc8c5b24577595c82f94f786e433206cfdceade85c67d3cb715664e SHA512 2405191ccae587a7d13713dfff647effd60064c0f9c89975066fec1e3f908670161d665d1a042e7fb0af00cdbc5fbf81a6512f8a05f4d6c913e97ff5f380aa8b
-EBUILD thunar-shares-plugin-0.3.0.ebuild 609 BLAKE2B ab3381fc0bc1c48f8dc51bdff026d9d755f53069d2e606ab4478d2d312500b5288a271f7cd7c093b5ad87cb34416cfacf29f7cb773c81a3a98e51b4f202c7842 SHA512 25194e4e72ec275af1960051bce7fc2b24fd708165bf65e19e45081e31d459fa3670d169b1a8a4cee57e585aee1c24f096e7b085c419362bfa07fb277933d3ce
+EBUILD thunar-shares-plugin-0.3.0.ebuild 620 BLAKE2B 5f58faf3d60663b3b3ec857b888cab1b65ef9d0ca2b1f44461a85c9d593e6136c767c8b25ee24936b7b954d6dda6160a532d7075f0e9b12f5450988799f4df49 SHA512 f6906633b5b881d0426022a85e4a75ca97789afc99fadf364b6931e7bbe9ddead6421cb10bb3c61fd70d4da62501783bbb951c647b164dfc9520c50d1361d039
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.0.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.0.ebuild
index e63c697c431d..59be59f8740f 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.0.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Thunar plugin to share files using Samba"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/thunar-shares-plugin/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-vcs-plugin/Manifest b/xfce-extra/thunar-vcs-plugin/Manifest
index 8e434cd58a4c..88c06d446fcc 100644
--- a/xfce-extra/thunar-vcs-plugin/Manifest
+++ b/xfce-extra/thunar-vcs-plugin/Manifest
@@ -1,5 +1,5 @@
DIST thunar-vcs-plugin-0.1.5.tar.bz2 478866 BLAKE2B 9bf2b060d88a4379f02c0e8af1829f4cf621e2590f7885f59d9af56d825c1d9d218c56c3b97420087b46eece0eb6c15146f6630569928c8523fa34bcfdbbcc22 SHA512 0315613fe97d5cb2fa9589af49bdb5074f20c83b52d5f7d4a151091839679b4617e8e0b20df85914b7bcef2464173dc1bd2bc182312364c7d5a94171aba28983
DIST thunar-vcs-plugin-0.1.90.tar.bz2 537001 BLAKE2B 0f2a77af75a33fe514892a1eb7f1df92be6e50d5c0aeae5f9350db648b10b868b3ff0421614ab7de681ff445d5a1f8ac9a5749e235c06cc3a039cd89b382fd7d SHA512 6231bb863d9b884cd27f26e6cabbc3f8d3b39dc162f867932923408636bb96621bb60aa1bfa9b4637f5eed694e623cd911e855dde00d382b2a1bf36bb6b44e63
-EBUILD thunar-vcs-plugin-0.1.5-r1.ebuild 1036 BLAKE2B d32cb8f71c200bdfcfdc9803e19d4e6a65ebbb8d922113d56ac5f186dc1c20ad55fac98d2b58395a72bfd9dc6e53682ce64e075f0ab10b29e4882215920a13b6 SHA512 a63764dd55694f59189e4f979fa72fa5d9cb6a38535494ab6cfc53f360675698e999155592cffc18fd4974ddeac2f81719afaf2382c1ffedd418e144f2643925
-EBUILD thunar-vcs-plugin-0.1.90.ebuild 1003 BLAKE2B 8abc87619f0a8803428f694419fda7538d4f5c7977902dd13279637a47e8e44ffc13436d85701230e7cf7460026c2c7d0d8f5b0d876b98a24ab2a10539edde96 SHA512 e85c05d0670b8af44c0f3df1f102bfca13016257f3598103c0015b29e61bda56a6ce4aba6c4724f5f9c7791f122b406fd30ef9e89cb9bd1eeb87b3848969c5cf
+EBUILD thunar-vcs-plugin-0.1.5-r1.ebuild 1047 BLAKE2B d51bc9ecb75ef5ff44d7a9884f8cf5b9c5bd61128fc217e29a3df8e4af0d0d8bd9a97fcca41cd59dc763d6600ff29a03a05f02ca9918ed838651b780eb228d69 SHA512 bb3a76ee42077891f10e37e9d6134ace8778b21935a38d38aa6d4f602cbacd758c00108b3e300aab99631bdd941121b9ef5e0b40008898c24c5ecf0ac06b82ba
+EBUILD thunar-vcs-plugin-0.1.90.ebuild 1014 BLAKE2B 355db2f26dfb3c27a43bcbf9585e63bf7c01c713dd833ead48908c823f97f2adbb4bb12966adf1fd3104b16b9395341aa4d99d91448e530e2d47ac7b77f2d7fc SHA512 b3e6fb3d17e9af8eb8d7f7a5f7a5d1a77afef7bde947fac5d7d78092edf27f2a74a3741bcd44b0e320e252b211e16b6bd26fb9a29039c9c187f44d54330bdffa
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild
index c5c9272e12fd..f8ed9e146de6 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Adds Subversion and GIT actions to the context menu of thunar"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.90.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.90.ebuild
index ef9f9a686aa4..796427a2ac59 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.90.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.90.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Adds Subversion and GIT actions to the context menu of thunar"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
-SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 9d9653cf1aa1..c16afd454ef8 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,5 +1,5 @@
DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
DIST thunar-volman-0.9.0.tar.bz2 474533 BLAKE2B fff6292c7e613da47c32d92db9ffe0abd32ab2ba5c956c630208d2b3235d4f7a5e3aab5ddef291c0d185264afe6493566f4e5e0d73c60e093dd52567c5d5ff1e SHA512 d753e2aeded921e5652e6ace164845997dc3cdfbfd92561e2af822bffdf910a06850658a9f662198e4f7c485a3dc1226f97b573d28fb66e5ba490aa08f56a8f5
-EBUILD thunar-volman-0.8.1-r1.ebuild 1061 BLAKE2B fd6415b3d5f4cf421e2c451155a7b5a05bda35c0ab945ae21d04bd7e2cf30df0464623ca2c1ba4ab9977152938ebd6f5fd4f077da318d74976821197bac4ffd7 SHA512 cff715ea14f0c8dbb740f558fd7d91e8ac1b85191f2d76dbc78552eede23280d18513ebc7d30b39aa975e1a92745d52ae7132ff952ff0066107c45240e137b8c
-EBUILD thunar-volman-0.9.0.ebuild 1033 BLAKE2B 5d5137fa7eb5c3e9b90cbf0e363f081ce19d650a8ca7715f138795438a94b955e4f434b1bb6855484fcef442040cf3d1bd1ae5856597db98f4913564391503f5 SHA512 5bb418947cb406f65fe1469742d5dc33080b52a61ade1bda56b263be6024512e8a4e27956621c8673c734084a7ec2ae44ca9cddd3fe342f01a1e765b2a5f8651
+EBUILD thunar-volman-0.8.1-r1.ebuild 1072 BLAKE2B 499a87f5bf590fc075e158d8359a5217446dfcd7f4e24f422232787b26357f5e14aa0bb9ca6a70393a68dd311b8b7b09c10f3f5aaec783f134985981d81b5718 SHA512 dc81052be56239ea4180db4da03a714cfec87c18517ff7dc464359302197e07251e7c15444e51301d5388e80db92fafdb2fd10dc64a86df9f315eca924408fa4
+EBUILD thunar-volman-0.9.0.ebuild 1044 BLAKE2B f8ddd807ba1e3b99fa272501269027bedd17df3070f3dec29f72f6f2edecc40513fa5e8656df4f09a4c32612a365d132702a1a4de0ab4e032f22640dcc007bba SHA512 dc3d7ad31f9c95e552377866a450899ad1a1e2196f6182c0a1763834d14ac623bef2b722e93c4662395f83ac23b00b3f08fe49dc06adb1be863126ec65d3b567
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
index 64d3941b4b00..7e88da37b88a 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Daemon that enforces volume-related policies"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.0.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.0.ebuild
index d9a80b036e34..373a86c2987e 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.9.0.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.9.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Daemon that enforces volume-related policies"
HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 6e2a9307a392..a468a37c0540 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,5 +1,5 @@
DIST tumbler-0.2.0.tar.bz2 571300 BLAKE2B b4b923716897773febaff21c7d13fb8e4abfb36f9a0a02e4b777516ecd6170552d757057a228832924f4d8cb9f61380109ef52d0efaddcf69069ca5c0df4ae6c SHA512 54f83f904b32fcde5960f3343f8f4477bd30cd96a784aec5a3cb70aa2c9f924e833b2c0b429d608a36c75104d2689975d688358893127aed501f3cd8f24c280b
DIST tumbler-0.2.1.tar.bz2 577996 BLAKE2B fc1b9dbf9fee4453f6de5d4e901fac13e38534560230cb18e51c3325f648d51885081c5af182af2621f682cc22b0abb99a02ef45ef37a7e604249baa73eaacfc SHA512 c88595312e34534cb43d304d97a60886338d92997a7d0b5a8bb22d06dfb13d7a7445b148ba4af3766df24f6c87106a7f65758debf198e46d9fabf00049b13386
-EBUILD tumbler-0.2.0.ebuild 1517 BLAKE2B 48bbda328f478a2a5a3919f5eb9a33ff6fdb765f64fe776f242d9df4a793c6fa7d77660aa80be2965f385844c59df202d199e4920c14ff6affe06425fff6ab79 SHA512 fe2fd3bb5a63fa2fe1794b32d53058aa1c1d67832bf14916d198d2acbf79eabca590ca24936c2896328855e2418f594169979c0773ace03f527913d2a0600f48
-EBUILD tumbler-0.2.1.ebuild 1522 BLAKE2B 3885400e00f8629e558cb57571574b78a520916658d4065585a8ca3fafc55892bf7990a3d67a0e55e9b272c3cc99794a272d237a8b13eff4d4455ab0ab86b26a SHA512 e9539fd95ff70e1538b70ddd464a12e980ee6ace357bad88653b571295fcf7c5854eb8e41774565b79222d62b363585f66c668f0c517a001353088d397adc951
+EBUILD tumbler-0.2.0.ebuild 1528 BLAKE2B 44fe4648ef7c7797cf71e43e9f5ddd6e8c297d6c3dd0f73b5fcb87063f188101b4baffd61e4ddea26b1a78818278bcbe52ff62a0801297ffca2b78f38aa5e684 SHA512 3afd2050d7ca96961d3e0e394c9db19d8850508facc9eb8698f05ed458881018b5c2a17578453a01ca8d6bf3e544bd076f786209fa9443460e351498a93b022c
+EBUILD tumbler-0.2.1.ebuild 1533 BLAKE2B 3ea3f082f65df65b2edf4918e9b8523096df6c200ffc214015fcddc40f3f468a1f77856049751d306e51d8ed9ca9d1a9e2979fd3eb0257c08e2008eedf8c472a SHA512 52889928a3ae10b113c368eea6c80877eaa3b6b29bdd74685f43a03d4f26664a9ac521a0ff8528896f41ad95f677a589d8e5f590e4e85d4f7668b6f78fcfcbc8
MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.0.ebuild b/xfce-extra/tumbler/tumbler-0.2.0.ebuild
index 6ee0e2e7df99..78ae69e7b630 100644
--- a/xfce-extra/tumbler/tumbler-0.2.0.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A thumbnail service for Thunar"
HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/tumbler/tumbler-0.2.1.ebuild b/xfce-extra/tumbler/tumbler-0.2.1.ebuild
index c4289a84e246..004f4f20d9f6 100644
--- a/xfce-extra/tumbler/tumbler-0.2.1.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A thumbnail service for Thunar"
HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index 268e41132e5f..01ae7eb63249 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-battery-plugin-1.1.0.tar.bz2 398621 BLAKE2B 461f32e07708c29f2157c8909ba48a43458c06c9622ec0835f4cf6abb0b1232bc35f23a7e945315eb2d49048b9c0023da3a27803cf95217374962531db986e97 SHA512 d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
-EBUILD xfce4-battery-plugin-1.1.0.ebuild 1090 BLAKE2B 04f6de56d27957cc189efa6d1946f7adab0321670742c4b2c79f82b8d0cbe344f8788e64a10791897c53dacc23bf930cb3f34751e98f042e10e6db7c24565e0e SHA512 7cbdcbe23e4aef35969556c39955c8a2e4b20f785ed9f1a004c52d880fb0fbd37a81946d550e376773e7e92949c377e3a576c8795be3ad93c5d46d56eac914ee
+EBUILD xfce4-battery-plugin-1.1.0.ebuild 1101 BLAKE2B bbc742ccf3cfb93277e3f5dd7eee324587f14a154bd286688ab1d715a6247e291b2a5f087086538351d5e217bd2eb0862b734331ae29390e024ca592af5120a5 SHA512 908ef23e02b60659d1478e042ff5239d10aa539db7bec59504932a054e216690a3be5a6909a50026e89b038ac01bc8107a828b56a04a8bef556670ab541d994c
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
index 0482fdae6e49..49751e1695fb 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils linux-info xdg-utils
DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cellmodem-plugin/Manifest b/xfce-extra/xfce4-cellmodem-plugin/Manifest
index 1d041aceb1ea..da387b591413 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/Manifest
+++ b/xfce-extra/xfce4-cellmodem-plugin/Manifest
@@ -2,6 +2,6 @@ AUX xfce4-cellmodem-plugin-0.0.5-asneeded.patch 329 BLAKE2B 266428763655887f88cd
AUX xfce4-cellmodem-plugin-0.0.5-build.patch 1601 BLAKE2B f51476b859b063feb7c12bd312128e8f4ab21ea29d2ef95d29f0543a0b115a3f7e5797cf6945892bf9d37274d1f62a215f3f795c83ea7539a4334fff7d602426 SHA512 825fcb47f2bbadecec1efefb4ee62eac1e91e29505615355d15ef17d3e6b792ea97914ccf52ae3060ffd4b2714237d2c9de4a3ebcfef6dd8092e954018d9fec4
AUX xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch 864 BLAKE2B 64c0d402afcf7ca0441a8540e45c19e9d8164154021ac9bace8c032a7447d8a0cd22ac1929c3d913bdfff7d2b3c6f791299a176f3ec6a3ee77573bc3406ec8b8 SHA512 29522daf5e822f272d5014019656076d5e400055fcc0ea274181eb599eae739a5598f55fd224aafd10602a2ffb706b0a28335a988682c8b1aca674831424e6ee
DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 BLAKE2B d5a0e040d92886d37232dff755069fa8f58951fc5bbdcb261f308629ac7802d474f2e677da50b82187d14b7956655af9a90639a81fa32bf2482c582675262544 SHA512 a59e2b8fa71b490abc99dc9f28e5b147e77538036988ae4c2faa93bc3f7a0187607d486b7eb92580fe2519a31917cbdba5c7312070149340adc417871e8702bd
-EBUILD xfce4-cellmodem-plugin-0.0.5-r1.ebuild 998 BLAKE2B 96d509679fa2a36df93c0c2cce62c21ff98a7d9d48a13acfbb4975b0f5b5953d2dc1776341a43c37817e83a907010f6e2347dc8dd0859914776f456e1fe97b25 SHA512 c21c01165427fab05a67bf26aa0067860867c116a38eeeaecbf02ab144303da310ef750ab011ab6f3c92caf6e64bc3d648cf1316df0e16d25b04cc6a3ccccfb1
-EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 988 BLAKE2B dda1b841e322ba84e2afacf5c28fcf03a6ca845aa1fec2ee78eb790e1ba2e45268efea024f56120410e9f3fa494c68505315c59b8999c20f7f0907fdbcaa3919 SHA512 7795415c17dc81014e52797a6909a7671bac7d4817161c2778e8d44993b4f6d21356bc52eb5135b8ef411f90ba9c47dab9d8790e4e4b3adc493f1252c8cf7e76
+EBUILD xfce4-cellmodem-plugin-0.0.5-r1.ebuild 1009 BLAKE2B 85bca06c75578e5c09e9f80458ca8c280d721e8b033f599b889d42807b9d434f886e0c4c262116e91e1d0f4bc4f70dccf23df964fc1c9667a0ce038929585525 SHA512 648e6cefb94d6ca702c7f37fd360935a9f964635a67188253287f8964769037da4f8dfa345fd7e314b53288770dd7a146d209140c71bd0d5599d0bb00902e44a
+EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 999 BLAKE2B 105e93fd02d889fa45b037f87e32711d747545c396a7ec355ff36f9ac96d79ed69daac7a80922727d47dae0a0dfbb34671818be1ac2bc29af1ec3c68ae254607 SHA512 8adbc7cd1edf5c11e131493323327a69f14c4dc4572545c8a96e316c36157a661aa1fcc6f6f05bbc0cbdde4eb33c8d6fa4e59041773d9bdf4d22ef8145ad8716
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild
index 4960cd532c3e..d9dddb355873 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools multilib
DESCRIPTION="A panel plug-in with monitoring support for GPRS/UMTS(3G)/HSDPA(3.5G) modems"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
index 818aa1cf2d40..6c98dd7393db 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
@@ -7,7 +7,7 @@ inherit multilib xfconf
DESCRIPTION="A panel plug-in with monitoring support for GPRS/UMTS(3G)/HSDPA(3.5G) modems"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index b478422e0fed..fc6402e71608 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-clipman-plugin-1.4.2.tar.bz2 485244 BLAKE2B 6e183b82db5c3325691d04afa110c4dd83b013a94ed9b3b1b1b7bbb4166bcb1176a6b4ed52fd0b3256b7f73816a0031ea6084f31344a9ac3187b7b5fd25f01ed SHA512 f12d9e3e37a26f9dade5b76e73ac3998030112b53e7ec7b756128f7f1ee28d19a1d7b8d4a26e0ccb69aaba2f0ab2f6c4cd5a435bd1cc7efd81c05b711480eba6
-EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1131 BLAKE2B d6953e95b6a0d922b2ae761ef61067a6150db03de594c02d7f1159f407b4b515750788e1791303ddb0ba5c19c2eb63bc38d01ea2ba38f850c70825cf66caea5e SHA512 7933f3bbdea6758f3c6b98fefe0e68d345e46e8ec0f5d473cdd05b92dd37c31ec60131cd2346ee24f66ae2617a69501b31313f4372e73c5254fcddbc8c38d748
+EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1142 BLAKE2B 32e9d5f2c2e61bb8274d2d3d1765442c12f55027f2ce6985378277f41a4fb39ac6b8fe3e3f7ba78251b53b717b52bf7a105bb67ed8574939c6b563df884591ee SHA512 c23c68ce77772c5e584e7e0fd81fe65d84d23355d13e17d3b0ecf5c84f36b037a88c623e788bedfa57238d4774d5d65899b573a724afc3433b244048f24ecde0
MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
index 5f1a2cdaf06b..0712d1f5ea6f 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index b9847e0d1a58..be1bdb4aaaa1 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-cpufreq-plugin-1.1.3.tar.bz2 369419 BLAKE2B 6c7f38773b0c7a1b6a814b4e3576d9ecd7a5a9f1e3a401a431b2a637eca7b4a1d99aa5fe5efc07435a739594edd8cd5ff6ae7726e4b3563a4b0e37925beb9387 SHA512 fe67abc120c0715b653258abbafab19386289ce0a373e5053e544484219c3b05aafe1e84a23721f6603043db5aac24dc1230f2e7d4974ec483d5120aca11ca25
DIST xfce4-cpufreq-plugin-1.1.90.tar.bz2 366569 BLAKE2B 784d19e0ae13d8c2fb9767a2322d79bbe3e5ea0a6dfc2e2061c76501e04ba51ea7d74e7d1aceace48f6f8c4d797adf41e0f56af0315feffc59ccf0a7d5fef9ce SHA512 23a70603181c69c25fd55d523f29526b88252203f087132f271cf47376d5d04c5b81615d2aba4c2641c886497323d88301ca0a285b9c0894b0051e913cc9a70e
DIST xfce4-cpufreq-plugin-1.2.0.tar.bz2 388599 BLAKE2B 938aa17df367ca4da7cb07df732a413d5cd3da2867772808baf3c1377c80e8b7153f5e659911d48a03d9e292e33af8764b9434e016d7b7f0933898971440ae58 SHA512 594124808fffaed514719a50e05e75612f5c1b7a802df5bb7caf65814c2c7412b9575ce916c8cd0da1360987d198c61ab078efd4a462e756248012999e597072
-EBUILD xfce4-cpufreq-plugin-1.1.3.ebuild 758 BLAKE2B ed27bd5ca7e02ffaf6e8966f9171bd7d7aed00140b68dc3529f61ab46852f66d0e6df41726fccdf392f27dc2facec52c05523826d561566141f5f8755469033b SHA512 f1a46d9969ac3ff5cbbe21c9763ef650b4ef67b189ef06eb0c3edf130690de694ef2a5776573f6f54f83c174861a51335acb0ed544810e70d5c39ed86fddbcf9
-EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 690 BLAKE2B 085f29447c985e71965f7a49aaf6e40f13ce54306920519f1e6130c08c1576cc745ff1eacc2cda5cad203996b39ffb707667ff72cb46e43f40a4d985640c4532 SHA512 2fc51c5fd3f4e8d614bf32934a15eeb44583dc2b9c5928d22eb8473a07265f632735ba5e14de8b2acd1605fc7e21c63b03f1dd8a3cec3d76ad92490409c8a41c
-EBUILD xfce4-cpufreq-plugin-1.2.0.ebuild 805 BLAKE2B 584460bca8302cfb7be858777b4da060d96efb32793307a05554e3eb75925267d62d685224ee9ef6ab33785ce0860cbb29dd253d651c8f7b199c344f2415ed83 SHA512 22455e27d21ad51bc37a41711b698283b6f00435fd02fefbbadaf4d074792b42dc3aa3d9568cbb3200d394c09775978c621bd0f508cfde1e2f1d1791d4637259
+EBUILD xfce4-cpufreq-plugin-1.1.3.ebuild 769 BLAKE2B 1643ac785a317cf573ea49664abaf38560dc616ecccfe0ebf2cf01ca3c6b05cc52d68a3431e5a64ac2cea6c453ee84ea381fff30018e269361967a38084b8fdc SHA512 0c319071094e31ded5f2fc9fea624a42b8a29a844d39374f1289a1421ddf8b62d9aa51be3f4efa4d0fcabb1a6437a448e00ba25182e60354e75ec4b4449ad397
+EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 701 BLAKE2B ca0cb13ffb583b0e9c71d2af37f31ba21bd1fb5746e97cb2b5a7791aea1e5c405f6399327aa67427042f382af389cd2208b2a671f476cdfcf715867b4ee63b97 SHA512 6ddbc64dad79a472d411bb9facca9dc89feb6e18d3cbc10424b1b92c38b6fface358b61ef548c09a6b918925af0869bc861b019bb1fd84f9148cbec4df85b6be
+EBUILD xfce4-cpufreq-plugin-1.2.0.ebuild 816 BLAKE2B a2cf68dfb970b75409213304f26d941b9b739e9fea71751b37898866bdbc21e32a68ec525c1c1a98c1e996ee5303a46fea1bc88ed90f0c391d8a53884df76654 SHA512 662e6bde76b6fb378ec97ff9849227e03d5dcf40bd5de75d52068c7e854d17089908bcc862e0b2a83d703e3835c6265065b0b502d37dce2196d80f68064724f5
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
index b7bce8a105a8..a90579733585 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A panel plugin for showing information about cpufreq settings"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
index 0b7b1e274681..d7b90246d7c4 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A panel plugin for showing information about cpufreq settings"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild
index 9b5a1e034f11..5e72b4997bf7 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel plugin for showing information about cpufreq settings"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 5e1c5fbc0e44..1806facfbe01 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,4 +1,4 @@
DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 BLAKE2B 7c39aa6fd9d0d6ecc5bedce1d99d330765c329d1fa673b61282fdea654ebd997caa118f57dd0776008584eaa2dbe0a6ae7df532ed3b941b03b111f5ae753d2e8 SHA512 3d1246958dd30638104f14a8b0078e25c05b67b42da953a97cb51d2b04e70d3f1da9d42ca4f4575b7114bce5abc4cb94d598737631536c0575b55d9a391e210a
-EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 811 BLAKE2B a648612cefd8aabbb477d85d1b1724a4fb2f365575e298abb79a0ea0651bd672dcae32cbb2a1adbf600f2d5bc92a8540d0e60ba5515309a44ab8c9ab5e07e4bc SHA512 ba398a44b42b945903fa8e50b3267af1e0909cc4106a89007ea747224a3ef4de3c109437ad018ee58b5f7072ae3ae19967d01f7a81b29d9df14b4728c9b7d7f4
-EBUILD xfce4-cpugraph-plugin-1.0.5.ebuild 748 BLAKE2B 8075f3c581d656598b828aa8195b713ad3311fb2a726c3749c221967e575d99cd601eec0989cc6c4106c98019be57983df03d98f6eea9c7a66fdc1e4494a35b7 SHA512 9d8b7c0fa8af1230f94dd84c5572ba2ab71ed30c799abcc12bda4fcde87d79b839f8881535fbff2084b8f4caae6e933aa67188faccd9d39acd84d8ab7a366f62
+EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 822 BLAKE2B 5bf938e4ee62179583d4ae822fec4c9ad12795e441aa5b5d3fc4a105b106b8d4ce3e6b6ffd24beffcb49cf648729c744709fe6ff40518b50a84b596afdbe00d2 SHA512 60a5471fc1881f9b9e8abd9b6f241a1344dbf98a8565240d4bb3474b94c18953bd8608d6a9e440dbc94501e1c4510a2f303062f791ed219a85421ff4aee9cf10
+EBUILD xfce4-cpugraph-plugin-1.0.5.ebuild 759 BLAKE2B ad59e6bed62e9f40ce9438bb8ddb2c7b324ab31b492980081aa940c16aaf26d01d12ceb616281aa76b484ce6fd450ca069d616aadebd3177b67c86c16061130d SHA512 0dc1c5a775fcad33d3db2846f476be9e897dba4a05c1ef1bb01c1aed35660f16e21d474ad4b03b2257dd06779be747cdfd4a60214eb80f9b599ecbc10ee1f3d8
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
index 68b09902c873..376b56129b36 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A system load plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2 GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild
index c0b30417baac..ca2d38b12b5a 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A system load plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2 GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 9872fe07571c..bf56f405eee8 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-datetime-plugin-0.7.0.tar.bz2 283142 BLAKE2B 6b65ab036a0781492b09c277bc1a9531edf5f197a98e83aa748579e58c1c765d9c8eccf860a934dd37fd45b8626e516e6deae8383a909c2335ff6f81a9663809 SHA512 a6d12a5f30fd6f5d0cfa85e50ed261c09378ff9f74897c5b30aef491c0f81a1985c033a416c9e080c1b07551666e1c6d1b1a1d75b5fac72dd71417ec23a640f7
-EBUILD xfce4-datetime-plugin-0.7.0.ebuild 948 BLAKE2B 537488011b26a6234cd3d5a230aab19cfe04329e7edbdddecb3b362ee28b5318789fd39dd470784a2a3fa95b5303f4ad37ed3d18b7b857f7df6c1270ab02e0e0 SHA512 86d4757624b6529f3c36b1902a8fd1d064ddb1e46d17e397d8d182c8aff2d246f9f59b7394b96c4daaeb41bef62c03b4473378b22941dcfab2c27a75b59abebf
+EBUILD xfce4-datetime-plugin-0.7.0.ebuild 959 BLAKE2B 0514a780aec562ae83e648911597c404a2c855c5a8679a1062b1a8a96ace70d2033dabdef5e818723b37db14f8610d2271eae9e9e9f3a7495ccd35e5a6134cbe SHA512 a045f813d29508f0914d9a5b8ad043c3ff1e49947eaedb5a82438464b04f25483cfadb918e656a46ee687c07545b6a3c3f58c7797c1cb3cf9496487c03801004
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
index 855c01a4fb7c..054ac86bdc48 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A panel plug-in with date, time and embedded calender"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index b7bb40ed2509..1f2afd304e31 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-dict-0.8.0.tar.bz2 483618 BLAKE2B 8365fe96710b6350be350fff0479d71fa2d2c85403e4bbb3e759cdfca9e4ed22ccd5ffcffa71f6ae6ca43e79cbd9c6d25bd675603ffd523fc7782d5040208673 SHA512 96e59b21b91352970e33aea84fe67fa9bce5f1fab47d794a129ec68285bd03c5e26a02b03519b1834d08a15c2cb54fe3d91c64799a8df283b89f304800024cb4
DIST xfce4-dict-0.8.1.tar.bz2 482413 BLAKE2B d7ece7a93c107315f65cf25e0ae724e99f88ec64d3289c33f5aa0a85c4865acae45e96c3047d30f5b972814079aa3e5987cf4b347bb1dea0d2e0fbc9fd272a37 SHA512 6cadc479afe5bede536915f8094f4c3ae80139cd11f4b594ee17d28373e5ee3f60a918193b0eefb2e247dfd8780d632e8b508538fd101b4064e36260fc30c67e
-EBUILD xfce4-dict-0.8.0.ebuild 1002 BLAKE2B 12508cf2d4bd5b098b3c8957923960bfe0083f6197561131c448b41d33a369d56c1ac318bdbf80975275e4952c801c2beb5f59f96180125d7996fa48d9eb3684 SHA512 c43b45af375be81321a11b8a67e2ae7bdc8493a0aa01a66c1c5d98865bfd011aee19e089976056539fcff7376e3f76aaedde85ba5f289fdc8d852106c4724a94
-EBUILD xfce4-dict-0.8.1.ebuild 975 BLAKE2B 5227f3a1c77b1b0dd1eb5ba0a495c8eb8821298aaf8a349a79deaced23e1b132b40e47180d67afb3e453be9e39184270db70fec9a50b183602c58fea592084c4 SHA512 2dbc53195f41832a085c13e014548f84288adc34947c4f96586599859b9ec5b2adcdc5e754406767546fc10eff6709dfcd3a776bdcbaa077629eb41f604382e1
+EBUILD xfce4-dict-0.8.0.ebuild 1013 BLAKE2B ed4b8cf7568d5b6cf7f7de8e0072c9855aa065e30ae1c6d0b639514885d08d42ee81b605f089b51586ec9541bf511a2cb3e3ad8bf8300ff43b2fb41438ec400a SHA512 0d2ebf9908f6b19ab52d3fbcb24d5ad57bbce926bbdd63bcdb64c4339876c877a83e2cdfcabb47cf31c07d21062cdfc89e7333adcfaae331ac24aff5def0a77a
+EBUILD xfce4-dict-0.8.1.ebuild 986 BLAKE2B 2ba885e105288a266b91220a3ca3a1928fb58b61bccf7204f119b6cf689f10a0be1448491cc3afee006053c86d5a3f9750cd0ef6091fd76316bece249b83781e SHA512 f58a53816b0613c051dc8ef7405c35ea20c3192396207785335056611ba8d25178d4e4328ebcbb8543af50a14de2986ced984bb8e9fe3f65f23f52a70a7688d0
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
index 1a0f3845a2a3..a562ff7c0774 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
index d37ed15a13d7..8dcf6adc4ba7 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 1778a102aee7..626790fbb242 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,4 +1,4 @@
AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b994dd279a1e5983e14f7786899f479042cc08a4bacbbf3677d46a9265863b59eb567cdabb433a67100f0ea6cbad12f90e0ba96fac6221d9c SHA512 167751a95d33f7a91a8a2cd70d444c31667ad30fa8f99b74f303f9edf699708511d0cdfa0830b07f08191ae4d1e4932cf3e350501e1ca809b255f0a1673d5406
DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
-EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 989 BLAKE2B ae0f5110cc8f01ac3075d44cfff8d96c690b43aed7461fb93209f130fc85358541cea687f964d9cc34d6d2ff5769426955198c8e9bee2b956fea19f052541664 SHA512 4e326c996d56c6f963cefa553dd1e383d2cf82f016ff0426d38f8732ca0bde9cbbeea881511235494c17567451ec88cea5c921a61a61d746ef7103164519ae3c
+EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 1000 BLAKE2B 30a4dbe0665b1747a1a6dbb30abc353fde200732981796e57a5aa39b4592ab568c61c35528117ab67431b7cdf6a97b96263f37a6a20d0cd531df28db6c21b0db SHA512 33a01df02451d0f000351a3f4f41327a0b7f3a008a57aba4f5c5197b4a358aee9a0ddac9714bd707435f32fa87de337f70be669f172bbb25829053f57ce82b06
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
index 54497d9226f2..ebd46d5d7ef5 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A panel plug-in for disk usage and performance statistics"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 3c2fbb1621b5..34f6a86c682f 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,4 +1,4 @@
DIST xfce4-embed-plugin-1.6.0.tar.bz2 348026 BLAKE2B 5da2423f2717798070cd8f550db75567263c2632de7109b94899fd2a6b469ee6f92f0b38c8ef5a8833ceec2f9d8d5bb58aa54e06caf7494268175388d605d186 SHA512 0d036a5b3f8394edb9640ea891fa848416ef9f173b67ba2ccc55eb8bdab96619c355c3cdfaa3cd59d6f48e3de0a01c95682a2466452f8c01a631bd5d8196df6c
-EBUILD xfce4-embed-plugin-1.6.0-r1.ebuild 711 BLAKE2B 9211b5bf6e205c2a5e2330c95dab6b9487a949448ae354378776299dbd2f22b346d807a941bc7ff91d356689f87dd9475028b6c7689ef1a3d7f79f7e4c83dbae SHA512 7b30748123b915736c7f3e72b6c1a8e5134731658fd69388e04489f9ad83fa8481949eaa00d950bf9044bb98a2078602011535bc4c33a88320b3b153805f1b42
-EBUILD xfce4-embed-plugin-1.6.0.ebuild 762 BLAKE2B 8210f40bf0048f46d9e098e8b490828f09c76ec08a90acf9936f13694b20f3b57143c9161b8b46af6a29112125503a9e89370ac8ee65fb46d799848d3e7b4e7b SHA512 af47745f14e6f36db469397f0dd87960ed79a3c0543a93f27c73d0ac3c1a41b66704633b07799de5941fc66be5c2e31ca3f4d3f048358aad1597a754c1096900
+EBUILD xfce4-embed-plugin-1.6.0-r1.ebuild 722 BLAKE2B 21b5a3400a6ccb814093aee9b14c43c5f85c22e44a5577d01225565297485d437f3baf52775864d71c66c91e6147026f443150c692d8ac4acc7197cd7cbb5289 SHA512 62b1d4eb5655e6c88ef93c0f3dff5c58a2530e069963e07c78f26a25e0627ef3b5e975de7dba7933c81f1f8ca4f20e4260235e45468b8f6e7cdd8845370311f5
+EBUILD xfce4-embed-plugin-1.6.0.ebuild 773 BLAKE2B 47e582947e68a590141f32dd1d10b9b7f75cd3c1883872680b54ecfa3da32b09a890b38d94b56001ebf2b407c1f80e559b213e435519babe1b11523a06d984b1 SHA512 512d80e9b9f0b3bc5c11aa7fbab272df43bc8676c01b21ac6f95bacc781729f54897beb26510cd0ac0e987448e26ad677bd1e88b00420b6b0d99cec78eabd4b2
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
index b4519156b1f2..d4cb38cddfa1 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
index 479a3468858c..adfed2422885 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest
index 2038bd5f66b4..5834316fca4e 100644
--- a/xfce-extra/xfce4-equake-plugin/Manifest
+++ b/xfce-extra/xfce4-equake-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-equake-plugin-1.3.8.1.tar.bz2 393086 BLAKE2B c34b68ee79cd087b9f0eb178d947c73d596a978415ecb2cef55238bdae65a4443ac83daa6b8350ab8560fa026a8e580c49bcdd4cbba682adc50e53c02ff1782b SHA512 dc9d399ea3f6dd6ee401b29a821130136c1f2ce976d2dfe6a434ec7030e999ad1c903b5c42e8bd3b25397ffb51327cfceb112b1d45193e82efd4fc4f86190890
-EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 822 BLAKE2B 932056bbfc63f931055031cf8770972bd4a9d4870c826cf5e5e65a4db439c0ab1fc372a46656dea002ec52460a68364a96fe5ab92a5f58a7bc74eb2fc1b9969d SHA512 c7db6cd52eb7e3805635467e77d877876d28a008cda269d24a0c63ca07edf28eda7db96103cd04f1afba5c632f5afaa3b02568a4d0741904d3430c97512b043b
+EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 833 BLAKE2B 8530af8e25997665eccf5aba6437c53399d096ecdca422e1db00fc245436c3c77ab6a7cc82aa52883fd361bbd461214e18f78b7a7dada7214a1768b91bcf4e93 SHA512 5290e9936ede712a0e8a0f8bea605d0c7cf0e52628be89e2a8ab00031de9b125d3368594b23345b739514a4402203db538a2a7bb078639fcb7ac00fee312a1c4
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
index b8c962dc8291..b6b3c192142a 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Panel plug-in that displays information about earthquakes at regular intervals"
HOMEPAGE="http://www.e-quake.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index 5acca5c4d730..9a45c42d4ad7 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,4 +1,4 @@
DIST xfce4-eyes-plugin-4.4.5.tar.bz2 369297 BLAKE2B c1e7b9e01174e3909306abfb53c9836b2817013b6cb8676cfd7717da986b68827bd286b6319853d79143b7f0b44abec75342abb7e68df3d2fb1c7424a8f763c1 SHA512 f8ac109edbf2edb066af3f13617e2c247151c36fd91551a99b334d85f528663d3764c8566bb4a8b8ad7ae2c021d5b5c46933dc63d523566055d243b440c61e01
-EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 749 BLAKE2B 5f64e828346539d78e51ff3679aacf524703655854eb3b6235223b65868f8271279862b57e592696229a70847b6b5a5f7d89ebfe572945ba78a58392608bacad SHA512 8889821cfba6beca4622e2b423f4780ee4f7741d807d9cb0fe9c50f02b50fec155c6dcccb4abea19395218e4ca6fc97aea0c098f3cda071fdbabc9107c815457
-EBUILD xfce4-eyes-plugin-4.4.5.ebuild 793 BLAKE2B ed9766204eabc644c363c203d5a9f87b27272b7fa506b164fd7d949c29fa14c2da0b3721d3e897554e064b8feab56c65c6b25aeadb4b3df32d1341763a46fa41 SHA512 98812691ff2c40bc212facbb10303b83e751cf7f96b9fa70503eb2be7935da99068ffb3b5f53fdcde7041c511a470c66d975e48fb78b6e5ae300f9887b0b04d4
+EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 760 BLAKE2B b2226d15c2150a5f0046fea32bc33aad4b75a520516f902eb3d27cb36c92b2555b492ca30b09d7dd2afa58e29809337837b10fac545f19920e03506b2e30b122 SHA512 bb92cf78e628962454896e55ca57943fa48807cc36cdc53a78c58c3cc59f5764c34a521b7356b3a593b3e50f5139105776c7b5e39dc3983c9da60491aba20272
+EBUILD xfce4-eyes-plugin-4.4.5.ebuild 804 BLAKE2B ae0fc7d46a0bb26e309ac1e85abcd6d781c2fdec537ea544fe7dd9bf3039d0a35e1e3f46c3f809757d13ba1eb3b87e9b7f18bcc302dfb1388d4e932b05b865d2 SHA512 f2c7443e3310006f141593b430e567244a7ecef5c41ea4a02fd6cd1daed8cd06680419a26ba4e274b4113ac6f339539c0ba689a7365d06e2668a17d828e8579c
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
index d4dfa5f9ec10..1d7ccbd2092b 100644
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
index cb66d6c41551..2901dbf658a5 100644
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 5c9243a29e1d..7c92542535c8 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-fsguard-plugin-1.1.0.tar.bz2 360463 BLAKE2B a83bfcf9d2847a2c37731c6549a51d1d6e18a5a8d689e5c6b7bd3270988cccf25007aa6b47bd70937f61998c676e08ab071caf41b50631d031e5c11fb8921932 SHA512 c5e49a045f1987d57c6e6d120ad25785d2f9ad4e97d07af3d40ab88c268b5b8417deba40e0277ecc1725092063fa2a7f94aa163579f04a419aad5b4e47c79d7d
-EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 969 BLAKE2B 370800ce5f33d089f2f3a257e64e14286b721095f4dd95e996676f787fd13f7046a443bb9ff6c9a1e1a061545e43a53a0c8005f0c8d16ce624052a28266409fb SHA512 1af20fda4e24e1469e91aecc4dc1c0de82e1715cdcdf504d86962c290356118fbbda851715cb9dbb265e4fcd56d48c36c68bd3944b3a7da23af33af74892f604
+EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 980 BLAKE2B 6ecf0a3cdea0b4ffc9fb4553dab0d511e4dfd454afd8d29195dd4e89152622e2094ee660d9ecac711e605c8bdf91945fe9543a0d4f932f4b3ca55ec1b5501f9c SHA512 5a6b0b391f2e9dc15f2627759bf8cc59f042a103ae5b25b028ba59e057b4a7d2b2ba03e27929b57d433ebf51dcf61282b11a8f8eaa5f0a2a1b59a504993166f2
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
index 8ecabd1c0104..444e12a8ba9d 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index 7e4d4dec1505..2a2f8116e64f 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-genmon-plugin-4.0.1.tar.bz2 327605 BLAKE2B 908571d5ca2cc8e657416d18f1da61452b045163233a82beb5a1e876a244b2ce463e6cda54f0b7a8239e642eb4bf5d73ea807a5d26c22ded48baf955595fa805 SHA512 14590ba4a3b31773e38139d274c93060b2dfdf3cd476dc2235f95f987529b93b74d2422507cc4bf1152f376ec9c6a01bd1da903d422757b95b19c01aa412b35e
-EBUILD xfce4-genmon-plugin-4.0.1.ebuild 619 BLAKE2B 73476a49e68e284b74dd1e78d18670255ef5a914889fceeb59a648ae2e42940d49ddb3496b0ee8ebf506cd06a898557386ec3b806d08063ba9d8c2d37edf903d SHA512 2c77d97941dc7c01d008d95314bcf67bff61309062ddc8c3fbca36b90e8bd265ed5fcf45fb65dfec0da9cdf390dece457f6bd5a120d776baf87997f5c0ad8749
+EBUILD xfce4-genmon-plugin-4.0.1.ebuild 630 BLAKE2B bd2ed583c6f61ae52d4d4a963990af86aabbfbbc363d1da138219e65dfc965872ce65390896f281a1cb11821dbdeef9c4ddd52b4b676abe72ba3bed1171401ec SHA512 551e43d846aabe1b523836a5fabc814a44ceda7ef31b587bd991d704ff8fe182ec3fc55de65a55f3d5f7d636f84b636fad8f913ab701c1abbeef95293ced9e08
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
index c60551d7fee6..bfc7763e8062 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Cyclically spawned executable output on the panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/xfce-extra/xfce4-gvfs-mount/Manifest b/xfce-extra/xfce4-gvfs-mount/Manifest
index c037986fe687..1388eb1a0705 100644
--- a/xfce-extra/xfce4-gvfs-mount/Manifest
+++ b/xfce-extra/xfce4-gvfs-mount/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2 280614 BLAKE2B f3405351c3a2cab4a051fa74a7de68ee52b1c82aa065253a3779d48ea298eae3521d0838b1b427833945bfc7421a2cae68bc1073217edde41d82315a1cbc16b3 SHA512 0bab5e20620594e1633c12c4c20724a43317004eda6f353579f890cc1d9b3288b7a3bdc411e9f34efb00ed31876d1e29d70e8bfacc9f18ed6806b36f5e112527
-EBUILD xfce4-gvfs-mount-0.0.4-r1.ebuild 941 BLAKE2B d1bbeac131a67f8f90faa6c134224b220f6ad4ebde2bf2c7440594adfd28c919b95431569bca1c361533c85f3f3613818c29a8a6a2ce4cb61c3147392b091090 SHA512 471ca9bef28b60e876ce350cdc88b7748ea506a7c283fefd3f2c5db57bb4591ecaf3603701e3ac1e2b73ab5f4a2f059bccf1b8642de6b2b387e942f99aa28e07
+EBUILD xfce4-gvfs-mount-0.0.4-r1.ebuild 952 BLAKE2B b0fc05c6be9dd689bcdbeb3ba0e97dce39a8dd0b0e0333dcb626a9cd756aa3af02b07e65bc20e2f95bac630dae2ed5596443e6aeac97ac98633cde6000a32b57 SHA512 70dd83f8a7ff9a5729efeeb614029287a070ef53efede36ce7c9edbbd27fc49ed728bf71a70ba8bfe466361659a2a724b0a4cb2fe92c7ba7f2461950f45229ff
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild
index 36e88a01540e..298f2348e387 100644
--- a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild
+++ b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild
@@ -8,7 +8,7 @@ MY_REV=6d2684b
DESCRIPTION="A panel plug-in to mount remote filesystems for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-gvfs-mount"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}-${MY_REV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}-${MY_REV}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-indicator-plugin/Manifest b/xfce-extra/xfce4-indicator-plugin/Manifest
index 4aab8da31d39..fd772a727505 100644
--- a/xfce-extra/xfce4-indicator-plugin/Manifest
+++ b/xfce-extra/xfce4-indicator-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-indicator-plugin-2.3.4.tar.bz2 406991 BLAKE2B 3d499f9f923e9cc51b25e2bed3dc6dfb6d4413c90d0a1afeacd14e0d1f33c9f9d5bdd6bdeb03a3e61bef0c3ec8cb1d1c766d89d921aaf9610bc797dc99a12219 SHA512 b1fd065c8221ae91d95b540411317cd67bb9b26d46c7cfe85ec90d7ccdcd11e7b8832008c8b6fb5c257e0b1a08360f00ad9da5520108024cc36c63d865ffdca6
-EBUILD xfce4-indicator-plugin-2.3.4.ebuild 1102 BLAKE2B c8b0ad42c2a7a89b195452a11f79fb516819c83a7766cc5009ff18d8beed06be559265c6a907c7a997c91d425abc78059fb79fce5af2f11469c4c5d9ca62d882 SHA512 319be4056caccab0ac515518a79064fb2255b98d1eb448e4f2b36bbf6239a6b0c6b62de49b3d8d67a012aa764f3dba63ca451ca236173beb341758dff01699ae
+EBUILD xfce4-indicator-plugin-2.3.4.ebuild 1113 BLAKE2B 4310185956297f740b5195525c472fd0ce1a4066d3fb754da85c0b1b44e7e0fe312e2db839c49a0c407e1995283b3a75590cd05791a811fc6e466e3038178942 SHA512 158c88209b122c25402a69bcd51aecebc4e81455f37afea22016e92491dda249750ef4d661990213244cf3f8952ff6c9e59e2454130df743c44c2e4fbd7912a5
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
index 4e41cded2668..472a735dc6b5 100644
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
+++ b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A panel plugin that uses indicator-applet to show new messages"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index 3f01e4c96fed..ab6bdc3c0d7c 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,4 +1,4 @@
DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 BLAKE2B 7749914cf4e8ca34e27c63033e84718c4bc8d9da11ca9f6487bf9291c145f5b062d6b7b07d03d2eb273d0e88b96946641721f6f24dd19c19db9f923e9b33ff53 SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83
-EBUILD xfce4-mailwatch-plugin-1.2.0-r1.ebuild 1058 BLAKE2B f2c03d34648d484dcb7ff47a127e68ec40e886ab6e71e76c1bd9549a66d46635b6024f9f4b76c3a0693c4067463207a5d3144263f12b683d4539f2dd42100801 SHA512 9d4eeb08dc4ef80f506c16fe1c270d3be2cfe4f897a2e407129c5afeae3702a6fef91abfb1da34c71ffeaaf7ddac48a578b58792c720c692c18e4405b9a03606
-EBUILD xfce4-mailwatch-plugin-1.2.0.ebuild 970 BLAKE2B 5c4ae61618f95602eb92a8fc04af96cd151c6d0989ecf655ed8b7528ab96418cd31bf96b0bf466a66cdda47c0d737083e0769f4857c5469782defadcb42892b6 SHA512 533d87aa68ab75bf5320b7ccd350258f770682b2cedb2d1d99a2910e1ef655f2279d65a20067496eabe2f31e3ef5e5a33cca8693a29bed28d09469bc913f4246
+EBUILD xfce4-mailwatch-plugin-1.2.0-r1.ebuild 1069 BLAKE2B f7633a6badf98d68d209483bcfc199f699b35303116a5a392c0eb5318c08177cbe5041f518ea3ec477160599e1cd3e6f65c213f7b07195e08c4ebb4bb7d0cb6e SHA512 74db626313ad340b75b12cb5196ce40116c10e20b88b9718f6067324df2fd5806dede58bbc96af50860ddaba8908beb7cf2dca1e82569aefd67996d6f021a660
+EBUILD xfce4-mailwatch-plugin-1.2.0.ebuild 981 BLAKE2B bede900ca171d0be3d49564554d7df5f2d3a334a62ee2d279956ee58596aeb67a75b7003b9cec3630594d6dd824fa149c6daa6e4da2d811b2b5f13712ede0979 SHA512 ef441ab55edbd4b1686a2af991d4c40b9e52f84a5141e37eaed4758bb9f2ab6ec9c76bda3ecfbf13422f2d05fe53b029a82f817dbe351b79ae8cfe30adfcda52
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild
index 0c70bc8952d1..03835ae547af 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
index 30e946c5345c..02b257f28980 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-modemlights-plugin/Manifest b/xfce-extra/xfce4-modemlights-plugin/Manifest
index 664ebe8cd5f7..fba4fcc77b3f 100644
--- a/xfce-extra/xfce4-modemlights-plugin/Manifest
+++ b/xfce-extra/xfce4-modemlights-plugin/Manifest
@@ -1,4 +1,4 @@
DIST xfce4-modemlights-plugin-0.1.3.99.tar.bz2 157029 BLAKE2B fed4099fd828e3cc50460ecad84e365fc3661475b4a7381ec017b59baf1b0e101184534dfcf362d59045ed674dc93a150100c9c3b3bc533acb47214760b9ba04 SHA512 d23c5b733012b072b01b7e10aa39cd2b5d3a218ff52806e4fece00cc891a64d9fa7fd6f1765320befe767359a15c197f7dbd663744105d8aef8117798dded32d
-EBUILD xfce4-modemlights-plugin-0.1.3.99-r1.ebuild 794 BLAKE2B c0ce74343dfc6c6b51f53bc3efc36a969f71b284ad9c1cf7854b384268792a6b5dbee7248dd6b8481634141a587ff1a25fdd06aff15d6475d183000022ad5df0 SHA512 1c19ca9d730e9d97fcbaf4610b6d80f5f5fe78ee41ee73f214e3e613f86b997c15fbf35a394a5e670a30a80634dbf23aff77997b8a43068fa79d2ee7cd38d374
-EBUILD xfce4-modemlights-plugin-0.1.3.99.ebuild 769 BLAKE2B 0dc3fe3423caa7273666fe760e28f8a16413343951ef9a730d54cc7a4d5efa2a8c6c32f532a5588b7bf0ac21966dfa3df4da7c89c801b924fc048b9f47877bdf SHA512 b3f797387dbbb2d0c59345434504ab7135d8d11dd5ede68dd6fdd1e919743d88e2fc22860324afc91a90813abf53e7612e861dc499c842acd66ac9fb9dead5e7
+EBUILD xfce4-modemlights-plugin-0.1.3.99-r1.ebuild 805 BLAKE2B 2556a37aec847d0a963f29234439725ecf57f4990a857818baba9659181de8bb2f61cd75b6f02787b70914bf1caa8ee1b7793787e27a8c969dbec272fc369859 SHA512 71e77d843b330f676e324157fcf3a5ccc792ef3fd22b0cd497c34910731fd8cb18aec2d530fd247a5c4c91ff0af29eee1224b37bd6d31500cdefd698edda2330
+EBUILD xfce4-modemlights-plugin-0.1.3.99.ebuild 780 BLAKE2B 12af79fc6069ab9b8495396ea77e833f368544423022ab85e65c3548c16eae71dddfffde769983e55a89cc2a13b91867e2e31ba5adc9eb064376b36dff7bf37e SHA512 1e56cc56881c2ed5a2d6e6fc3d1a156470ab4fa4c871a1a7e6570e8695236abfaffbc28f78fb23923becf5f8e425fc73fe8e3e34e171dc72f5f04c2dd4b6e97f
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
index 02d23ae0b33a..4caac3e79811 100644
--- a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
+++ b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
@@ -6,7 +6,7 @@ inherit multilib gnome2-utils
DESCRIPTION="A panel plug-in intended to simplify establishing a ppp connection"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-modemlights-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
index 3dafe7a4da3a..a4856855e16b 100644
--- a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
+++ b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
@@ -6,7 +6,7 @@ inherit multilib xfconf
DESCRIPTION="A panel plug-in intended to simplify establishing a ppp connection"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-modemlights-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index fb4e0039ad3d..1730a0094ffa 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,3 +1,5 @@
DIST xfce4-mount-plugin-1.1.2.tar.bz2 425997 BLAKE2B bc53f56d2cfe147ccabb3b8f16dbb6226e63dc77e724541bdac349cc17c24b216227e0ec4f8b84911ff97e8faa9b080d6118ed5ac436156c6e98971883ddd77f SHA512 95a4654b2dca87d8c86190163e908170509a7d37ca9aabbce9f397552fcd53a27912c09a33c5c259ef01799fb690714e9b9d14a962fa781d59dfce61bb69c728
-EBUILD xfce4-mount-plugin-1.1.2.ebuild 660 BLAKE2B 2a9bbfd21df3ba4cc0a68e24b33686384ae91515e5203742c96a62a1a4bf33cfe154a54654b43ce3d725a43611a3c4089de2189736fee15f8e6fb3b496c5c3f0 SHA512 c74b9d5a101b602c36974cb12a84599dcac802d580e43c8fc43778732a9cba7ca84faaf0c6c3dc4ce9108993ff07739a3807b09d116f6c6e74eeafda66086c64
+DIST xfce4-mount-plugin-1.1.3.tar.bz2 431182 BLAKE2B ba197ae9028b726e3b1e2b7fd68ebaec3e8e247322d916a1579681af9b004418d4738bfff05e7b947d6bcc5a1bd3cd1e0419f2e7421ae8cf7a7aeb3011658132 SHA512 10894069fd98fa0b709a3e743f0d6f9a8e9487b0de8495c3d177731190480f18b11b0179325d2ed47f80eeeaea10144ddce7f9cd60397dfb6a0db602bd4f8124
+EBUILD xfce4-mount-plugin-1.1.2.ebuild 671 BLAKE2B 42f6873571baec73b1fb04e38c9ea8327c7b04117c6e23ead3393378dc24266ce19c7e25a490f76315a9530efdc1d04c6b6706c40a537445d8c0bfe7e44371be SHA512 9244b1f664790dd3dade401c3946ddbef105733d3b21bb8f26040db003c6df7ca3a05920b75ecbd40ca323c6458ec6d114c8948f8ae34ef180cdd805eb2ba3d6
+EBUILD xfce4-mount-plugin-1.1.3.ebuild 790 BLAKE2B dca119a1f0956ef2c5b913807a6f0d6c2da7521e1fb7653206215a96ed674bec7cf44655f9c90d1e6eb24d2211b6db5da9f02ba9f222228643b3661371049cec SHA512 26ec94e00075718b1e9226d255343a8c3d352f716db07b308919418dc4d4c9ef3fb19c03bfecc0a2bffa431e9157f5d8e1648bba8d895461fa939d84ecaf2fa8
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
index 7d8d1249c8f6..6f4f417ce952 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="An mount plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
new file mode 100644
index 000000000000..37504731c21b
--- /dev/null
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="An mount plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+ >=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index 198d571a1263..de31835b402c 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-mpc-plugin-0.5.0.tar.bz2 282688 BLAKE2B 2ad968ba53ee391224f20ae6d62061feb9c63bda6414868daee024b948d8e5e11c0f696e522dc7914ed5d88f798f6be48bb420c19e3b4f36dcf7af3e5756b303 SHA512 b6cd8c756d952e19bbd0be3a8385b0bdd647960708537a8997589c07e512560856aa78de2ed0c6267810aa7b33c4470facd45048158e373053dc30813e8ebaa1
-EBUILD xfce4-mpc-plugin-0.5.0.ebuild 930 BLAKE2B 7886e4b8f62d94b45d30843ac476aba1da237743b3e8fc3133b30f5cd59a676502ae4d8ad94fc98243a569547f11c7c9eba8bced9032a213c85058060c4301b2 SHA512 2b37534ad16d416997043d4382a7296c32e6abde2d4948bf078a36650561e157cfb748e82b708ebcfbce18e0712d8b87b56622429aaa8ec30694158bc83c61b7
+EBUILD xfce4-mpc-plugin-0.5.0.ebuild 941 BLAKE2B 0a2f6fd38fea157058dcf1a1ffa17b954e32b83beb306b9e38b39868b3c67755dc91cb4cd0876aff2c3960a391c0cb8dfc8c2bc8e2a8c0eebab55e0c12fa6d35 SHA512 77d629f1be705e9c57d5bf5ce79f06ca81ecfebbf9fe9424ab2f27bd0c0b41e1da5e807cf040a3522315e8cec0c75852cc642517ac1b028bc01962e4549214d5
MISC metadata.xml 391 BLAKE2B 5f0144a6e45fa3c716c04e9c482be6c6f132e461f57af55bdf2f3c41590909e7c65a0cc36ab0b29a2dd0cdc2a3c4b9d8f2042d90cbe54458aa9c4175a9e7148a SHA512 cf9d54decdbcc2879e190343f71a2fee82f1bf91a34c83e6b262428e9a7042f0e54169d4d28005bf623c2d8a7ac38269e1531ec853e6332ef761a057b42fe2a4
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
index 82a39af36596..d83765b53dc4 100644
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="Music Player Daemon (mpd) panel plugin"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 9266a003572c..10fbae4bdc5f 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-netload-plugin-1.3.1.tar.bz2 367844 BLAKE2B b68cfefd2f54f8ee5868d6dab5dd4818b5268e4da96d9e53b55b354d170c56d72ef8fc7f360a1c97e1700795935c81ef6d0c982578fd8237c83ce04d266ef780 SHA512 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9
-EBUILD xfce4-netload-plugin-1.3.1.ebuild 914 BLAKE2B c5279e27a22161f36c08a7e9a24b11c28aa8949e74c6143da4a763b8ae402f59aef3314a77926f73b5021ced9e9a532b0c433457a09407d7719c6557b317bc33 SHA512 e85f963e131cc9d770826839e2d35d9e32a784ab0fe09c6ccbc68192ab3b19b81382c71f2b9b835bc2179ebb96f70ae461f90df5b1157e33e1dcbc43606f392e
+EBUILD xfce4-netload-plugin-1.3.1.ebuild 925 BLAKE2B f0e7c1f1905020923b4cb6f6804cc32cf97bd068b34880be7db0b85a76a805e52793e59a4083059e9d0fa04472159600237b094c378a1d5a94aea125c932524b SHA512 35ad24d7f053a09a6d4d6f19b4292984262b29af72d52c9730b0e8eda9725e3b70d46b18fd68cab5f47a78b43546447c1f06ffa1d0388f623c8e456140a9cd36
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
index 51f79e78b4f8..c654f9f125a1 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A network load plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 96f2569e4578..f02159f2879f 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
-EBUILD xfce4-notes-plugin-1.8.1.ebuild 810 BLAKE2B 1f7901c92505b833b2e906eba5cd84e2d167e1ab0a7dce7f193ca7e15b0b53162f325ee9eb59993391cfee088ae3c8719ec70b7bf87e04958bd2ef5316d1fd40 SHA512 8314efae771635ad6d52b2613d04f34fdb269ad94e50bdd4822ae982eb97dd4f34552875ac893237a7a7daf6b3df66d99f1294ee6780d1c91948f04c8327126d
+EBUILD xfce4-notes-plugin-1.8.1.ebuild 821 BLAKE2B 3f6b0cf3541d488ededb646b5acb0f0e45586813669ca7b261105e38e91688b1f0b5c01e19dc5d126ab83a6a25eb967c2e0bd5230f0252858907e1c0639f2ba4 SHA512 53700d951945c799bc98e8108fca5dc3ed95d77084a6258afc013bdf640b23aad41af8e0c3165d95d7f382396e7d851edf9309eb27af55a0d63a5a2defcf1766
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
index a585f9b18d55..1c1e32a10cc8 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
@@ -6,7 +6,7 @@ inherit versionator xfconf
DESCRIPTION="Xfce4 panel sticky notes plugin"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index fffbe198bf8c..4b74b6ecd9b6 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-notifyd-0.4.1.tar.bz2 524411 BLAKE2B f90c8241e484b256cfc1619f6bc9b1f5ad0f375fe3efdcadfe8f2acf740697f887a98044bcceb15a70cac9529cf9e1119192875682d0fb59355b4a10b3e479c1 SHA512 3dd12a8d27d950c2ffe7a4bc0eaa3b44f4a783273fc90d95304ec77450e88241ad39ca13366cb2a0c666ff6afb9ad58f6468e2fc38b8a87a2737614cfedadfae
DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
-EBUILD xfce4-notifyd-0.4.1.ebuild 851 BLAKE2B 083e07fc28ce734d456396eab4f7fda979f9a1fa5fa67110709d3be690b84f0e05111d289857d61c7b03dec0f15d0b9ace0243fc9f25dafe10704f18d816aeed SHA512 f8a266d49a9295853eb30fddf2783411141a801ce468a7a1ac1ae9bcc01731bc1aa447448218b92f17f03084d293666a01c65c42e92c28c100399decf7b2b347
-EBUILD xfce4-notifyd-0.4.2.ebuild 816 BLAKE2B a3de364ed07c591d2ae21f6b9a3719b027d00097327b423658413d6db91274608c05586e26c227020f1b31293e66a2111cc119fe5682edd103e6c6de353bbabc SHA512 c037a7878b6e3fd752b26a6b2da6b6011b8f55a2de586187bb6ab403678a5abd903b8b08a97d77ce1f9bc5ce466bdb61911e70358c5e59f13c925bdd239e3f0c
+EBUILD xfce4-notifyd-0.4.1.ebuild 862 BLAKE2B 11fd2c3532f8fb7070cc9dc1e990bd34bdcabc22d99f014660cbca2009ba7e8c031428515b87ea432b8d3995a670de791ee6ffa020ccd090e0dbc026111faa3c SHA512 ee548f2bb6b80404e68be14503efb473622e9a484007c2ae1c6fe8ce10b7ee29c38739031f4bb5757b26c9a7c051ae57c83cc8dbaa0f71e1f9bef2642f4e46f8
+EBUILD xfce4-notifyd-0.4.2.ebuild 827 BLAKE2B a8bc49924755f5fc6b9bdbf1ac413fdda656962103fd25436f45eb60ea75e3c9280822d8753e4a3eb0c3408ead94e20f3c9791f25457482ffe8c7ca9bb7d88b5 SHA512 2bd2808d5b25ceec62b3f209d16b8ba5d7e0d7dfd1c1359e0880e9415b865efe2edc041e1f3d9ae54a6535f42b758c7d157b5893c542793f7da2cf6063f6c193
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.1.ebuild
index 2103abb4359c..e748b9cd2a26 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.1.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Notification daemon for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
index 397dccb1c08e..17648282041e 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Notification daemon for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index f5de35d95440..1f8a1082a912 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-places-plugin-1.7.0.tar.bz2 371395 BLAKE2B fe18391e0cabe06d9d63dfc86a829e35461858b5915d7331053dfabbc9bb689bba0a3cc05b7d7f6dced6e19aa6e32308ba052cca9416bbfb2f050768d3e86f5e SHA512 ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3
-EBUILD xfce4-places-plugin-1.7.0.ebuild 997 BLAKE2B 1d41fb6ba1a1fb15fb9576f7588325c336b8f38cd296d4b7a36bab42b76c9af4e580a072d1511352a3f393a823cf980b0b4182f31bd61fcc4b7e11689ac99d3e SHA512 ac6dda183321530b8ddfba9a6d9f152bad46bd4482cbc71fbb3e92cd841e133e127b383addac5bd394252dcedaee48f5c4fd64f82c5c171a94c61bebc76c91a4
+EBUILD xfce4-places-plugin-1.7.0.ebuild 1008 BLAKE2B 69eab8b8f052d3f3c70f6b8db7fb2c1cf9bd612b3e553d884e543cbab152aaf615a81a072b4b9c3dda9a891ee2f3350c0df9a13619c707478a18a6b2547f5130 SHA512 c4124cd08e20808ba505ad95af806a70d3984c293f681efde9f0f21b07129046c6d08f45d53c2b608f1f5cd00a38f74e072d1369a11e0a8f6b2aa1f5546b1e6c
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
index d889aadac22c..ce99f6b8d7fd 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 548918091c21..c568b0199b57 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
-EBUILD xfce4-power-manager-1.6.1.ebuild 1399 BLAKE2B 5565398a5edb8c8e42150e102f9761c72226f1b3c31d5aa7a45fa64afce2892059d560d0bc572d7d80e45e1bfce0b4ed928b019f0cc61990ebb7905c53e38b43 SHA512 2b8bd24e4e133501218d41ea36503a3835513e13d6cc6f38d990264d834d5d675cc5bc82756f3fad478caffd4867e31b20ea231734d57c00520dd9f13ab8da19
+EBUILD xfce4-power-manager-1.6.1.ebuild 1410 BLAKE2B f1526099bfa749d48cbc0e6ad7a5cbaff51819fd027fa2821268031a00dc4f31b129faa1554d6c770f83ac5124144fd4b2ecf9c70ba9abc2239b8dad11fe2a03 SHA512 320fab64dfdd9ef0a95657f2269dbe6dc819189581314c3b641cfeb48e56f6aa891cbbfda0fe70fdaaf4ca2580ac6c13ae299cee51518665f96b1cd6dd255092
MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
index c69433e99643..5a75b1ef93e7 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils
DESCRIPTION="Power manager for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 21ea0173ecbb..d9570e1c5b48 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-pulseaudio-plugin-0.3.4.tar.bz2 400380 BLAKE2B b8cd4df84f3119d90a7671d8217eaeb83025206d9bfdc5aaae2281cd7c9b13ab03fa8a99ff1eb352f2fa01e889bcd3a505b558ce9884c46b1136bc75a6fb22e7 SHA512 2dfa6a4567caeb2f336b1d9e32cedb5f03e363253549810e768bb51746cd1db362ebd0990098e461a71b8206d81ff877291860a3568a288fe2010498ad486c78
DIST xfce4-pulseaudio-plugin-0.4.0.tar.bz2 391068 BLAKE2B c06b05fbb910e7a1d13fde976f6b8b3f0d22de43223bdc8472440c52868cf1f3f37359a81c96efb2644ba202382cb53c2780214d3fe1af7977ec2e9d2f5e8c19 SHA512 28e2185ffea3f6e3e7d07e0cdd5062d423dddb2f7ee4a1e2f2965d4bf65e11cd0a409403ffb7d6afd89206dc37cf5700430ad6a53967395e3a58dde6dd13503f
DIST xfce4-pulseaudio-plugin-0.4.1.tar.bz2 391791 BLAKE2B 038eedbecbc6ba4845f1be86938aa57165f55e1d287f914deea998383fad5a019d1ca7500c7366d76692c1b59cf87214e2057833786318cb69c326eea2a69ea4 SHA512 e7b778c78ede9ad62afaa379941ce03636a79dd000e40e748079d3e0f3c71f2e68e32cf85e527be4e1192074652714db4b7c5707b727066198c2ea43184a71cc
-EBUILD xfce4-pulseaudio-plugin-0.3.4.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
-EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
-EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1460 BLAKE2B 54a7cb17c1c53eaa5c140f5e5d033cf1cded917799a942f160e559c53586670c6e43122bdb7ded231af69feb03345fdf263bda43ff35d28d806a4fc2f517ff97 SHA512 30e137593af98c53b0c3f0c96f9d230a20e4ba4cdb4c3aabc47b141494b5c7678601d89c8f59c8ef8248c4b90daac99af27aa2e956502203ccdd6d60fca6ce22
+EBUILD xfce4-pulseaudio-plugin-0.3.4.ebuild 1469 BLAKE2B a81cacfc4043e0e748a4723ad00ee2ec94a77b395e5d456ca3146c148c74b08c07bb41be04bf5caf0ae423c2bfaafcbaf09c77061e75027d64ef0025c0b1aaeb SHA512 1b4ee4f5931a323ea21eabe0fb7afea1522543b4c1b0c4d55f6be19c8d31a5d7d7a593d86f6c2ad6b4f9730992a3b7a009ff9e6a8662399afc6e533e06b7fb60
+EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1469 BLAKE2B a81cacfc4043e0e748a4723ad00ee2ec94a77b395e5d456ca3146c148c74b08c07bb41be04bf5caf0ae423c2bfaafcbaf09c77061e75027d64ef0025c0b1aaeb SHA512 1b4ee4f5931a323ea21eabe0fb7afea1522543b4c1b0c4d55f6be19c8d31a5d7d7a593d86f6c2ad6b4f9730992a3b7a009ff9e6a8662399afc6e533e06b7fb60
+EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1471 BLAKE2B a4332c20d2d74e6ce8715c7dfd92c5fdcf8f249bbed89308a2c6db1c46623d306b3b78981932ef8b2715cd211a8729e2fa716eec4b0d3a96857d808a85fecb7d SHA512 eea63eff8593b1c6e739ae1bfbb0ab3d7ae940329e2bf8a74ae1638f4c8096a0c9432bf9845ab56b8003b8b71e7f6c84621813d8c381b7577b0df12dd8efc11b
MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild
index 6d8e2452d19d..7123eaf2fc98 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel plug-in for PulseAudio volume control"
HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
index 6d8e2452d19d..7123eaf2fc98 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel plug-in for PulseAudio volume control"
HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
index 4dcbd980caaf..3e99070d0dab 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel plug-in for PulseAudio volume control"
HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/Manifest b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
index 8dd1d055718f..07287db274ca 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/Manifest
+++ b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
@@ -1,4 +1,4 @@
AUX xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch 330 BLAKE2B ddec736e2cc23ce8941139b30a70eaa7761e71fcb72f89dfaa9eb59be9790a42113317fb81e7356a4d4e8e6e231f305366bf70b06cee153f9e5b4a7017e7b3f7 SHA512 e32d2730f9a78c45d387b22a1a39d96c376600abde1f91548da9f423901da0dc4569183c828282c5c62b94fe515ec5af18fcbe71508c4664197a4f20cbdf3d01
DIST xfce4-quicklauncher-plugin-1.9.4.tar.bz2 282545 BLAKE2B 533f5fc32250bd3844e895bcfcce2fb6adfdd6e9e70459ba5f3786da3b58c869b6a8e05a2baacc60092544bc21898189442e06644dcf25df2c1322dc3814b1c2 SHA512 11db64adbef5a04f25891132e798e77a713d5f68fcda9ec5349f975f56c4f352a2da8493d721f307d23e973c02802840c2feef444921da29f2b6e21a5c79a228
-EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1239 BLAKE2B 4fefd0971856534469a4959a2b666a674cd37c4e2d7ed3cc8f1045f1876d69487ecd017eecabae381e44309a5e81eb5f657f2caeea916bf2515ac3458b333064 SHA512 fab8738baa67f0c9ec7d5029968284bc6283afb099fdb57feb86e3daa94ef85753f03bc24b85928011ae6b7ac8a4fe2fd3549e537fccd1f7ab5802cb0be651ba
+EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1250 BLAKE2B 9b22bf2d2a2d39db16f24534b1f5f49e7c8fac8a77de71988355661293fd64549226422c80e6f707d55a814ffd6e420e79b5afd8c77618f6baa5c58c5fd81e64 SHA512 4f6c3e7c798d61487c881a192cb856ac0beefcda3935135dbee2b806f11345d8eca97d1ac5e8777a2c020891f678e410df39c0cee7fe910113969fae78749120
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
index e4cce727609e..c61a5eb870ff 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools xfconf
DESCRIPTION="A quicklauncher plug-in for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-radio-plugin/Manifest b/xfce-extra/xfce4-radio-plugin/Manifest
index 60dd9576bc01..85d1c7a3db09 100644
--- a/xfce-extra/xfce4-radio-plugin/Manifest
+++ b/xfce-extra/xfce4-radio-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-radio-plugin-0.5.1.tar.bz2 137447 BLAKE2B 83d3281df34b850db3d96611587ef5b6ca370e74cd130c2ed7ad72f79d8dcfa08e70e4f8f19921fc9b7b94152fc7651700aaa7f9256d6e466d5b9a030beab3e0 SHA512 54cc25c965dd6d220019382d0cc0970bffc3b9eaf315f2b055ee2ed56f818066e1fa51d2613c04b74562ec4f4786e9b87197a791c3e7867038b9b2737c540e09
-EBUILD xfce4-radio-plugin-0.5.1-r1.ebuild 751 BLAKE2B df6c70467e97ce63492583ebaeac835f36cca5cfdc67769780147b13b6b48ff274099dceb1cd7dd2a3ea3d7e9a944577a42ac33b6903b5ce97e8006fa856cebd SHA512 2c697fc45772d2753155e10be94a3db9751731b8cbcdd1254f7f511b7393677e4a08116faf8f24bcbf478afecd5371f62c21dec71263859a0dc9d90a0e047749
+EBUILD xfce4-radio-plugin-0.5.1-r1.ebuild 762 BLAKE2B d595d98ab1ca8ce9e46ddbe65e4158188ad51d3778ef5f7c4abbef9b27b3143122c5582f37369a06e5397a68da97b57036bd15eaeae626438d847805fe34fb6a SHA512 90c5686b8425c7fc51dbaf83d26a87e0723e7a9075e17939c76bd6f44a0902da90989a2644f32460ab8c9e6ab1295cf03255ffa0357e92ad0409e7ac1c4c59e9
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
index 476a66693d69..7f5a2633f486 100644
--- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
+++ b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
@@ -6,7 +6,7 @@ inherit flag-o-matic multilib xfconf
DESCRIPTION="V4L radio device control plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-radio-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 4e0a0e680eea..4c4487a53d33 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-screenshooter-1.8.2.tar.bz2 492524 BLAKE2B 88b0ea17331c9ffc25928df29b708d6f9cbbc844f5048f40bf29e22925e6326761a0a693601cfecf950bc61f97a0e9873f3d85e743a3e497d2fe19d6fc2f26e1 SHA512 e43dce108c7bacfeebdc39b0c9948b348c77faf358fb0ab5f26d59c96980f1c5473ef87895fe53387340202813935ddad6e200010e61aa27c2c56b662ee56b1e
DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
DIST xfce4-screenshooter-1.9.2.tar.bz2 504757 BLAKE2B 6c22e409974b6251a756f0b7addd91850d4454b0a725623dd47dd3dc29d8e3f6037bd69ef6bfcb363f4a6f2512062e80779a07b4ab1f77dc9ca0b6db5361a5b5 SHA512 fb60fe89a620122e59352154dbcace8f3e3a2f2f3f2d6cfff521651f4dc021241e9b370f7929fca55b36bbb13ed3ae0c4393a621291b51e451bc2e57b1a798c8
-EBUILD xfce4-screenshooter-1.8.2.ebuild 1002 BLAKE2B 23a513df1150fb195312752eb11b6b01dc4cffd83afa0e8e35ecdaf490080814d81a4502081334977d8cbed079e99162c3479f84eb864678573c4268754f897d SHA512 1ba9af13f28ae2bd44bb894ba2db2e9deb3533147c00a8f4d5c28fff5f149338116bf284b217ccc3f5bfe16135577be6b6ae3f8f8bc738bf19104e3d65fe9f25
-EBUILD xfce4-screenshooter-1.9.1.ebuild 1089 BLAKE2B 434a132f2bf0b115626516144e99e67d1236ee741f8c098d75584d2ad7ec6c93040511d069acae7ce70f34d286c107676aad395275b5d3f5e12ea71848804ccc SHA512 c751f2a55222d7eefe37332f909f31f5e1f348df4a46243f68c2920326fd6b82b9892419f76681f7113a136bedfa691bea00f93cae5d694982532b9f012cd7f2
-EBUILD xfce4-screenshooter-1.9.2.ebuild 1094 BLAKE2B cebc460890280525ed6f426e0263b8338f660d567f9391f90a2a0e7af8d31babea8af20267553bedf040b0aa150521a59200fa4fdbe3720033bd7bc8f4cdcae2 SHA512 bdb65c1655d84097a8b327aa1a5cd54c1cd151616ebebabf08dd50f7b9607a9be4145885f7164d510dcc8fbf8d47ab02b6fc9c2f8122ccdff3bdafb8372201b3
+EBUILD xfce4-screenshooter-1.8.2.ebuild 1013 BLAKE2B 09184dc632319842492365aac32cc22d893758d81feabf6272a7587b86762a50353afe768ec30d62eef0f6ac253971253dbca6b6036ab318639dedc5ec96e70a SHA512 a2b786a0a4fdb5f823306fca286ec2ff43b2f48533a085fa708a78b871b9bd6ce8e06b83132e14d0e16be88538369ae9b72f8c81d9a3a0a6557ae045399dffe3
+EBUILD xfce4-screenshooter-1.9.1.ebuild 1100 BLAKE2B ba25af07633cc8c2636029d83dd4a7b03b03b1da2635c2110481b52c4ae8681809de81f6c0c9949c722a20f9c0f43d4d6b36b8ba185058199d1ac8b1cf2390c4 SHA512 373707325c3cfc345ea5b34ea81bdbf29b1efa67968cf6e12ab3c825995ac17055b9773740e15be7207d4ef377e2f10ffd1562def72d31bca93434f7919d66a5
+EBUILD xfce4-screenshooter-1.9.2.ebuild 1105 BLAKE2B 7425ab4787a4c726185fff2aa8cdaafe3d04f9dddac33628ef2eec1cbd111de07e3e0469341cb81f19c1739fb83067895dadbb4018f9bc2f3a615be22bad7dfb SHA512 05bada967a36563c6d1f3913ae9ff93ed0646a5a8369caed2fd47905893b00c71a805713135e3275786a9435d1cda525ff300d6b8005ede65b50999ec9f922cc
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild
index c1cf4b1d8a55..e0a2bea4ce3a 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="Xfce4 screenshooter application and panel plugin"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
index f1ca29d1cb3e..63f0862902af 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Xfce4 screenshooter application and panel plugin"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild
index 9139ec91154d..a4b036e1dc6c 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Xfce4 screenshooter application and panel plugin"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index bdb506534c5b..e533ce6a0c5c 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,7 +1,7 @@
DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 BLAKE2B 1dc663f726f6079fc030ef08fc9384fd4ccf3b05786bb899c7028d9adb66d85e3da4d9aed5a29cc5b15c0bb258538fdca31cd2a9430710c1e0a383f8eb8d2353 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60
DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
-EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1863 BLAKE2B db1313175b658c66d6155510f1fa892bb7fc00ee2f736a030d0993a19824c2c6a20d311afee8a618bda0bd5fcbd1b23a7f7c4b97dbc37f4c92776d2c28e3df5c SHA512 9656af8b47c27dbd9021448778fd89e912603f8c8f0237c4cadd3ce611821a90a51dc3605db009949a444543f3d411cd8c950b98baab7f15fd7dcd06d2203745
-EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1450 BLAKE2B aa20ae9de9183d0b9347678bb6a9c253d55174c1f19d782d185010ccd0cbef681c11d161de7e9c00a3c399ccb30079a6c82a25a6408c68968e3b3f6a80ac9160 SHA512 186e8d998f456ee72c93416d75d5c4ad9fbd0fb236d0a0c1be9963579238cf2b872e61f4d99a1d875a9add2daf0bbf439c84df076137d7731e2e00f294eee294
-EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1563 BLAKE2B 556d4ef2d94d7ca9e392dbd5ce3e8cf06da50c90c9def3a5b9c584b162f2121d8b817a321fd48fe19754ab60dcfa609b5d5260b4ddfdfbcd9b7fd6667cfd7db2 SHA512 eedfecc63688f16b452a016b18b3d16d1645a5b9759c60f5a670dbabf35aea6aa4aef0efa258b2b74dac51b0c36e13702c04838e91836dc1b7ced61732f1d412
+EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1874 BLAKE2B a6d6192a3613a8a006b15ef14a587e5b6f01080e445e56bfb5936b0d43e314dbdc90c812a16e61fe636c38bad210e8d425169965f55a5dcfbf54430b19fe063c SHA512 d0333126b63d3e913a71afe88c770960a1f578e9b89ed1a573441f3aa3fca86c08621ec7c789c2c1dd50d2ddf54081c091389fa242af91fef3be2d5fe19c0e9a
+EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1461 BLAKE2B 082d21aac4042b4aaf0914e74a0caf222837869242bffe4e4bb86d6ad51991fe23b7f6f224ed46b99e7b4e5f289a2bf98749b1cd8268a92039463cd35e2d383e SHA512 aa5eb5bef8659f59a87963e70f3513248589dd5eea1d7a80da4c3ba2d5300f1e023d1ed11725826a23e698a85394cbcd66f828f48f411830ef80a760bffc1abb
+EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1574 BLAKE2B c4c1204086170e1ee5e701e1302b4722ad7d689a68f936f44d041a07f2adbf68ee9303f99cbd5e4aca7fa2128fd85c78bb3ce76a28ab072d9bc714d74cc21c60 SHA512 1276e3e7d27a996cb70a60a8f70435dc9c8c6ab1cf27592edeb56983481b2520af92b157f87e8888fef4687037080bf09ac890ba4d39e7b4908fce405515a2bc
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
index 863f0a8810de..acd8d1da0c1c 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
@@ -7,7 +7,7 @@ inherit multilib xfconf
DESCRIPTION="A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
index 4ef22bc3d0d3..225cabbdbf2a 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
index 9c6fafa0d3f9..0a7079f854dd 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 865d58f91462..cd0bf3fb3ec9 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-smartbookmark-plugin-0.5.0.tar.bz2 280988 BLAKE2B 783d495aae351454abf1a3d9bd43c0656baf7ff94bf3015ad300a103cd17eccfdae13385b025d293bd9d7a65b37c0a19aebf3cbca8276ce36d1e41287359d62c SHA512 0514a1159cb5218af73d28897a218c369a64b9c3a7c286c0bf45ad404773ccaa49af5c8b0492e38f56f8089a2ec79b0434de93388d960b993ad67cecef5315cc
-EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1097 BLAKE2B 0c53c2e135e88c2b7da282cc3ab9ee6ab7931abf485b0d13eca0f3bf0c174d136162f735841d6de44fc09b347a78612f7b210815e84a0ccb474ece98d52d1e02 SHA512 cb59896980619f0cee5955e62a1cb0324f0c1f592de77d740126b29528a560658d0474e43b140254d924bcd597e89892d79558c420cf7c2444063d0ff95d2721
+EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1108 BLAKE2B f2a71fc3b5da38b432e45edc76dcec91a7c8ecca0a10ef8c4a82bd597a0b4b4498b29bc650e321451f5a614bafad59a3b87dfad1cc4e9c917de37b8c3bd9ad4a SHA512 bdbaaf524c24a4c2abef5a266c991539bb0af0b2118d1c609b7166cefa4c476a0cda66f0edfc865ddd3ac05ee7924c68c094d56b4c5527cc254db2c42bd683a4
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
index 4b4c62583b5a..504c648221fe 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/Manifest b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
index e75052ea7992..7ceafdc0e31b 100644
--- a/xfce-extra/xfce4-statusnotifier-plugin/Manifest
+++ b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-statusnotifier-plugin-0.2.1.tar.bz2 384119 BLAKE2B e8035750c8d376569d3694340c8630af3032da19e684adb374fbb79379d523a293b78b98d3c61601a0abe3639125106a56e976d8e0fe0b60244569593a087384 SHA512 508614543716a64f2fd45909c4a2acfbd4f41f9e494a48b97dd51a83171eec44811a8a2925d39ba8a5b5dba1f9faedddade0e5b7bf2ae08f494954637cf2209f
-EBUILD xfce4-statusnotifier-plugin-0.2.1.ebuild 868 BLAKE2B 22afb3ab043a608b3d0e692f535f9a939ffe846fdb8f545ea81f635a555d505813f1c9c7281abeaced1f5bca0288666a1ae745a6bc23a32450a0d17d148283f9 SHA512 300678898f3805c9051ec91330f04daf4d2cb37fdd6b08872390f94e701d222a9344f4813e33019be2cdf7da61b16ce480cf6e064eefc56fdb6ed5f31acabe00
+EBUILD xfce4-statusnotifier-plugin-0.2.1.ebuild 879 BLAKE2B ad760d50956238cfe3c6afdc3e67a33c0ce27844b337dc7dfa9d8b6d9d591a07ddc2174b2cfbae7398d1b9f9030b88b885d70781d7382028d4eb0e627eb83fe7 SHA512 5afbee62d2c23fc00e09c98d55e190a14c644bfe4a425afe1983cb66baa133cc30496378150018c88848682640f5d8f24d53671a719097be98d563b69285a519
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild b/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild
index 01a0cd1f11aa..1eb2dd7f2ff3 100644
--- a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild
+++ b/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A panel area for fd.o Status Notifiers (systray replacement)"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index f9a9b42122da..66b4506d4c9c 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-systemload-plugin-1.2.1.tar.bz2 328136 BLAKE2B 0476c6e89be950a89f54d6d4fce0cfd0b4781520edb76e4280341f1f2c34e13ab54d68a84175524dd6877242da128c409f749c2c94ea6357dc453ed3c4da449d SHA512 01e57d799731a5860f043339ff0e90e0967ac1bda91d9f500d657ea14f3a52f31d9dd68ef5293f7941ef93e26e48af72de22aef976d0ccd497c62096e1aaf0b9
-EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1037 BLAKE2B c0c6182e7a1b5166c7c6e8c0ce4f631090792f302a618abf7d97abece905d5c13ccb6b77a1533979fded3bd9fa644561eb8ba6878b5039d8cf0f1c1e68e41dcf SHA512 e5d96ef2ca7225319d51d03d417d320b980d340474e253ff0b88f02d60dc30604218d818fc83f326af0b9ecfb1f311d0fcdc5d1c3db83ea5f0b67ee8deef401a
+EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1048 BLAKE2B fc52e85fae8a058b79e6032b8e5b13b06f0a3006247a154aac652428b6dd67c480a9961ec02275d8be1c158d9b9013dafb3b81f2c7a3063529d7f4cd07f39391 SHA512 c961b66f2544b6cc4030af9c99a8d2bb4588a9edefaafd5d20c20646913de6c6249dff897de5a48bd8606340cb9e74f74fc8476c644a682770b1acc5b0e5fd96
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
index 40ed8a8cc98d..f4bbfde25da5 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="System load plug-in for Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 469fa184ab51..f505c9731fcf 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
DIST xfce4-taskmanager-1.2.1.tar.bz2 394704 BLAKE2B 0fc1d43aafec3301687faca4ba6f6a3bef4d3cdf682c9220522557bf9c999b0979b658b0153108308fa38abcf933b9d3e6a82a55aec19bb1e3b81c60def1c116 SHA512 72a1ea75403ef5b96d461f0e4846374f7aa3eebbdd09a1a25c49278e4909904ed6305fe6a06f3a2fc370e191421726b96924e35427253428e968665155808d4e
-EBUILD xfce4-taskmanager-1.2.0.ebuild 957 BLAKE2B 8cc67da954bc7c1664b985e5a27df3682036a48845e54e2b827179d6929a8274aa873c9ff452ba026ef02c146deb0b8c40942e0a6ed9ad43762f0169ab720390 SHA512 113f96f2be85c0ca4fdbff11666351b1e0e3a4545896aafdb51444f0b0fe4ff6d84c1459f3aa8a648948776a603236c67a18dddd98e35d15c24607898b1b55d3
-EBUILD xfce4-taskmanager-1.2.1.ebuild 1077 BLAKE2B 3d4b86e71c6374a0eab3e256c2799fc6315f95fabaeb664f5a71f12d19242afdee41ea111efc53217266e5153e7d4bbf52d1809e6bc623708f9aa0f5279a2217 SHA512 86d4e98a971ce0bd15f65d22c758d34c3411a6988ead823c355c617154ab6662979eb1bedde7824a7969a8fc5911b29637e2b86a0c5cb90404180c1afcbf6ff2
+EBUILD xfce4-taskmanager-1.2.0.ebuild 968 BLAKE2B 554d8b9c0edc5886da54ff4ddae68c5934a714bab117c24d690d527a2369e1154c805401d7b5fe1a72bc94ad19d8051157b3c18e655bbd2fa0816b264b80d47a SHA512 f66dadecb500abdf18ff581a4d9c1752faba35507c05bdf9fc04cbaa66e4be1814396fadd2d10d20b5c1f897007b9b00e34912f7808ef561e7f16971e6ab37a1
+EBUILD xfce4-taskmanager-1.2.1.ebuild 1088 BLAKE2B d4b86892cc62ad45fc6d9cd0d2ff4ade631fd13875db8652b40b9e76c1c1c3772284d841b0476254c0a93d212ce4fbe6f31a8a7004ce7f4a597cd478b97afb0e SHA512 59c098bc47721463c5f685e910c80e25022a67bf13fca934998e6679b12d309facd1ede02edebcf1eec750f14b76b3a519c1c4f8308aae6f3e8f4c91f00494bc
MISC metadata.xml 310 BLAKE2B 72a1b36cc0a16c67ca5492863c4be9e014b5507b5ae54753adb63bc2e73720555fdb1c427ea346124541a8df64a4cda01cd1f5c492367c733ec4f33874fa4b1c SHA512 758e1edfe2d12b46877c27c2d7c52aaadce97e9fc6106a43be179ff53316ec0edab226ec1a69860081ad9491e52d5eee558bbdb5de078f0bcecdcf32b56168f0
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
index 4c36d797eff0..702b63033acb 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Easy to use task manager"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
index 65defddf3e13..10e673b7ebda 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="Easy to use task manager"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index 77b82b656fec..224531b69beb 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-time-out-plugin-1.0.2.tar.bz2 337382 BLAKE2B e98102dcb2531ee42950022e484ed57b307ebf9b4ea7adbff3508e75465b9ade24f90e9c800ff0daa8b0da59ffe84aac9fe802267327e9d361de4359b0b95eef SHA512 3f49664fc8fd947627e40de0338e3a115806045c97fa08fd678fdbb831947bcfe14c02e9961d671ce7546d4913fd9319322476df590a70458bdf86fa3bd43464
-EBUILD xfce4-time-out-plugin-1.0.2.ebuild 788 BLAKE2B e92e79bc2aa0a214fd6e434fc3041f4f2ef4a161b10216a73c61be8f39ac7aed921570b9b576ac7c0f3e5cbbc8671eebeb720be45c29f0fcd8f4fb8feb87f8ca SHA512 9eda8e270720cfe9496f7115445bc55840bebefdbdec3bebbf26a68bb043e91c17838193a9e3d604534b256e6a07e4a0314c9d84f37814231531c1adbc592e5f
+EBUILD xfce4-time-out-plugin-1.0.2.ebuild 799 BLAKE2B a2c23f08ab7b4a5c5c8dfbf6b09624a3ee163a7a9446f324e6c08657f5bd2484f507df5cb1cec6b9f5b5bc42b9ab81a0fadacb51d0139613e61cba0f6706064b SHA512 47d1d8ca4897f4333d232f5a00ae8c8c769165406811bf758ac7b56a4f5230b7e4cbcc9862dcae6fd66f33f291cd304036e73568ab6aedd004797a4d167cee44
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
index 2b48d5edc69b..17405c72e0a5 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index e4144fcbc784..c46bc626c7a9 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-timer-plugin-1.6.0.tar.bz2 325662 BLAKE2B d6eae55ba20b3fdd59ea3e62ee96409927bce966453f24df76512ee3a1362caf7bc7813cc4baf90d43c90bca3628fb547a96eec2345b0c9160f0ae1626395c1d SHA512 aa2c6760945fe28fb1e8189b167dae176137164c017acb7057c93eb579147ef31134a840b23c78e3d1914c89865a0cc7b428e3561449f7ae01eb2d8a0fbd5815
DIST xfce4-timer-plugin-1.7.0.tar.bz2 381222 BLAKE2B 3c273d818b7b04cf2ceeea3b72837ccf43ee0433ca458dbbb3aa68015ee28fb2e61ab3b5f36b341d087f00e9c4ca8e9be5453e735251bf9c9c1e910ce8c6d2f3 SHA512 b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e
-EBUILD xfce4-timer-plugin-1.6.0.ebuild 805 BLAKE2B 6e30619b335ecf22c7879dc1a13226b4117d1fd1f0120c18f4a3b7185d98c0629563c6cc8dd1c3dc02a87950d44d6b8c0e02ebf08821ba153849e5cd85ea17b7 SHA512 45453d6181723a8f9f934887b191b934cf5d75b236ff112d3056f52a9af8d0d8cfcda71377ef26e75e310db19dfd0e18c99e3c5637de30df19ff4a449ab400bc
-EBUILD xfce4-timer-plugin-1.7.0.ebuild 842 BLAKE2B bc4db85e61cb5acf254816f2444ebabbf0ac75617e9f93bccedbd4877910348d5ba9db34e273658bb2c543db6a959e102967eb611174128fb6880a89afbd7660 SHA512 c5d3fce542ad7a3f5f29540de88678dcdc45c9cf98928778d1b56c428f6137049e5b45f1d6b8dab19347785e242d7e57c7e1fc0a0cffbe9a1d066e6bd44472c7
+EBUILD xfce4-timer-plugin-1.6.0.ebuild 816 BLAKE2B 3c826058e0fcff8d13a200da8a902f207acec3abbe5e97f382c37a49cfec3356a0c5a923c43df987d791a78f12d35d307c71789ad1ddb89740572990ee0bd20f SHA512 b4ebcd0ca85042080e6b5160c3c43f54ae42d4d0304c4d7568721267b03ef8962ff91ed11abf290a2bf25b0097bc1ed4e1790b9f2a74823519cd7f1adc1ee243
+EBUILD xfce4-timer-plugin-1.7.0.ebuild 853 BLAKE2B a9ae4a71c99b704935b1951ac806b08692cfea4d1dccf6f4399e589a3c7d6e231617fae2c01299b94939db19f634bd7876f01cd0f62e175f851e845e592a7dc8 SHA512 48c44879a3a007205cde168b6d0f6bd19f789a6126ab6b85f2cd8921f3c555019a2914e08c7d568d1d440f68c6db721dca45b2984e3723ff5120f35f33e1fbac
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
index 56f3cc96ce2b..62d8e0de1ad3 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
@@ -6,7 +6,7 @@ inherit multilib xfconf
DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
index 7e10e9bd72b0..65db5e6e5c4a 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-vala/Manifest b/xfce-extra/xfce4-vala/Manifest
index 061b22c95584..baa49b27d1fe 100644
--- a/xfce-extra/xfce4-vala/Manifest
+++ b/xfce-extra/xfce4-vala/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-vala-4.10.3.tar.bz2 88023 BLAKE2B fb5ec9ae0cf14d0f28c49ee04288a9fb78d512f2619e3fb52fd7ceca743763ab12a2e504fdcac78ff3c37b2e8c1aa43acd082b1101f10a2e881eac4655684367 SHA512 ef5d6c67d53edc428ed10e59c21a1264a0d6d06efbea531a15f2eb1309e632e3cd275657aeb01c5723f437b9c319b922055598f97b0ee7db45853beef4f4d987
-EBUILD xfce4-vala-4.10.3-r3.ebuild 888 BLAKE2B 70b01f0e11cc35366c24ad2d3a2f7605c99de8a8fbcfb33f9d2eb2188ae06bcb519446a3ff4fee118e13588d8e74e4ca5bdca3f124a8ae724a24cfdf611f9278 SHA512 8f9c802f58d8d5ca5f773a1dbef7fe6d9c7e11a9494e8e290675a31a05e68bba3839c98aec308c5aa304b072a453ed73615c62aaab8c0bbbca89cce76f4397fa
+EBUILD xfce4-vala-4.10.3-r3.ebuild 899 BLAKE2B 4346e2c28428a90d29bd84c93a1b4f75520072d32e7cd32ea7a04f9c82fc4ff8debbbe8dab02e10defe5c5a17b609ee6f4bbfaba923b3c3600755f1715447f2d SHA512 a55830b82a95b92fda759a8fc85064fff47104dab67e44a85331b738d566c60d63c8ac4f4a60608e498548a8c3746be1d23a91c0ebbc2e13ea8f84f45606d39b
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
index 65b1ff8f1712..765c8e56052d 100644
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
+++ b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
@@ -10,7 +10,7 @@ inherit xfconf vala
DESCRIPTION="Vala bindings for the Xfce desktop environment"
HOMEPAGE="https://wiki.xfce.org/vala-bindings"
-SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index f72bf7c6ff55..e1f4c4c29825 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-verve-plugin-1.1.0.tar.bz2 353998 BLAKE2B fa1f521e7c5a8a9640746e6c4ab96e2adcb280d225a7cc81ed3b63808b15b30e95806e00621c80e39b946314603ee695d6c40daea21d6d011e7f94c24ab99667 SHA512 7e4c01fb6ba51c86eb7ba75fd1fdfbad11c4cadb64de3c28da711b3c17d67cb521f0fc6d92efbf81d6a01e988ea6a4fc9619c3737ada17b20b347914ca19ec19
DIST xfce4-verve-plugin-2.0.0.tar.bz2 384165 BLAKE2B 7223a2f52574a41acb07ea777a00470a7b0aed027b1084f6fc706d6af07eceb801b15bf2bcdfb9988806f18189363e34f99f929911e23c7ed702ee94c1ca21d7 SHA512 b6be658f5996857e1c5696dc66f973fa5875ba95682297ad157e107abae821023cdf7101ba5f8e5358740549e392b76bf7d1dae252f43bf1a7e8716d798ed39a
-EBUILD xfce4-verve-plugin-1.1.0.ebuild 897 BLAKE2B 3b1b5ff0ac6b15db1c28fa6bc68f31094b9cff4df58813eb3fecad0927f2e641282b005b8da12448135100aa24038a78205c28e1457389e0fe7f79d6776c6fa8 SHA512 dc44e764fbdd5a9d2d62d4a8aaf310a8a11e051380ae5aa2debc181ea0273cf79815fccff867ab4f7d27e680b851f4f25c5b642762a5a23e69bfec192ceb9140
-EBUILD xfce4-verve-plugin-2.0.0.ebuild 815 BLAKE2B 516da10b0aa8100d846d90e7794618dfecf05ea13b09010e79acc83acadf12b0937a5289bfbf2adb0bbd5af6640cd7b2407c503a52476abade3c1aa58683f8b8 SHA512 ccf4fe1d513bb6aa2253fa7599a126ff5144c803bc2cbe99d86a2580bd84a195b10c5a8e4127d2f33fa5530dde1f783bdeb1e8a8747487dd794e747b2362cba8
+EBUILD xfce4-verve-plugin-1.1.0.ebuild 908 BLAKE2B 484ff5f01d5c2122cf7b638fcbeaa4b8014f02037718d68e98f3db4d52953c2ba97d4c0c0d8493253706d3c145bc99be5eeffc52262dee0a2fa46b845aaf71a9 SHA512 88f6b5283817011610b1d367d541e0eaa31208b2bfb246bfd10b6cbc70ff66971c5e5b07c4a3eaa94388a2535001ab20ca6b1fa9198c40a2f72cb46b6dcd637b
+EBUILD xfce4-verve-plugin-2.0.0.ebuild 826 BLAKE2B 919757f9da256de6593d04b079b0e67f4b7113bcb28ae2e0b98213b57ddb4f6b704a9b7690e9d39e6816be8c2095b31789b4a0cd92d2f969deb293c991c5e906 SHA512 c080231e6b75808b2afe6ad85be8f92c0c52bc6f5a1f4d99d85bed0ed0d5e5a07652fb325211e812184f34ed559fad9ed249f4e64fa3b1387bb7c004a0bfffb9
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
index 4dcb7c9aa155..05f65a1b47c8 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
@@ -6,7 +6,7 @@ inherit multilib xfconf
DESCRIPTION="A comfortable command line plugin for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
index 7feaa6d127d1..bca38884468a 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="A comfortable command line plugin for the Xfce panel"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 253cf1603c05..14126df63a2b 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,5 +1,5 @@
DIST xfce4-volumed-pulse-0.2.2.tar.bz2 312703 BLAKE2B 6c88c8f4023f5200c7b5b976ee4fff94344913f313ede29334d3f3b291d6862f56fa11e22a90c79019bcc137e1c77feac84ad14d067f4ce13c86ce58484480ea SHA512 6e452a603ca19b8fc8470851ed9570c84a8208bc7695493cc8ad6425ce6176427a264e39c5249767fe93bdb172137a0c59ef858336f28a574e74bce8d9d35bb6
DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
-EBUILD xfce4-volumed-pulse-0.2.2.ebuild 744 BLAKE2B 3d8c2e9327b900a25d836b1419ae5b05eefcedbe11571cfa7d9ee8cb41995c8d52f8feb821da0190a5f31d0e86cfa787af17ff42d5d4d9828c000ec388f4ac96 SHA512 61f7c0e4bcb0a14f1d1625c314878e73b6e369433e9158c31d76334035ff89051315f5260e8f86448324b34290a720241a57f2da1007349119e70195ad37a06a
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 690 BLAKE2B 18e0b227cafa2e026c5ce41346685dd6882659cf00183a0a6626f26f39de4d31c8471719ec8aa30842bbe5920b999901782098e551c073d3940a6f963d3242f6 SHA512 0fbdb96ddeeaed187fbe7a8540d0d9dfa9bc6106c28763dff14576a96fa6de4ee0a738f3062b01a5e3419a7b685cf52ae12ee51ac6b23ac936ed24fc1e428ea4
+EBUILD xfce4-volumed-pulse-0.2.2.ebuild 755 BLAKE2B a85a19b11b8e490a4eba339a36fdf8d003e0a139a9b8791a1ef503751c8b8d1d64bfed091744f5c55d5044a88e85412904a9fc26c51103041101821fa1898c5f SHA512 b0aa9c50184ac4a2e3f5dffa84890601bec73b2369205cbd46f7436e0f859abb445758319ded002dead8a8196b8f0bdb1b3163a989ef32ca7a3c26bb928fa13c
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 701 BLAKE2B c606aad5112046a6a7e3abc9759a3afa6534631f9821395cba0fdc6ddd39f7a30356d5285ccd905e2ce4d5429caf9d6bdef65190235612f2f01a3b908301f407 SHA512 0e9fe7a62583ee4283f3422a85db0d313fefada92f567743f59d6a305d7be51bc83f418fa6ffac19f4981f82c46dd3fa46d6985b705ea7ff8821b77774c5f2cf
MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
index 26a9f4c19a6c..86e68f933a68 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
HOMEPAGE="https://git.xfce.org/apps/xfce4-volumed-pulse/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 9ed5707226be..c7003ec8315d 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
HOMEPAGE="https://git.xfce.org/apps/xfce4-volumed-pulse/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index bb659855e4c6..a9496281b181 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-wavelan-plugin-0.6.0.tar.bz2 303220 BLAKE2B ce2a8fe3f8cb6ef312459ae73d2cde1a87052a5a9b45e06795937656bf926ff3f8dd73ad0e8d1770d6ded7761cbc787b21ef0ca1b04580ab3dd4961453ae0ef3 SHA512 50dd069902d69071f0d4ab7036fa451ae6cdaca9fbeb56255d58a5864d4e4b3749267b1cc4b411e1073daac9678554f3d483d30aba759ef161425ba3cdd0306e
-EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 991 BLAKE2B a8689f00574c12244708ca99ed720782ecd00928c9141690b70141fcf4679de4feb792307852eb5e1d040802428884f1f57edafc817dfcc6092b7ff1c23d9b07 SHA512 168ebf81ff63ce5f93ed84e7cbac4c33d22863bed6cbf1fd8aeb166abfd762e9c885231ecb68f983ba05775715f6b36d576e4d29d6e743a24173fe63c383ad8f
+EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 1002 BLAKE2B b27185a7c6acc3c2d7faf24dbb6ed8c5f9bb343973431c9fd4f836f1ebf4e9fbfd0c3576cadcb3262def320087730b4f4db77b3a9c5c81c6015a8a2e0ba945a2 SHA512 d31b4084b676fdd639ac14c5ef8ac25e73608e5655173a59eb45cdbeda0f77c3b7f3a2f05992ecd666c81944eefc671d21cdf89f04947261344d51d2fb2efb11
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
index 73024fafddba..ba6ce6615fcd 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
DESCRIPTION="A panel plug-in to display wireless interface statistics"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index ea6401ebe72d..beb36d634ddb 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-weather-plugin-0.8.10.tar.bz2 2991350 BLAKE2B c3c71952a196d49068bac9c1de0695d2845db6931cfe220caf5ebb88919eb40fa0fc9c9a6dc640adbd82fa284449daf6ac537aaf5d258108083b2e63d8288610 SHA512 e40f794e824cc48038ece0c1336eed21b2e28091b86a4b76099c092c2e45abc5041d010d286f64fc483e8ad7c496127152df86330187afbd0872506d89f37c35
-EBUILD xfce4-weather-plugin-0.8.10.ebuild 1078 BLAKE2B e94b1e5c2d7766a38cd3881c6fdbfe536fd853acdd55bad09acc506b1f818640b79fc79c26e8378cf60628a11c1fbc44a8b7e7d51ff4ad96018031ce5f8f7bc9 SHA512 fb1301f1fe1d728566af305eaff0c0961e5252bf96eecaff4b2e2d637d454d31424c6a813ac998cf61e54cf80b3d499e20cacbac55d4228498a5bdc9c156133a
+EBUILD xfce4-weather-plugin-0.8.10.ebuild 1089 BLAKE2B 1e63f72c0b9c6ff7ae193f77bb0829d7c08fb894985091e481e2c9bde190c222eb24b24606ad2407f299b8c33b7e4a665dfbdab6fdee133569c3d38b3853d5f4 SHA512 525c021213d65127f653ec5104714cee2b188ab249cc2ff4363a18277e32cb72d6c8418e147b8c045f843829dfc5db930257a6a258834dcaa66ff46eba31e406
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild
index 6eb823e4a217..0b33afcde916 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
DESCRIPTION="A weather plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index b9ada9e8a6b4..d4089baa0c82 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -3,9 +3,11 @@ DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f
DIST xfce4-whiskermenu-plugin-2.1.6.tar.bz2 166910 BLAKE2B 344bf87bca119fe52da48a62be5d762db1498ea0e248bf394e657f5aa08f48c721806d17acedd52edf34b4775b80d054d95a8d482a8c3c3c0fb1c64b72981bec SHA512 20888a8d16edfccc8da0ec958af39041c423683ed3f56f60b1d520bb54bbc4cfd58841582d24813a4eea364030d2a16fce7f7eb3beeb386ccfa2b43cb1471ef4
DIST xfce4-whiskermenu-plugin-2.1.7.tar.bz2 167498 BLAKE2B 415466b61bb9e7c940a5234024ce04b4d505393c3732bf77b8a706e853273070bd61a3df33bbf72747e4a8ca486cd50cca1eeaac50d023710812c6c697dad475 SHA512 ae912318c0e60b5040486a3dd9b832822a66073db66afc0a7f9344bec25486c57d164ec0fdc18917ff439bcb8715a650e1a39897243b10d33413964729865704
DIST xfce4-whiskermenu-plugin-2.2.0.tar.bz2 168577 BLAKE2B aca6aaa7cf7da6ead40ded6025a5ae67ebe360ae6ad358aaf3563044751fe97bcc231c03a9137b9635fefc57a2978430d9e842ab2285344b843dbe3c8e082111 SHA512 0fd86a2f82f196cc24022a0a5c17882bef4f554ccd0d271f86ec61ea0d2b3dd9206990e7469e874aaabb6f0931ed62da2e50d5086b850137ee759a5a54b4c41b
-EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 873 BLAKE2B 6088679e00cd89a08a3693e87c8331bf8552d1fd25fe16f0edc9b284af2008b4e6a21fc57183a2cb02e1c2bf943d11e13f32729c64080f10e892f6211f0f0a01 SHA512 9bab065373adda0f0bb524d2b6226f391e1912d6c766e753ef05bbfba672f04c7db6eec542499f1c521ee95130d3dfb2fd9287e4e47fe72bccfc4de3f37de72e
-EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 882 BLAKE2B aace5f408b1b9e669414a1e9e42f9611b3c75e368ec1a35e54ea84eec069cb0e1ef151ed70db971f4d1e9b6901ded300b136271274f88db07d21071f8ea32b15 SHA512 1078c943cc24939c9593466180913145b473c13da08c3550fd73b1a949b190d8d6fb19d012a2055074073c4f283e7b709668055c37e534affa70ba1d8a239579
-EBUILD xfce4-whiskermenu-plugin-2.1.6.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
-EBUILD xfce4-whiskermenu-plugin-2.1.7.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
-EBUILD xfce4-whiskermenu-plugin-2.2.0.ebuild 884 BLAKE2B 626d6f9dbdeda209808f9fce19a87f1d275d180d8b189eddbebc38cb95dd33774fb5252b53073d004635d360f3afde0c2724abab78fa1117a1a0fdeccf7ce96e SHA512 d60bca62d631e6c37e53652586f38911441e31269783e9e05acf8a930fdcf5598727b4953c9723d24defa35e17f46e7249cb1bd672a44f00d677c6cc4352664b
+DIST xfce4-whiskermenu-plugin-2.2.1.tar.bz2 145751 BLAKE2B b0addf7ffcd3bb2bf5a7498a50597ccd622d2e87b8fb4153c9d19c7388cade65d2457dec37ef07772e00b3d5bf93f23a95cdcf561960f4f60255d37611a78a57 SHA512 e5b8ab54b66397d0d956d0ddcf7ab9c7531936fa7413094d4cae99aca8f7fca4659012beceec06c9bd6f1ba7695a3e0955d1fd2f10ebf08cf5701224a5dbeb18
+EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 884 BLAKE2B 950d7782cc57b4699a6f15304cdb60abf43ac739f768ef9677d7458901c968dbd154869ce05abedaf8786c1995e47c93844df7bab6501258dec5aa7770dd14df SHA512 b62c8c969b92a7f805f7b92adcb4174212d3502646a686ee2ec011ac0e071b8f7d62228fc182b3526bfb4aa8b122ea24cbee1c6a7689c14df908b38b076873c8
+EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 893 BLAKE2B ebbd32d93e569ee8fc15aa3524e883e046e288a4484165b67bab0c368ebbd03add962f2bfc37143d2f5868b3ea8b4e9190694fcd8daff4e50f5ff3570f10299f SHA512 d8ff9dadee92df1762156e618328f34207434d4a7956c16064cb004a77982ee050c59adb9aa607148993d5d1aa409fe0372eab73d39851c32cdb3c3ddf5b830b
+EBUILD xfce4-whiskermenu-plugin-2.1.6.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
+EBUILD xfce4-whiskermenu-plugin-2.1.7.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
+EBUILD xfce4-whiskermenu-plugin-2.2.0.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
+EBUILD xfce4-whiskermenu-plugin-2.2.1.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild
index c843a5c47af2..abf1e519056c 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils
DESCRIPTION="Alternate application launcher for Xfce"
HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
index 22a86c70fd5c..95857d01f507 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils
DESCRIPTION="Alternate application launcher for Xfce"
HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild
index 0cdcb3cdeaf7..0a191020f9aa 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils
DESCRIPTION="Alternate application launcher for Xfce"
HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild
index 0cdcb3cdeaf7..0a191020f9aa 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils
DESCRIPTION="Alternate application launcher for Xfce"
HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
index 0cdcb3cdeaf7..0a191020f9aa 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils
DESCRIPTION="Alternate application launcher for Xfce"
HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild
new file mode 100644
index 000000000000..0a191020f9aa
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/libintl:=
+ x11-libs/gtk+:3=
+ >=xfce-base/exo-0.11.0:=
+ xfce-base/garcon:=
+ xfce-base/libxfce4ui:=
+ xfce-base/libxfce4util:=
+ xfce-base/xfce4-panel:="
+
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_AS_NEEDED=OFF
+ -DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+ -DENABLE_DEVELOPER_MODE=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-wmdock-plugin/Manifest b/xfce-extra/xfce4-wmdock-plugin/Manifest
index 83f262c0954f..08d69b5a2e06 100644
--- a/xfce-extra/xfce4-wmdock-plugin/Manifest
+++ b/xfce-extra/xfce4-wmdock-plugin/Manifest
@@ -1,4 +1,4 @@
AUX xfce4-wmdock-plugin-0.6.0-LINGUAS.patch 435 BLAKE2B 03100011aa35b98d7cdebec604a014457d3c5e19e4f67f0db4a16dc650fa4525e76766912fcb181fd54c7dac01b956d0af44af8f2b08a0f762fa2cc4db72c06c SHA512 673e64b5da0a577781b23b3cf4a4c3f2121c8be144539970b39bd91165fce5245657aad5e53c57e33031f4e65d8e625b7a24a4abb3f18f74acf7edf50ea2f31e
DIST xfce4-wmdock-plugin-0.6.0.tar.bz2 344743 BLAKE2B 5b425e55dfd5de6805e1a592f86c26bd1e8a655be6d89fb8f8c3722fb76746adc25643e04f22dfac14653e3f3b47b8eb1c9a8ada86b69fd7296404f8324ee4c2 SHA512 4057021d3a664200b1c096047e81611813cfb9e268193d299097430c0c499280d67d326917fd303c21177cc714cea8c81847d3445ddc93860516b55eb6a0ad8e
-EBUILD xfce4-wmdock-plugin-0.6.0.ebuild 963 BLAKE2B 6d1ec413c117b916f4e85daec45f4a5e29cc54bf330b90983f506d289bf3181ff4d782ecfa9851c50923c62768b3459bc7dc0029e67f8dde54ff1ec39e9d49ff SHA512 d70dea34913835e0a553f78267b9ce55369af2275d022246bca11e3f30c7a8328ad4308f3db594ce750df519bb9fe95ae14e41aa2157e3129e2af74e721c68a1
+EBUILD xfce4-wmdock-plugin-0.6.0.ebuild 974 BLAKE2B a783153190b6e3c15f299d38cc86241482c246af16f3d7435b9ea1e1e5d43a348158dce55120211a6a22161354b3d6faf779f1e6e3c78a9af184f4e927a6a3d9 SHA512 37b8252e44c265844d4c3e42d38a6384d35dce2aea629c4dfad49921af10c8659268ab6e178a074463a9222cab7fa62cf3932c5b696a12aaa89ac72baf1900c2
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
index 99dd20a41051..4fdb10aedfb2 100644
--- a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
@@ -6,7 +6,7 @@ inherit multilib xfconf
DESCRIPTION="a compatibility layer for running WindowMaker dockapps on Xfce4"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 93e4e84aa78c..6cd588e4c902 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
-EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1018 BLAKE2B 72842dca33061c6524b938dcc64f44f6a26a8980e0773b62b3702fabf1a3e7aa1d170b56ab0ba991acd26c446af3dd2c2ee654340948be80dca7645db771b960 SHA512 34e4c568b6cf9944754de6d0dc971c4e0d3e2a6936393afda7ddbe4e0a80d0ffb8a3ea46ca884b31eb626c9240021c144197529d347d4d0546a19582f7f3b451
+EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1029 BLAKE2B 098082e3119a7eafaec70b462a41f50d6d52b27451c5182e8b098ce64ad1f233d8ac3d4a74e8321685b60a1156c2419515604a56e919e14b4dcb22a62921950d SHA512 087feb097933ae2becbe51649c4e124fb3fbf4f796d6804802ec30f07ac3fa1dc066bb640ba937bca203571140d3a12c604f6bc016de698dfaaabc5d1d72eb33
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
index fa6ad217267b..9f48b4724d3b 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="BSD-2 GPL-2+"
SLOT="0"
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index b46eb86d2fe2..fdf917266d9b 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,3 +1,3 @@
DIST xfdashboard-0.4.0.tar.bz2 2249568 BLAKE2B a11beea33f9230ad904b876a4ee44e5131c27eded9237b5705e6cd5ce6e763c830550fcd970d4a48918426a8b17cd026bb8634ddbf526ac4019309ba97f84d94 SHA512 d737a65ab27f0d6e49fd24ff7852bd2e00feebd3cce2c1ced5580bb5af1449fad0c593707686b6b83f4fd2e3d7cc318e0778ce404e53240dee53c6aeb9886df0
-EBUILD xfdashboard-0.4.0.ebuild 880 BLAKE2B d3d582bf6b0dceb606d404ac0df5e1f78d60569cf613675a4f6da2952ac71f25728b5b03e1556cd6f04e4e2e5e562e8e2ae38de4585b3d4cdbfadd4b7082637d SHA512 28aaaad39d4d4ee3577e4dbad3b30d7b89890337237967b3f0ec2d30253f8bf09fd63b9c1d90399748f2c2d87e4bbfc30c18f5380c731fde3475c761103e169a
+EBUILD xfdashboard-0.4.0.ebuild 891 BLAKE2B 750d8ca4487fece336449e011df9f4b62bdd0ee36680b893ba7800c91293e3334e106d3ccae26600c66a94ef587a1795843d23c2735ed9b5038aeb07ccacfb38 SHA512 49d7618b156a045ee8478bc262e9aa847478695237d768597508193a345cbaae1841f310068bd5e9ffa0d1ad9f2828b6950572a81bb5a020b2f0aab3ad5aa916
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
index c27d65e22232..765e8365311e 100644
--- a/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
+++ b/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
@@ -6,7 +6,7 @@ inherit xfconf
DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/xfce-extra/xfswitch-plugin/Manifest b/xfce-extra/xfswitch-plugin/Manifest
index 052eb6af57fd..f5be22871a9b 100644
--- a/xfce-extra/xfswitch-plugin/Manifest
+++ b/xfce-extra/xfswitch-plugin/Manifest
@@ -1,3 +1,3 @@
DIST xfswitch-plugin-0.0.1.tar.gz 314589 BLAKE2B 7db630178bbe6ef7dcb6154f6aca0ba3ebc80670d78d0c87f1e4d140a23082c64118aa89d36793384a3b3217784c585bffdad505e213a78837054469a85c7d1d SHA512 58b427d5d099f9e351911cb30707a6024e10ae90f7c978aafba5824f76f5ecdc615979e7a060146ca6cab85f69f8dc10e553884e37737c4f674dfdd3d1fa634e
-EBUILD xfswitch-plugin-0.0.1-r2.ebuild 1318 BLAKE2B b0e7094f87e7b3d187dab5c00a55eba0f9a00af240a2beac2099584b9f6c6323cc17079b2a365aef973f8069217c637059f56329c491e1c375dfd907d9b21edb SHA512 b4f5f04347762846d943769b5c2c113d01a3b8eca5661224a672d5e6328579928c3724466d27484eb24dc3783948a679141691baa330d66e8b06fb195dfc9621
+EBUILD xfswitch-plugin-0.0.1-r2.ebuild 1329 BLAKE2B 31afb45b049bb28e47e181689de328fd6b8219b32292dbcdcc200a049f04a167b8f60bc48c1e9662e1e7f69d3770bf91b5320f571583b651aff1e3b2ad80a2a3 SHA512 8fd38acf0f88bd3212d0d6cc94ec0591a8163fb75e007b7b3a7b2969ea9c5ac8bf5d4d7b98215109ba15015409584b3af529fd25ec2da71b251ff59ba629e0cb
MISC metadata.xml 505 BLAKE2B 16c9d4c25fb50b1ec189d21800850907c279ba2d1d54dc8b05eaee9f289fe7111e6200615f3e88582172d9e0f3b113f770fc53b70ae5ce817347e403cc8885b8 SHA512 44c5a790a69ac0978d234ecb7916e6ce80f08ca805caf2409989d769cadd80e301dee2b7db1a8f653f5ba03dc3dc0227e22816d410360fb619453fcf3a617f01
diff --git a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
index 9d15a9bb1299..abf5b49a3b4f 100644
--- a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
+++ b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
@@ -6,7 +6,7 @@ inherit multilib xfconf
DESCRIPTION="A panel plug-in for user switching (using lightdm or gdm or ldm)"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfswitch-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"