remove parabola and libre suffixes on our packages

1 files changed, 138 insertions, 138 deletions

diff --git a/blacklist.txt b/blacklist.txt
index a830230..97f5a23 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -7,17 +7,17 @@ perf:linux-libre-tools-perf:::                                    [semifree] (li
 tmon:linux-libre-tools-tmon:::                                    [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
-abiword:abiword-libre:::[semifree] Supports nonfree fonts
-abiword-plugins:abiword-libre-plugins:::[semifree] Supports nonfree fonts
-abs:abs-parabola:::[branding] Change default abs.conf to use Parabola servers
-abuse:abuse-libre:fsf:Free_Abuse_Extensions:[semifree] Contains a nonfree addon
+abiword:abiword:::[semifree] Supports nonfree fonts
+abiword-plugins:abiword-plugins:::[semifree] Supports nonfree fonts
+abs:abs:::[branding] Change default abs.conf to use Parabola servers
+abuse:abuse:fsf:Free_Abuse_Extensions:[semifree] Contains a nonfree addon
 acetoneiso2::fsf:AcetoneISO:[uses-nonfree] ask to download and install nonfree poweriso
-acpi_call:acpi_call-parabola:::[technical] Build against our kernel
-acpi_call-lts:acpi_call-lts-parabola:::[technical] Build against our LTS kernel
+acpi_call:acpi_call:::[technical] Build against our kernel
+acpi_call-lts:acpi_call-lts:::[technical] Build against our LTS kernel
 alienarena-data::::[semifree] Some nonfree data (doesn't allow commercial redistribution)
 alienarena::::[uses-nonfree] Depends on alienarena-data
 alsa-firmware::::[FIXME:description] issue68
-angband:angband-libre:::[semifree] Sounds are "freeware"
+angband:angband:::[semifree] Sounds are "freeware"
 antlr2:antrl2:::[technical] Repackage for boring reasons
 apache-ant:apache-ant:::[technical] Arch version was not built from source
 arch-firefox-search::::[branding]
@@ -43,59 +43,59 @@ arm-wince-cegcc-libstdcppdll::::  [uses-nonfree] only useful for building for no
 arm-wince-cegcc-newlib::::        [uses-nonfree] only useful for building for nonfree OS
 arm-wince-cegcc-profile::::       [uses-nonfree] only useful for building for nonfree OS
 arm-wince-cegcc-w32api::::        [uses-nonfree] only useful for building for nonfree OS
-arora:arora-libre::::[semifree] recommends nonfree flash and non-privacy search providers e.g. Bing, Google, Facebook, Yahoo!, etc
+arora:arora::::[semifree] recommends nonfree flash and non-privacy search providers e.g. Bing, Google, Facebook, Yahoo!, etc
 assaultcube::::non-free freeware license http://sauerbraten.org/README.html#license
-atool:atool-libre:::[uses-nonfree] Has unrar support for rar and recommends unace optional installation
-atril:atril-libre:::[uses-nonfree] Recommends unrar installation
-audacious-plugins:audacious-plugins-libre:::[semifree] multiple copyright problems make software non-redistributable as currently packaged
-audex:audex-parabola:::[uses-nonfree] recommends nonfree faac optional installation
-audio-convert:audio-convert-parabola:::[uses-nonfree] recommends nonfree faac optional installation
-avidemux-cli:avidemux-cli-parabola:::[uses-nonfree] depends and recommends nonfree faac installation
-avidemux-gtk:avidemux-gtk-parabola:::[uses-nonfree] depends and recommends nonfree faac installation
-avidemux-qt:avidemux-qt-parabola:::[uses-nonfree] depends and recommends nonfree faac installation
+atool:atool:::[uses-nonfree] Has unrar support for rar and recommends unace optional installation
+atril:atril:::[uses-nonfree] Recommends unrar installation
+audacious-plugins:audacious-plugins:::[semifree] multiple copyright problems make software non-redistributable as currently packaged
+audex:audex:::[uses-nonfree] recommends nonfree faac optional installation
+audio-convert:audio-convert:::[uses-nonfree] recommends nonfree faac optional installation
+avidemux-cli:avidemux-cli:::[uses-nonfree] depends and recommends nonfree faac installation
+avidemux-gtk:avidemux-gtk:::[uses-nonfree] depends and recommends nonfree faac installation
+avidemux-qt:avidemux-qt:::[uses-nonfree] depends and recommends nonfree faac installation
 b43-fwcutter::fsf:b43-fwcutter:[uses-nonfree] Only usefull to install non-free software
 bass::::[nonfree] freeware
-bbswitch:bbswitch-parabola:::[technical] Build against our kernel
+bbswitch:bbswitch:::[technical] Build against our kernel
 beanshell2:beanshell2:::[technical] Arch version is not compiled from source
-bfgminer:bfgminer-parabola:::[semifree] recommends nonfree opencl optional installation
-bitlbee:bitlbee-parabola:::[uses-nonfree] removed support for Skype
-blackbox:blackbox-libre:::[uses-nonfree] recommends nonfree programs on menu
-blender:blender-libre:::[uses-nonfree] supports nonfree cuda
+bfgminer:bfgminer:::[semifree] recommends nonfree opencl optional installation
+bitlbee:bitlbee:::[uses-nonfree] removed support for Skype
+blackbox:blackbox:::[uses-nonfree] recommends nonfree programs on menu
+blender:blender:::[uses-nonfree] supports nonfree cuda
 bluez-firmware::::[FIXME:description] [issue67]
-bogofilter:bogofilter-libre:sv:34593:[semifree] Includes nonfree (CC BY-NC-ND) documentation
+bogofilter:bogofilter:sv:34593:[semifree] Includes nonfree (CC BY-NC-ND) documentation
 boinc::::[nonfree] nonfree files including and relating to api/texfont.{cpp,h} and possible other license issues
 boinc-nox::::[nonfree] nonfree files including and relating to api/texfont.{cpp,h} and possible other license issues
-bumblebee:bumblebee-libre:::[semifree] adapted to nonfree nvidia driver
-calibre:calibre-libre:::[uses-nonfree] depends on libunrar
-cdrkit:cdrkit-libre:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
-cdrtools:cdrkit-libre:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
+bumblebee:bumblebee:::[semifree] adapted to nonfree nvidia driver
+calibre:calibre:::[uses-nonfree] depends on libunrar
+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::fsf:chromium-browser:[semifree] (1) Copyright or license of some code is unclear (2) Links to proprietary plugins
 cinelerra-cv::::[uses-nonfree] needs nonfree faac
-clementine:clementine-libre:::[uses-nonfree] asks to download an nonfree plugin to support spotify
+clementine:clementine:::[uses-nonfree] asks to download an nonfree plugin to support spotify
 closure-compiler:closure-compiler:::[technical] Arch version is not compiled from source
 cuda::::[FIXME:description]
-cups-filters:cups-filters-parabola:::[uses-nonfree] recommends foomatic-db-nonfree
+cups-filters:cups-filters:::[uses-nonfree] recommends foomatic-db-nonfree
 dangerdeep-data::::[nonfree] non commercial license
 dangerdeep::::[uses-nonfree] needs nonfree data
 dina-font::::[nonfree] using it for "for anything illegal" not allowed
 dosemu::fsf:dosemu:[uses-nonfree] contains free software that can only be built using nonfree software
-doublecmd-gtk2:doublecmd-libre-gtk2:::[uses-nonfree] recommends libunrar optional installation
-doublecmd-qt:doublecmd-libre-qt:::[uses-nonfree] recommends libunrar optional installation
-dvdrip:dvdrip-libre:::[uses-nonfree] depends and recommends unrar optional installation
-dvdrtools:dvdrtools-libre:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
+doublecmd-gtk2:doublecmd-gtk2:::[uses-nonfree] recommends libunrar optional installation
+doublecmd-qt:doublecmd-qt:::[uses-nonfree] recommends libunrar optional installation
+dvdrip:dvdrip:::[uses-nonfree] depends and recommends unrar optional installation
+dvdrtools:dvdrtools:::[semifree] Apple's license binding with no clarification (apple_driver utility is nonfree)
 dwarffortress::::[nonfree] dwarffortress
-ecasound:ecasound-parabola:::[uses-nonfree] recommends nonfree faac optional installation
-engrampa:engrampa-parabola:::[uses-nonfree] recommends unrar and unace installation
-epdfview:epdfview-libre:::[technical] has firefox in default config
-epiphany:epiphany-libre:parabola:367:[uses-nonfree] has Google support
-evince:evince-libre:::[uses-nonfree] recommends unrar installation
+ecasound:ecasound:::[uses-nonfree] recommends nonfree faac optional installation
+engrampa:engrampa:::[uses-nonfree] recommends unrar and unace installation
+epdfview:epdfview:::[technical] has firefox in default config
+epiphany:epiphany:parabola:367:[uses-nonfree] has Google support
+evince:evince:::[uses-nonfree] recommends unrar installation
 faac::::[nonfree] is a GPL'ed package, but has non free code that can't be distributed under the GPL
-faenza-icon-theme:faenza-icon-theme-libre:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
-faience-icon-theme:faience-icon-theme-libre:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
+faenza-icon-theme:faenza-icon-theme:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
+faience-icon-theme:faience-icon-theme:::[branding] has nonfree distros and application icons, also Archlinux logo and menu, rebranding
 figlet:toilet:::[FIXME:description]
-file-roller:file-roller-parabola:::[uses-nonfree] recommends unrar and unace installation
-filesystem:filesystem-parabola:::[branding]
+file-roller:file-roller:::[uses-nonfree] recommends unrar and unace installation
+filesystem:filesystem:::[branding]
 firefox-adblock-plus:iceweasel-adblock-plus:fsf:firefox:[technical] adapted for Firefox
 firefox-firebug:iceweasel-firebug:fsf:firefox:[technical] adapted for Firefox
 firefox-i18n-ach:iceweasel-l10n-ach:fsf:firefox:[semifree]
@@ -184,36 +184,36 @@ firefox-i18n-zh-tw:iceweasel-l10n-zh-tw:fsf:firefox:[semifree]
 firefox-noscript:iceweasel-noscript:fsf:firefox:[technical] adapted for Firefox
 firefox-raismth:iceweasel-raismth:fsf:firefox:[technical] adapted for Firefox
 firefox-spell-ru:iceweasel-spell-ru:fsf:firefox:[technical] adapted for Firefox
-firefox:iceweasel-libre:fsf:firefox:[semifree] Firefox recommends nonfree software
+firefox:iceweasel:fsf:firefox:[semifree] Firefox recommends nonfree software
 flashplugin::::[nonfree]
 fmodex::::[FIXME:description]
-font-bh-ttf:font-bh-ttf-libre:::[nonfree] non libre font
+font-bh-ttf:font-bh-ttf:::[nonfree] non libre font
 font-mathematica::::[FIXME:description]
-font-misc-meltho:font-misc-meltho-libre:::[nonfree] non libre font
+font-misc-meltho:font-misc-meltho:::[nonfree] non libre font
 foomatic-db-nonfree::::[nonfree] clearly non free :P
 fop::sv:34579:[FIXME:description] (the linked bug is about batik, not fop...)
 frogatto-data::::[nonfree] nonfree data
 frogatto::::[uses-nonfree] nonfree data
 gigedit::::[uses-nonfree] only useful with nonfree linuxsampler
-gloobus-preview:gloobus-preview-libre:::[uses-nonfree] recommends unrar
+gloobus-preview:gloobus-preview:::[uses-nonfree] recommends unrar
 glsof:glsof:parabola:277:[technical] glsof isn't built from source
-gnome-boxes:gnome-boxes-libre:parabola:517:[FIXME:description] has nonfree system logos (nonfree artwork, or free artwork for nonfree systems?)
+gnome-boxes:gnome-boxes:parabola:517:[FIXME:description] has nonfree system logos (nonfree artwork, or free artwork for nonfree systems?)
 gnome-do-plugins::::[uses-nonfree] recommends nonfree software
-gnormalize:gnormalize-parabola:::[uses-nonfree] recommends nonfree faac and mac optional installation
-ghostscript:ghostscript-libre:::[semifree] source contains nonfree JPEG XR library (it has the following license that forbids making modifications that do not comply with the ITU standard and might have other issues)
-grub:grub-parabola:::[branding]
+gnormalize:gnormalize:::[uses-nonfree] recommends nonfree faac and mac optional installation
+ghostscript:ghostscript:::[semifree] source contains nonfree JPEG XR library (it has the following license that forbids making modifications that do not comply with the ITU standard and might have other issues)
+grub:grub:::[branding]
 gsopcast::::[FIXME:description]
-gst-plugins-bad:gst-plugins-bad-parabola:::[uses-nonfree] depends on nonfree package faac
-gstreamer0.10-bad-plugins:gstreamer0.10-bad-plugins-parabola:::[uses-nonfree] depends on nonfree package faac
-gstreamer0.10-bad:gstreamer0.10-bad-parabola:::[uses-nonfree] depends on nonfree package faac
-gummiboot:gummiboot-parabola:::[branding]
+gst-plugins-bad:gst-plugins-bad:::[uses-nonfree] depends on nonfree package faac
+gstreamer0.10-bad-plugins:gstreamer0.10-bad-plugins:::[uses-nonfree] depends on nonfree package faac
+gstreamer0.10-bad:gstreamer0.10-bad:::[uses-nonfree] depends on nonfree package faac
+gummiboot:gummiboot:::[branding]
 handbrake:handbrake-svn:::[uses-nonfree] Uses non-free faac (fixed in recent versions)
 handbrake-cli:handbrake-cli-svn:::[uses-nonfree] Uses non-free faac (fixed in recent versions)
-hardinfo:hardinfo-parabola:::[branding]
-hexchat:hexchat-libre:::[technical] [branding] refers to a nonfree browser in its URL handlers and rebranding
-hplip:hplip-libre:::[uses-nonfree] recommends binary blobs
+hardinfo:hardinfo:::[branding]
+hexchat:hexchat:::[technical] [branding] refers to a nonfree browser in its URL handlers and rebranding
+hplip:hplip:::[uses-nonfree] recommends binary blobs
 human-icon-theme::::[branding] Archlinux logo rebranding
-hydrogen:hydrogen-libre:parabola:288:[uses-nonfree] recommends nonfree drumkits
+hydrogen:hydrogen:parabola:288:[uses-nonfree] recommends nonfree drumkits
 intel-ucode::::[nonfree] no modification, use restrictions
 ipw2100-fw::fsf:ipw2100.2C_ipw2200.2C_ipw2915.2C_ipw3945:
 ipw2200-fw::fsf:ipw2100.2C_ipw2200.2C_ipw2915.2C_ipw3945:
@@ -222,18 +222,18 @@ ivtv-utils:::: includes nonfree firmware
 java-batik::sv:34579:
 jsampler:::: only useful with nonfree linuxsampler
 junit:junit::: Arch version is not compiled from source
-kdebase-konqueror:kdebase-konqueror-libre:fsf:konqueror: recommends nonfree plugins on about:home's specifications
-kdebase-runtime:kdebase-runtime-libre::: recommends non-privacy search providers for konqueror eg: Bing, Google, Facebook, Yahoo!, etc
-kdelibs:kdelibs-libre:::[[issue108]]
-kdenetwork-kopete:kdenetwork-kopete-libre:fsf:kopete: recommends Skype
-kdeutils-ark:kdeutils-ark-libre::: recommends unrar, need build with lukeshu's patch to add support for unar https://svn.reviewboard.kde.org/r/6730/ 
-kile:kile-libre:::[semifree] recommends Adobe Reader
-kipi-plugins:kipi-plugins-libre::: has nonfree jAlbum and SimpleViewer support
+kdebase-konqueror:kdebase-konqueror:fsf:konqueror: recommends nonfree plugins on about:home's specifications
+kdebase-runtime:kdebase-runtime::: recommends non-privacy search providers for konqueror eg: Bing, Google, Facebook, Yahoo!, etc
+kdelibs:kdelibs:::[[issue108]]
+kdenetwork-kopete:kdenetwork-kopete:fsf:kopete: recommends Skype
+kdeutils-ark:kdeutils-ark::: recommends unrar, need build with lukeshu's patch to add support for unar https://svn.reviewboard.kde.org/r/6730/ 
+kile:kile:::[semifree] recommends Adobe Reader
+kipi-plugins:kipi-plugins::: has nonfree jAlbum and SimpleViewer support
 krusader:::: recommends nonfree programs like RAR, [[issue217]]
-lesspipe:lesspipe-libre::: recommends unrar
+lesspipe:lesspipe::: recommends unrar
 lib32-flashplugin::::
 lib32-libcl:lib32-mesa-libcl:::
-lib32-mesa-demos:lib32-mesa-demos-libre::: contains nonfree files. libreplanet says it probably can be built without them
+lib32-mesa-demos:lib32-mesa-demos::: contains nonfree files. libreplanet says it probably can be built without them
 lib32-nvidia-304xx-libgl::::
 lib32-nvidia-304xx-utils::::
 lib32-nvidia-cg-toolkit::::
@@ -241,14 +241,14 @@ lib32-nvidia-libgl::::
 lib32-nvidia-utils::::
 lib32-opencl-nvidia:lib32-mesa-libcl:::
 lib32-opencl-nvidia-304xx:lib32-mesa-libcl:::
-lib32-sdl:lib32-sdl-libre::: license doesn't mention modification
+lib32-sdl:lib32-sdl::: license doesn't mention modification
 libcl:mesa-libcl::: built from nonfree binaries (nvidia)
-libosinfo:libosinfo-libre:parabola:517: has support for nonfree systems
-libquicktime:libquicktime-parabola::: depends on faac
+libosinfo:libosinfo:parabola:517: has support for nonfree systems
+libquicktime:libquicktime::: depends on faac
 libunrar:::: part of unrar, Issue442
 libview:::: only useful with vmware
-licenses:licenses-libre::: contains non copyleft friendly licenses
-liferea:liferea-libre:fsf:liferea:recommends nonfree browsers
+licenses:licenses::: contains non copyleft friendly licenses
+liferea:liferea:fsf:liferea:recommends nonfree browsers
 linux-api-headers:linux-libre-api-headers::: has source containing and recommending nonfree software, [[issue444]]
 linux-docs:linux-libre-docs:::
 linux-grsec-docs:linux-libre-grsec-docs:::
@@ -264,34 +264,34 @@ linux-grsec:linux-libre-grsec:fsf:linux_linux-backports-modules.2A_linux-ubuntu-
 linux-lts:linux-libre-lts:fsf:linux_linux-backports-modules.2A_linux-ubuntu-modules: blobs
 linux_logo:::: contains tux text-based logo for kernel
 linuxsampler:::: licence of the sampler backend prohibits commercial use, the backend is thus not free software
-lirc-utils:lirc-utils-parabola::: adapted to nonfree linux kernel
-lirc:lirc-parabola::: adapted to nonfree linux kernel
-lsb-release:lsb-release-parabola::: rebranding
+lirc-utils:lirc-utils::: adapted to nonfree linux kernel
+lirc:lirc::: adapted to nonfree linux kernel
+lsb-release:lsb-release::: rebranding
 luxblend25:blender-addon-luxrender::: adapted for the nonfree blender package that is built under svn
 luxmark:::: incompatible mesa-libcl-v10.2
-luxrays:luxrays-parabola::: incompatible mesa-libcl-v10.2
-luxrender:luxrender-parabola::: recommends nonfree opencl optional installation and incompatible mesa-libcl-v10.2
+luxrays:luxrays::: incompatible mesa-libcl-v10.2
+luxrender:luxrender::: recommends nonfree opencl optional installation and incompatible mesa-libcl-v10.2
 mac::fsf:Monkey.27s_Audio_Codec: Monkey's Audio Source Code License Agreement, changes must be contributed back
 mari0:::: is licensed under cc-by-nc-sa
-mate-icon-theme-faenza:mate-icon-theme-faenza-libre::: has nonfree distros and application icons
+mate-icon-theme-faenza:mate-icon-theme-faenza::: has nonfree distros and application icons
 maven:maven::: maven isn't built from source
-mc:mc-libre::: recommends unace, unrar and unarj optional installation
-mcomix:mcomix-libre::: recommends unrar optional installation for rar compressed comics
-mencoder:mencoder-parabola::: depends on nonfree package faac, Parabola use mencoder-libre, without dependency of faac
-mesa-demos:mesa-demos-libre:fsf:mesademos: contains nonfree files. libreplanet says it probably can be built without them
-midori:midori-libre::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
-midori-gtk3:midori-libre-gtk3::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
-mkisolinux:mkisolinux-parabola::: rebranding
-mkpxelinux:mkpxelinux-parabola::: rebranding
-mksyslinux:mksyslinux-parabola::: rebranding
+mc:mc::: recommends unace, unrar and unarj optional installation
+mcomix:mcomix::: recommends unrar optional installation for rar compressed comics
+mencoder:mencoder::: depends on nonfree package faac, Parabola use mencoder, without dependency of faac
+mesa-demos:mesa-demos:fsf:mesademos: contains nonfree files. libreplanet says it probably can be built without them
+midori:midori::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
+midori-gtk3:midori-gtk3::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
+mkisolinux:mkisolinux::: rebranding
+mkpxelinux:mkpxelinux::: rebranding
+mksyslinux:mksyslinux::: rebranding
 mod_fastcgi::::
 mp32ogg::fsf:mp32ogg: Artistic License 1.0
-mplayer:mplayer-parabola::: depends on nonfree package faac, Parabola use mplayer-libre, without dependency of faac
-mplayer-vaapi:mplayer-vaapi-parabola::: depends on faac
+mplayer:mplayer::: depends on nonfree package faac, Parabola use mplayer, without dependency of faac
+mplayer-vaapi:mplayer-vaapi::: depends on faac
 netperf:::: license forbids commercial redistribution
-netsurf:netsurf-libre::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
-nltk-data:nltk-data-libre::: contains nonfree corpora. we'll have to remove those
-nss:nss-parabola::: cacert.org was removed in nss-3.15.5-2 to match ca-certificates, but our certificates are issued by cacert.org, it needs be re-added again
+netsurf:netsurf::: recommends non-privacy search providers eg: Bing, Google, Facebook, Yahoo!, etc
+nltk-data:nltk-data::: contains nonfree corpora. we'll have to remove those
+nss:nss::: cacert.org was removed in nss-3.15.5-2 to match ca-certificates, but our certificates are issued by cacert.org, it needs be re-added again
 nvdock:::: only useful with nvidia-settings
 nvidia::::
 nvidia-304xx::::
@@ -299,61 +299,61 @@ nvidia-304xx-libgl::::
 nvidia-304xx-lts::::
 nvidia-304xx-utils::::
 nvidia-cg-toolkit::::
-nvidia-libgl:bumblebee-libre:::
+nvidia-libgl:bumblebee:::
 nvidia-lts::::
 nvidia-utils::::
-ogmrip:ogmrip-parabola::: depends and recommends nonfree faac installation
-ogre:ogre-libre::: needs nvidia-cg-toolkit [[issue199]]
+ogmrip:ogmrip::: depends and recommends nonfree faac installation
+ogre:ogre::: needs nvidia-cg-toolkit [[issue199]]
 open-vm-tools:::: only useful with vmware
 opencl-mesa:mesa-libcl::: depends on nonfree libcl
 opencl-nvidia:mesa-libcl:::
 opencl-nvidia-304xx:mesa-libcl:::
 opencollada:opencollada::: adapted for the nonfree blender package that is built under git
 opencolorio:opencolorio::: adapted for the nonfree blender package that is built under git
-openexr:openexr-libre::: includes embedded nonfree fonts in the documentation
+openexr:openexr::: includes embedded nonfree fonts in the documentation
 openimageio:openimageio::: adapted for the nonfree blender package that is built under git
 openshadinglanguage:openshadinglanguage::: adapted for the nonfree blender package that is built under git
-openshot:openshot-parabola::: recommends nonfree faac optional installation
+openshot:openshot::: recommends nonfree faac optional installation
 openttd-opensfx::::
 opera:::: nonfree software
 ovmf::parabola:521:nonfree, use restriction in source package
-p7zip:p7zip-libre::: contains unrar
-pacman-mirrorlist:pacman-mirrorlist-parabola::: points to mirrors containing nonfree packages
-pacman:pacman-parabola::: needs be repackaged to add [libre] repo
+p7zip:p7zip::: contains unrar
+pacman-mirrorlist:pacman-mirrorlist::: points to mirrors containing nonfree packages
+pacman:pacman::: needs be repackaged to add [libre] repo
 paintown:::: some nonfree data
 paxd:paxd-libre::: supports nonfree software
-pcsx2:pcsx2-libre::: depends on nonfree nvidia-cg-toolkit support
+pcsx2:pcsx2::: depends on nonfree nvidia-cg-toolkit support
 pdflib-lite::parabola:522: has several problems, but the main one is that it prohibits commercial use of the software
 pkgstats:::: sends a list of all installed packages, the architecture and the mirror you are using to the Archlinux project rebranding
 phoronix-test-suite:::: recommends nonfree software
 phpvirtualbox:::: only useful with virtualbox
 playonlinux::parabola:278: has a collection of scripts to download and install proprietary software for Windows
-ponysay:ponysay-libre:parabola:206: contains nonfree pony graphics
-povray:povray-libre::: 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)
+ponysay:ponysay:parabola:206: contains nonfree pony graphics
+povray:povray::: 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)
 profont::::
-psi:psi-parabola::: rebranding
-psutils:psutils-libre:fsf:psutils: has nonfree files
+psi:psi::: rebranding
+psutils:psutils:fsf:psutils: has nonfree files
 pycuda-headers:::: depends on nonfree cuda
 pypy::parabola:294:contains sourceless JARs
-python-reportlab:python-reportlab-libre::: setup.py downloads adobe t1 fonts without license
+python-reportlab:python-reportlab::: setup.py downloads adobe t1 fonts without license
 python-pycuda:::: depends on nonfree cuda
 python2-antlr2:antlr2-python2:::Repackage for boring reasons
-python2-reportlab:python2-reportlab-libre::: setup.py downloads adobe t1 fonts without license
+python2-reportlab:python2-reportlab::: setup.py downloads adobe t1 fonts without license
 python2-pycuda:::: depends on nonfree cuda
 qmc2:::: only useful with nonfree sdlmame
 qsopcast::::
-qupzilla:qupzilla-libre::: recommends non-privacy search providers eg: Google, Youtube
-qupzilla-qt4:qupzilla-libre-qt4::: recommends non-privacy search providers eg: Google, Youtube
+qupzilla:qupzilla::: recommends non-privacy search providers eg: Google, Youtube
+qupzilla-qt4:qupzilla-qt4::: recommends non-privacy search providers eg: Google, Youtube
 r8168:::: blobs
 r8168-lts:::: blobs
-reflector:reflector-parabola::: rebranding
-rp-pppoe:rp-pppoe-libre::: installs documentation about nonfree counterpart
+reflector:reflector::: rebranding
+rp-pppoe:rp-pppoe::: installs documentation about nonfree counterpart
 rt3562sta:::: blobs
 sane-gt68xx-firmware:::: [[issue75]] Contains nonfree Software
 sauerbraten-data:::: CC-NC data [[issue336]]
 sauerbraten:::: free but needs -data
 screenlets::fsf:screenlets:
-sdl:sdl-libre::: license doesn't mention modification
+sdl:sdl::: license doesn't mention modification
 sdlmame::fsf:MAME: noncormecial software http://www.mamedev.org/legal.html
 seamonkey:::: contains propietary artwork and trademark issues [[issue384]], points to the nonfree addon site [[issue66]]
 simutrans::fsf:simutrans: nonfree license: Artistic license 1.0
@@ -366,22 +366,22 @@ slmodem-utils::::
 snes9x:::: noncommercial software http://github.com/snes9xgit/snes9x/blob/master/docs/snes9x-license.txt
 snes9x-gtk:::: 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:::: forbids commercial use
-soundkonverter:soundkonverter-parabola::: recommends nonfree faac and mac optional installation
-spacefm:spacefm-libre::: has unrar support for rar
-spectrwm:spectrwm-parabola::: depends on nonfree package profont
+soundkonverter:soundkonverter::: recommends nonfree faac and mac optional installation
+spacefm:spacefm::: has unrar support for rar
+spectrwm:spectrwm::: depends on nonfree package profont
 speedtouch:::: [speedtouch] needs unfound possibly nonfree firmware issue168
 spring-kp:::: noncommercial, unknown and unknown public domain
 sqlite-doc:::: sqlite3-doc update
 sqlite3-doc:::: 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:::: binary package
-syslinux:syslinux-parabola::: rebranding
+syslinux:syslinux::: rebranding
 tangerine-icon-theme:::: Archlinux logo rebranding
 tarsnap::::
 teamspeak3:::: nonfree, nondistributable, built from binary installers, etc
-texlive-bin:texlive-bin-parabola::: rebranding due to other TeXLive changes
-texlive-core:texlive-core-libre::: some nonfree packages
-texlive-fontsextra:texlive-fontsextra-libre::: some nonfree packages
-texlive-latexextra:texlive-latexextra-libre::: some nonfree packages
+texlive-bin:texlive-bin::: rebranding due to other TeXLive changes
+texlive-core:texlive-core::: some nonfree packages
+texlive-fontsextra:texlive-fontsextra::: some nonfree packages
+texlive-latexextra:texlive-latexextra::: some nonfree packages
 thunderbird-i18n-ar:icedove-l10n-ar:::
 thunderbird-i18n-ast:icedove-l10n-ast:::
 thunderbird-i18n-be:icedove-l10n-be:::
@@ -437,9 +437,9 @@ thunderbird-i18n-uk:icedove-l10n-uk:::
 thunderbird-i18n-vi:icedove-l10n-vi:::
 thunderbird-i18n-zh-cn:icedove-l10n-zh-cn:::
 thunderbird-i18n-zh-tw:icedove-l10n-zh-tw:::
-thunderbird:icedove-libre::: contains propietary artwork and trademark issues [[issue384]], points to the nonfree addon site [[issue66]] and nonfree searchplugins
-tp_smapi:tp_smapi-parabola::: adapted to nonfree linux kernel
-tp_smapi-lts:tp_smapi-lts-parabola::: adapted to nonfree linux-lts kernel
+thunderbird:icedove::: contains propietary artwork and trademark issues [[issue384]], points to the nonfree addon site [[issue66]] and nonfree searchplugins
+tp_smapi:tp_smapi::: adapted to nonfree linux kernel
+tp_smapi-lts:tp_smapi-lts::: adapted to nonfree linux-lts kernel
 truecrypt:::: license too complex to understand and consider free
 ttf-hannom::::
 ttytter:::: licensed under FFSL (Floodgap Free Software License)
@@ -449,12 +449,12 @@ unace:::: unace2 is nonfree
 unarj:arj:::
 unetbootin::fsf:unetbootin: it lists many non-fsdg operating systems. Remove or change the list of distros available. FUSBi is a fork which does so
 unrar:unar:fsf:unrar:
-unzip:unzip-libre::: contains a source file that doesn't mention modification
+unzip:unzip::: contains a source file that doesn't mention modification
 urbanterror-data:::: proprietary, it permits distribute together with the game only
 urbanterror:::: GPL2, but it can use together with proprietary data only
-usermin:usermin-parabola::: rebranding
-vhba-module:vhba-module-parabola::: adapted to nonfree linux kernel
-vim-colorsamplerpack:vim-colorsamplerpack-libre:parabola:496: contains nonfree colorschemes
+usermin:usermin::: rebranding
+vhba-module:vhba-module::: adapted to nonfree linux kernel
+vim-colorsamplerpack:vim-colorsamplerpack:parabola:496: contains nonfree colorschemes
 vim-ctrlp:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-doxygentoolkit:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-guicolorscheme:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
@@ -462,7 +462,7 @@ vim-jad:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermai
 vim-omnicppcomplete:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-pastie:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-project:::: unknown license terms for accompanying documentation -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
-vim-runtime:vim-runtime-parabola::: rebranding
+vim-runtime:vim-runtime::: rebranding
 vim-systemd:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 vim-workspace:::: unknown license terms -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002275.html
 virtualbox:::: contains BIOS which needs a nonfree compiler to build from source (OpenWatcom compiler), doesn't contains free distros presets for the virtual machine creation wizard, supports for nonfree Extension Pack, has nonfree user manual and adapted to nonfree linux kernel
@@ -478,20 +478,20 @@ virtualbox-host-modules-lts:::: depends on virtualbox
 virtualbox-sdk:::: depends on virtualbox
 warsow-data:::: nonfree license
 warsow:::: depends on warson-data
-webmin:webmin-parabola::: rebranding
+webmin:webmin::: rebranding
 winetricks:winetricks-libre:parabola:366: recommends and installs nonfree software
-wings3d:wings3d-libre::: supports nonfree kerkythea renderer
-xarchiver:xarchiver-libre::: recommends unrar
-xbmc:xbmc-libre::: contains unrar
-xchat:xchat-libre:fsf:XChat: refers to a nonfree browser in its URL handlers
+wings3d:wings3d::: supports nonfree kerkythea renderer
+xarchiver:xarchiver::: recommends unrar
+xbmc:xbmc::: contains unrar
+xchat:xchat:fsf:XChat: refers to a nonfree browser in its URL handlers
 xdm-archlinux::::rebranding
-xorg-fonts-100dpi:xorg-fonts-100dpi-libre::: nonfree fonts
-xorg-fonts-75dpi:xorg-fonts-75dpi-libre::: nonfree fonts
-xorg-fonts-type1:xorg-fonts-type1-libre::: nonfree fonts
-xorg-server:xorg-server-parabola:::[semifree] Arch version contains custom autoconfig and autodetect support for nonfree nvidia driver
-xscreensaver:xscreensaver-libre:parabola:131: dmsc.asm file don't have source code supplied
+xorg-fonts-100dpi:xorg-fonts-100dpi::: nonfree fonts
+xorg-fonts-75dpi:xorg-fonts-75dpi::: nonfree fonts
+xorg-fonts-type1:xorg-fonts-type1::: nonfree fonts
+xorg-server:xorg-server:::[semifree] Arch version contains custom autoconfig and autodetect support for nonfree nvidia driver
+xscreensaver:xscreensaver:parabola:131: dmsc.asm file don't have source code supplied
 xsnow::::
-xsp:xsp-parabola::: rebranding
+xsp:xsp::: rebranding
 xv::fsf:xv:
 zd1211-firmware:::: it's free, but drivers are propietary and it's not included in linux-libre
 zsh-completions:::: several files do not contain any license information