From 2cef2cbda5dea60f5fbdd5d4edd4778a23596113 Mon Sep 17 00:00:00 2001 From: gardenapple Date: Tue, 5 Jan 2021 01:55:38 +0200 Subject: [PATCH] Bring back custom: prefixes to unambiguous_db --- vrms_arch/unambiguous_db.py | 250 ++++++++++++++++++------------------ 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/vrms_arch/unambiguous_db.py b/vrms_arch/unambiguous_db.py index c7f837d..bae585a 100644 --- a/vrms_arch/unambiguous_db.py +++ b/vrms_arch/unambiguous_db.py @@ -1,193 +1,193 @@ AMBIGUOUS_PACKAGES = { - 'acroread-fonts-systemwide': ['non-free'], - 'adobe-base-14-fonts': ['non-free'], + 'acroread-fonts-systemwide': ['custom:non-free'], + 'adobe-base-14-fonts': ['custom:non-free'], 'adobe-source-code-pro-fonts': ['OFL'], 'adobe-source-sans-pro-fonts': ['OFL'], 'adobe-source-serif-pro-fonts': ['OFL'], - 'amd-ucode': ['non-free'], + 'amd-ucode': ['custom:non-free'], 'boost': ['Boost'], 'boost-libs': ['Boost'], - 'broadcom-wl': ['non-free'], + 'broadcom-wl': ['custom:non-free'], 'bsd-games': ['BSD'], - 'bzip2': ['bzip2'], + 'bzip2': ['custom:bzip2'], 'cmake': ['BSD'], 'cups-filters': ['GPL', 'GPL2', 'GPL3-only', 'GPL3'], - 'db': ['Sleepycat'], - 'discord': ['non-free'], + 'db': ['custom:Sleepycat'], + 'discord': ['custom:non-free'], 'expat': ['MIT'], 'file': ['BSD'], - 'flashplugin': ['non-free'], - 'foldingathome': ['non-free'], - 'fontconfig': ['HPND'], - 'gd': ['GD'], + 'flashplugin': ['custom:non-free'], + 'foldingathome': ['custom:non-free'], + 'fontconfig': ['custom:HPND'], + 'gd': ['custom:GD'], 'ghc': ['BSD3'], 'ghc-libs': ['BSD3'], 'hdf5': ['BSD3'], - 'imagemagick': ['ImageMagick', 'Public Domain', 'MIT'], - 'intel-ucode': ['non-free'], - 'ipw2100-fw': ['non-free'], - 'ipw2200-fw': ['non-free'], + 'imagemagick': ['custom:ImageMagick', 'custom:Public Domain', 'MIT'], + 'intel-ucode': ['custom:non-free'], + 'ipw2100-fw': ['custom:non-free'], + 'ipw2200-fw': ['custom:non-free'], 'java-openjfx': ['GPL2'], 'jdk11-openjdk': ['GPL2'], 'jdk8-openjdk': ['GPL2'], - 'jdk': ['non-free'], + 'jdk': ['custom:non-free'], 'jdk-openjdk': ['GPL2'], 'jre11-openjdk': ['GPL2'], 'jre11-openjdk-headless': ['GPL2'], 'jre8-openjdk': ['GPL2'], 'jre8-openjdk-headless': ['GPL2'], - 'jre': ['non-free'], + 'jre': ['custom:non-free'], 'jre-openjdk': ['GPL2'], 'jre-openjdk-headless': ['GPL2'], 'jslint': ['BSD', 'MIT'], 'lapack': ['BSD'], - 'lib32-sqlite': ['publicdomain'], + 'lib32-sqlite': ['custom:publicdomain'], 'libaec': ['BSD2'], - 'libbsd': ['BSD', 'Expat', 'Public Domain', 'Beerware'], + 'libbsd': ['BSD', 'MIT', 'custom:Public Domain', 'custom:Beerware'], 'libdrm': ['MIT'], 'libfontenc': ['MIT'], - 'libice': ['X11'], - 'libldap': ['OpenLDAP'], - 'libmagick6': ['ImageMagick', 'Public Domain', 'MIT'], + 'libice': ['custom:X11'], + 'libldap': ['custom:OpenLDAP'], + 'libmagick6': ['custom:ImageMagick', 'custom:Public Domain', 'MIT'], 'libmng': ['ZLIB'], - 'libmodplug': ['publicdomain'], - 'libpciaccess': ['MIT', 'ISC', 'X11'], - 'libpng12': ['libpng'], - 'libpng': ['libpng'], - 'libsm': ['MIT', 'X11'], - 'libtiff': ['libtiff'], - 'libtommath': ['Public Domain'], + 'libmodplug': ['custom:publicdomain'], + 'libpciaccess': ['MIT', 'ISC', 'custom:X11'], + 'libpng12': ['custom:libpng'], + 'libpng': ['custom:libpng'], + 'libsm': ['MIT', 'custom:X11'], + 'libtiff': ['custom:libtiff'], + 'libtommath': ['custom:Public Domain'], 'libuv': ['MIT', 'BSD2', 'BSD3', 'ISC'], - 'libva-mesa-driver': ['MIT', 'Khronos', 'SGI'], + 'libva-mesa-driver': ['MIT', 'custom:Khronos', 'custom:SGI'], 'libva-utils': ['MIT'], 'libvdpau': ['MIT'], 'libwpe': ['BSD2'], - 'libx11': ['MIT', 'X11', 'TekHVC'], - 'libxau': ['X11'], - 'libxaw': ['X11', 'HPND', 'MIT'], - 'libxcb': ['X11'], - 'libxcomposite': ['libxcomposite', 'MIT'], - 'libxcursor': ['HPND'], - 'libxdamage': ['HPND'], - 'libxdmcp': ['X11'], - 'libxext': ['X11', 'HPND', 'MIT'], - 'libxfixes': ['HPND', 'MIT'], - 'libxfont2': ['MIT', 'HPND', 'BSD2', 'X11'], - 'libxft': ['HPND'], - 'libxinerama': ['MIT', 'X11'], - 'libxi': ['X11', 'HPND', 'MIT'], - 'libxkbcommon': ['MIT', 'HPND', 'X11'], - 'libxkbcommon-x11': ['MIT', 'HPND', 'X11'], - 'libxkbfile': ['HPND', 'X11'], - 'libxmu': ['X11'], - 'libxpm': ['X11'], - 'libxpresent': ['MIT', 'HPND'], - 'libxrandr': ['HPND'], - 'libxrender': ['HPND'], - 'libxres': ['X11'], - 'libxslt': ['X11'], - 'libxss': ['X11'], - 'libxt': ['MIT', 'HPND', 'X11'], - 'libxtst': ['MIT', 'HPND', 'X11'], - 'libxv': ['HPND'], - 'libxxf86vm': ['X11'], + 'libx11': ['MIT', 'custom:X11', 'custom:TekHVC'], + 'libxau': ['custom:X11'], + 'libxaw': ['custom:X11', 'custom:HPND', 'MIT'], + 'libxcb': ['custom:X11'], + 'libxcomposite': ['custom:libxcomposite', 'MIT'], + 'libxcursor': ['custom:HPND'], + 'libxdamage': ['custom:HPND'], + 'libxdmcp': ['custom:X11'], + 'libxext': ['custom:X11', 'custom:HPND', 'MIT'], + 'libxfixes': ['custom:HPND', 'MIT'], + 'libxfont2': ['MIT', 'custom:HPND', 'BSD2', 'custom:X11'], + 'libxft': ['custom:HPND'], + 'libxinerama': ['MIT', 'custom:X11'], + 'libxi': ['custom:X11', 'custom:HPND', 'MIT'], + 'libxkbcommon': ['MIT', 'custom:HPND', 'custom:X11'], + 'libxkbcommon-x11': ['MIT', 'custom:HPND', 'custom:X11'], + 'libxkbfile': ['custom:HPND', 'custom:X11'], + 'libxmu': ['custom:X11'], + 'libxpm': ['custom:X11'], + 'libxpresent': ['MIT', 'custom:HPND'], + 'libxrandr': ['custom:HPND'], + 'libxrender': ['custom:HPND'], + 'libxres': ['custom:X11'], + 'libxslt': ['custom:X11'], + 'libxss': ['custom:X11'], + 'libxt': ['MIT', 'custom:HPND', 'custom:X11'], + 'libxtst': ['MIT', 'custom:HPND', 'custom:X11'], + 'libxv': ['custom:HPND'], + 'libxxf86vm': ['custom:X11'], 'lolcat': ['BSD3'], 'l-smash': ['ISC'], - 'lsof': ['lsof'], - 'mesa-demos': ['MIT', 'SGI', 'LGPL'], - 'mesa': ['MIT', 'Khronos', 'SGI'], - 'mesa-vdpau': ['MIT', 'Khronos', 'SGI'], + 'lsof': ['custom:lsof'], + 'mesa-demos': ['MIT', 'custom:SGI', 'LGPL'], + 'mesa': ['MIT', 'custom:Khronos', 'custom:SGI'], + 'mesa-vdpau': ['MIT', 'custom:Khronos', 'custom:SGI'], 'minizip': ['ZLIB'], - 'mobile-broadband-provider-info': ['Public Domain'], - 'ntp': ['HPND', 'BSD2'], - 'nvidia-cg-toolkit': ['non-free'], - 'nvidia-dkms': ['non-free'], - 'nvidia': ['non-free'], - 'nvidia-utils': ['non-free'], + 'mobile-broadband-provider-info': ['custom:Public Domain'], + 'ntp': ['custom:HPND', 'BSD2'], + 'nvidia-cg-toolkit': ['custom:non-free'], + 'nvidia-dkms': ['custom:non-free'], + 'nvidia': ['custom:non-free'], + 'nvidia-utils': ['custom:non-free'], 'openjdk8-src': ['GPL2'], 'orc': ['BSD2', 'BSD3'], - 'pepper-flash': ['non-free'], + 'pepper-flash': ['custom:non-free'], 'perl-rename': ['GPL', 'PerlArtistic'], 'pigz': ['ZLIB'], 'pixman': ['MIT'], 'png++': ['BSD3'], - 'popt': ['X11'], + 'popt': ['custom:X11'], 'python2': ['Python'], - 'python-docutils': ['publicdomain', 'BSD2', 'Python', 'GPL3'], + 'python-docutils': ['custom:publicdomain', 'BSD2', 'Python', 'GPL3'], 'python-magic': ['BSD2'], 'python-numpy': ['BSD3'], 'python': ['Python'], - 'qhull': ['Qhull'], + 'qhull': ['custom:Qhull'], 'rogue': ['BSD3'], 'rpcbind': ['BSD3'], 'sdl_image': ['zlib'], - 'sound-theme-freedesktop': ['CC-BY-SA', 'GPL2', 'Creative Commons Attribution 3.0 Unported', 'GPL'], - 'spirv-tools': ['Apache-2.0'], - 'steam': ['non-free'], + 'sound-theme-freedesktop': ['custom:CC-BY-SA', 'GPL2', 'custom:Creative Commons Attribution 3.0 Unported', 'GPL'], + 'spirv-tools': ['Apache'], + 'steam': ['custom:non-free'], 'sudo': ['ISC', 'BSD3', 'BSD2', 'ZLIB'], - 'tcl': ['tcl'], - 'ttf-bitstream-vera': ['bitstream-vera'], - 'ttf-dejavu': ['publicdomain', 'bitstream-vera'], - 'unrar': ['non-free'], - 'unzip': ['Info-ZIP'], + 'tcl': ['custom:tcl'], + 'ttf-bitstream-vera': ['custom:bitstream-vera'], + 'ttf-dejavu': ['custom:publicdomain', 'custom:bitstream-vera'], + 'unrar': ['custom:non-free'], + 'unzip': ['custom:Info-ZIP'], 'vdpauinfo': ['MIT'], 'vulkan-icd-loader': ['Apache'], - 'vulkan-mesa-layers': ['MIT', 'Khronos', 'SGI'], - 'vulkan-radeon': ['MIT', 'Khronos', 'SGI'], - 'vulkan-tools': ['Apache-2.0'], - 'w3m': ['w3m'], - 'webkit2gtk': ['BSD', 'MIT', 'GPL2', 'GPL3', 'LGPL2', 'LGPL2.1', 'Unicode-DFS'], + 'vulkan-mesa-layers': ['MIT', 'custom:Khronos', 'custom:SGI'], + 'vulkan-radeon': ['MIT', 'custom:Khronos', 'custom:SGI'], + 'vulkan-tools': ['Apache'], + 'w3m': ['custom:w3m'], + 'webkit2gtk': ['BSD', 'MIT', 'GPL2', 'GPL3', 'LGPL2', 'LGPL2.1', 'custom:Unicode-DFS'], 'webrtc-audio-processing': ['BSD3'], - 'xcb-proto': ['X11'], - 'xcb-util-image': ['X11'], - 'xcb-util-keysyms': ['HPND', 'X11'], - 'xcb-util-renderutil': ['HPND', 'X11'], - 'xcb-util-wm': ['HPND', 'X11'], - 'xcb-util': ['X11'], - 'xf86-input-libinput': ['HPND'], - 'xf86-video-amdgpu': ['X11', 'MIT', 'HPND'], + 'xcb-proto': ['custom:X11'], + 'xcb-util-image': ['custom:X11'], + 'xcb-util-keysyms': ['custom:HPND', 'custom:X11'], + 'xcb-util-renderutil': ['custom:HPND', 'custom:X11'], + 'xcb-util-wm': ['custom:HPND', 'custom:X11'], + 'xcb-util': ['custom:X11'], + 'xf86-input-libinput': ['custom:HPND'], + 'xf86-video-amdgpu': ['custom:X11', 'MIT', 'custom:HPND'], 'xfce4-wavelan-plugin': ['BSD2'], 'xfce4-xkb-plugin': ['BSD2'], - 'xkeyboard-config': ['MIT', 'HPND', 'X11', 'MIT-style'], - 'xorg-bdftopcf': ['X11'], - 'xorg-fonts-encodings': ['Public Domain'], - 'xorg-font-util': ['UCD', 'MIT', 'BSD2'], - 'xorg-iceauth': ['X11'], - 'xorg-mkfontscale': ['MIT', 'HPND', 'X11'], - 'xorgproto': ['MIT', 'HPND', 'X11'], - 'xorg-server': ['BSD', 'MIT', 'HPND', 'X11'], - 'xorg-server-common': ['BSD', 'MIT', 'HPND', 'X11'], - 'xorg-setxkbmap': ['HPND'], - 'xorg-x11perf': ['HPND'], - 'xorg-xauth': ['X11'], - 'xorg-xdpyinfo': ['X11'], - 'xorg-xev': ['X11'], - 'xorg-xeyes': ['X11'], - 'xorg-xfontsel': ['HPND', 'X11'], - 'xorg-xhost': ['MIT', 'X11'], - 'xorg-xinit': ['X11'], + 'xkeyboard-config': ['MIT', 'custom:HPND', 'custom:X11', 'custom:MIT-style'], + 'xorg-bdftopcf': ['custom:X11'], + 'xorg-fonts-encodings': ['custom:Public Domain'], + 'xorg-font-util': ['custom:UCD', 'MIT', 'BSD2'], + 'xorg-iceauth': ['custom:X11'], + 'xorg-mkfontscale': ['MIT', 'custom:HPND', 'custom:X11'], + 'xorgproto': ['MIT', 'custom:HPND', 'custom:X11'], + 'xorg-server': ['BSD', 'MIT', 'custom:HPND', 'custom:X11'], + 'xorg-server-common': ['BSD', 'MIT', 'custom:HPND', 'custom:X11'], + 'xorg-setxkbmap': ['custom:HPND'], + 'xorg-x11perf': ['custom:HPND'], + 'xorg-xauth': ['custom:X11'], + 'xorg-xdpyinfo': ['custom:X11'], + 'xorg-xev': ['custom:X11'], + 'xorg-xeyes': ['custom:X11'], + 'xorg-xfontsel': ['custom:HPND', 'custom:X11'], + 'xorg-xhost': ['MIT', 'custom:X11'], + 'xorg-xinit': ['custom:X11'], 'xorg-xinput': ['MIT'], - 'xorg-xkbcomp': ['HPND', 'X11'], - 'xorg-xkbevd': ['HPND'], - 'xorg-xkbutils': ['HPND', 'X11-DEC', 'MIT'], - 'xorg-xmessage': ['X11'], - 'xorg-xmodmap': ['MIT', 'X11'], - 'xorg-xprop': ['HPND', 'X11'], - 'xorg-xrandr': ['HPND'], - 'xorg-xrdb': ['X11'], - 'xorg-xset': ['X11'], + 'xorg-xkbcomp': ['custom:HPND', 'custom:X11'], + 'xorg-xkbevd': ['custom:HPND'], + 'xorg-xkbutils': ['custom:HPND', 'custom:X11-DEC', 'MIT'], + 'xorg-xmessage': ['custom:X11'], + 'xorg-xmodmap': ['MIT', 'custom:X11'], + 'xorg-xprop': ['custom:HPND', 'custom:X11'], + 'xorg-xrandr': ['custom:HPND'], + 'xorg-xrdb': ['custom:X11'], + 'xorg-xset': ['custom:X11'], 'xorg-xwayland': ['MIT'], - 'youtube-dl': ['Unlicense'], + 'youtube-dl': ['custom:Unlicense'], 'zathura-cb': ['zlib'], 'zathura-djvu': ['zlib'], 'zathura-pdf-mupdf': ['zlib'], 'zathura-pdf-poppler': ['zlib'], 'zathura-ps': ['zlib'], 'zathura': ['zlib'], - 'zip': ['Info-ZIP'], + 'zip': ['custom:Info-ZIP'], 'zlib': ['ZLIB'], - 'zoom': ['non-free'], # AUR - 'zsh': ['MIT-style', 'GPL'], + 'zoom': ['custom:non-free'], # AUR + 'zsh': ['custom:MIT-style', 'GPL'], } class Package(object):