Merged with upstream

2 files changed, 11 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c146190..3a1bab7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=your-freedom
 pkgdesc="This package conflicts with every proven nonfree package to ensure your system is free."
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
-pkgver=20180516
+pkgver=20180626
 pkgrel=1
 
 arch=('any')
@@ -11,7 +11,7 @@ groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('d090b6d7a7f0e376a0d9050cf00b96b80e9fb22330ee6976dae825f6830b5d7655b5e511a45d9ac3657e98c640d0ff1382c6c63e311e041c58abd3038a6c1b41')
+sha512sums=('abfd56994e468972cdbcda891b6873e0ec4576f968dbec45f8b5dc9ec40c07c644c9236aaad285290adf3a96ed05cf3cf2b752c74fd85d8a58c5e4f2e1c2e9c4')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist.txt b/blacklist.txt
index 1f05a14..bbfdc4b 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -353,10 +353,12 @@ lesspipe:lesspipe:::[semifree] recommends nonfree unrar
 lib32-flashplugin::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-mesa-demos:lib32-mesa-demos:::[semifree] The 'pointblast' and 'spriteblast' demos are nonfree
 lib32-nvidia-340xx-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+lib32-nvidia-390xx-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-nvidia-cg-toolkit::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-nvidia-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-opencl-nvidia::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-opencl-nvidia-340xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+lib32-opencl-nvidia-390xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-primus::::[uses-nonfree] only useful with bumblebee
 lib32-sdl:lib32-sdl:::[semifree] contains a source file that doesn't mention modification
 libosinfo:libosinfo:parabola:517:[uses-nonfree] contains non-FSDG compliant distros and operating systems support
@@ -442,7 +444,6 @@ mc:mc:::[uses-nonfree] recommends nonfree unace, unrar and unarj optional instal
 mcomix:mcomix:::[uses-nonfree] recommends nonfree unrar optional installation for RAR compressed comics
 memtest86+:memtest86+:::[technical] Arch version was not built from source
 mencoder:mencoder:::[uses-nonfree] depends on nonfree package faac, Parabola use mencoder, without dependency of faac
-mesa:mesa:::[uses-nonfree] (mesa) Recommends nonfree software in /etc/drirc
 mesa-demos:mesa-demos:fsf:mesademos:[semifree] The 'pointblast' and 'spriteblast' demos are nonfree
 messengerfordesktop::::[uses-nonfree] depends on nonfree electron
 midori:midori:::[uses-nonfree] has non-privacy search engines
@@ -465,7 +466,13 @@ nvidia::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-340xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-340xx-dkms::parabola:823:[uses-nonfree] depends on nonfree package nvidia-340xx-utils
 nvidia-340xx-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+nvidia-340xx-settings::::[uses-nonfree] depends on nonfree package nvidia-340xx-utils
 nvidia-340xx-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+nvidia-390xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+nvidia-390xx-dkms::::[uses-nonfree] depends on nonfree package nvidia-390xx-utils
+nvidia-390xx-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+nvidia-390xx-settings::::[uses-nonfree] depends on nonfree package nvidia-390xx-utils
+nvidia-390xx-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-cg-toolkit::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-dkms::parabola:825:[uses-nonfree] depends on nonfree package nvidia-utils
 nvidia-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
@@ -478,6 +485,7 @@ okular:okular:parabola:1067:[semifree] has copy-protection anti-feature turn on
 open-vm-tools::::[uses-nonfree] only useful with vmware
 opencl-nvidia::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 opencl-nvidia-340xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
+opencl-nvidia-390xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 opencv:opencv:parabola:735:[semifree] contains nonfree module and some nonfree data
 openexr:openexr:::[semifree] includes embedded nonfree fonts in the documentation
 openmw::parabola:612:[uses-nonfree] has wizard installation support to install nonfree assets from Morrowind to run Morrowind
@@ -543,7 +551,6 @@ ponysay:ponysay:parabola:206:[semifree] contains nonfree pony graphics
 povray:povray:::[semifree] contains nonfree documentation (CC by-nc-sa) see: https://github.com/POV-Ray/povray/blob/master/README.md (POV-Ray below 3.7 version are nonfree software)
 primus::::[uses-nonfree] only useful with bumblebee
 psutils:psutils:fsf:psutils:[semifree] has nonfree files
-pycharm-pro-eap::::[nonfree] proprietary trialware, built from binary installer (from Antergos)
 pycuda-headers::::[uses-nonfree] depends on nonfree cuda
 pyrit:pyrit:parabola:1142:[uses-nonfree] recommends nonfree cpyrit-cuda optional installation
 pysolfc-cardsets:pysolfc-cardsets:::[semifree] some copyrighted cardsets
@@ -589,7 +596,6 @@ snes9x::::[nonfree] noncommercial software http://github.com/snes9xgit/snes9x/bl
 snes9x-gtk::::[nonfree] depends on nonfree package faac and the core of snes9x-gtk is snes9x under snes9x license http://code.google.com/p/snes9x-gtk http://github.com/snes9xgit/snes9x/blob/master/docs/snes9x-license.txt
 sopcast::::[nonfree] forbids commercial use
 soundkonverter:soundkonverter:::[uses-nonfree] recommends nonfree faac and mac optional installation
-speedtouch::::[uses-nonfree] needs unfound possibly nonfree firmware
 sqlite-doc::::[FIXME:description] portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library
 steam::::[nonfree] binary package
 steam-native-runtime::::[uses-nonfree] only useful with nonfree steam
@@ -749,4 +755,3 @@ xorg-fonts-75dpi:xorg-fonts-75dpi:::[FIXME:description] nonfree fonts
 xorg-fonts-type1:xorg-fonts-type1:::[FIXME:description] nonfree fonts
 xscreensaver:xscreensaver:parabola:131:[semifree] dmsc.asm file don't have source code supplied
 xsnow::::[nonfree] License only allows giving the software to others as is, packaging the software, and modifications that enable packaging. License does not grant the right to run the software.
-zd1211-firmware::::[uses-nonfree] it's free, but drivers are propietary and it's not included in linux-libre