Merged upstream "remove more deprecated packages from blacklist.txt"

2 files changed, 2 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c322bbe..49f0a58 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=20170927
-pkgrel=1.arcfour1
+pkgrel=2.arcfour1
 
 arch=('any')
 groups=('base' 'base-openrc')
 
 makedepends=(librelib)
 source=(blacklist.txt)
-sha512sums=('0124f858ecb343ff96bea05e2d478f3052492eaa8d9386badc0a45c64a69d38b1217ed7b27f3661e4bc7b03ba60ef74dbffa8266d22438a136f18af31a595f01')
+sha512sums=('9deac590acdd5f14f6ab01a97c02dcfc5f34931fce13d0bfc95070eebb4bd3d86b4863274e1545f5fcf71cd838068e5629953485ba308e2d7a7522621fdd0755')
 
 package() {
 	cd "$srcdir"
diff --git a/blacklist.txt b/blacklist.txt
index cd3437a..d2f7a55 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -59,7 +59,6 @@ b43-fwcutter:b43-tools:fsf:b43-fwcutter:[uses-nonfree] only useful to install no
 bbswitch:bbswitch:::[technical] Recompile for linux-libre kernel instead of linux kernel
 bbswitch-dkms:bbswitch-dkms:::[technical] Recompile for linux-libre kernel instead of linux kernel
 bbswitch-lts:bbswitch-lts:::[technical] Recompile for linux-libre-lts kernel instead of linux-lts kernel
-bbswitch-lts-dkms:bbswitch-lts-dkms:::[technical] Recompile for linux-libre-lts kernel instead of linux-lts kernel
 beanshell:beanshell:::[technical] Arch version is not compiled from source
 bfgminer:bfgminer:::[uses-nonfree] recommends nonfree opencl optional installation
 bitlbee:bitlbee:::[uses-nonfree] removed support for Skype
@@ -77,7 +76,6 @@ bumblebee::::[uses-nonfree] only useful for nonfree nvidia driver
 calibre:calibre:::[semifree] contains nonfree unrar
 capi4hylafax::::[technical] [FIXME:package] requires isdn4k-utils (for which there is a free replacement that is unpackaged)
 caprine::::[uses-nonfree] depends on nonfree electron
-cdrkit:cdrkit:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
 cdrtools:cdrkit:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
 cgminer::::[uses-nonfree] only useful with nonfree video drivers
 chromium::::[uses-nonfree][technical][FIXME:package] (1) links to proprietary plugins (2) probably not entirely built from sources
@@ -127,8 +125,6 @@ file-roller:file-roller:::[uses-nonfree] recommends nonfree unrar and unace inst
 filesystem:filesystem:::[branding]
 firefox::fsf:firefox:[uses-nonfree] Has trademark issues, recommends nonfree software and by default has non-privacy search engines
 firefox-adblock-plus::fsf:firefox:[uses-nonfree] adapted for Firefox
-firefox-beta::fsf:firefox:[semifree] Has trademark issues, recommends nonfree software and by default has non-privacy search engines
-firefox-firebug::fsf:firefox:[uses-nonfree][semifree] contains propietary artwork and trademark issues [[issue384]] and adapted for Firefox
 firefox-i18n-ach::fsf:firefox:[semifree]
 firefox-i18n-af::fsf:firefox:[semifree]
 firefox-i18n-an::fsf:firefox:[semifree]
@@ -225,11 +221,7 @@ firefox-i18n-xh::fsf:firefox:[semifree]
 firefox-i18n-zh-cn::fsf:firefox:[semifree]
 firefox-i18n-zh-tw::fsf:firefox:[semifree]
 firefox-noscript::fsf:firefox:[uses-nonfree] adapted for Firefox
-firefox-raismth::fsf:firefox:[uses-nonfree] adapted for Firefox
 firefox-spell-ru::fsf:firefox:[uses-nonfree] adapted for Firefox
-firefox-theme-adwaita::fsf:firefox:[uses-nonfree][technical] adapted for Firefox, Arch version is not built from sources
-firefox-theme-gnome::fsf:firefox:[technical][uses-nonfree] adapted for Firefox, depends on Firefox, Arch version is not built from sources
-firefox-theme-gnome-tweak::fsf:firefox:[technical][uses-nonfree] adapted for Firefox, Arch version is not built from sources
 flashplugin::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 font-bh-ttf:font-bh-ttf:::[nonfree] non libre font
 font-mathematica::::[FIXME:description]
@@ -252,8 +244,6 @@ gnormalize:gnormalize:::[uses-nonfree] recommends nonfree faac and mac optional
 grub:grub:::[branding]
 gsopcast::::[FIXME:description]
 gst-plugins-bad:gst-plugins-bad:::[uses-nonfree] depends on nonfree package faac
-gstreamer0.10-bad:gstreamer0.10-bad:::[uses-nonfree] depends on nonfree package faac
-gstreamer0.10-bad-plugins:gstreamer0.10-bad-plugins:::[uses-nonfree] depends on nonfree package faac
 gvim:gvim:::[technical] (vim) requires vim and vim-runtime with different $pkgrel than ours (eg: Arch -> pkgrel=${archrel} and Parabola -> pkgrel=${archrel}.parabola${parabolarel})
 handbrake:handbrake:::[technical] Arch version uses network during building (also doesn't use system fdk-aac, x265, or libvpx)
 handbrake-cli:handbrake-cli:::[technical] Arch version uses network during building (also doesn't use system fdk-aac, x265, or libvpx)
@@ -308,7 +298,6 @@ kodi:kodi:::[semifree] contains nonfree decompression engine for RAR archives an
 krusader::::[semifree] recommends nonfree programs like RAR, [[issue217]]
 lesspipe:lesspipe:::[semifree] recommends nonfree unrar
 lib32-flashplugin::::[nonfree] nonfree, nondistributable, built from binary installers, etc
-lib32-libcl:lib32-ocl-icd:::[nonfree] built from nonfree binaries (nvidia)
 lib32-mesa-demos:lib32-mesa-demos:::[semifree] The 'pointblast' and 'spriteblast' demos are nonfree
 lib32-nvidia-304xx-libgl::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 lib32-nvidia-304xx-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
@@ -434,7 +423,6 @@ 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
-midori-gtk2:midori-gtk2:::[uses-nonfree] has non-privacy search engines
 min::parabola:1204:[uses-nonfree] has non-privacy search engines, depends on nonfree electron
 minitube:minitube:parabola:1457:[semifree] recommends unfree projects from same author
 misdnuser::::[technical] [FIXME:package] requires isdn4k-utils (for which there is a free replacement that is unpackaged)
@@ -469,17 +457,14 @@ nvdock::::[uses-nonfree] only useful with nvidia-settings
 nvidia::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-304xx::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-304xx-dkms::parabola:762:[uses-nonfree] depends on nonfree package nvidia-304xx-utils
-nvidia-304xx-libgl:bumblebee:::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-304xx-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-304xx-utils::::[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-libgl:bumblebee:::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-340xx-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-340xx-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-libgl:bumblebee:::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-lts::::[nonfree] nonfree, nondistributable, built from binary installers, etc
 nvidia-settings::::[uses-nonfree] depends on nonfree package nvidia-utils
 nvidia-utils::::[nonfree] nonfree, nondistributable, built from binary installers, etc
@@ -744,11 +729,9 @@ vim-ctrlp::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.o
 vim-doxygentoolkit::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-guicolorscheme::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-jad::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
-vim-minimal:vim-minimal:::[technical] (vim) requires vim and vim-runtime with different $pkgrel than ours (eg: Arch -> pkgrel=${archrel} and Parabola -> pkgrel=${archrel}.parabola${parabolarel})
 vim-omnicppcomplete::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-pastie::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-project::::[nonfree] unknown license terms for accompanying documentation -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
-vim-python3:vim-python3:::[technical] (vim) requires vim and vim-runtime with different $pkgrel than ours (eg: Arch -> pkgrel=${archrel} and Parabola -> pkgrel=${archrel}.parabola${parabolarel})
 vim-runtime:vim-runtime:::[branding] (vim)
 vim-systemd::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-workspace::::[nonfree] unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html