Fixed conflicts

2 files changed, 93 insertions, 91 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2396f0d..d32948c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@ pkgdesc="This package conflicts with every proven nonfree package to ensure your
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
 pkgver=20180113
-pkgrel=1
+pkgrel=2
 
 arch=('any')
 groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('adaa543a3455f78a37d6c1a2a483d4dbccdc518da3101660490516f5c32edf9094a2f46e78f7563bab2148c1fef6b9f3ea1f04a4c8b1d4b25e85b663401c7196')
+sha512sums=('80fa0f6191fab043d299449cb38cc13eadaea81dc08adc397d57b31eec8cac7b945f9455c2b7f03fae30b527bf50692d4e8f0c55aeb705acefdb2e642634f315')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist.txt b/blacklist.txt
index 05f8b66..0155017 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -1,13 +1,13 @@
-cgroup_event_listener::::  [semifree] (linux-tools) Build from the Linux-libre kernel
-cpupower::::                            [semifree] (linux-tools) Build from the Linux-libre kernel
-libtraceevent::::                  [semifree] (linux-tools) Build from the Linux-libre kernel
-linux-tools-meta::::                        [semifree] (linux-tools) Build from the Linux-libre kernel
-perf::::                                    [semifree] (linux-tools) Build from the Linux-libre kernel
-tmon::::                                    [semifree] (linux-tools) Build from the Linux-libre kernel
-turbostat::::                          [semifree] (linux-tools) Build from the Linux-libre kernel
-usbip::::                                  [semifree] (linux-tools) Build from the Linux-libre kernel
-x86_energy_perf_policy::::[semifree] (linux-tools) Build from the Linux-libre kernel
-aarch64-linux-gnu-linux-api-headers::::[semifree] has source containing and recommending nonfree software, [[issue1571]]
+cgroup_event_listener:linux-libre-tools-cgroup_event_listener:::  [semifree] (linux-tools) Build from the Linux-libre kernel
+cpupower:linux-libre-tools-cpupower:::                            [semifree] (linux-tools) Build from the Linux-libre kernel
+libtraceevent:linux-libre-tools-libtraceevent:::                  [semifree] (linux-tools) Build from the Linux-libre kernel
+linux-tools-meta:linux-libre-tools-meta:::                        [semifree] (linux-tools) Build from the Linux-libre kernel
+perf:linux-libre-tools-perf:::                                    [semifree] (linux-tools) Build from the Linux-libre kernel
+tmon:linux-libre-tools-tmon:::                                    [semifree] (linux-tools) Build from the Linux-libre kernel
+turbostat:linux-libre-tools-turbostat:::                          [semifree] (linux-tools) Build from the Linux-libre kernel
+usbip:linux-libre-tools-usbip:::                                  [semifree] (linux-tools) Build from the Linux-libre kernel
+x86_energy_perf_policy:linux-libre-tools-x86_energy_perf_policy:::[semifree] (linux-tools) Build from the Linux-libre kernel
+aarch64-linux-gnu-linux-api-headers:aarch64-linux-gnu-linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software, [[issue1571]]
 abiword:abiword:::[semifree] Hard-codes nonfree fonts, and has non-privacy search engines e.g. Google
 abuse:abuse:fsf:Free_Abuse_Extensions:[semifree] Contains a nonfree addon
 acetoneiso2::fsf:AcetoneISO:[uses-nonfree] ask to download and install nonfree poweriso
@@ -372,86 +372,88 @@ libretro-snes9x::parabola:1012:[nonfree] noncommercial software https://github.c
 libunrar::::[nonfree] part of nonfree unrar, Issue442
 libview::::[uses-nonfree] only useful with vmware
 libxnvctrl::parabola:763:[uses-nonfree] only useful for nonfree nvidia driver
-linux::fsf::[semifree] nonfree blobs and firmwares
+licenses:licenses:::[use-nonfree] Remove non-free CC -NC and -ND licenses (also add WTFPL)
+linux:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
 linux_logo::::[FIXME:description] [uses-nonfree] contains tux text-based logo for nonfree linux kernel
-linux-am33x::fsf::[semifree] nonfree blobs and firmwares
-linux-am33x-headers::fsf::[semifree] blobbed source
+linux-am33x:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-am33x-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
 linux-api-headers:linux-libre-api-headers:::[semifree] has source containing and recommending nonfree software, [[issue444]]
-linux-armv7::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-mirabox::fsf::[semifree] nonfree blobs and f
-linux-armv7-ax3::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-chromebook::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-cubox::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-d3plug::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-headers::fsf::[semifree] blobbed source
-linux-armv7-mirabox::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc-ax3::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc-chromebook::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc-d3plug::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc-headers::fsf::[semifree] blobbed source
-linux-armv7-rc-mirabox::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-rc-smileplug::fsf::[semifree] nonfree blobs and firmwares
-linux-armv7-smileplug::fsf::[semifree] nonfree blobs and firmwares
-linux-boundary::fsf::[semifree] nonfree blobs and firmwares
-linux-boundary-headers::fsf::[semifree] blobbed source
-linux-clearfog::fsf::[semifree] nonfree blobs and firmwares
-linux-clearfog-headers::fsf::[semifree] blobbed source
-linux-cubox::fsf::[semifree] nonfree blobs and firmwares
-linux-cubox-headers::fsf::[semifree] blobbed source
-linux-cubox-headless::fsf::[semifree] nonfree blobs and firmwares
-linux-d3plug::fsf::[semifree] nonfree blobs and firmwares
-linux-docs::::[semifree] docs comes from nonfree linux kernel
-linux-firmware::fsf:linux-firmware:[semifree] nonfree blobs and firmwares
-linux-hardened::fsf::[semifree] nonfree blobs and firmwares
-linux-hardened-headers::fsf::[semifree] blobbed source
-linux-hardened-docs::::[semifree] docs comes from nonfree linux-hardened kernel
-linux-headers::fsf::[semifree] blobbed source
-linux-headers-clearfog::fsf::[semifree] blobbed source
-linux-headers-d3plug::fsf::[semifree] blobbed source
-linux-headers-imx6-cubox::fsf::[semifree] blobbed source
-linux-headers-imx6-cubox-dt::fsf::[semifree] blobbed source
-linux-headers-odroid::fsf::[semifree] blobbed source
-linux-headers-utilite-dt::fsf::[semifree] blobbed source
-linux-imx6::fsf::[semifree] nonfree blobs and firmwares
-linux-imx6-cubox::fsf::[semifree] nonfree blobs and firmwares
-linux-imx6-cubox-dt::fsf::[semifree] nonfree blobs and firmwares
-linux-imx6-headers::fsf::[semifree] blobbed source
-linux-lts::fsf::[semifree] nonfree blobs and firmwares
-linux-lts-docs::::[semifree] docs comes from nonfree linux-lts kernel
-linux-lts-headers::fsf::[semifree] blobbed source
-linux-manpages::::[semifree] manpages comes from nonfree linux kernel
-linux-odroid-c1::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-c1-headers::fsf::[semifree] blobbed source
-linux-odroid-u2::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-x::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-x2::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-xu3::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-xu3-headers::fsf::[semifree] blobbed source
-linux-odroid-xu::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-xu-headers::fsf::[semifree] blobbed source
-linux-odroid-xu-headless::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-xu-headless-headers::fsf::[semifree] blobbed source
-linux-odroid-xu-mainline::fsf::[semifree] nonfree blobs and firmwares
-linux-odroid-xu-mainline-headers::fsf::[semifree] blobbed source
-linux-parallella::fsf::[semifree] nonfree blobs and firmwares
-linux-parallella-headers::fsf::[semifree] blobbed source
-linux-peach::fsf::[semifree] nonfree blobs and firmwares
-linux-peach-headers::fsf::[semifree] blobbed source
-linux-raspberrypi::fsf::[semifree] nonfree blobs and firmwares
-linux-raspberrypi-headers::fsf::[semifree] blobbed source
-linux-utilite::fsf::[semifree] nonfree blobs and firmwares
-linux-utilite-dt::fsf::[semifree] nonfree blobs and firmwares
-linux-utilite-headers::fsf::[semifree] blobbed source
-linux-veyron::fsf::[semifree] nonfree blobs and firmwares
-linux-veyron-headers::fsf::[semifree] blobbed source
-linux-wandboard::fsf::[semifree] nonfree blobs and firmwares
-linux-wandboard-headers::fsf::[semifree] blobbed source
-linux-zedboard::fsf::[semifree] nonfree blobs and firmwares
-linux-zedboard-headers::fsf::[semifree] blobbed source
-linux-zen::fsf::[semifree] nonfree blobs and firmwares
-linux-zen-docs::::[semifree] docs comes from nonfree linux-zen kernel
-linux-zen-headers::fsf::[semifree] blobbed source
+linux-armv7:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-mirabox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and f
+linux-armv7-ax3:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-chromebook:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-cubox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-d3plug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-armv7-mirabox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc-ax3:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc-chromebook:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc-d3plug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-armv7-rc-mirabox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-rc-smileplug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-armv7-smileplug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-boundary:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-boundary-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-clearfog:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-clearfog-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-cubox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-cubox-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-cubox-headless:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-d3plug:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-docs:linux-libre-docs:::[semifree] docs comes from nonfree linux kernel
+linux-firmware:linux-libre-firmware:fsf:linux-firmware:[semifree] nonfree blobs and firmwares
+linux-hardened:linux-libre-hardened:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-hardened-headers:linux-libre-hardened-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-hardened-docs:linux-libre-hardened-docs:::[semifree] docs comes from nonfree linux-hardened kernel
+linux-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-clearfog:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-d3plug:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-imx6-cubox:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-imx6-cubox-dt:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-odroid:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-headers-utilite-dt:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-howtos::::[uses-nonfree] [FIXME:package] recommends nonfree software
+linux-imx6:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-imx6-cubox:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-imx6-cubox-dt:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-imx6-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-lts:linux-libre-lts:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-lts-docs:linux-libre-lts-docs:::[semifree] docs comes from nonfree linux-lts kernel
+linux-lts-headers:linux-libre-lts-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-manpages:linux-libre-manpages:::[semifree] manpages comes from nonfree linux kernel
+linux-odroid-c1:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-c1-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-odroid-u2:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-x:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-x2:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-xu3:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-xu3-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-odroid-xu:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-xu-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-odroid-xu-headless:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-xu-headless-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-odroid-xu-mainline:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-odroid-xu-mainline-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-parallella:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-parallella-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-peach:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-peach-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-raspberrypi:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-raspberrypi-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-utilite:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-utilite-dt:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-utilite-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-veyron:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-veyron-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-wandboard:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-wandboard-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-zedboard:linux-libre:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-zedboard-headers:linux-libre-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
+linux-zen:linux-libre-pck:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] nonfree blobs and firmwares
+linux-zen-docs:linux-libre-pck-docs:::[semifree] docs comes from nonfree linux-zen kernel
+linux-zen-headers:linux-libre-pck-headers:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules:[semifree] blobbed source
 linuxsampler::::[nonfree] licence of the sampler backend prohibits commercial use, the backend is thus not free software
 luxmark:luxmark:::[uses-nonfree] recommends nonfree opencl optional installation
 luxrays:luxrays:::[uses-nonfree] recommends nonfree opencl optional installation
@@ -713,7 +715,7 @@ unace::::[nonfree] license forbids making competing ACE archivers from unace
 unarj::::[nonfree] license forbids making competing ARJ archivers from unarj. arj shouldn't be mentioned as replacement as long as it isn't modified to conflicts=(unarj), etc
 unetbootin::fsf:unetbootin:[semifree] it lists many non-fsdg operating systems. Remove or change the list of distros available. FUSBi is a fork which does so
 unp:unp:parabola:715:[uses-nonfree] recommends nonfree unace, unrar and unarj optional installation
-unrar::fsf:unrar:[nonfree]
+unrar:unar:fsf:unrar:[nonfree]
 unzip:unzip:::[semifree] contains a source file that doesn't mention modification
 urbanterror::::[uses-nonfree] GPL2, but it can use together with proprietary data only
 urbanterror-data::::[nonfree] proprietary, it permits distribute together with the game only