aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-12-30 19:04:30 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-12-30 21:05:50 +0100
commit63f5e7d295659a855709901ce22a3e5f40fce455 (patch)
treeebd2abfa5f6629423b3b5902ce88ffdeb329b0f0 /testing
parent5bca7d4880028b18028b0b5dbcd20c32f145d67e (diff)
downloadaports-63f5e7d295659a855709901ce22a3e5f40fce455.tar.gz
aports-63f5e7d295659a855709901ce22a3e5f40fce455.tar.bz2
aports-63f5e7d295659a855709901ce22a3e5f40fce455.tar.xz
[various]: unify names of licenses according to SPDX
This commit updates $license variable in all APKBUILDs to comply with short names specified by SPDX version 3.0 [1] where possible. It was done using find-and-replace method on substrings inside $license variables. Only license names were updated, not "expressions" specifying relation between the licenses (e.g. "X and Y", "X or Y", "X and (Y or Z)") or exceptions (e.g. "X with exceptions"). Many licenses have a version or multiple variants, e.g. MPL-2.0, BSD-2-Clause, BSD-3-Clause. However, $license in many aports do not contain license version or variant. Since there's no way how to infer this information just from abuild, it were left without the variant suffix or version, i.e. non SPDX compliant. GNU licenses (AGPL, GFDL, GPL, LGPL) are especially complicated. They exist in two variants: -only (formerly e.g. GPL-2.0) and -or-later (formerly e.g. GPL-2.0+). We did not systematically noted distinguish between these variants, so GPL-2.0, GPL2, GPLv2 etc. may mean GPL-2.0-only or GPL-2.0-or-later. Thus GNU licenses without "+" (e.g. GPL2+) were left without the variant suffix, i.e. non SPDX compliant. Note: This commit just fixes format of the license names, no verification has been done if the specified license information is actually correct! [1]: https://spdx.org/licenses/
Diffstat (limited to 'testing')
-rw-r--r--testing/accountsservice/APKBUILD2
-rw-r--r--testing/agg/APKBUILD2
-rw-r--r--testing/alttab/APKBUILD2
-rw-r--r--testing/amule/APKBUILD2
-rw-r--r--testing/apache2-mod-authnz-external/APKBUILD2
-rw-r--r--testing/apache2-mod-perl/APKBUILD2
-rw-r--r--testing/apt-dater-host/APKBUILD2
-rw-r--r--testing/apt-dater/APKBUILD2
-rw-r--r--testing/aqemu/APKBUILD2
-rw-r--r--testing/argon2/APKBUILD2
-rw-r--r--testing/arp-scan/APKBUILD2
-rw-r--r--testing/artifactory-oss/APKBUILD2
-rw-r--r--testing/atool/APKBUILD2
-rw-r--r--testing/aufs-util/APKBUILD2
-rw-r--r--testing/autocutsel/APKBUILD2
-rw-r--r--testing/aws-cli/APKBUILD2
-rw-r--r--testing/beard/APKBUILD2
-rw-r--r--testing/biblatex/APKBUILD2
-rw-r--r--testing/bird/APKBUILD2
-rw-r--r--testing/blender/APKBUILD2
-rw-r--r--testing/bobcat/APKBUILD2
-rw-r--r--testing/buildbot-slave/APKBUILD2
-rw-r--r--testing/capstone/APKBUILD2
-rw-r--r--testing/catcodec/APKBUILD2
-rw-r--r--testing/celery/APKBUILD2
-rw-r--r--testing/checkpolicy/APKBUILD2
-rw-r--r--testing/clapf/APKBUILD2
-rw-r--r--testing/closure-compiler/APKBUILD2
-rw-r--r--testing/cloudfoundry-cli/APKBUILD2
-rw-r--r--testing/cntlm/APKBUILD2
-rw-r--r--testing/colord-gtk/APKBUILD2
-rw-r--r--testing/colord/APKBUILD2
-rw-r--r--testing/colormake/APKBUILD2
-rw-r--r--testing/consul/APKBUILD2
-rw-r--r--testing/containerd/APKBUILD2
-rw-r--r--testing/copyq/APKBUILD2
-rw-r--r--testing/cpd/APKBUILD2
-rw-r--r--testing/cpiped/APKBUILD2
-rw-r--r--testing/cpupower/APKBUILD2
-rw-r--r--testing/createrepo_c/APKBUILD2
-rw-r--r--testing/criu/APKBUILD2
-rw-r--r--testing/crypto++/APKBUILD2
-rw-r--r--testing/ctorrent-dnh/APKBUILD2
-rw-r--r--testing/daemontools/APKBUILD2
-rw-r--r--testing/dante/APKBUILD2
-rw-r--r--testing/darktable/APKBUILD2
-rw-r--r--testing/deluge/APKBUILD2
-rw-r--r--testing/dep/APKBUILD2
-rw-r--r--testing/dnsenum/APKBUILD2
-rw-r--r--testing/dnssec-tools/APKBUILD2
-rw-r--r--testing/dspam/APKBUILD2
-rw-r--r--testing/dstat/APKBUILD2
-rw-r--r--testing/dynagen/APKBUILD2
-rw-r--r--testing/ecasound/APKBUILD2
-rw-r--r--testing/eigen/APKBUILD2
-rw-r--r--testing/ejabberd/APKBUILD2
-rw-r--r--testing/emby/APKBUILD2
-rw-r--r--testing/esptool/APKBUILD2
-rw-r--r--testing/etcd/APKBUILD2
-rw-r--r--testing/evolution-ews/APKBUILD2
-rw-r--r--testing/fatback/APKBUILD2
-rw-r--r--testing/fatresize/APKBUILD2
-rw-r--r--testing/ffcall/APKBUILD2
-rw-r--r--testing/fgt/APKBUILD2
-rw-r--r--testing/filebeat/APKBUILD2
-rw-r--r--testing/filezilla/APKBUILD2
-rw-r--r--testing/flawfinder/APKBUILD2
-rw-r--r--testing/flickcurl/APKBUILD2
-rw-r--r--testing/fontforge/APKBUILD2
-rw-r--r--testing/fuse3/APKBUILD2
-rw-r--r--testing/fwknop/APKBUILD2
-rw-r--r--testing/gatling/APKBUILD2
-rw-r--r--testing/gdnsd/APKBUILD2
-rw-r--r--testing/geos/APKBUILD2
-rw-r--r--testing/getmail/APKBUILD2
-rw-r--r--testing/ginger/APKBUILD2
-rw-r--r--testing/gingerbase/APKBUILD2
-rw-r--r--testing/git-cola/APKBUILD2
-rw-r--r--testing/git-review/APKBUILD2
-rw-r--r--testing/go-bindata/APKBUILD2
-rw-r--r--testing/goobook/APKBUILD2
-rw-r--r--testing/googler/APKBUILD2
-rw-r--r--testing/gosu/APKBUILD2
-rw-r--r--testing/gpa/APKBUILD2
-rw-r--r--testing/gpg-remailer/APKBUILD2
-rw-r--r--testing/gutenprint/APKBUILD2
-rw-r--r--testing/hamlib/APKBUILD2
-rw-r--r--testing/handbrake/APKBUILD2
-rw-r--r--testing/handlebars/APKBUILD2
-rw-r--r--testing/hexer/APKBUILD2
-rw-r--r--testing/hfst/APKBUILD2
-rw-r--r--testing/hping3/APKBUILD2
-rw-r--r--testing/httrack/APKBUILD2
-rw-r--r--testing/i2c-tools/APKBUILD2
-rw-r--r--testing/icingaweb2-module-businessprocess/APKBUILD2
-rw-r--r--testing/icingaweb2-module-fileshipper/APKBUILD2
-rw-r--r--testing/icingaweb2-module-generictts/APKBUILD2
-rw-r--r--testing/icingaweb2-module-pnp/APKBUILD2
-rw-r--r--testing/icmake/APKBUILD2
-rw-r--r--testing/idris/APKBUILD2
-rw-r--r--testing/infiniband-diags/APKBUILD2
-rw-r--r--testing/iprange/APKBUILD2
-rw-r--r--testing/irclog2html/APKBUILD2
-rw-r--r--testing/jabber-roster/APKBUILD2
-rw-r--r--testing/jo/APKBUILD2
-rw-r--r--testing/kexec-tools/APKBUILD2
-rw-r--r--testing/keychain/APKBUILD2
-rw-r--r--testing/kimchi/APKBUILD2
-rw-r--r--testing/knot-resolver/APKBUILD2
-rw-r--r--testing/kubernetes/APKBUILD2
-rw-r--r--testing/ladspa/APKBUILD2
-rw-r--r--testing/laszip/APKBUILD2
-rw-r--r--testing/lazperf/APKBUILD2
-rw-r--r--testing/lbzip2/APKBUILD2
-rw-r--r--testing/libbson/APKBUILD2
-rw-r--r--testing/libcli/APKBUILD2
-rw-r--r--testing/libcypher-parser/APKBUILD2
-rw-r--r--testing/libdwarf/APKBUILD2
-rw-r--r--testing/libfilezilla/APKBUILD2
-rw-r--r--testing/libgeotiff/APKBUILD2
-rw-r--r--testing/libgnomecanvas/APKBUILD2
-rw-r--r--testing/libibmad/APKBUILD2
-rw-r--r--testing/libibumad/APKBUILD2
-rw-r--r--testing/libieee1284/APKBUILD2
-rw-r--r--testing/libimobiledevice/APKBUILD2
-rw-r--r--testing/libmdf/APKBUILD2
-rw-r--r--testing/libmodbus/APKBUILD2
-rw-r--r--testing/libneo4j-client/APKBUILD2
-rw-r--r--testing/libpipeline/APKBUILD2
-rw-r--r--testing/libplist/APKBUILD2
-rw-r--r--testing/librtlsdr/APKBUILD2
-rw-r--r--testing/libselinux/APKBUILD2
-rw-r--r--testing/libsemanage/APKBUILD2
-rw-r--r--testing/libsepol/APKBUILD2
-rw-r--r--testing/libsigsegv/APKBUILD2
-rw-r--r--testing/libsmi/APKBUILD2
-rw-r--r--testing/libspatialite/APKBUILD2
-rw-r--r--testing/libspiro/APKBUILD2
-rw-r--r--testing/libtbb/APKBUILD2
-rw-r--r--testing/libuninameslist/APKBUILD2
-rw-r--r--testing/libupnpp/APKBUILD2
-rw-r--r--testing/libusbmuxd/APKBUILD2
-rw-r--r--testing/libxml++-2.6/APKBUILD2
-rw-r--r--testing/libxml++/APKBUILD2
-rw-r--r--testing/lightdm/APKBUILD2
-rw-r--r--testing/linuxconsoletools/APKBUILD2
-rw-r--r--testing/litespeed/APKBUILD2
-rw-r--r--testing/lizardfs/APKBUILD2
-rw-r--r--testing/logstash/APKBUILD2
-rw-r--r--testing/lshell/APKBUILD2
-rw-r--r--testing/lttng-tools/APKBUILD2
-rw-r--r--testing/lua-uuid/APKBUILD2
-rw-r--r--testing/luakit/APKBUILD2
-rw-r--r--testing/lxqt-build-tools/APKBUILD2
-rw-r--r--testing/lzlib/APKBUILD2
-rw-r--r--testing/mailutils/APKBUILD2
-rw-r--r--testing/man-db/APKBUILD2
-rw-r--r--testing/mapnik/APKBUILD2
-rw-r--r--testing/mblaze/APKBUILD2
-rw-r--r--testing/mednafen/APKBUILD2
-rw-r--r--testing/meep/APKBUILD2
-rw-r--r--testing/megatools/APKBUILD2
-rw-r--r--testing/meld/APKBUILD2
-rw-r--r--testing/mhddfs/APKBUILD2
-rw-r--r--testing/mlocate/APKBUILD2
-rw-r--r--testing/mongo-c-driver/APKBUILD2
-rw-r--r--testing/mongo-php7-driver/APKBUILD2
-rw-r--r--testing/mongo-php7-library/APKBUILD2
-rw-r--r--testing/mopidy/APKBUILD2
-rw-r--r--testing/most/APKBUILD2
-rw-r--r--testing/motion/APKBUILD2
-rw-r--r--testing/msgpuck/APKBUILD2
-rw-r--r--testing/mtd-utils/APKBUILD2
-rw-r--r--testing/mu/APKBUILD2
-rw-r--r--testing/mxml/APKBUILD2
-rw-r--r--testing/ncmpcpp/APKBUILD2
-rw-r--r--testing/ndpi/APKBUILD2
-rw-r--r--testing/neomutt/APKBUILD2
-rw-r--r--testing/netdata/APKBUILD2
-rw-r--r--testing/netdisco/APKBUILD2
-rw-r--r--testing/netsink/APKBUILD2
-rw-r--r--testing/netsurf/APKBUILD2
-rw-r--r--testing/nimble/APKBUILD2
-rw-r--r--testing/nitro/APKBUILD2
-rw-r--r--testing/node-closurecompiler-externs/APKBUILD2
-rw-r--r--testing/nomp/APKBUILD2
-rw-r--r--testing/nototools/APKBUILD2
-rw-r--r--testing/numactl/APKBUILD2
-rw-r--r--testing/nzbget/APKBUILD2
-rw-r--r--testing/oath-toolkit/APKBUILD8
-rw-r--r--testing/obs-studio/APKBUILD2
-rw-r--r--testing/octave/APKBUILD2
-rw-r--r--testing/ofono/APKBUILD2
-rw-r--r--testing/opencc/APKBUILD2
-rw-r--r--testing/openconnect/APKBUILD2
-rw-r--r--testing/opensm/APKBUILD2
-rw-r--r--testing/openssh-askpass/APKBUILD2
-rw-r--r--testing/opensubdiv/APKBUILD2
-rw-r--r--testing/openttd-opengfx/APKBUILD2
-rw-r--r--testing/openttd/APKBUILD2
-rw-r--r--testing/opmsg/APKBUILD2
-rw-r--r--testing/ossec-hids/APKBUILD2
-rw-r--r--testing/ostinato/APKBUILD2
-rw-r--r--testing/otrs/APKBUILD2
-rw-r--r--testing/p0f/APKBUILD2
-rw-r--r--testing/pacparser/APKBUILD2
-rw-r--r--testing/pam_sqlite3/APKBUILD2
-rw-r--r--testing/pass/APKBUILD2
-rw-r--r--testing/pastebinc/APKBUILD2
-rw-r--r--testing/pcsxr/APKBUILD2
-rw-r--r--testing/pdfcrack/APKBUILD2
-rw-r--r--testing/peervpn/APKBUILD2
-rw-r--r--testing/pelican/APKBUILD2
-rw-r--r--testing/percona-toolkit/APKBUILD2
-rw-r--r--testing/perl-glib-ex-objectbits/APKBUILD2
-rw-r--r--testing/perl-session-storage-secure/APKBUILD2
-rw-r--r--testing/perl-snmp-info/APKBUILD2
-rw-r--r--testing/perl-test-api/APKBUILD2
-rw-r--r--testing/perl-test-roo/APKBUILD2
-rw-r--r--testing/perl-www-curl/APKBUILD2
-rw-r--r--testing/php7-couchbase/APKBUILD2
-rw-r--r--testing/physlock/APKBUILD2
-rw-r--r--testing/pixiewps/APKBUILD2
-rw-r--r--testing/platformio-core/APKBUILD2
-rw-r--r--testing/plzip/APKBUILD2
-rw-r--r--testing/policycoreutils/APKBUILD2
-rw-r--r--testing/postgis/APKBUILD2
-rw-r--r--testing/pwsafe/APKBUILD2
-rw-r--r--testing/py-actdiag/APKBUILD2
-rw-r--r--testing/py-ansi2html/APKBUILD2
-rw-r--r--testing/py-application/APKBUILD2
-rw-r--r--testing/py-apsw/APKBUILD2
-rw-r--r--testing/py-argcomplete/APKBUILD2
-rw-r--r--testing/py-arrow/APKBUILD2
-rw-r--r--testing/py-astral/APKBUILD2
-rw-r--r--testing/py-astroid/APKBUILD2
-rw-r--r--testing/py-augeas/APKBUILD2
-rw-r--r--testing/py-banknumber/APKBUILD2
-rw-r--r--testing/py-barcodenumber/APKBUILD2
-rw-r--r--testing/py-blockdiag/APKBUILD2
-rw-r--r--testing/py-boto3/APKBUILD2
-rw-r--r--testing/py-botocore/APKBUILD2
-rw-r--r--testing/py-cairosvg/APKBUILD2
-rw-r--r--testing/py-cassandra-driver/APKBUILD2
-rw-r--r--testing/py-cjson/APKBUILD2
-rw-r--r--testing/py-codecov/APKBUILD2
-rw-r--r--testing/py-coverage/APKBUILD2
-rw-r--r--testing/py-coveralls/APKBUILD2
-rw-r--r--testing/py-cssutils/APKBUILD2
-rw-r--r--testing/py-django-debug-toolbar/APKBUILD2
-rw-r--r--testing/py-dulwich/APKBUILD2
-rw-r--r--testing/py-elasticsearch/APKBUILD2
-rw-r--r--testing/py-enchant/APKBUILD2
-rw-r--r--testing/py-ev/APKBUILD2
-rw-r--r--testing/py-exconsole/APKBUILD2
-rw-r--r--testing/py-fedmsg/APKBUILD2
-rw-r--r--testing/py-feedgenerator/APKBUILD2
-rw-r--r--testing/py-flake8-isort/APKBUILD2
-rw-r--r--testing/py-flask-enterprise/APKBUILD2
-rw-r--r--testing/py-flask-psycopg2/APKBUILD2
-rw-r--r--testing/py-google-apputils/APKBUILD2
-rw-r--r--testing/py-hearplanetapi/APKBUILD2
-rw-r--r--testing/py-hurry-filesize/APKBUILD2
-rw-r--r--testing/py-hypothesis/APKBUILD2
-rw-r--r--testing/py-ibanlib/APKBUILD2
-rw-r--r--testing/py-isbn/APKBUILD2
-rw-r--r--testing/py-kerberos/APKBUILD2
-rw-r--r--testing/py-libacl/APKBUILD2
-rw-r--r--testing/py-libnacl/APKBUILD2
-rw-r--r--testing/py-logilab-astng/APKBUILD2
-rw-r--r--testing/py-lxc-python2/APKBUILD2
-rw-r--r--testing/py-mongo/APKBUILD2
-rw-r--r--testing/py-napalm/APKBUILD2
-rw-r--r--testing/py-ncclient/APKBUILD2
-rw-r--r--testing/py-newt_syrup/APKBUILD2
-rw-r--r--testing/py-nmap/APKBUILD2
-rw-r--r--testing/py-ntplib/APKBUILD2
-rw-r--r--testing/py-nwdiag/APKBUILD2
-rw-r--r--testing/py-osourcer/APKBUILD2
-rw-r--r--testing/py-pika/APKBUILD2
-rw-r--r--testing/py-poppler/APKBUILD2
-rw-r--r--testing/py-praw/APKBUILD2
-rw-r--r--testing/py-progressbar/APKBUILD2
-rw-r--r--testing/py-pybles/APKBUILD2
-rw-r--r--testing/py-pycountry/APKBUILD2
-rw-r--r--testing/py-pycryptodome/APKBUILD2
-rw-r--r--testing/py-pygfm/APKBUILD2
-rw-r--r--testing/py-pygtail/APKBUILD2
-rw-r--r--testing/py-pyparted/APKBUILD2
-rw-r--r--testing/py-pyphen/APKBUILD2
-rw-r--r--testing/py-pyzor/APKBUILD2
-rw-r--r--testing/py-qt/APKBUILD2
-rw-r--r--testing/py-redmine/APKBUILD2
-rw-r--r--testing/py-relatorio/APKBUILD2
-rw-r--r--testing/py-rpio/APKBUILD2
-rw-r--r--testing/py-runstatus/APKBUILD2
-rw-r--r--testing/py-s3transfer/APKBUILD2
-rw-r--r--testing/py-seqdiag/APKBUILD2
-rw-r--r--testing/py-sphinx-theme-epfl/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-gist/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-git/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-images/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-manpage/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-mercurial/APKBUILD2
-rw-r--r--testing/py-sphinxcontrib-whoosh/APKBUILD2
-rw-r--r--testing/py-stdnum/APKBUILD2
-rw-r--r--testing/py-telegram-bot/APKBUILD2
-rw-r--r--testing/py-tzlocal/APKBUILD2
-rw-r--r--testing/py-unicorn-hat/APKBUILD2
-rw-r--r--testing/py-urlobject/APKBUILD2
-rw-r--r--testing/py-vatnumber/APKBUILD2
-rw-r--r--testing/py-wbdata/APKBUILD2
-rw-r--r--testing/py-whoispy/APKBUILD2
-rw-r--r--testing/py-xlib/APKBUILD2
-rw-r--r--testing/py-zeroconf/APKBUILD2
-rw-r--r--testing/py-zope-configuration/APKBUILD2
-rw-r--r--testing/py-zope-deprecation/APKBUILD2
-rw-r--r--testing/py3-aiohttp-debugtoolbar/APKBUILD2
-rw-r--r--testing/py3-aiohttp-jinja2/APKBUILD2
-rw-r--r--testing/py3-aiohttp-session/APKBUILD2
-rw-r--r--testing/py3-pygpgme/APKBUILD2
-rw-r--r--testing/py3-unoconv/APKBUILD2
-rw-r--r--testing/pylint/APKBUILD2
-rw-r--r--testing/qperf/APKBUILD2
-rw-r--r--testing/qt-creator/APKBUILD2
-rw-r--r--testing/qt5-qtconnectivity/APKBUILD2
-rw-r--r--testing/qt5-qtlocation/APKBUILD2
-rw-r--r--testing/qt5-qtquickcontrols2/APKBUILD2
-rw-r--r--testing/qt5-qtremoteobjects/APKBUILD2
-rw-r--r--testing/qt5-qtsensors/APKBUILD2
-rw-r--r--testing/qt5-qtwebchannel/APKBUILD2
-rw-r--r--testing/rabbitmq-server/APKBUILD2
-rw-r--r--testing/radare2/APKBUILD2
-rw-r--r--testing/radicale/APKBUILD2
-rw-r--r--testing/rcs/APKBUILD2
-rw-r--r--testing/reaver-wps-fork-t6x/APKBUILD2
-rw-r--r--testing/recoll/APKBUILD2
-rw-r--r--testing/refpolicy/APKBUILD2
-rw-r--r--testing/rlwrap/APKBUILD2
-rw-r--r--testing/sane/APKBUILD2
-rw-r--r--testing/sbt/APKBUILD2
-rw-r--r--testing/sch-cake-hardened/APKBUILD2
-rw-r--r--testing/setroot/APKBUILD2
-rw-r--r--testing/shadowsocks-libev/APKBUILD2
-rw-r--r--testing/shellinabox/APKBUILD2
-rw-r--r--testing/shine/APKBUILD2
-rw-r--r--testing/shotcut/APKBUILD2
-rw-r--r--testing/simple-scan/APKBUILD2
-rw-r--r--testing/snapraid/APKBUILD2
-rw-r--r--testing/softhsm/APKBUILD2
-rw-r--r--testing/spreed-webrtc/APKBUILD2
-rw-r--r--testing/sqm-scripts/APKBUILD2
-rw-r--r--testing/sslh/APKBUILD2
-rw-r--r--testing/stargazer/APKBUILD2
-rw-r--r--testing/stoken/APKBUILD2
-rw-r--r--testing/subtitleeditor/APKBUILD2
-rw-r--r--testing/swaks/APKBUILD2
-rw-r--r--testing/tanidvr/APKBUILD2
-rw-r--r--testing/tcc/APKBUILD2
-rw-r--r--testing/tcpreplay/APKBUILD2
-rw-r--r--testing/tcsh/APKBUILD2
-rw-r--r--testing/td-agent-bit/APKBUILD2
-rw-r--r--testing/thermald/APKBUILD2
-rw-r--r--testing/tiptop/APKBUILD2
-rw-r--r--testing/tlp/APKBUILD2
-rw-r--r--testing/ts/APKBUILD2
-rw-r--r--testing/tsung/APKBUILD2
-rw-r--r--testing/ttf-font-awesome/APKBUILD2
-rw-r--r--testing/twemproxy/APKBUILD2
-rw-r--r--testing/ucspi-tcp/APKBUILD2
-rw-r--r--testing/udpcast/APKBUILD2
-rw-r--r--testing/upmpdcli/APKBUILD2
-rw-r--r--testing/ustr/APKBUILD2
-rw-r--r--testing/uucp/APKBUILD2
-rw-r--r--testing/vdr/APKBUILD2
-rw-r--r--testing/viewnior/APKBUILD2
-rw-r--r--testing/vips/APKBUILD2
-rw-r--r--testing/virt-what/APKBUILD2
-rw-r--r--testing/vpnc/APKBUILD2
-rw-r--r--testing/watchman/APKBUILD2
-rw-r--r--testing/websockify/APKBUILD2
-rw-r--r--testing/wicd/APKBUILD2
-rw-r--r--testing/windowmaker/APKBUILD2
-rw-r--r--testing/wine-staging/APKBUILD2
-rw-r--r--testing/wireguard-hardened/APKBUILD2
-rw-r--r--testing/wireguard-tools/APKBUILD2
-rw-r--r--testing/wireguard-vanilla/APKBUILD2
-rw-r--r--testing/wkhtmltopdf/APKBUILD2
-rw-r--r--testing/wmi-client/APKBUILD2
-rw-r--r--testing/wok/APKBUILD2
-rw-r--r--testing/wpa_actiond/APKBUILD2
-rw-r--r--testing/wput/APKBUILD2
-rw-r--r--testing/wqy-zenhei/APKBUILD2
-rw-r--r--testing/x11vnc/APKBUILD2
-rw-r--r--testing/xf86-input-wacom/APKBUILD2
-rw-r--r--testing/xfce-polkit/APKBUILD2
-rw-r--r--testing/xfce4-mailwatch-plugin/APKBUILD2
-rw-r--r--testing/xfce4-sensors-plugin/APKBUILD2
-rw-r--r--testing/xonotic-data/APKBUILD2
-rw-r--r--testing/xonotic/APKBUILD2
-rw-r--r--testing/xournal/APKBUILD2
-rw-r--r--testing/yodl/APKBUILD2
-rw-r--r--testing/zbar/APKBUILD2
-rw-r--r--testing/zerotier-one/APKBUILD2
-rw-r--r--testing/zim/APKBUILD2
-rw-r--r--testing/zsh-syntax-highlighting/APKBUILD2
406 files changed, 409 insertions, 409 deletions
diff --git a/testing/accountsservice/APKBUILD b/testing/accountsservice/APKBUILD
index 629d33fea0..ad3fdd83fa 100644
--- a/testing/accountsservice/APKBUILD
+++ b/testing/accountsservice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="D-Bus interface for user account query and manipulation"
url="http://www.freedesktop.org/software/accountsservice/"
arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
depends=""
depends_dev="glib-dev gobject-introspection-dev polkit-dev"
makedepends="$depends_dev intltool gnome-doc-utils"
diff --git a/testing/agg/APKBUILD b/testing/agg/APKBUILD
index 80a091b0d4..3d72b6a50e 100644
--- a/testing/agg/APKBUILD
+++ b/testing/agg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Anti-Grain Geometry (AGG) is a general purpose graphical toolkit written completely in standard and platform independent C++."
url="http://www.antigrain.com"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
options="!check"
makedepends="autoconf automake libgfortran libtool sdl-dev"
install=""
diff --git a/testing/alttab/APKBUILD b/testing/alttab/APKBUILD
index fa854a48f0..b61a7ffd39 100644
--- a/testing/alttab/APKBUILD
+++ b/testing/alttab/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="X11 window switcher designed for minimalistic window managers or standalone X11 session"
url="https://github.com/sagb/alttab"
arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="libx11 libxft libxrender libpng fts"
makedepends="libx11-dev libxft-dev uthash-dev libxrender-dev libpng-dev fts-dev"
install=""
diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD
index 19fa543d17..83586f2222 100644
--- a/testing/amule/APKBUILD
+++ b/testing/amule/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="An eMule-like client for the eD2k and Kademlia networks"
url="http://www.amule.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="bison crypto++-dev gd-dev geoip-dev libsm-dev libupnp-dev wxgtk2.8-dev"
subpackages="$pkgname-lang $pkgname-doc"
source="http://amule.sourceforge.net/tarballs/${_pkgname}${pkgver}.tar.bz2"
diff --git a/testing/apache2-mod-authnz-external/APKBUILD b/testing/apache2-mod-authnz-external/APKBUILD
index 8f36bb79ad..0299abadda 100644
--- a/testing/apache2-mod-authnz-external/APKBUILD
+++ b/testing/apache2-mod-authnz-external/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Apache module for external authentication"
url="https://code.google.com/p/mod-auth-external/"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends="apache2"
makedepends="apache2-dev"
install=""
diff --git a/testing/apache2-mod-perl/APKBUILD b/testing/apache2-mod-perl/APKBUILD
index 78d71540f6..2a72f5d7a0 100644
--- a/testing/apache2-mod-perl/APKBUILD
+++ b/testing/apache2-mod-perl/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Perl Module for Apache2"
url="http://perl.apache.org/"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends="apache2"
depends_dev="$pkgname"
makedepends="apache2-dev perl-dev perl-linux-pid apr-dev apr-util-dev"
diff --git a/testing/apt-dater-host/APKBUILD b/testing/apt-dater-host/APKBUILD
index eef272209d..adc245dcdd 100644
--- a/testing/apt-dater-host/APKBUILD
+++ b/testing/apt-dater-host/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
pkgdesc="Host helper application for apt-dater"
url="https://github.com/DE-IBH/apt-dater-host"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
checkdepends="bats checkbashisms"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/DE-IBH/$pkgname/archive/v$pkgver.tar.gz
diff --git a/testing/apt-dater/APKBUILD b/testing/apt-dater/APKBUILD
index 312d38bbd4..d88cfbecc1 100644
--- a/testing/apt-dater/APKBUILD
+++ b/testing/apt-dater/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="terminal-based remote package update manager"
url="https://github.com/DE-IBH/apt-dater"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="lockfile-progs screen openssh-client"
makedepends="automake autoconf popt-dev glib-dev ncurses-dev tcl-dev libconfig-dev libxml2-dev"
install=""
diff --git a/testing/aqemu/APKBUILD b/testing/aqemu/APKBUILD
index eb370ed866..702c343a04 100644
--- a/testing/aqemu/APKBUILD
+++ b/testing/aqemu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="GUI for virtual machines using QEMU as the backend"
url="https://sourceforge.net/projects/aqemu/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="qemu"
makedepends="cmake libvncserver-dev bzip2 qt5-qtbase-dev glib-dev"
install=""
diff --git a/testing/argon2/APKBUILD b/testing/argon2/APKBUILD
index b8ba82cf77..41397d2b8e 100644
--- a/testing/argon2/APKBUILD
+++ b/testing/argon2/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="The password hash Argon2, winner of PHC"
url="https://github.com/P-H-C/phc-winner-argon2"
arch="all !armhf"
-license="ASL 2.0 CC0 1.0"
+license="Apache-2.0 CC0-1.0"
subpackages="$pkgname-dev libargon2"
source="$pkgname-$pkgver.tar.gz::https://github.com/P-H-C/$_pkgname/archive/$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
diff --git a/testing/arp-scan/APKBUILD b/testing/arp-scan/APKBUILD
index 0216489d1b..d0c57b08e5 100644
--- a/testing/arp-scan/APKBUILD
+++ b/testing/arp-scan/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="The ARP scanner"
url="https://github.com/royhills/arp-scan"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
depends=""
makedepends="libpcap-dev autoconf automake libtool"
install=""
diff --git a/testing/artifactory-oss/APKBUILD b/testing/artifactory-oss/APKBUILD
index 31b9a5626a..4269b876e9 100644
--- a/testing/artifactory-oss/APKBUILD
+++ b/testing/artifactory-oss/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Open source Maven repository manager"
url="https://www.jfrog.com/open-source/"
arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
depends="jetty-runner openjdk8-jre-base"
makedepends="unzip zip"
install="$pkgname.pre-install $pkgname.post-install"
diff --git a/testing/atool/APKBUILD b/testing/atool/APKBUILD
index 05622ab9e0..c1cbe76b4c 100644
--- a/testing/atool/APKBUILD
+++ b/testing/atool/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="a Perl script for managing file archives of various types"
url="http://nongnu.org/atool"
arch="noarch"
-license="GPL3"
+license="GPL-3.0"
depends="perl"
depends_dev=""
makedepends="perl"
diff --git a/testing/aufs-util/APKBUILD b/testing/aufs-util/APKBUILD
index 3a7b38578b..5cf35e0d08 100644
--- a/testing/aufs-util/APKBUILD
+++ b/testing/aufs-util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Utilities for aufs"
url="http://aufs.sourceforge.net/"
arch="all"
-license="GPLv2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev linux-headers"
diff --git a/testing/autocutsel/APKBUILD b/testing/autocutsel/APKBUILD
index 2365984a3b..b42427cd61 100644
--- a/testing/autocutsel/APKBUILD
+++ b/testing/autocutsel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="automated xcutsel"
url="http://www.nongnu.org/autocutsel/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libx11-dev libxaw-dev"
source="https://github.com/sigmike/autocutsel/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/testing/aws-cli/APKBUILD b/testing/aws-cli/APKBUILD
index 4928d42f93..20c2b79467 100644
--- a/testing/aws-cli/APKBUILD
+++ b/testing/aws-cli/APKBUILD
@@ -8,7 +8,7 @@ _libname=${pkgname/-/}
pkgdesc="Universal Command Line Interface for Amazon Web Services"
url="https://github.com/aws/aws-cli"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
provides=$_libname
depends="$_python groff py3-botocore py3-jmespath py3-s3transfer py3-docutils py3-colorama py3-yaml py3-rsa"
makedepends="$_python-dev py-setuptools"
diff --git a/testing/beard/APKBUILD b/testing/beard/APKBUILD
index 65b62cbd52..ae6801ad1a 100644
--- a/testing/beard/APKBUILD
+++ b/testing/beard/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Simple hibernation daemon"
url="https://github.com/ahills/beard"
arch="noarch"
-license="Public Domain"
+license="Public-Domain"
depends="pm-utils"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/ahills/beard/archive/v$pkgver.tar.gz"
diff --git a/testing/biblatex/APKBUILD b/testing/biblatex/APKBUILD
index 4bd579e963..9af1209a6f 100644
--- a/testing/biblatex/APKBUILD
+++ b/testing/biblatex/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Sophisticated Bibliographies in LaTeX"
url="https://www.ctan.org/pkg/biblatex"
arch="noarch"
-license="LPPL1.3"
+license="LPPL-1.3"
depends="texlive-luatex"
makedepends="bash perl"
source="$pkgname-$pkgver.tar.gz::https://github.com/plk/biblatex/archive/v$pkgver.tar.gz"
diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 8cd142fd01..011028c938 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="BIRD Internet Routing Daemon"
url="http://bird.network.cz/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
depends=""
makedepends="bison flex ncurses-dev readline-dev linux-headers"
install=""
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index 4f9e004a34..ecbcc12474 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="3D Creation/Animation/Publishing System"
url="http://www.blender.org/"
arch=""
-license="GPL2"
+license="GPL-2.0"
depends="blender-shared=$pkgver-r$pkgrel"
makedepends="cmake libx11-dev jpeg-dev zlib-dev libpng-dev freetype-dev python3-dev
openimageio-dev opencolorio-dev glew-dev openal-soft-dev ffmpeg-dev
diff --git a/testing/bobcat/APKBUILD b/testing/bobcat/APKBUILD
index 5cba65aa26..25bef27efa 100644
--- a/testing/bobcat/APKBUILD
+++ b/testing/bobcat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Brokken's Own Base Classes And Templates"
url="https://fbb-git.github.io/bobcat/"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends_dev="$pkgname=$pkgver-r$pkgrel"
makedepends="icmake bash yodl"
subpackages="$pkgname-doc $pkgname-dev"
diff --git a/testing/buildbot-slave/APKBUILD b/testing/buildbot-slave/APKBUILD
index 15864b2525..1a5354023a 100644
--- a/testing/buildbot-slave/APKBUILD
+++ b/testing/buildbot-slave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Buildbot slave daemon"
url="http://buildbot.net/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="python2 py-twisted"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/capstone/APKBUILD b/testing/capstone/APKBUILD
index 1268e31d22..2967a12b62 100644
--- a/testing/capstone/APKBUILD
+++ b/testing/capstone/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="The Ultimate Disassembler"
url="http://www.capstone-engine.org"
arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
depends=""
depends_dev="$pkgname"
makedepends="cmake"
diff --git a/testing/catcodec/APKBUILD b/testing/catcodec/APKBUILD
index 9416da757d..7edb4b27e8 100644
--- a/testing/catcodec/APKBUILD
+++ b/testing/catcodec/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Decodes and encodes sample catalogues for OpenTTD"
url="http://www.openttd.org/en/download-catcodec"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends=""
diff --git a/testing/celery/APKBUILD b/testing/celery/APKBUILD
index de34d60107..2d7d4e27ab 100644
--- a/testing/celery/APKBUILD
+++ b/testing/celery/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
pkgdesc="Official Python low-level client for Elasticsearch"
url="http://www.celeryproject.org/"
arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
depends="py-urllib3 py-redis py-vine py-kombu py-billiard"
makedepends="python3-dev"
install="$pkgname.pre-install"
diff --git a/testing/checkpolicy/APKBUILD b/testing/checkpolicy/APKBUILD
index 65caffab0a..924ba26658 100644
--- a/testing/checkpolicy/APKBUILD
+++ b/testing/checkpolicy/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="SELinux policy checker"
url="http://www.selinuxproject.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libsepol-dev bison flex-dev"
subpackages="$pkgname-doc"
source="https://github.com/SELinuxProject/selinux/archive/checkpolicy-$pkgver.tar.gz
diff --git a/testing/clapf/APKBUILD b/testing/clapf/APKBUILD
index aa3651a994..60607ac52b 100644
--- a/testing/clapf/APKBUILD
+++ b/testing/clapf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
pkgdesc="clapf is an open source email content filter application"
url="http://clapf.org"
arch="all"
-license="as-is"
+license="AS-IS"
depends="clamav-db"
depends_dev="gsl-dev mysql-dev clamav-dev zlib-dev bzip2-dev"
makedepends="$depends_dev autoconf automake"
diff --git a/testing/closure-compiler/APKBUILD b/testing/closure-compiler/APKBUILD
index e488f617e7..9d31d60b4b 100644
--- a/testing/closure-compiler/APKBUILD
+++ b/testing/closure-compiler/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="A JavaScript checker and optimizer"
url="https://developers.google.com/closure/compiler/"
arch="noarch !s390x"
-license="ASL-2.0"
+license="Apache-2.0"
depends="openjdk8-jre-base"
source="$pkgname-$pkgver-jar.tar.gz::http://dl.google.com/$pkgname/compiler-$pkgver.tar.gz
$pkgname"
diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD
index aba93faff9..b3215cf18e 100644
--- a/testing/cloudfoundry-cli/APKBUILD
+++ b/testing/cloudfoundry-cli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A CLI for Cloud Foundry written in Go"
url="https://github.com/cloudfoundry/cli"
arch="all"
-license="Apache 2.0"
+license="Apache-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev go bash"
diff --git a/testing/cntlm/APKBUILD b/testing/cntlm/APKBUILD
index cb82deba81..e6ec959122 100644
--- a/testing/cntlm/APKBUILD
+++ b/testing/cntlm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
pkgdesc="NTLM Session Response / NTLMv2 authenticating HTTP proxy"
url="http://cntlm.sourceforge.net/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
depends=""
makedepends=""
install=""
diff --git a/testing/colord-gtk/APKBUILD b/testing/colord-gtk/APKBUILD
index 7fbb52cded..5fca22e5ae 100644
--- a/testing/colord-gtk/APKBUILD
+++ b/testing/colord-gtk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="GTK support library for colord"
url="https://www.freedesktop.org/software/colord/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="intltool glib-dev gtk+3.0-dev colord-dev"
subpackages="$pkgname-dev"
source="https://www.freedesktop.org/software/colord/releases/colord-gtk-$pkgver.tar.xz"
diff --git a/testing/colord/APKBUILD b/testing/colord/APKBUILD
index 63fa140205..63dd1e1fdc 100644
--- a/testing/colord/APKBUILD
+++ b/testing/colord/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="System daemon for managing color devices"
url="http://www.freedesktop.org/software/colord"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev="dconf-dev dbus-dev gobject-introspection-dev sqlite-dev
polkit-dev libgudev-dev"
diff --git a/testing/colormake/APKBUILD b/testing/colormake/APKBUILD
index bc1ea4d079..836f02f365 100644
--- a/testing/colormake/APKBUILD
+++ b/testing/colormake/APKBUILD
@@ -7,7 +7,7 @@ _sha=93dd19b5143b124208caab5e9b6d57b5e6ec02cb
pkgdesc="A simple wrapper around make to colorize the output"
url="http://bre.klaki.net/programs/colormake"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
checkdepends="make"
depends="bash less perl"
subpackages="$pkgname-doc"
diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD
index fb106d8731..6fa759aabc 100644
--- a/testing/consul/APKBUILD
+++ b/testing/consul/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A tool for service discovery, monitoring and configuration"
url="https://www.consul.io/"
arch="all !aarch64"
-license="MPL 2.0"
+license="MPL-2.0"
depends=""
makedepends="go bash"
install="$pkgname.pre-install"
diff --git a/testing/containerd/APKBUILD b/testing/containerd/APKBUILD
index 01e4e37838..deacb75351 100644
--- a/testing/containerd/APKBUILD
+++ b/testing/containerd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="An open and reliable container runtime"
url="https://containerd.io/"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
makedepends="go linux-headers btrfs-progs-dev protobuf-dev"
source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz
"
diff --git a/testing/copyq/APKBUILD b/testing/copyq/APKBUILD
index 9bc2c9d095..a38ddfb49a 100644
--- a/testing/copyq/APKBUILD
+++ b/testing/copyq/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Clipboard manager with searchable and editable history"
url="https://github.com/hluk/CopyQ"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="cmake qt5-qtscript-dev qt5-qttools-dev qt5-qtsvg-dev
libxfixes-dev libxtst-dev"
options="!check" #upstream does not provide check
diff --git a/testing/cpd/APKBUILD b/testing/cpd/APKBUILD
index ff115b1b86..6124efb280 100644
--- a/testing/cpd/APKBUILD
+++ b/testing/cpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="C++ implementation of the Coherent Point Drift point set registration algorithm."
url="https://github.com/gadomski/cpd"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
makedepends="cmake eigen-dev fgt-dev"
install=""
subpackages="$pkgname-dev"
diff --git a/testing/cpiped/APKBUILD b/testing/cpiped/APKBUILD
index 0c33db69ea..178f312a82 100644
--- a/testing/cpiped/APKBUILD
+++ b/testing/cpiped/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Captures an audio stream and outputs it to a pipe"
url="https://github.com/b-fitzpatrick/cpiped"
arch="all"
-license="GPL3"
+license="GPL-3.0"
options="!check"
depends=""
makedepends="alsa-lib-dev"
diff --git a/testing/cpupower/APKBUILD b/testing/cpupower/APKBUILD
index 8fe7573a9f..a32573f07c 100644
--- a/testing/cpupower/APKBUILD
+++ b/testing/cpupower/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=$_kpkgrel
pkgdesc="Linux kernel tool to examine and tune power saving related features of your processor"
url="http://www.kernel.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends_dev="pciutils-dev readline-dev"
makedepends="$depends_dev bash linux-headers"
subpackages="$pkgname-doc $pkgname-dev"
diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index 8624fc8ecd..f61aae92a5 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -18,7 +18,7 @@ pkgrel=1
pkgdesc="C implementation of createrepo"
url="https://github.com/rpm-software-management/createrepo_c/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="
bash-completion
bzip2-dev
diff --git a/testing/criu/APKBUILD b/testing/criu/APKBUILD
index 5b0afc4ea6..72bd53f1c9 100644
--- a/testing/criu/APKBUILD
+++ b/testing/criu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="A Checkpoint/Restore utility for Linux in Userspace"
url="http://criu.org"
arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
makedepends="xmlto asciidoc python protobuf-c-dev protobuf-dev libaio-dev libnl3-dev
py-protobuf libcap-dev perl"
subpackages="$pkgname-dev $pkgname-doc py-$pkgname:_py:noarch"
diff --git a/testing/crypto++/APKBUILD b/testing/crypto++/APKBUILD
index 6c2d22b9c2..6dbc27d7d8 100644
--- a/testing/crypto++/APKBUILD
+++ b/testing/crypto++/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="A free C++ class library of cryptographic schemes"
url="http://www.cryptopp.com"
arch="all"
-license="Boost"
+license="BSL-1.0"
depends=""
depends_dev="$pkgname"
makedepends=""
diff --git a/testing/ctorrent-dnh/APKBUILD b/testing/ctorrent-dnh/APKBUILD
index e4af307b10..2c0ac9c66a 100644
--- a/testing/ctorrent-dnh/APKBUILD
+++ b/testing/ctorrent-dnh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Enhanced CTorrent is a BitTorrent client for unix-like environments"
url="http://www.rahul.net/dholmes/ctorrent/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
source="http://www.rahul.net/dholmes/ctorrent/${pkgname}${pkgver}.tar.gz
unistd.patch"
builddir="$srcdir/${pkgname}${pkgver}"
diff --git a/testing/daemontools/APKBUILD b/testing/daemontools/APKBUILD
index d21ce8be1f..302d2e2de6 100644
--- a/testing/daemontools/APKBUILD
+++ b/testing/daemontools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Collection of tools for managing UNIX services"
url="http://cr.yp.to/daemontools.html"
arch="all"
-license="public-domain"
+license="Public-Domain"
depends=
# The makefile need GNU cat for 'cat -v'
makedepends="coreutils"
diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD
index e26ab0b358..bd889d1223 100644
--- a/testing/dante/APKBUILD
+++ b/testing/dante/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="Dante is SOCKS server and a SOCKS client"
url="http://www.inet.no/dante/index.html"
arch="all"
-license="BSD/CMU"
+license="BSD CMU"
depends=""
depends_dev=""
makedepends="bison flex"
diff --git a/testing/darktable/APKBUILD b/testing/darktable/APKBUILD
index bdfa4bcc00..c479854965 100644
--- a/testing/darktable/APKBUILD
+++ b/testing/darktable/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="an open source photography workflow application and raw developer"
url="https://www.darktable.org/"
arch="x86 x86_64 aarch64"
-license="GPL3"
+license="GPL-3.0"
depends=""
makedepends="
cmake
diff --git a/testing/deluge/APKBUILD b/testing/deluge/APKBUILD
index a32a14722f..fe3b7dd50e 100644
--- a/testing/deluge/APKBUILD
+++ b/testing/deluge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A lightweight, Free Software, cross-platform BitTorrent client"
url="http://deluge-torrent.org"
arch="noarch"
-license="GPL3"
+license="GPL-3.0"
depends="libtorrent-rasterbar<1.1.0 librsvg py-cffi py-chardet py-cryptography
py-enum34 py-gtk py-mako py-openssl py-setuptools py-six py-twisted
py-xdg xdg-utils"
diff --git a/testing/dep/APKBUILD b/testing/dep/APKBUILD
index 5ac1f3ceb4..5440620740 100644
--- a/testing/dep/APKBUILD
+++ b/testing/dep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Go dependency management tool"
url="https://github.com/golang/dep"
arch="all"
-license="BSD3"
+license="BSD-3-Clause"
makedepends="go"
source="$pkgname-$pkgver.tar.gz::https://github.com/golang/$pkgname/archive/v$pkgver.tar.gz"
builddir="$srcdir"/$pkgname-$pkgver
diff --git a/testing/dnsenum/APKBUILD b/testing/dnsenum/APKBUILD
index 2b7ac29849..7abf1a9d8c 100644
--- a/testing/dnsenum/APKBUILD
+++ b/testing/dnsenum/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A tool to enumerate DNS info about domains"
url="https://github.com/fwaeytens/dnsenum"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="perl-net-ip perl-net-dns perl-net-netmask perl-xml-writer perl-string-random"
source="$pkgname-$pkgver.tar.gz::https://github.com/fwaeytens/dnsenum/archive/$pkgver.tar.gz"
builddir="$srcdir"/$pkgname-$pkgver
diff --git a/testing/dnssec-tools/APKBUILD b/testing/dnssec-tools/APKBUILD
index 42cd5b4ebd..798547fb0a 100644
--- a/testing/dnssec-tools/APKBUILD
+++ b/testing/dnssec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Set of tools that will help ease the deployment of DNSSEC"
url="https://www.dnssec-tools.org/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="autoconf automake bind-dev libtool libressl-dev perl-graphviz perl-crypt-openssl-random
perl-net-dns perl-net-dns-sec perl-xml-simple perl-dev sed chrpath"
source="http://dev.alpinelinux.org/archive/dnssec-tools/dnssec-tools-$pkgver.tar.gz"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index f7774fb8fb..d1dcf146e7 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -9,7 +9,7 @@ url="http://dspam.nuclearelephant.com/"
pkgusers="dspam"
pkggroups="dspam"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=
install="$pkgname.pre-install"
makedepends="postgresql-dev sqlite-dev mariadb-dev autoconf automake libtool"
diff --git a/testing/dstat/APKBUILD b/testing/dstat/APKBUILD
index 2fa0dff095..7ad3ef7cad 100644
--- a/testing/dstat/APKBUILD
+++ b/testing/dstat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A versatile resource statistics tool"
url="http://dag.wieers.com/home-made/dstat/"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python2"
depends_dev="python2-dev"
makedepends="$depends_dev"
diff --git a/testing/dynagen/APKBUILD b/testing/dynagen/APKBUILD
index a5a2e07348..bad28d6670 100644
--- a/testing/dynagen/APKBUILD
+++ b/testing/dynagen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Dynagen is a front-end for use with the Dynamips Cisco router emulator"
url="http://www.dynagen.org/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="dynamips python2"
source="http://downloads.sourceforge.net/dyna-gen/${pkgname}-${pkgver}.tar.gz
etc-path.patch"
diff --git a/testing/ecasound/APKBUILD b/testing/ecasound/APKBUILD
index 0e31e18d86..55441f72ed 100644
--- a/testing/ecasound/APKBUILD
+++ b/testing/ecasound/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Textmode multitrack audio processing"
url="https://ecasound.seul.org/ecasound/"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
makedepends="alsa-lib-dev readline-dev ncurses-dev
mpg123-dev lame-dev libsndfile-dev libsamplerate-dev"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/eigen/APKBUILD b/testing/eigen/APKBUILD
index b2b216911c..491aabfd39 100644
--- a/testing/eigen/APKBUILD
+++ b/testing/eigen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Eigen is a C++ template library for linear algebra"
url="http://eigen.tuxfamily.org/index.php?title=Main_Page"
arch="noarch"
-license="MPL2"
+license="MPL-2.0"
depends=""
makedepends=""
install=""
diff --git a/testing/ejabberd/APKBUILD b/testing/ejabberd/APKBUILD
index b69d8fb0a1..e9ec369ae1 100644
--- a/testing/ejabberd/APKBUILD
+++ b/testing/ejabberd/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="An erlang jabber server"
url="http://www.ejabberd.im"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
_erl_deps="erlang-asn1 erlang-crypto erlang-eldap erlang-mnesia
erlang-public-key erlang-sasl erlang-ssl erlang-syntax-tools
"
diff --git a/testing/emby/APKBUILD b/testing/emby/APKBUILD
index 7ca170bcd8..235cf452d4 100644
--- a/testing/emby/APKBUILD
+++ b/testing/emby/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Bring together your videos, music, photos, and live television"
url="http://emby.media"
arch="x86_64 x86"
-license="GPL2"
+license="GPL-2.0"
depends="ffmpeg mono imagemagick sqlite"
pkgusers=$pkgname
pkggroups=$pkgname
diff --git a/testing/esptool/APKBUILD b/testing/esptool/APKBUILD
index 3d6fac4f8e..26368cdaf2 100644
--- a/testing/esptool/APKBUILD
+++ b/testing/esptool/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ESP8266 and ESP32 serial bootloader utility"
url="https://github.com/themadinventor/esptool"
arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
depends="python2 py-serial py-setuptools"
makedepends="python2-dev"
install=""
diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD
index 9715dab782..354b0ff31d 100644
--- a/testing/etcd/APKBUILD
+++ b/testing/etcd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A highly-available key value store for shared configuration and service discovery"
url="https://github.com/coreos/etcd"
arch="x86_64 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
makedepends="go bash"
options="!strip"
install="$pkgname.pre-install"
diff --git a/testing/evolution-ews/APKBUILD b/testing/evolution-ews/APKBUILD
index 0de6d4d100..f547199a74 100644
--- a/testing/evolution-ews/APKBUILD
+++ b/testing/evolution-ews/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="MS Exchange integration through Exchange Web Services"
url="https://wiki.gnome.org/Apps/Evolution/EWS"
arch="x86 x86_64 ppc64le"
-license="LGPL2.1"
+license="LGPL-2.1"
depends="evolution"
makedepends="cmake
gtk-doc intltool glib-dev gettext-dev gnome-common
diff --git a/testing/fatback/APKBUILD b/testing/fatback/APKBUILD
index 0350677a49..7aaff958e5 100644
--- a/testing/fatback/APKBUILD
+++ b/testing/fatback/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A tool for recovering files from FAT file systems"
url="http://fatback.sourceforge.net/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends="flex-dev"
install=""
diff --git a/testing/fatresize/APKBUILD b/testing/fatresize/APKBUILD
index 07e7dc4083..e56b0319ab 100644
--- a/testing/fatresize/APKBUILD
+++ b/testing/fatresize/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="The FAT16/FAT32 non-destructive resizer."
url="https://sourceforge.net/projects/fatresize/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="automake autoconf parted-dev e2fsprogs-dev"
subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
diff --git a/testing/ffcall/APKBUILD b/testing/ffcall/APKBUILD
index 4cd914dbb8..5b32f235bb 100644
--- a/testing/ffcall/APKBUILD
+++ b/testing/ffcall/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="C library for implementing foreign function calls in embedded interpreters"
url="http://www.gnu.org/software/libffcall/"
arch="all !x86 !armhf"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/fgt/APKBUILD b/testing/fgt/APKBUILD
index d0fe24302e..a25704ca55 100644
--- a/testing/fgt/APKBUILD
+++ b/testing/fgt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="C++ library for fast Gauss transforms."
url="https://github.com/gadomski/fgt"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
makedepends="cmake eigen-dev"
install=""
subpackages="$pkgname-dev"
diff --git a/testing/filebeat/APKBUILD b/testing/filebeat/APKBUILD
index cdcb3f0b4d..afbda66535 100644
--- a/testing/filebeat/APKBUILD
+++ b/testing/filebeat/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Lightweight Shipper for Logs"
pkgusers="root"
url="https://www.elastic.co/products/beats"
arch="all !armhf !aarch64"
-license="ASL 2.0"
+license="Apache-2.0"
depends=""
makedepends="go"
install=""
diff --git a/testing/filezilla/APKBUILD b/testing/filezilla/APKBUILD
index 9f7c1db372..50126bcf0c 100644
--- a/testing/filezilla/APKBUILD
+++ b/testing/filezilla/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="FTP Client"
url="http://filezilla-project.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libfilezilla-dev wxgtk-dev libidn-dev nettle-dev gnutls-dev
pugixml-dev xdg-utils gtk+2.0-dev sqlite-dev"
subpackages="$pkgname-doc $pkgname-lang"
diff --git a/testing/flawfinder/APKBUILD b/testing/flawfinder/APKBUILD
index bcdfc5f70d..69ecf74b27 100644
--- a/testing/flawfinder/APKBUILD
+++ b/testing/flawfinder/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Examines C/C++ source code for security flaws"
url="http://www.dwheeler.com/flawfinder/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="python2"
makedepends="python2-dev py-setuptools"
subpackages="$pkgname-doc"
diff --git a/testing/flickcurl/APKBUILD b/testing/flickcurl/APKBUILD
index 15d6b73282..356242e889 100644
--- a/testing/flickcurl/APKBUILD
+++ b/testing/flickcurl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="C library for the Flickr API"
url="http://librdf.org/flickcurl/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="curl-dev libxml2-dev raptor2-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz"
diff --git a/testing/fontforge/APKBUILD b/testing/fontforge/APKBUILD
index 1194fc1c31..0e0c8391e7 100644
--- a/testing/fontforge/APKBUILD
+++ b/testing/fontforge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="FontForge is a free (libre) font editor for Windows, Mac OS X and GNU+Linux."
url="https://github.com/fontforge/fontforge"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.xz"
builddir="$srcdir/$pkgname-2.0.$pkgver"
makedepends="autoconf automake libtool jpeg-dev tiff-dev libpng-dev giflib-dev libxt-dev freetype-dev libltdl libxml2-dev libuninameslist-dev libspiro-dev python-dev pango-dev cairo-dev coreutils"
diff --git a/testing/fuse3/APKBUILD b/testing/fuse3/APKBUILD
index 0ffa325e74..ef842de8ba 100644
--- a/testing/fuse3/APKBUILD
+++ b/testing/fuse3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="!fuse"
makedepends="gettext-dev linux-headers meson eudev-dev"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/fwknop/APKBUILD b/testing/fwknop/APKBUILD
index 8ecd8226f9..6aada2e300 100644
--- a/testing/fwknop/APKBUILD
+++ b/testing/fwknop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="A Single Packet Authorization (SPA) implementation"
url="http://www.cipherdyne.org/fwknop/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="iptables"
depends_dev=""
makedepends="$depends_dev libpcap-dev iptables gpgme-dev"
diff --git a/testing/gatling/APKBUILD b/testing/gatling/APKBUILD
index 3e205a0821..b91a3620a3 100644
--- a/testing/gatling/APKBUILD
+++ b/testing/gatling/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="High performance web server"
url="https://www.fefe.de/gatling/"
arch="x86_64 x86 ppc64le"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="libressl-dev libowfat-dev zlib-dev"
diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD
index 5eef745835..5e1b3509e8 100644
--- a/testing/gdnsd/APKBUILD
+++ b/testing/gdnsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Geographic Authoritative DNS server"
url="https://github.com/gdnsd/gdnsd/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/geos/APKBUILD b/testing/geos/APKBUILD
index d0db782891..4714384aab 100644
--- a/testing/geos/APKBUILD
+++ b/testing/geos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="GEOS is a library providing OpenGIS and JTS spatial operations in C++."
url="http://trac.osgeo.org/geos/"
arch="x86 x86_64"
-license="LGPL2.1"
+license="LGPL-2.1"
depends=""
depends_dev=""
makedepends="swig python2-dev $depends_dev"
diff --git a/testing/getmail/APKBUILD b/testing/getmail/APKBUILD
index 69dcbd42eb..c8e95eaaa3 100644
--- a/testing/getmail/APKBUILD
+++ b/testing/getmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="POP3, IMAP4, and SDPS mail retriever with Maildir delivery"
url="http://pyropus.ca/software/getmail/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev"
diff --git a/testing/ginger/APKBUILD b/testing/ginger/APKBUILD
index 3ef3a78748..8e0a248dca 100644
--- a/testing/ginger/APKBUILD
+++ b/testing/ginger/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="WoK plugin for host management"
url="http://kimchi-project.github.io/ginger"
arch=""
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
depends="py2-configobj py2-pyparted wok"
makedepends="automake autoconf libtool
python2-dev gettext-dev pyflakes libxslt"
diff --git a/testing/gingerbase/APKBUILD b/testing/gingerbase/APKBUILD
index c2f4bcd293..35cf0d4d23 100644
--- a/testing/gingerbase/APKBUILD
+++ b/testing/gingerbase/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Gingerbase: basic host management for WoK"
url="http://kimchi-project.github.io/gingerbase/"
arch="noarch"
-license="AGPL2.1"
+license="AGPL-2.1"
depends="py2-configobj py2-pyparted wok"
makedepends="automake autoconf libtool
python2-dev gettext-dev pyflakes libxslt"
diff --git a/testing/git-cola/APKBUILD b/testing/git-cola/APKBUILD
index ee2b16f804..352820bc7a 100644
--- a/testing/git-cola/APKBUILD
+++ b/testing/git-cola/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A GUI application for git built on Python & Qt5"
url="https://git-cola.github.io"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python3 py3-qtpy"
checkdepends="py3-nose"
makedepends="python3-dev py3-qtpy"
diff --git a/testing/git-review/APKBUILD b/testing/git-review/APKBUILD
index a1bdc404aa..fbd01d2a66 100644
--- a/testing/git-review/APKBUILD
+++ b/testing/git-review/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A git command for submitting branches to Gerrit"
url="https://github.com/openstack-infra/git-review"
arch="noarch"
-license="APACHE2.0"
+license="Apache-2.0"
depends="git python3 py3-requests py3-idna py3-urllib3 py3-chardet py3-certifi"
makedepends="python3-dev"
subpackages="$pkgname-doc"
diff --git a/testing/go-bindata/APKBUILD b/testing/go-bindata/APKBUILD
index 7c7cbcb9b9..f00b35b81d 100644
--- a/testing/go-bindata/APKBUILD
+++ b/testing/go-bindata/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A small utility which generates Go code from any file"
url="https://github.com/jteeuwen/go-bindata"
arch="all"
-license="CC0 1.0"
+license="CC0-1.0"
depends=""
makedepends="go"
install=""
diff --git a/testing/goobook/APKBUILD b/testing/goobook/APKBUILD
index dde3f0e46a..1ccf66eb9a 100644
--- a/testing/goobook/APKBUILD
+++ b/testing/goobook/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Access Google contacts from the command line"
url="https://gitlab.com/goobook/goobook"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="py-httplib2 py-asn1 py-rsa py-asn1-modules py-six"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname}:_py2 py3-${pkgname}:_py3"
diff --git a/testing/googler/APKBUILD b/testing/googler/APKBUILD
index 47bd2e523d..2cc20a9c81 100644
--- a/testing/googler/APKBUILD
+++ b/testing/googler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Google Search, Google Site Search, Google News from the terminal."
url="https://github.com/jarun/googler"
arch="noarch"
-license="GPL3"
+license="GPL-3.0"
depends="python3"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/jarun/${pkgname}/archive/v${pkgver}.tar.gz"
diff --git a/testing/gosu/APKBUILD b/testing/gosu/APKBUILD
index d0c7fb6bec..3bd928cb31 100644
--- a/testing/gosu/APKBUILD
+++ b/testing/gosu/APKBUILD
@@ -15,7 +15,7 @@ pkgrel=0
pkgdesc="Simple Go-based setuid+setgid+setgroups+exec"
url="https://github.com/tianon/gosu"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
depends_dev=""
makedepends="$depends_dev coreutils go"
diff --git a/testing/gpa/APKBUILD b/testing/gpa/APKBUILD
index d5516d98bf..366d0d42b4 100644
--- a/testing/gpa/APKBUILD
+++ b/testing/gpa/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A graphical user interface for the GnuPG"
url="https://www.gnupg.org/related_software/gpa/"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
depends=""
makedepends="gpgme-dev gtk+2.0-dev"
install=""
diff --git a/testing/gpg-remailer/APKBUILD b/testing/gpg-remailer/APKBUILD
index d7dc08f1cf..889d2fc71e 100644
--- a/testing/gpg-remailer/APKBUILD
+++ b/testing/gpg-remailer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Decrypt GPG messages and re-encrypt them to a well-defined group"
url="https://fbb-git.github.io/gpg-remailer/"
arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="gnupg mailutils"
makedepends="icmake bash yodl bobcat-dev"
subpackages="$pkgname-doc"
diff --git a/testing/gutenprint/APKBUILD b/testing/gutenprint/APKBUILD
index 26ace89031..3be01c0dce 100644
--- a/testing/gutenprint/APKBUILD
+++ b/testing/gutenprint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Printer Drivers Package"
url="http://gimp-print.sourceforge.net/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev cups-dev tiff-dev libjpeg-turbo-dev libpng-dev
diff --git a/testing/hamlib/APKBUILD b/testing/hamlib/APKBUILD
index 17ef3c4aba..81e88738e1 100644
--- a/testing/hamlib/APKBUILD
+++ b/testing/hamlib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Library to control radio transceivers and receivers"
url="http://www.hamlib.org/"
arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev linux-headers perl-dev python-dev swig tcl-dev chrpath"
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD
index f47b419dda..52ca7494cf 100644
--- a/testing/handbrake/APKBUILD
+++ b/testing/handbrake/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
pkgdesc="Handbrake video transcoder"
url="https://handbrake.fr"
arch="x86_64 x86 armhf ppc64le"
-license="GPL2"
+license="GPL-2.0"
makedepends="yasm autoconf libtool zlib-dev libbz2 libogg-dev libtheora-dev
libvorbis-dev libsamplerate-dev fribidi-dev freetype-dev
tinyxml-dev fontconfig-dev libass-dev intltool glib-dev dbus-glib-dev
diff --git a/testing/handlebars/APKBUILD b/testing/handlebars/APKBUILD
index d376fe243b..de6a3817d0 100644
--- a/testing/handlebars/APKBUILD
+++ b/testing/handlebars/APKBUILD
@@ -8,7 +8,7 @@ _mustachespec_ver="1.1.3"
_handlebarsspec_ver="4.0.5-p1"
pkgdesc="C implementation of handlebars.js"
url="https://github.com/jbboehr/handlebars.c"
-license="LGPLv2.1+"
+license="LGPL-2.1-or-later"
arch="all"
makedepends="autoconf automake bison check-dev flex json-c-dev libtool lmdb-dev
pcre-dev talloc-dev yaml-dev"
diff --git a/testing/hexer/APKBUILD b/testing/hexer/APKBUILD
index ba71db9d31..bbb0aafc02 100644
--- a/testing/hexer/APKBUILD
+++ b/testing/hexer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="LAS and OGR hexagonal density and boundary surface generation"
url="https://github.com/hobu/hexer"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
options="!check"
depends="gdal"
makedepends="cmake gdal-dev"
diff --git a/testing/hfst/APKBUILD b/testing/hfst/APKBUILD
index beab64f9ce..1115702ff9 100644
--- a/testing/hfst/APKBUILD
+++ b/testing/hfst/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Helsinki Finite-State Transducer Technology toolkit"
url="http://www.ling.helsinki.fi/kieliteknologia/tutkimus/$pkgname/"
arch="all"
-license="LGPL3"
+license="LGPL-3.0"
depends=""
depends_dev=""
makedepends="$depends_dev python2 bison python2-dev swig"
diff --git a/testing/hping3/APKBUILD b/testing/hping3/APKBUILD
index 6f688cd2dd..eb1a4bc4d5 100644
--- a/testing/hping3/APKBUILD
+++ b/testing/hping3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
url="http://www.hping.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
options="!check"
makedepends="libpcap-dev tcl-dev"
subpackages="$pkgname-doc"
diff --git a/testing/httrack/APKBUILD b/testing/httrack/APKBUILD
index 3456d3a3f1..acb7338287 100644
--- a/testing/httrack/APKBUILD
+++ b/testing/httrack/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Website Copier - Free Software Offline Browser"
url="http://www.httrack.com/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="zlib-dev openssl-dev libtool"
source="http://mirror.httrack.com/historical/${pkgname}-${pkgver}.tar.gz"
subpackages="$pkgname-doc"
diff --git a/testing/i2c-tools/APKBUILD b/testing/i2c-tools/APKBUILD
index 56d0d1ab4b..ea2d61d46d 100644
--- a/testing/i2c-tools/APKBUILD
+++ b/testing/i2c-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Tools for monitoring I2C devices"
url="http://www.lm-sensors.org/wiki/I2CTools"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=
depends_dev=""
makedepends="$depends_dev linux-headers py-setuptools python2-dev"
diff --git a/testing/icingaweb2-module-businessprocess/APKBUILD b/testing/icingaweb2-module-businessprocess/APKBUILD
index c528ac6696..fe1bf8eab6 100644
--- a/testing/icingaweb2-module-businessprocess/APKBUILD
+++ b/testing/icingaweb2-module-businessprocess/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Manage Business Processes in Icinga Web 2"
url="http://www.icinga.org"
arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
_php=php7
depends="icingaweb2-module-director"
pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-fileshipper/APKBUILD b/testing/icingaweb2-module-fileshipper/APKBUILD
index 93cbce174f..6288c20da8 100644
--- a/testing/icingaweb2-module-fileshipper/APKBUILD
+++ b/testing/icingaweb2-module-fileshipper/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Provide CSV, JSON, XML and YAML files as an Import Source for the Icinga Director"
url="http://www.icinga.org"
arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
_php=php7
depends="icingaweb2-module-director ${_php}-xml"
pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-generictts/APKBUILD b/testing/icingaweb2-module-generictts/APKBUILD
index c0581c092e..9a59b2ea38 100644
--- a/testing/icingaweb2-module-generictts/APKBUILD
+++ b/testing/icingaweb2-module-generictts/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Generic ticket system integration into Icinga web 2"
url="http://www.icinga.org"
arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
_php=php7
depends="icingaweb2-module-director"
pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-pnp/APKBUILD b/testing/icingaweb2-module-pnp/APKBUILD
index 5f98581d06..cabf4ceaf4 100644
--- a/testing/icingaweb2-module-pnp/APKBUILD
+++ b/testing/icingaweb2-module-pnp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Integrate PNP graphs into Icinga Web 2"
url="http://www.icinga.org"
arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
_php=php7
depends="icingaweb2-module-director"
pkggroups="icingaweb2"
diff --git a/testing/icmake/APKBUILD b/testing/icmake/APKBUILD
index 566778fa35..1a3173364e 100644
--- a/testing/icmake/APKBUILD
+++ b/testing/icmake/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Make utility using a C-like grammar"
url="https://fbb-git.github.io/icmake/"
arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
makedepends="bash"
subpackages="$pkgname-doc"
source="icmake-$pkgver.tar.gz::https://github.com/fbb-git/icmake/archive/$pkgver.tar.gz"
diff --git a/testing/idris/APKBUILD b/testing/idris/APKBUILD
index 2cfcdd4f51..9863c29580 100644
--- a/testing/idris/APKBUILD
+++ b/testing/idris/APKBUILD
@@ -9,7 +9,7 @@ url="http://www.idris-lang.org"
# Note: same as ghc, if it gets ported elsewhere this should run too.
# armhf: disabled due to build failure
arch="x86_64"
-license="BSD3"
+license="BSD-3-Clause"
depends="gmp-dev gcc"
makedepends="ghc cabal libffi-dev ncurses-dev zlib-dev"
subpackages="$pkgname-doc"
diff --git a/testing/infiniband-diags/APKBUILD b/testing/infiniband-diags/APKBUILD
index 1634f9c2a3..81532c2e05 100644
--- a/testing/infiniband-diags/APKBUILD
+++ b/testing/infiniband-diags/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Various infiniband diagnostic tools"
url="https://www.openfabrics.org/index.php/openfabrics-software.html"
arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
depends=""
depends_dev="opensm-dev libibmad-dev glib-dev eudev-dev"
makedepends="$depends_dev"
diff --git a/testing/iprange/APKBUILD b/testing/iprange/APKBUILD
index 95df945967..895d60a6c1 100644
--- a/testing/iprange/APKBUILD
+++ b/testing/iprange/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="manages IP ranges (part of FireHOL)"
url="https://github.com/firehol/iprange"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
install=""
subpackages="$pkgname-doc"
diff --git a/testing/irclog2html/APKBUILD b/testing/irclog2html/APKBUILD
index 408b709507..e82313a83b 100644
--- a/testing/irclog2html/APKBUILD
+++ b/testing/irclog2html/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Script to convert IRC logs to HTML and other formats"
url="http://mg.pov.lt/irclog2html/"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python3"
makedepends="python3-dev"
source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/jabber-roster/APKBUILD b/testing/jabber-roster/APKBUILD
index c4db10c2fc..a459a44f17 100644
--- a/testing/jabber-roster/APKBUILD
+++ b/testing/jabber-roster/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A Python tool for listing your Jabber roster contacts"
url="https://github.com/kparal/jabber-roster"
arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
depends_dev="py-xmpp"
makedepends="python2-dev py-setuptools"
source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/jo/APKBUILD b/testing/jo/APKBUILD
index 01b0de4b51..5f12a20371 100644
--- a/testing/jo/APKBUILD
+++ b/testing/jo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="JSON output from a shell"
url="https://github.com/jpmens/jo/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
subpackages="$pkgname-doc"
source="https://github.com/jpmens/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/testing/kexec-tools/APKBUILD b/testing/kexec-tools/APKBUILD
index fab9be8f81..34735101b8 100644
--- a/testing/kexec-tools/APKBUILD
+++ b/testing/kexec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Directly boot into a new kernel over a currently running one"
url="https://kernel.org/pub/linux/utils/kernel/kexec/"
arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
depends="xz zlib"
makedepends="zlib-dev xz-dev linux-headers"
subpackages="$pkgname-doc"
diff --git a/testing/keychain/APKBUILD b/testing/keychain/APKBUILD
index ac081672d8..7aa5328c2a 100644
--- a/testing/keychain/APKBUILD
+++ b/testing/keychain/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="keychain ssh-agent front-end"
url="http://www.funtoo.org/Keychain"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends=""
install=""
diff --git a/testing/kimchi/APKBUILD b/testing/kimchi/APKBUILD
index 6330a1422f..b08831c1fb 100644
--- a/testing/kimchi/APKBUILD
+++ b/testing/kimchi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="An HTML5 management interface for KVM"
url="https://github.com/kimchi-project/kimchi"
arch="noarch"
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
depends="
python2
py-ipaddr
diff --git a/testing/knot-resolver/APKBUILD b/testing/knot-resolver/APKBUILD
index 01c9f704a4..6e5e92ef33 100644
--- a/testing/knot-resolver/APKBUILD
+++ b/testing/knot-resolver/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Minimalistic caching DNS resolver implementation"
url="https://www.knot-resolver.cz/"
# luajit is not available for disabled arches
arch="all !s390x"
-license="GPLv3"
+license="GPL-3.0"
depends="lua5.1-sec lua5.1-socket"
depends_dev="knot-dev libuv-dev luajit-dev"
makedepends="$depends_dev"
diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index ff129c4dd7..b90ef45192 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Container Cluster Manager for Docker"
url="http://kubernetes.io/"
arch="x86_64"
-license="APACHE"
+license="Apache"
options="!check !nostrip"
depends="bash"
makedepends="bash coreutils findutils go linux-headers rsync"
diff --git a/testing/ladspa/APKBUILD b/testing/ladspa/APKBUILD
index 6d2ba1c76c..583cde5a6a 100644
--- a/testing/ladspa/APKBUILD
+++ b/testing/ladspa/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Linux Audio Developer's Simple Plug-in API, examples and tools"
url="http://www.ladspa.org/"
arch="all"
-license="LGPL2"
+license="LGPL-2.0"
depends=""
makedepends=""
install=""
diff --git a/testing/laszip/APKBUILD b/testing/laszip/APKBUILD
index 11efa0e306..bab0790c30 100644
--- a/testing/laszip/APKBUILD
+++ b/testing/laszip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="LASzip point cloud compression library"
url="https://github.com/laszip/laszip"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
options="!check"
makedepends="cmake"
install=""
diff --git a/testing/lazperf/APKBUILD b/testing/lazperf/APKBUILD
index de53e5364b..a272ce5697 100644
--- a/testing/lazperf/APKBUILD
+++ b/testing/lazperf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Alternative LAZ implementation for C++ and JavaScript"
url="https://github.com/hobu/laz-perf"
arch="all !armhf" # armhf: io_test segfaults
-license="LGPL2+"
+license="LGPL-2.0-or-later"
makedepends="cmake"
install=""
subpackages="$pkgname-dev"
diff --git a/testing/lbzip2/APKBUILD b/testing/lbzip2/APKBUILD
index 9728d37769..1a9d3c6132 100644
--- a/testing/lbzip2/APKBUILD
+++ b/testing/lbzip2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A parallel bzip2 compression utility"
url="http://lbzip2.org"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
source="http://archive.lbzip2.org/$pkgname-$pkgver.tar.gz"
diff --git a/testing/libbson/APKBUILD b/testing/libbson/APKBUILD
index d63fc96df5..d9a6273570 100644
--- a/testing/libbson/APKBUILD
+++ b/testing/libbson/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="routines related to building, parsing, and iterating BSON documents"
url="https://github.com/mongodb/libbson"
arch="all"
-license="Apache2"
+license="Apache-2.0"
depends=
depends_dev=
makedepends="$depends_dev autoconf automake libtool"
diff --git a/testing/libcli/APKBUILD b/testing/libcli/APKBUILD
index f3fdf55a0b..1af049e8aa 100644
--- a/testing/libcli/APKBUILD
+++ b/testing/libcli/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A library for including a Cisco-like command-line interface"
url="https://github.com/dparrish/libcli"
arch="all"
options="!check"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
source="$pkgname-$pkgver.tar.gz::https://github.com/dparrish/libcli/archive/v$pkgver.tar.gz
gcc-5.2-fix.patch"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/libcypher-parser/APKBUILD b/testing/libcypher-parser/APKBUILD
index 4be75d2db9..dfed1492e4 100644
--- a/testing/libcypher-parser/APKBUILD
+++ b/testing/libcypher-parser/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Parsing library for the Cypher query language"
url="https://github.com/cleishm/libcypher-parser"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev automake autoconf libtool check-dev doxygen pkgconfig"
diff --git a/testing/libdwarf/APKBUILD b/testing/libdwarf/APKBUILD
index 04c778b363..b8409c204f 100644
--- a/testing/libdwarf/APKBUILD
+++ b/testing/libdwarf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Parsing library for DWARF2 and later debugging file format"
url="http://www.prevanders.net/dwarf.html"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
makedepends="elfutils-dev"
subpackages="$pkgname-dev dwarf-tools dwarf-tools-doc"
source="http://www.prevanders.net/$pkgname-$pkgver.tar.gz"
diff --git a/testing/libfilezilla/APKBUILD b/testing/libfilezilla/APKBUILD
index a63550856d..9d52c257aa 100644
--- a/testing/libfilezilla/APKBUILD
+++ b/testing/libfilezilla/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="C++ library, offering some basic functionality to build high-performing, platform-independent programs"
url="http://filezilla-project.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="cppunit-dev"
subpackages="$pkgname-dev"
source="http://download.filezilla-project.org/libfilezilla/libfilezilla-$pkgver.tar.bz2"
diff --git a/testing/libgeotiff/APKBUILD b/testing/libgeotiff/APKBUILD
index b63a80f925..f4e6e9bc98 100644
--- a/testing/libgeotiff/APKBUILD
+++ b/testing/libgeotiff/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="TIFF based interchange format for georeferenced raster imagery."
url="https://trac.osgeo.org/geotiff"
arch="all"
-license="Public Domain"
+license="Public-Domain"
options="!check"
makedepends="autoconf automake libtool tiff-dev proj4-dev"
install=""
diff --git a/testing/libgnomecanvas/APKBUILD b/testing/libgnomecanvas/APKBUILD
index ff8fbfe53d..56db20ca0d 100644
--- a/testing/libgnomecanvas/APKBUILD
+++ b/testing/libgnomecanvas/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="GNOME Canvas library"
url="http://www.gnome.org/"
arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
makedepends="intltool libart-lgpl-dev glib-dev pango-dev gtk+2.0-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/testing/libibmad/APKBUILD b/testing/libibmad/APKBUILD
index 5ede3c6095..4e6f43b862 100644
--- a/testing/libibmad/APKBUILD
+++ b/testing/libibmad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Generic InfiniBand MAD handling library"
url="https://www.openfabrics.org/index.php/openfabrics-software.html"
arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
depends_dev="libibumad-dev"
makedepends="$depends_dev"
subpackages="$pkgname-dev"
diff --git a/testing/libibumad/APKBUILD b/testing/libibumad/APKBUILD
index 830e9eae8f..afc9f18b11 100644
--- a/testing/libibumad/APKBUILD
+++ b/testing/libibumad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Interface to ib_umad module (user_mad) library. (InfiniBand)"
url="https://www.openfabrics.org/index.php/openfabrics-software.html"
arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
depends=""
depends_dev=""
makedepends=""
diff --git a/testing/libieee1284/APKBUILD b/testing/libieee1284/APKBUILD
index f2e1fef085..f9dde3f8a0 100644
--- a/testing/libieee1284/APKBUILD
+++ b/testing/libieee1284/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A cross-platform library for parallel port access"
url="http://cyberelk.net/tim/libieee1284"
arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
depends_dev="py-$pkgname"
makedepends="file python2-dev"
subpackages="$pkgname-dev $pkgname-doc py-$pkgname:_py"
diff --git a/testing/libimobiledevice/APKBUILD b/testing/libimobiledevice/APKBUILD
index 28016d9196..7aeb12633a 100644
--- a/testing/libimobiledevice/APKBUILD
+++ b/testing/libimobiledevice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Library that talks the protocols to support iPhone and iPod Touch devices on Linux"
url="http://libimobiledevice.org/"
arch="all"
-license="GPL2 LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
makedepends="gnutls-dev libressl-dev libgcrypt-dev libusbmuxd-dev
libtasn1-dev libplist-dev libtool automake autoconf"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/libmdf/APKBUILD b/testing/libmdf/APKBUILD
index 35ecc8abd6..995d6759de 100644
--- a/testing/libmdf/APKBUILD
+++ b/testing/libmdf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Millistream Data Feed API library"
url="https://millistream.com"
arch="all"
-license="LGPL3"
+license="LGPL-3.0"
depends=""
makedepends="libressl-dev zlib-dev"
install=""
diff --git a/testing/libmodbus/APKBUILD b/testing/libmodbus/APKBUILD
index 3b51df7f65..3951feeaa1 100644
--- a/testing/libmodbus/APKBUILD
+++ b/testing/libmodbus/APKBUILD
@@ -8,7 +8,7 @@ url="http://libmodbus.org/"
source="http://libmodbus.org/releases/$pkgname-$pkgver.tar.gz"
arch="all"
-license="LGPL-3"
+license="LGPL-3.0"
depends=""
makedepends="linux-headers"
install=""
diff --git a/testing/libneo4j-client/APKBUILD b/testing/libneo4j-client/APKBUILD
index 346191bbfa..c87262e11b 100644
--- a/testing/libneo4j-client/APKBUILD
+++ b/testing/libneo4j-client/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="Client library for the Neo4j graph database"
url="https://github.com/cleishm/libneo4j-client"
arch="x86_64 aarch64 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
depends="openssl"
depends_dev="libressl-dev"
makedepends="$depends_dev automake autoconf libtool check-dev doxygen pkgconfig fts fts-dev libedit-dev libcypher-parser-dev"
diff --git a/testing/libpipeline/APKBUILD b/testing/libpipeline/APKBUILD
index e26cc306a8..5872c22c0a 100644
--- a/testing/libpipeline/APKBUILD
+++ b/testing/libpipeline/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="C pipeline manipulation library"
url="http://libpipeline.nongnu.org/"
arch="all"
-license="GPL-3+"
+license="GPL-3.0-or-later"
checkdepends="check-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="http://download.savannah.nongnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz"
diff --git a/testing/libplist/APKBUILD b/testing/libplist/APKBUILD
index f7ff87e6bd..dfac474f47 100644
--- a/testing/libplist/APKBUILD
+++ b/testing/libplist/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A library to handle Apple Property List format in binary or XML "
url="http://www.libimobiledevice.org/"
arch="all"
-license="GPL2 LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
makedepends="automake autoconf libtool cython-dev"
subpackages="$pkgname-dev py2-$pkgname:_py"
options="!check"
diff --git a/testing/librtlsdr/APKBUILD b/testing/librtlsdr/APKBUILD
index 0939112d10..d621a3fd7c 100644
--- a/testing/librtlsdr/APKBUILD
+++ b/testing/librtlsdr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Software defined radio receiver for Realtek RTL2832U"
url="https://osmocom.org/projects/sdr/wiki/rtl-sdr"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev="libusb-dev"
makedepends="$depends_dev cmake"
diff --git a/testing/libselinux/APKBUILD b/testing/libselinux/APKBUILD
index b58af9ac4e..6e70975b29 100644
--- a/testing/libselinux/APKBUILD
+++ b/testing/libselinux/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="SELinux library and simple utilities"
url="https://github.com/SELinuxProject/selinux/wiki"
arch="all"
-license="Public Domain"
+license="Public-Domain"
depends=""
depends_dev=""
# we need coreutils for ln --relative
diff --git a/testing/libsemanage/APKBUILD b/testing/libsemanage/APKBUILD
index fbfdac7242..c2f7ea163b 100644
--- a/testing/libsemanage/APKBUILD
+++ b/testing/libsemanage/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="SELinux binary policy manipulation library"
url="https://github.com/SELinuxProject/selinux/wiki"
arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev libselinux-dev libsepol-dev bzip2-dev ustr-dev bison flex audit-dev"
diff --git a/testing/libsepol/APKBUILD b/testing/libsepol/APKBUILD
index a04850ced0..d8310350ac 100644
--- a/testing/libsepol/APKBUILD
+++ b/testing/libsepol/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="SELinux binary policy manipulation library"
url="https://github.com/SELinuxProject/selinux/wiki"
arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
depends=""
depends_dev="bsd-compat-headers"
makedepends="$depends_dev flex-dev coreutils"
diff --git a/testing/libsigsegv/APKBUILD b/testing/libsigsegv/APKBUILD
index e3a2a88e2d..8108b4f898 100644
--- a/testing/libsigsegv/APKBUILD
+++ b/testing/libsigsegv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Page fault detection library"
url="http://www.gnu.org/software/libsigsegv/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
subpackages="$pkgname-dev"
source="http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-$pkgver.tar.gz
0001-Avoid-use-of-glibc-internal-macros.patch
diff --git a/testing/libsmi/APKBUILD b/testing/libsmi/APKBUILD
index 0ce3cf9fbb..b9534c836d 100644
--- a/testing/libsmi/APKBUILD
+++ b/testing/libsmi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Library to access SMI management information"
url="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
arch="all"
-license="GPLv2+ BSD"
+license="GPL-2.0-or-later BSD"
depends=""
makedepends="$depends_dev"
install=""
diff --git a/testing/libspatialite/APKBUILD b/testing/libspatialite/APKBUILD
index 514fcbcc26..1f6a0c9e03 100644
--- a/testing/libspatialite/APKBUILD
+++ b/testing/libspatialite/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="SpatiaLite extends the SQLite core to support fully fledged Spatial SQL capabilities."
url="https://www.gaia-gis.it/fossil/libspatialite/index"
arch="x86 x86_64"
-license="MPLv1.1"
+license="MPL-1.1"
options="!check"
makedepends="geos-dev sqlite-dev proj4-dev zlib-dev libxml2-dev"
install=""
diff --git a/testing/libspiro/APKBUILD b/testing/libspiro/APKBUILD
index 7c74f960b8..f392274e2a 100644
--- a/testing/libspiro/APKBUILD
+++ b/testing/libspiro/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Spiro is the creation of Raph Levien. It simplifies the drawing of beautiful curves."
url="https://github.com/fontforge/libspiro"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
makedepends="autoconf automake libtool"
diff --git a/testing/libtbb/APKBUILD b/testing/libtbb/APKBUILD
index 0fba84c0be..5fed6e17ae 100644
--- a/testing/libtbb/APKBUILD
+++ b/testing/libtbb/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="IntelĀ® TBB, a widely used C++ template library for task parallelism"
url="https://threadingbuildingblocks.org"
arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
subpackages="$pkgname-debug $pkgname-dev $pkgname-doc"
source="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/${_pkgverstr}_src.tgz"
diff --git a/testing/libuninameslist/APKBUILD b/testing/libuninameslist/APKBUILD
index 7ea628b4d3..2dbdce2774 100644
--- a/testing/libuninameslist/APKBUILD
+++ b/testing/libuninameslist/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A Library of Unicode names and annotation data"
url="https://github.com/fontforge/libuninameslist"
arch="all"
-license="BSD3"
+license="BSD-3-Clause"
source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
makedepends="autoconf automake libtool"
diff --git a/testing/libupnpp/APKBUILD b/testing/libupnpp/APKBUILD
index b04deae245..80c32a1793 100644
--- a/testing/libupnpp/APKBUILD
+++ b/testing/libupnpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="a C++ wrapper for libupnp"
url="https://opensourceprojects.eu/p/libupnpp"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
options="!check"
depends=""
makedepends="curl-dev expat-dev libupnp-dev"
diff --git a/testing/libusbmuxd/APKBUILD b/testing/libusbmuxd/APKBUILD
index 27184f4463..7ccfe83b7e 100644
--- a/testing/libusbmuxd/APKBUILD
+++ b/testing/libusbmuxd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="USB Multiplex Daemon"
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
depends="libplist libusb"
makedepends="libplist-dev libusb-dev"
subpackages="$pkgname-dev"
diff --git a/testing/libxml++-2.6/APKBUILD b/testing/libxml++-2.6/APKBUILD
index bd9d062c93..5112afd722 100644
--- a/testing/libxml++-2.6/APKBUILD
+++ b/testing/libxml++-2.6/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="libbxml++ is a C++ wrapper for the libxml XML parser library."
url="http://libxmlplusplus.sourceforge.net/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libxml2-dev glibmm-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/$_pkgname/${pkgver%.[0-9]*}/$_pkgname-$pkgver.tar.xz"
diff --git a/testing/libxml++/APKBUILD b/testing/libxml++/APKBUILD
index 1a5f2811f9..d75b9b0be1 100644
--- a/testing/libxml++/APKBUILD
+++ b/testing/libxml++/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="libbxml++ is a C++ wrapper for the libxml XML parser library."
url="http://libxmlplusplus.sourceforge.net/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libxml2-dev glibmm-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/$pkgname/${pkgver%.[0-9]*}/$pkgname-$pkgver.tar.xz"
diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index 3f2bd5252c..21d908b278 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
pkgdesc="A cross-desktop display manager"
url="http://www.freedesktop.org/wiki/Software/LightDM"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="dbus xinit accountsservice"
depends_dev="glib-dev libxklavier-dev libx11-dev"
makedepends="$depends_dev linux-pam-dev gtk+3.0-dev libxext-dev
diff --git a/testing/linuxconsoletools/APKBUILD b/testing/linuxconsoletools/APKBUILD
index d53cc5fe4c..cc763799e5 100644
--- a/testing/linuxconsoletools/APKBUILD
+++ b/testing/linuxconsoletools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Tools for connecting joysticks & legacy devices to the kernels input subsystem"
url="http://sourceforge.net/projects/linuxconsole/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
makedepends="linux-headers sdl-dev"
subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/linuxconsole/linuxconsoletools-$pkgver.tar.bz2"
diff --git a/testing/litespeed/APKBUILD b/testing/litespeed/APKBUILD
index bb97e77374..4238a7b0be 100644
--- a/testing/litespeed/APKBUILD
+++ b/testing/litespeed/APKBUILD
@@ -9,7 +9,7 @@ _php=php7
pkgdesc="High-performance, lightweight, open source HTTP server"
url="https://open.litespeedtech.com"
arch="all !aarch64 !ppc64le"
-license="GPL3"
+license="GPL-3.0"
pkgusers=litespeed
pkggroups=litespeed
depends="$_php-$pkgname $_php-bcmath $_php-json $_php-mcrypt $_php-session"
diff --git a/testing/lizardfs/APKBUILD b/testing/lizardfs/APKBUILD
index dd794ee7a3..2508211207 100644
--- a/testing/lizardfs/APKBUILD
+++ b/testing/lizardfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="a highly reliable, scalable and efficient distributed file system"
url="https://github.com/lizardfs/lizardfs/"
arch=""
-license="GPLv3"
+license="GPL-3.0"
depends=""
depends_dev=""
makedepends="$depends_dev boost-dev cmake fuse-dev zlib-dev asciidoc python2"
diff --git a/testing/logstash/APKBUILD b/testing/logstash/APKBUILD
index d875bcbc04..76a3bffb63 100644
--- a/testing/logstash/APKBUILD
+++ b/testing/logstash/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A flexible, open source, data collection, parsing and enrichment pipeline"
url="http://logstash.net"
arch="noarch"
-license="apache"
+license="Apache"
depends="openjdk8-jre-base java-jffi-native libc6-compat bash"
makedepends="$depends_dev"
install="$pkgname.pre-install"
diff --git a/testing/lshell/APKBUILD b/testing/lshell/APKBUILD
index 68237ebf6d..771fc7b5e1 100644
--- a/testing/lshell/APKBUILD
+++ b/testing/lshell/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Python-based limited Shell"
url="http://ghantoos.org/limited-shell-lshell"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/lttng-tools/APKBUILD b/testing/lttng-tools/APKBUILD
index 24f8073726..08e344eae6 100644
--- a/testing/lttng-tools/APKBUILD
+++ b/testing/lttng-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="LTTng 2.0 control and utility programs"
url="https://lttng.org"
arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
depends="babeltrace"
depends_dev="popt-dev libxml2-dev userspace-rcu-dev lttng-ust-dev kmod-dev
util-linux-dev"
diff --git a/testing/lua-uuid/APKBUILD b/testing/lua-uuid/APKBUILD
index 897abae789..db36ccae0a 100644
--- a/testing/lua-uuid/APKBUILD
+++ b/testing/lua-uuid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
url="http://tieske.github.io/uuid/"
arch="noarch"
-license="Apache 2.0"
+license="Apache-2.0"
depends=""
makedepends=""
install=""
diff --git a/testing/luakit/APKBUILD b/testing/luakit/APKBUILD
index 2c284cb799..a44946d6d4 100644
--- a/testing/luakit/APKBUILD
+++ b/testing/luakit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Fast, small, webkit based browser framework extensible by Lua"
url="https://github.com/luakit/luakit"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="lua5.1-filesystem lua5.1-luassert"
depends_dev=""
makedepends="webkit2gtk-dev luajit-dev"
diff --git a/testing/lxqt-build-tools/APKBUILD b/testing/lxqt-build-tools/APKBUILD
index a988a8ea21..ec204af724 100644
--- a/testing/lxqt-build-tools/APKBUILD
+++ b/testing/lxqt-build-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Various packaging tools and scripts for LXQt applications"
url="http://lxqt.org"
arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
depends=""
makedepends="cmake qt5-qttools-dev"
install=""
diff --git a/testing/lzlib/APKBUILD b/testing/lzlib/APKBUILD
index d5edd0eedf..5c7cf825e6 100644
--- a/testing/lzlib/APKBUILD
+++ b/testing/lzlib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Lzlib is a data compression library"
url="http://www.nongnu.org/lzip/lzlib.html"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
source="http://download.savannah.gnu.org/releases/lzip/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/mailutils/APKBUILD b/testing/mailutils/APKBUILD
index a2244b2bcd..fdb388e540 100644
--- a/testing/mailutils/APKBUILD
+++ b/testing/mailutils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="GNU swiss army knife of electronic mail handling"
url="https://mailutils.org/"
arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
replaces="mailx"
depends_dev="$pkgname-libs=$pkgver-r$pkgrel"
makedepends="readline-dev libtool"
diff --git a/testing/man-db/APKBUILD b/testing/man-db/APKBUILD
index 466e5be586..c766f48809 100644
--- a/testing/man-db/APKBUILD
+++ b/testing/man-db/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="The man command and related utilities for examining on-line help files"
url="http://www.nongnu.org/man-db/"
arch="all"
-license="GPL-2+"
+license="GPL-2.0-or-later"
depends="groff less"
makedepends="db-dev gettext-dev libpipeline-dev zlib-dev"
subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD
index 80c8cab2e4..6f85b8fe7c 100644
--- a/testing/mapnik/APKBUILD
+++ b/testing/mapnik/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="An open source toolkit for developing mapping applications"
url="http://mapnik.org/"
arch="x86_64 ppc64le"
-license="LPGL2+"
+license="LPGL-2.0-or-later"
depends="boost boost-regex freetype zlib harfbuzz postgresql-client sqlite-libs cairo libpng libjpeg tiff libwebp libxml2 proj4 gdal icu"
depends_dev=""
makedepends="$depends_dev python scons boost-dev freetype-dev zlib-dev harfbuzz-dev postgresql-dev sqlite-dev cairo-dev libpng-dev tiff-dev libwebp-dev libxml2-dev proj4-dev gdal-dev icu-dev"
diff --git a/testing/mblaze/APKBUILD b/testing/mblaze/APKBUILD
index f3289bfd20..36d9aebadd 100644
--- a/testing/mblaze/APKBUILD
+++ b/testing/mblaze/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Unix utilities to deal with Maildir"
url="https://github.com/chneukirchen/mblaze"
arch="all"
-license="public domain"
+license="Public-Domain"
depends=""
depends_dev=""
makedepends=""
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index 4879362b8f..780a5be822 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A command-line multi-system emulator"
url="http://mednafen.sourceforge.net"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends="alsa-lib-dev libsndfile-dev mesa-dev glu-dev paxmark sdl-dev zlib-dev"
subpackages="$pkgname-lang"
diff --git a/testing/meep/APKBUILD b/testing/meep/APKBUILD
index 7b81fd7df1..a8c080752b 100644
--- a/testing/meep/APKBUILD
+++ b/testing/meep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="free finite-difference time-domain (FDTD) simulation software package developed at MIT to model electromagnetic systems"
url="http://ab-initio.mit.edu/wiki/index.php/Meep"
arch="x86_64 x86 ppc64le"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev harminv-dev openblas-dev libctl-dev guile-dev
diff --git a/testing/megatools/APKBUILD b/testing/megatools/APKBUILD
index 8a42c05cb0..f642082739 100644
--- a/testing/megatools/APKBUILD
+++ b/testing/megatools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Megatools is a collection of programs for accessing Mega.nz service from a command line of your desktop or server."
url="https://megatools.megous.com"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="curl-dev glib-dev libressl-dev gmp-dev asciidoc"
subpackages="$pkgname-doc"
source="https://megatools.megous.com/builds/megatools-1.9.98.tar.gz libressl.patch"
diff --git a/testing/meld/APKBUILD b/testing/meld/APKBUILD
index 8591494393..6b0406be18 100644
--- a/testing/meld/APKBUILD
+++ b/testing/meld/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A visual diff and merge tool"
url="http://meldmerge.org"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="dconf gtksourceview gsettings-desktop-schemas py-gobject3"
makedepends="intltool itstool libxml2-utils"
subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/mhddfs/APKBUILD b/testing/mhddfs/APKBUILD
index 6137447ad4..b229d29081 100644
--- a/testing/mhddfs/APKBUILD
+++ b/testing/mhddfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A fuse-based file system for unifying several mount points into one."
url="http://mhddfs.uvw.ru"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="fuse"
depends_dev="fuse-dev attr-dev"
makedepends="$depends_dev"
diff --git a/testing/mlocate/APKBUILD b/testing/mlocate/APKBUILD
index a63cecbf74..228d82d3bc 100644
--- a/testing/mlocate/APKBUILD
+++ b/testing/mlocate/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=7
pkgdesc="A utility for finding files by name quickly"
url="https://pagure.io/mlocate"
arch="all"
-license="GPL2"
+license="GPL-2.0"
options="suid !check"
checkdepends="bash"
pkggroups="locate"
diff --git a/testing/mongo-c-driver/APKBUILD b/testing/mongo-c-driver/APKBUILD
index d5aae215e5..10e8af4314 100644
--- a/testing/mongo-c-driver/APKBUILD
+++ b/testing/mongo-c-driver/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Client library written in C for MongoDB"
url="https://github.com/mongodb/mongo-c-driver"
arch="all"
-license="Apache2"
+license="Apache-2.0"
depends=
depends_dev=
makedepends="$depends_dev autoconf automake libbson-dev libtool"
diff --git a/testing/mongo-php7-driver/APKBUILD b/testing/mongo-php7-driver/APKBUILD
index 7688b4a6cd..5475eb009b 100644
--- a/testing/mongo-php7-driver/APKBUILD
+++ b/testing/mongo-php7-driver/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
pkgdesc="Low-level PHP driver for MongoDB"
url="https://github.com/mongodb/mongo-php-driver"
arch="all"
-license="Apache2"
+license="Apache-2.0"
makedepends="autoconf automake libressl-dev pkgconfig
mongo-c-driver pcre-dev ${_php}-dev bash"
options="!check" #fails, is attended
diff --git a/testing/mongo-php7-library/APKBUILD b/testing/mongo-php7-library/APKBUILD
index 88931af849..31c6bb87e6 100644
--- a/testing/mongo-php7-library/APKBUILD
+++ b/testing/mongo-php7-library/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="High-level abstraction around the lower-level drivers for PHP"
url="https://github.com/mongodb/mongo-php-library"
arch="noarch"
-license="Apache2"
+license="Apache-2.0"
makedepends="$depends_dev mongo-${_php}-driver"
subpackages="$pkgname-doc"
options="!check"
diff --git a/testing/mopidy/APKBUILD b/testing/mopidy/APKBUILD
index 0eccfa40b8..7f3b699683 100644
--- a/testing/mopidy/APKBUILD
+++ b/testing/mopidy/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Mopidy is an extensible music server"
url="http://www.mopidy.com/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python py-pykka py-tornado gst-plugins-base gst-plugins-good
gst-plugins-ugly py-gst py-setuptools py-libxml2 py-requests
py-six
diff --git a/testing/most/APKBUILD b/testing/most/APKBUILD
index d5e9c87935..65e28eb92a 100644
--- a/testing/most/APKBUILD
+++ b/testing/most/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A terminal pager similar to more and less"
url="ftp://space.mit.edu/pub/davis/most"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=
makedepends="slang-dev ncurses-dev"
diff --git a/testing/motion/APKBUILD b/testing/motion/APKBUILD
index a044f7fa73..3f54b0cd1e 100644
--- a/testing/motion/APKBUILD
+++ b/testing/motion/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Detect if a significant part of the picture has changed (e.g. from a we
url="https://motion-project.github.io"
arch="all"
options="!check"
-license="GPL2"
+license="GPL-2.0"
pkgusers="motion"
pkggroups="motion"
depends="jpeg v4l-utils ffmpeg"
diff --git a/testing/msgpuck/APKBUILD b/testing/msgpuck/APKBUILD
index 3f04e6c9b8..d2c6491a65 100644
--- a/testing/msgpuck/APKBUILD
+++ b/testing/msgpuck/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A simple and efficient MsgPack binary serialization library"
url="https://github.com/rtsisyk/msgpuck"
arch="all !x86"
-license="BSD-2"
+license="BSD-2-Clause"
makedepends="cmake doxygen"
subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/rtsisyk/$pkgname/archive/$pkgver.tar.gz
diff --git a/testing/mtd-utils/APKBUILD b/testing/mtd-utils/APKBUILD
index 4582db88ab..1cb02196f3 100644
--- a/testing/mtd-utils/APKBUILD
+++ b/testing/mtd-utils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Utilities for handling MTD devices, and for dealing with FTL, NFTL JFFS2, etc."
url="http://www.linux-mtd.infradead.org/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="linux-headers lzo-dev util-linux-dev zlib-dev acl-dev"
subpackages="$pkgname-doc"
source="ftp://ftp.infradead.org/pub/mtd-utils/$pkgname-$pkgver.tar.bz2"
diff --git a/testing/mu/APKBUILD b/testing/mu/APKBUILD
index 63a257b34d..47631e9a1c 100644
--- a/testing/mu/APKBUILD
+++ b/testing/mu/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A collection of utilities for indexing and searching Maildirs"
arch="x86 x86_64 ppc64le"
url="http://www.djcbsoftware.nl/code/mu"
-license="GPL3"
+license="GPL-3.0"
depends="sqlite"
makedepends="xapian-core-dev gmime-dev sqlite-dev autoconf automake libtool"
install=""
diff --git a/testing/mxml/APKBUILD b/testing/mxml/APKBUILD
index e636c4b554..507720f8de 100644
--- a/testing/mxml/APKBUILD
+++ b/testing/mxml/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Small XML library that you can use to read and write XML files"
url="http://www.msweet.org/projects.php?Z3"
arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/michaelrsweet/$pkgname/releases/download/v2.11/$pkgname-$pkgver.tar.gz"
diff --git a/testing/ncmpcpp/APKBUILD b/testing/ncmpcpp/APKBUILD
index c276c37357..2617eb1b95 100644
--- a/testing/ncmpcpp/APKBUILD
+++ b/testing/ncmpcpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="An almost exact clone of ncmpc with some new features."
url="http://rybczak.net/ncmpcpp"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="boost-dev readline-dev curl-dev libmpdclient-dev
diff --git a/testing/ndpi/APKBUILD b/testing/ndpi/APKBUILD
index f6cd542836..6708c56537 100644
--- a/testing/ndpi/APKBUILD
+++ b/testing/ndpi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Open Source Deep Packet Inspection Software Toolkit"
url="https://github.com/ntop/nDPI"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="autoconf automake libpcap-dev libtool"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/ntop/nDPI/archive/$pkgver.tar.gz"
diff --git a/testing/neomutt/APKBUILD b/testing/neomutt/APKBUILD
index c4f0ac97e9..5a623bc3ee 100644
--- a/testing/neomutt/APKBUILD
+++ b/testing/neomutt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Mutt with miscellaneous fixes and feature patches"
url="https://www.neomutt.org/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="automake autoconf cyrus-sasl-dev gdbm-dev gettext-dev
diff --git a/testing/netdata/APKBUILD b/testing/netdata/APKBUILD
index a7d7065361..52d68118f0 100644
--- a/testing/netdata/APKBUILD
+++ b/testing/netdata/APKBUILD
@@ -5,7 +5,7 @@ pkgver=1.9.0
pkgrel=0
pkgdesc="Real-time performance monitoring"
url="https://github.com/firehol/netdata"
-license="GPL3+"
+license="GPL-3.0-or-later"
arch="all"
depends="bash"
makedepends="zlib-dev e2fsprogs-dev"
diff --git a/testing/netdisco/APKBUILD b/testing/netdisco/APKBUILD
index 1508391cbd..1407b475e8 100644
--- a/testing/netdisco/APKBUILD
+++ b/testing/netdisco/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
pkgdesc="An open source web-based network management tool."
url="http://search.cpan.org/dist/App-Netdisco/"
arch="noarch"
-license="bsd"
+license="BSD"
cpandepends="perl-dancer-plugin-passphrase perl-data-printer perl-plack perl-ldap
perl-file-sharedir perl-starman perl-socket6 perl-json-xs perl-netaddr-mac
perl-anyevent perl-uri perl-dancer-plugin-dbic perl-template-plugin-csv
diff --git a/testing/netsink/APKBUILD b/testing/netsink/APKBUILD
index a45e1eed9d..588865de9c 100644
--- a/testing/netsink/APKBUILD
+++ b/testing/netsink/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A Network Sinkhole for Isolated Malware Analysis"
url="https://github.com/shendo/netsink"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2 py-dnslib py-setuptools"
makedepends="python2-dev"
source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/netsurf/APKBUILD b/testing/netsurf/APKBUILD
index 4c6d28c137..2d2d30e654 100644
--- a/testing/netsurf/APKBUILD
+++ b/testing/netsurf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="NetSurf is a free, open source web browser."
url="http://www.netsurf-browser.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="curl-dev libressl-dev doxygen flex bison libwebp-dev lcms2-dev
diff --git a/testing/nimble/APKBUILD b/testing/nimble/APKBUILD
index c3b37cd411..e4f075b7aa 100644
--- a/testing/nimble/APKBUILD
+++ b/testing/nimble/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Package manager for the Nim programming language"
url="https://github.com/nim-lang/nimble"
arch="all"
-license="BSD3"
+license="BSD-3-Clause"
depends="nim"
source="$pkgname-$pkgver.tar.gz::https://github.com/nim-lang/$pkgname/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/nitro/APKBUILD b/testing/nitro/APKBUILD
index 41cfe88d71..d4db9b91d8 100644
--- a/testing/nitro/APKBUILD
+++ b/testing/nitro/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="The Nitro NITF project"
url="https://github.com/hobu/nitro"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
makedepends="cmake linux-headers"
install=""
diff --git a/testing/node-closurecompiler-externs/APKBUILD b/testing/node-closurecompiler-externs/APKBUILD
index 389929415e..9537fc6e2b 100644
--- a/testing/node-closurecompiler-externs/APKBUILD
+++ b/testing/node-closurecompiler-externs/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="A collection of node.js externs for use with Closure Compiler"
url="https://github.com/dcodeIO/node.js-closure-compiler-externs"
arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
depends="nodejs"
source="$pkgname-$pkgver.tar.gz::https://github.com/dcodeIO/$_pkgname/archive/$pkgver.tar.gz
domain.js-fix-type-annotations.patch"
diff --git a/testing/nomp/APKBUILD b/testing/nomp/APKBUILD
index c40b452d12..592747b005 100644
--- a/testing/nomp/APKBUILD
+++ b/testing/nomp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="Ncurses OpenVAS Manager Protocol"
url="https://github.com/git-rep/nomp"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libressl-dev libxml++-dev ncurses-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/git-rep/$pkgname/archive/v$pkgver.tar.gz
make-path.patch"
diff --git a/testing/nototools/APKBUILD b/testing/nototools/APKBUILD
index ccd2d6ead7..ae5fadb493 100644
--- a/testing/nototools/APKBUILD
+++ b/testing/nototools/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Noto fonts support tools and scripts"
url="https://www.google.com/get/noto/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
makedepends="python2-dev py-setuptools"
install=""
diff --git a/testing/numactl/APKBUILD b/testing/numactl/APKBUILD
index 8ce695a01f..21b0d04286 100644
--- a/testing/numactl/APKBUILD
+++ b/testing/numactl/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Simple NUMA policy support"
url="https://github.com/numactl/numactl"
# ARM lacks the __NR_migrate_pages syscall
arch="all !armhf"
-license="GPL2 LGPL2"
+license="GPL-2.0 LGPL-2.0"
makedepends="autoconf automake libtool linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
options="!check"
diff --git a/testing/nzbget/APKBUILD b/testing/nzbget/APKBUILD
index 3a7c0ea02e..100ab40c96 100644
--- a/testing/nzbget/APKBUILD
+++ b/testing/nzbget/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Usenet downloader"
url="http://nzbget.net"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libxml2-dev ncurses-dev libressl-dev"
subpackages="$pkgname-doc"
source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-src.tar.gz"
diff --git a/testing/oath-toolkit/APKBUILD b/testing/oath-toolkit/APKBUILD
index 9d2db6a565..ecbc16321f 100644
--- a/testing/oath-toolkit/APKBUILD
+++ b/testing/oath-toolkit/APKBUILD
@@ -32,14 +32,14 @@ package() {
liboath() {
pkgdesc="A shared and static C library for OATH handling."
- license="LGPL2.1+"
+ license="LGPL-2.1-or-later"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/liboath.so* "$subpkgdir"/usr/lib
}
libpskc() {
pkgdesc="Library for Portable Symmetric Key Container"
- license="LGPL2.1+"
+ license="LGPL-2.1-or-later"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libpskc.so* "$subpkgdir"/usr/lib
}
@@ -49,14 +49,14 @@ libpskc() {
oathtool() {
depends="oath-toolkit-liboath"
pkgdesc="A command line tool for generating and validating OTPs."
- license="GPLv3.0+"
+ license="GPL-3.0-or-later"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/oathtool "$subpkgdir"/usr/bin
}
pam_oath() {
depends="oath-toolkit-liboath"
- license="GPL3.0+"
+ license="GPL-3.0-or-later"
pkgdesc="A PAM module for pluggable login authentication for OATH."
mkdir -p "$subpkgdir"/lib/security
mv "$pkgdir"/usr/lib/security/pam_oath.so "$subpkgdir"/lib/security
diff --git a/testing/obs-studio/APKBUILD b/testing/obs-studio/APKBUILD
index 7fdcca0a7c..d58c66ce51 100644
--- a/testing/obs-studio/APKBUILD
+++ b/testing/obs-studio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Free and open source software for live streaming and screen recording"
url="https://obsproject.com/"
arch="all !aarch64 !armhf !ppc64le"
-license="GPL2"
+license="GPL-2.0"
options="!check"
makedepends="cmake ffmpeg-dev libxinerama-dev
qt5-qtbase-dev qt5-x11extras-dev x264-dev fontconfig-dev
diff --git a/testing/octave/APKBUILD b/testing/octave/APKBUILD
index f8de66737d..5c5590a25d 100644
--- a/testing/octave/APKBUILD
+++ b/testing/octave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A high-level language, primarily intended for numerical computations"
url="https://www.gnu.org/software/octave/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
subpackages="$pkgname-doc"
makedepends="autoconf automake bison curl fftw-dev fltk-dev fontconfig-dev
diff --git a/testing/ofono/APKBUILD b/testing/ofono/APKBUILD
index c9287be0bd..ba30a876e8 100644
--- a/testing/ofono/APKBUILD
+++ b/testing/ofono/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications"
url="https://01.org/ofono"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="bluez mobile-broadband-provider-info"
makedepends="glib-dev dbus-dev eudev-dev
linux-headers bsd-compat-headers libexecinfo-dev
diff --git a/testing/opencc/APKBUILD b/testing/opencc/APKBUILD
index 518ef39dd8..736f32cd2b 100644
--- a/testing/opencc/APKBUILD
+++ b/testing/opencc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Open Chinese Convert"
url="http://opencc.byvoid.com/"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
makedepends="cmake doxygen python"
subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-ver.$pkgver.tar.gz::https://github.com/BYVoid/$_pkgname/archive/ver.$pkgver.tar.gz"
diff --git a/testing/openconnect/APKBUILD b/testing/openconnect/APKBUILD
index 9b855bb5d2..c029bb25bb 100644
--- a/testing/openconnect/APKBUILD
+++ b/testing/openconnect/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Open client for Cisco AnyConnect VPN"
url="http://www.infradead.org/openconnect/"
arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
depends="vpnc iproute2"
makedepends="autoconf automake intltool gnutls-dev libxml2-dev
krb5-dev lz4-dev libproxy-dev linux-headers stoken-dev
diff --git a/testing/opensm/APKBUILD b/testing/opensm/APKBUILD
index b3070aeef8..7b01b04c76 100644
--- a/testing/opensm/APKBUILD
+++ b/testing/opensm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="OpenSM InfiniBand subnet manager"
url="https://www.openfabrics.org/index.php/openfabrics-software.html"
arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
depends=""
depends_dev="libibumad-dev"
makedepends="$depends_dev bison flex"
diff --git a/testing/openssh-askpass/APKBUILD b/testing/openssh-askpass/APKBUILD
index 76109697ce..7ce2373a43 100644
--- a/testing/openssh-askpass/APKBUILD
+++ b/testing/openssh-askpass/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A passphrase dialog for OpenSSH and GTK"
url="http://www.openssh.org/portable.html"
arch="all"
-license="as-is"
+license="AS-IS"
depends="openssh-client"
options="!check"
makedepends="gtk+2.0-dev"
diff --git a/testing/opensubdiv/APKBUILD b/testing/opensubdiv/APKBUILD
index 34cf31b9e8..80841645c3 100644
--- a/testing/opensubdiv/APKBUILD
+++ b/testing/opensubdiv/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=3
pkgdesc="An Open-Source subdivision surface library"
url="http://graphics.pixar.com/opensubdiv"
arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
depends=""
makedepends="cmake glew-dev glfw-dev doxygen py-docutils libxcursor-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tutorials $pkgname-tools"
diff --git a/testing/openttd-opengfx/APKBUILD b/testing/openttd-opengfx/APKBUILD
index 886188a9aa..c4ece6a071 100644
--- a/testing/openttd-opengfx/APKBUILD
+++ b/testing/openttd-opengfx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Free graphics set for OpenTTD"
url="http://openttd.org/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends=""
source="https://binaries.openttd.org/extra/opengfx/$pkgver/opengfx-$pkgver-all.zip"
diff --git a/testing/openttd/APKBUILD b/testing/openttd/APKBUILD
index ba26648693..757c7ec316 100644
--- a/testing/openttd/APKBUILD
+++ b/testing/openttd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Open source simulation game based upon Transport Tycoon Deluxe"
url="http://openttd.org/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends="libpng-dev zlib-dev sdl-dev lzo-dev xz-dev freetype-dev fontconfig-dev"
subpackages="$pkgname-doc $pkgname-lang::noarch"
diff --git a/testing/opmsg/APKBUILD b/testing/opmsg/APKBUILD
index 8863d73c90..fdfd82dfa6 100644
--- a/testing/opmsg/APKBUILD
+++ b/testing/opmsg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="opmsg gpg-like encryption system"
url="https://github.com/stealth/opmsg"
arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends=""
makedepends="libressl-dev"
install=""
diff --git a/testing/ossec-hids/APKBUILD b/testing/ossec-hids/APKBUILD
index 9575d87021..5577eeb86c 100644
--- a/testing/ossec-hids/APKBUILD
+++ b/testing/ossec-hids/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Open Source Host-based Intrusion Detection System"
url="http://www.ossec.net/"
arch="all !aarch64 !armhf"
-license="GPL3"
+license="GPL-3.0"
depends="inotify-tools procps"
makedepends="linux-headers inotify-tools-dev findutils file"
install="$pkgname.pre-install"
diff --git a/testing/ostinato/APKBUILD b/testing/ostinato/APKBUILD
index e85c94e542..d35fbdfd2a 100644
--- a/testing/ostinato/APKBUILD
+++ b/testing/ostinato/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Packet/Traffic Generator and Analyzer"
url="http://www.ostinato.org/"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
options="!check" # make test does nothing
makedepends="qt-dev protobuf-dev libpcap-dev paxmark"
subpackages="$pkgname-drone $pkgname-gui"
diff --git a/testing/otrs/APKBUILD b/testing/otrs/APKBUILD
index 1c148aec3a..fa2132c39b 100644
--- a/testing/otrs/APKBUILD
+++ b/testing/otrs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Flexible Open Source Service Management Software"
url="http://www.otrs.org/"
arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
pkgusers="otrs"
pkggroups="www-data"
depends="perl perl-archive-zip perl-crypt-eksblowfish perl-crypt-ssleay
diff --git a/testing/p0f/APKBUILD b/testing/p0f/APKBUILD
index 305df31285..8b02ec0569 100644
--- a/testing/p0f/APKBUILD
+++ b/testing/p0f/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Passive traffic fingerprinting tool"
url="http://lcamtuf.coredump.cx/p0f3/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="bash libpcap-dev"
subpackages="$pkgname-doc"
source="http://lcamtuf.coredump.cx/p0f3/releases/$pkgname-$pkgver.tgz
diff --git a/testing/pacparser/APKBUILD b/testing/pacparser/APKBUILD
index 6955f5973a..0ded41ab80 100644
--- a/testing/pacparser/APKBUILD
+++ b/testing/pacparser/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A library to parse proxy auto-config (PAC) files"
url="http://pacparser.manugarg.com"
# x86, armhf: https://github.com/pacparser/pacparser/issues/77
arch="x86_64"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
depends=""
makedepends="bash python2-dev"
subpackages="py-$pkgname:pymod $pkgname-doc $pkgname-dev"
diff --git a/testing/pam_sqlite3/APKBUILD b/testing/pam_sqlite3/APKBUILD
index 01a88d5a67..18413eecfe 100644
--- a/testing/pam_sqlite3/APKBUILD
+++ b/testing/pam_sqlite3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="pam_sqlite3"
url="https://github.com/HormyAJP/pam_sqlite3"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="linux-pam"
makedepends="linux-pam-dev sqlite-dev bsd-compat-headers"
install=""
diff --git a/testing/pass/APKBUILD b/testing/pass/APKBUILD
index 8e55e6caf9..f29fe77288 100644
--- a/testing/pass/APKBUILD
+++ b/testing/pass/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Stores, retrieves, generates, and synchronizes passwords securely"
url="http://zx2c4.com/projects/password-store/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="bash tree"
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/pastebinc/APKBUILD b/testing/pastebinc/APKBUILD
index bf6a53353d..de726f5db7 100644
--- a/testing/pastebinc/APKBUILD
+++ b/testing/pastebinc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="utility to pipe data into a paste on pastebin.com or a similar site"
url="https://github.com/jthomerson/pastebinc"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends=
depends_dev=
makedepends="wget glib-dev curl-dev"
diff --git a/testing/pcsxr/APKBUILD b/testing/pcsxr/APKBUILD
index 56b52846ef..05afac69a1 100644
--- a/testing/pcsxr/APKBUILD
+++ b/testing/pcsxr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Sony PlayStation emulator"
url="https://pcsxr.codeplex.com/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="libtxc_dxtn"
makedepends="autoconf automake libglade-dev libtool gtk+2.0-dev sdl-dev mesa-dev
libxv-dev libxtst-dev nasm libxxf86vm-dev"
diff --git a/testing/pdfcrack/APKBUILD b/testing/pdfcrack/APKBUILD
index f8ee72c4af..2b57a10bd1 100644
--- a/testing/pdfcrack/APKBUILD
+++ b/testing/pdfcrack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Command line, password recovery tool for PDF-files."
url="http://pdfcrack.sourceforge.net/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
options="!check"
source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/peervpn/APKBUILD b/testing/peervpn/APKBUILD
index facb2cf7fb..16512487fc 100644
--- a/testing/peervpn/APKBUILD
+++ b/testing/peervpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="PeerVPN builds virtual ethernet networks between multiple computers"
url="https://peervpn.net"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="libressl zlib"
makedepends="$depends libressl-dev zlib-dev linux-headers"
install=""
diff --git a/testing/pelican/APKBUILD b/testing/pelican/APKBUILD
index 802521ecfb..a91306569b 100644
--- a/testing/pelican/APKBUILD
+++ b/testing/pelican/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="A tool to generate a static blog from reStructuredText or Markdown input files."
url="https://pypi.python.org/pypi/pelican/"
arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
depends="bash py-feedgenerator py-pygments py-docutils py-blinker py-unidecode
py-markdown py-jinja2 py-dateutil"
makedepends="python2-dev py-setuptools python3-dev"
diff --git a/testing/percona-toolkit/APKBUILD b/testing/percona-toolkit/APKBUILD
index ecb30740f3..1b01ca679a 100644
--- a/testing/percona-toolkit/APKBUILD
+++ b/testing/percona-toolkit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Toolkit for MySQL/MariaDB"
url="https://www.percona.com/software/database-tools/percona-toolkit/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="perl perl-time-hires perl-dbd-mysql bash"
subpackages="$pkgname-doc"
source="https://www.percona.com/downloads/$pkgname/$pkgver/source/tarball/$pkgname-$pkgver.tar.gz"
diff --git a/testing/perl-glib-ex-objectbits/APKBUILD b/testing/perl-glib-ex-objectbits/APKBUILD
index 9929886066..b00c9458e5 100644
--- a/testing/perl-glib-ex-objectbits/APKBUILD
+++ b/testing/perl-glib-ex-objectbits/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Helpers for Glib objects."
url="http://search.cpan.org/dist/Glib-Ex-ObjectBits/"
arch="noarch"
-license="gpl_3"
+license="GPL-3.0"
cpandepends="perl-devel-globaldestruction perl-glib"
cpanmakedepends=" "
depends="$cpandepends"
diff --git a/testing/perl-session-storage-secure/APKBUILD b/testing/perl-session-storage-secure/APKBUILD
index e86d40dc28..1be2376b5d 100644
--- a/testing/perl-session-storage-secure/APKBUILD
+++ b/testing/perl-session-storage-secure/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Encrypted, expiring, compressed, serialized session data with integrity"
url="http://search.cpan.org/dist/Session-Storage-Secure/"
arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
cpandepends="perl-moox-types-mooselike perl-crypt-rijndael perl-string-compare-constanttime perl-moo perl-crypt-urandom perl-sereal-decoder perl-namespace-clean perl-crypt-cbc perl-math-random-isaac-xs perl-sereal-encoder"
cpanmakedepends=""
cpancheckdepends="perl-number-tolerant perl-test-deep perl-test-fatal"
diff --git a/testing/perl-snmp-info/APKBUILD b/testing/perl-snmp-info/APKBUILD
index dcc10bcb63..13a00611bd 100644
--- a/testing/perl-snmp-info/APKBUILD
+++ b/testing/perl-snmp-info/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="OO Interface to Network devices and MIBs through SNMP"
url="http://search.cpan.org/dist/SNMP-Info/"
arch="noarch"
-license="bsd"
+license="BSD"
cpandepends="net-snmp-perl"
cpanmakedepends=""
cpancheckdepends=""
diff --git a/testing/perl-test-api/APKBUILD b/testing/perl-test-api/APKBUILD
index 3b0f17bae9..aed9d34b4b 100644
--- a/testing/perl-test-api/APKBUILD
+++ b/testing/perl-test-api/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Test a list of subroutines provided by a module"
url="http://search.cpan.org/dist/Test-API/"
arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
cpandepends=""
cpanmakedepends=""
cpancheckdepends=""
diff --git a/testing/perl-test-roo/APKBUILD b/testing/perl-test-roo/APKBUILD
index 03b8f963f9..ee75538cd9 100644
--- a/testing/perl-test-roo/APKBUILD
+++ b/testing/perl-test-roo/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Composable, reusable tests with roles and Moo"
url="http://search.cpan.org/dist/Test-Roo/"
arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
cpandepends="perl-moox-types-mooselike perl-moo perl-sub-install perl-strictures"
cpanmakedepends=""
cpancheckdepends="perl-capture-tiny"
diff --git a/testing/perl-www-curl/APKBUILD b/testing/perl-www-curl/APKBUILD
index 885cc588e0..2b7189da1a 100644
--- a/testing/perl-www-curl/APKBUILD
+++ b/testing/perl-www-curl/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=3
pkgdesc="Perl extension interface for libcurl"
url="http://search.cpan.org/dist/WWW-Curl/"
arch="all"
-license="mit"
+license="MIT"
cpandepends=""
cpanmakedepends=" "
depends="$cpandepends"
diff --git a/testing/php7-couchbase/APKBUILD b/testing/php7-couchbase/APKBUILD
index 3db9a4ecd4..f112d4e0ba 100644
--- a/testing/php7-couchbase/APKBUILD
+++ b/testing/php7-couchbase/APKBUILD
@@ -9,7 +9,7 @@ _phpver=${_phpver%%-*}
pkgdesc="PHP$_phpver extension for Couchbase"
url="http://pecl.php.net/package/couchbase"
arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
depends="php$_phpver-common php$_phpver-json"
makedepends="php$_phpver-dev autoconf libcouchbase-dev zlib-dev"
source="$pkgname-$pkgver.tgz::http://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
diff --git a/testing/physlock/APKBUILD b/testing/physlock/APKBUILD
index 466b1ddd08..1c8a72ef55 100644
--- a/testing/physlock/APKBUILD
+++ b/testing/physlock/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Lightweight linux console locking tool"
url="https://github.com/muennich/physlock"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="linux-headers"
depends=""
install=""
diff --git a/testing/pixiewps/APKBUILD b/testing/pixiewps/APKBUILD
index 4f11c661d2..6c23728d60 100644
--- a/testing/pixiewps/APKBUILD
+++ b/testing/pixiewps/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="An offline WPS bruteforce utility"
url="https://github.com/wiire/pixiewps"
arch="all"
-license="GPL3"
+license="GPL-3.0"
source="$pkgname-$pkgver.tar.gz::https://github.com/wiire/$pkgname/archive/v$pkgver.tar.gz
make-bindir.patch"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/platformio-core/APKBUILD b/testing/platformio-core/APKBUILD
index 9bc92d36c5..691ca37b83 100644
--- a/testing/platformio-core/APKBUILD
+++ b/testing/platformio-core/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="An open source ecosystem for IoT development"
url="http://platformio.org"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python py-bottle py-click5 py-lockfile py-serial
py-requests py-colorama py-semanticversion"
makedepends="python-dev py-setuptools"
diff --git a/testing/plzip/APKBUILD b/testing/plzip/APKBUILD
index 15250d11c3..2688509018 100644
--- a/testing/plzip/APKBUILD
+++ b/testing/plzip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Plzip is a massively parallel lossless data compressor"
url="http://www.nongnu.org/lzip/plzip.html"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="lzlib"
diff --git a/testing/policycoreutils/APKBUILD b/testing/policycoreutils/APKBUILD
index c1dd807d5a..0888ad4b7a 100644
--- a/testing/policycoreutils/APKBUILD
+++ b/testing/policycoreutils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="SELinux policy core utilities"
url="http://www.selinuxproject.org"
arch="all"
-license="GPLv2"
+license="GPL-2.0"
depends="libsepol libselinux libsemanage gettext linux-pam python audit-libs"
depends_dev=""
makedepends="$depends_dev fts-dev libsepol-dev libselinux-dev libsemanage-dev gawk bsd-compat-headers linux-headers gettext-dev linux-pam-dev libcap-ng-dev coreutils python audit-dev"
diff --git a/testing/postgis/APKBUILD b/testing/postgis/APKBUILD
index d4ca4a3cfe..d74c219535 100644
--- a/testing/postgis/APKBUILD
+++ b/testing/postgis/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="PostGIS is a spatial database extender for PostgreSQL object-relational database."
url="http://postgis.net"
arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
depends="postgresql geos gdal proj4 perl"
depends_dev="postgresql-dev geos-dev gdal-dev libxml2-dev proj4-dev perl-dev"
makedepends="$depends_dev"
diff --git a/testing/pwsafe/APKBUILD b/testing/pwsafe/APKBUILD
index 1b73db1107..78e222a32e 100644
--- a/testing/pwsafe/APKBUILD
+++ b/testing/pwsafe/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
pkgdesc="Password database"
url="http://nsd.dyndns.org/pwsafe/"
arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
makedepends="ncurses-dev libressl-dev libxmu-dev readline-dev"
subpackages="$pkgname-doc"
source="http://nsd.dyndns.org/pwsafe/releases/pwsafe-$pkgver.tar.gz"
diff --git a/testing/py-actdiag/APKBUILD b/testing/py-actdiag/APKBUILD
index c56867f8e6..4cf95913d4 100644
--- a/testing/py-actdiag/APKBUILD
+++ b/testing/py-actdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="actdiag generate activity-diagram image file from spec-text file"
url="https://pypi.python.org/pypi/actdiag"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-pillow py-funcparserlib py-blockdiag"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-ansi2html/APKBUILD b/testing/py-ansi2html/APKBUILD
index ca67505495..a78c02cc08 100644
--- a/testing/py-ansi2html/APKBUILD
+++ b/testing/py-ansi2html/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Convert text with ANSI color codes to HTML"
url="http://github.com/ralphbean/ansi2html/"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2 py-setuptools py-six"
depends_dev=""
makedepends="python2-dev"
diff --git a/testing/py-application/APKBUILD b/testing/py-application/APKBUILD
index 660429e506..6e5fe9e81b 100644
--- a/testing/py-application/APKBUILD
+++ b/testing/py-application/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Basic building blocks for python applications"
url="http://pypi.python.org/pypi/python-application"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="python2"
makedepends="python2-dev py-setuptools"
install=""
diff --git a/testing/py-apsw/APKBUILD b/testing/py-apsw/APKBUILD
index 8f36a6bd8e..a252ce27a6 100644
--- a/testing/py-apsw/APKBUILD
+++ b/testing/py-apsw/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Another Python SQLite Wrapper"
url="https://github.com/rogerbinns/apsw/"
arch="all"
-license="ZLIB"
+license="zlib"
makedepends="python2-dev python3-dev py-setuptools sqlite-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3 $pkgname-doc"
source="$pkgname-$pkgver-$_pkgrel.tar.gz::https://github.com/rogerbinns/apsw/archive/$pkgver-$_pkgrel.tar.gz"
diff --git a/testing/py-argcomplete/APKBUILD b/testing/py-argcomplete/APKBUILD
index ad871a0dda..077c110177 100644
--- a/testing/py-argcomplete/APKBUILD
+++ b/testing/py-argcomplete/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Easy, extensible command line tab completion of arguments for your Python script"
url="https://github.com/kislyuk/argcomplete"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
install=""
diff --git a/testing/py-arrow/APKBUILD b/testing/py-arrow/APKBUILD
index 0ea7866a9b..b8ba979b74 100644
--- a/testing/py-arrow/APKBUILD
+++ b/testing/py-arrow/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python library to create and manipulate dates, times, and timestamps"
url="http://arrow.readthedocs.io/"
arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
depends="py-dateutil"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-astral/APKBUILD b/testing/py-astral/APKBUILD
index 55130ce628..2eed8841ae 100644
--- a/testing/py-astral/APKBUILD
+++ b/testing/py-astral/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Calculations for the position of the sun and moon"
url="https://pypi.python.org/pypi/astral/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-tz"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-astroid/APKBUILD b/testing/py-astroid/APKBUILD
index fd7011ef38..fa44725fb6 100644
--- a/testing/py-astroid/APKBUILD
+++ b/testing/py-astroid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A new abstract syntax tree from Python's ast"
url="http://www.astroid.org/"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="py-logilab-common"
replaces="py-logilab-astng"
makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-augeas/APKBUILD b/testing/py-augeas/APKBUILD
index bc2abcc255..51ed80a623 100644
--- a/testing/py-augeas/APKBUILD
+++ b/testing/py-augeas/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Pure python bindings for augeas"
url="https://pypi.python.org/pypi/python-augeas"
arch="noarch"
-license="GPL2.1"
+license="GPL-2.1"
depends="augeas-libs py-cffi"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-banknumber/APKBUILD b/testing/py-banknumber/APKBUILD
index b4c6a00736..6b5bb9515b 100644
--- a/testing/py-banknumber/APKBUILD
+++ b/testing/py-banknumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python module to validate Bank codes"
url="https://bitbucket.org/zikzakmedia/python-banknumber"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-barcodenumber/APKBUILD b/testing/py-barcodenumber/APKBUILD
index 457f79455b..2c6bb21617 100644
--- a/testing/py-barcodenumber/APKBUILD
+++ b/testing/py-barcodenumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python module to validate product codes"
url="https://bitbucket.org/zikzakmedia/python-barcodenumber"
arch="noarch"
-license="GPL3"
+license="GPL-3.0"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-blockdiag/APKBUILD b/testing/py-blockdiag/APKBUILD
index 45e494afe6..999b781f50 100644
--- a/testing/py-blockdiag/APKBUILD
+++ b/testing/py-blockdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="A python tool to generate block-diagram"
url="http://blockdiag.com"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-pillow py-funcparserlib py-webcolors"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-boto3/APKBUILD b/testing/py-boto3/APKBUILD
index 743b1953df..7b413fb166 100644
--- a/testing/py-boto3/APKBUILD
+++ b/testing/py-boto3/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="AWS SDK for Python (Boto3)"
url="http://aws.amazon.com/sdk-for-python/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-botocore"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
diff --git a/testing/py-botocore/APKBUILD b/testing/py-botocore/APKBUILD
index d6b0c9b01d..fa64b5166d 100644
--- a/testing/py-botocore/APKBUILD
+++ b/testing/py-botocore/APKBUILD
@@ -7,7 +7,7 @@ _pkgreal=${pkgname#py-}
pkgdesc="The low-level, core functionality of Boto3"
url="https://github.com/boto/botocore"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-dateutil py-jmespath"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py3-$_pkgreal:_py3 py2-$_pkgreal:_py2"
diff --git a/testing/py-cairosvg/APKBUILD b/testing/py-cairosvg/APKBUILD
index 7deb42537b..ea317eb2da 100644
--- a/testing/py-cairosvg/APKBUILD
+++ b/testing/py-cairosvg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Cairo-based SVG renderer for python"
url="http://cairosvg.org"
arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
depends="python2 py-cairocffi"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-cassandra-driver/APKBUILD b/testing/py-cassandra-driver/APKBUILD
index 34571e1bcf..694c27fee5 100644
--- a/testing/py-cassandra-driver/APKBUILD
+++ b/testing/py-cassandra-driver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Python driver for Apache Cassandra"
url="https://github.com/datastax/python-driver"
arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
depends="cython"
makedepends="cython-dev libev-dev py-setuptools python2-dev python3-dev"
subpackages="py2-${pkgname/py-/}:_py2 py3-${pkgname/py-/}:_py3"
diff --git a/testing/py-cjson/APKBUILD b/testing/py-cjson/APKBUILD
index c43c3618a3..6f482e2c39 100644
--- a/testing/py-cjson/APKBUILD
+++ b/testing/py-cjson/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Fast JSON encoder/decoder for Python"
url="https://pypi.python.org/pypi/python-cjson"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends=""
makedepends="python2-dev py-setuptools"
install=""
diff --git a/testing/py-codecov/APKBUILD b/testing/py-codecov/APKBUILD
index 00dc052c39..1422306167 100644
--- a/testing/py-codecov/APKBUILD
+++ b/testing/py-codecov/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Report uploader for Codecov"
url="https://github.com/codecov/codecov-python"
arch="noarch"
-license="Apache2"
+license="Apache-2.0"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-coverage/APKBUILD b/testing/py-coverage/APKBUILD
index bd5a3f5492..6be98781b8 100644
--- a/testing/py-coverage/APKBUILD
+++ b/testing/py-coverage/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Code coverage measurement for Python"
url="https://pypi.python.org/pypi/coverage"
arch="all"
-license="apache2"
+license="Apache-2.0"
depends=
depends_dev=
makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-coveralls/APKBUILD b/testing/py-coveralls/APKBUILD
index e6780519cc..74623d9158 100644
--- a/testing/py-coveralls/APKBUILD
+++ b/testing/py-coveralls/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Show coverage stats online via coveralls.io"
url="https://github.com/coveralls-clients/coveralls-python"
arch="noarch"
-license="Apache2"
+license="Apache-2.0"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-cssutils/APKBUILD b/testing/py-cssutils/APKBUILD
index 8fc3852bee..077c1cafc4 100644
--- a/testing/py-cssutils/APKBUILD
+++ b/testing/py-cssutils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A CSS Cascading Style Sheets library for Python"
url="http://cthedot.de/cssutils/"
arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
makedepends="python2-dev py-setuptools"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/testing/py-django-debug-toolbar/APKBUILD b/testing/py-django-debug-toolbar/APKBUILD
index 92b0d32d93..f95d0f4246 100644
--- a/testing/py-django-debug-toolbar/APKBUILD
+++ b/testing/py-django-debug-toolbar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Configurable set of panels that display various debug information about the current request/response"
url="https://github.com/jazzband/django-debug-toolbar"
arch="noarch"
-license="BSD3"
+license="BSD-3-Clause"
depends="py-django py-sqlparse"
makedepends="python2-dev python3-dev py-setuptools"
options="!check" #no testsuite
diff --git a/testing/py-dulwich/APKBUILD b/testing/py-dulwich/APKBUILD
index bbc5cdbf93..f11282a6f3 100644
--- a/testing/py-dulwich/APKBUILD
+++ b/testing/py-dulwich/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A python implementation of the Git file formats and protocols"
url="https://www.dulwich.io"
arch="all"
-license="GPL2+ or ASL 2.0"
+license="GPL-2.0-or-later or Apache-2.0"
options="!check" # Tests are failing (http-backend)
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-elasticsearch/APKBUILD b/testing/py-elasticsearch/APKBUILD
index d3376f0878..1f693fb85d 100644
--- a/testing/py-elasticsearch/APKBUILD
+++ b/testing/py-elasticsearch/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Official Python low-level client for Elasticsearch"
url="http://elasticsearch-py.rtfd.org/"
arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
depends="py-urllib3"
#checkdepends="py-requests py-nose py-coverage py-mock py-yaml py-nosexcover"
checkdepends="py-requests py-nose py-coverage py-mock py-yaml" # add nosexcover next release
diff --git a/testing/py-enchant/APKBUILD b/testing/py-enchant/APKBUILD
index 4cc2ebfdac..c8e3375b36 100644
--- a/testing/py-enchant/APKBUILD
+++ b/testing/py-enchant/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A spellchecking library for Python"
url="http://pythonhosted.org/pyenchant/"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools enchant-dev"
diff --git a/testing/py-ev/APKBUILD b/testing/py-ev/APKBUILD
index 74a511cef6..5407e93c99 100644
--- a/testing/py-ev/APKBUILD
+++ b/testing/py-ev/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python libev interface"
url="http://pythonhosted.org/pyev/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools libev-dev"
diff --git a/testing/py-exconsole/APKBUILD b/testing/py-exconsole/APKBUILD
index cbbb58ca13..4c7053c7c2 100644
--- a/testing/py-exconsole/APKBUILD
+++ b/testing/py-exconsole/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Emergency/postmortem Python console"
url="https://github.com/Eugeny/exconsole"
arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-fedmsg/APKBUILD b/testing/py-fedmsg/APKBUILD
index d7c2612593..a0e2b19620 100644
--- a/testing/py-fedmsg/APKBUILD
+++ b/testing/py-fedmsg/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Utilities used around Fedora Infrastructure to send and receive messages"
url="https://fedmsg.readthedocs.org/"
arch="noarch"
-license="LGPLv2"
+license="LGPL-2.0"
depends="python2"
depends_dev="py-setuptools"
makedepends="$depends_dev"
diff --git a/testing/py-feedgenerator/APKBUILD b/testing/py-feedgenerator/APKBUILD
index 0bd8524603..626741b380 100644
--- a/testing/py-feedgenerator/APKBUILD
+++ b/testing/py-feedgenerator/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python feed generator"
url="https://github.com/getpelican/feedgenerator"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="py-six py-tz"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-flake8-isort/APKBUILD b/testing/py-flake8-isort/APKBUILD
index 8bfa68d0e3..367efb8987 100644
--- a/testing/py-flake8-isort/APKBUILD
+++ b/testing/py-flake8-isort/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Extension for flake8 which integrates isort"
url="https://github.com/gforcada/flake8-isort"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="flake8 py3-isort"
makedepends="python3-dev"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-flask-enterprise/APKBUILD b/testing/py-flask-enterprise/APKBUILD
index 3b3674a5eb..331f7afb08 100644
--- a/testing/py-flask-enterprise/APKBUILD
+++ b/testing/py-flask-enterprise/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Flask enterprise capabilities"
url="https://pypi.python.org/pypi/Flask-Enterprise"
arch="noarch"
-license=" CDDL"
+license="CDDL"
depends="python2 py-flask"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-flask-psycopg2/APKBUILD b/testing/py-flask-psycopg2/APKBUILD
index e296e7165e..6e342290e4 100644
--- a/testing/py-flask-psycopg2/APKBUILD
+++ b/testing/py-flask-psycopg2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Flask Psycopg extension"
url="https://pypi.python.org/pypi/Flask-Psycopg2"
arch="noarch"
-license="Public Domain"
+license="Public-Domain"
depends="python2 py-flask py-psycopg2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-google-apputils/APKBUILD b/testing/py-google-apputils/APKBUILD
index 600e0a1f6c..849502f755 100644
--- a/testing/py-google-apputils/APKBUILD
+++ b/testing/py-google-apputils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Google Application Utilities for Python"
url="https://github.com/google/google-apputils"
arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
depends="python2 py-dateutil>=1.4 py-gflags>=1.4 py-tz>=2010"
makedepends="python2-dev py-setuptools"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-hearplanetapi/APKBUILD b/testing/py-hearplanetapi/APKBUILD
index d64ff430e4..8537b7a3f8 100644
--- a/testing/py-hearplanetapi/APKBUILD
+++ b/testing/py-hearplanetapi/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Python API wrapper for Hear Planet"
url="http://pypi.python.org/pypi/HearPlanetAPI/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-hurry-filesize/APKBUILD b/testing/py-hurry-filesize/APKBUILD
index 77d9fa398f..6e3a9d176b 100644
--- a/testing/py-hurry-filesize/APKBUILD
+++ b/testing/py-hurry-filesize/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python library for human readable file sizes"
url="https://pypi.python.org/pypi/hurry.filesize"
arch="noarch"
-license="ZPL 2.1"
+license="ZPL-2.1"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-hypothesis/APKBUILD b/testing/py-hypothesis/APKBUILD
index fb77abeb43..c87eeecf64 100644
--- a/testing/py-hypothesis/APKBUILD
+++ b/testing/py-hypothesis/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Advanced property-based (QuickCheck-like) testing for Python"
url="http://hypothesis.works/"
arch="noarch"
-license="MPLv2.0"
+license="MPL-2.0"
depends=""
makedepends="py-setuptools python2-dev python3-dev py-enum34"
install=""
diff --git a/testing/py-ibanlib/APKBUILD b/testing/py-ibanlib/APKBUILD
index e3c26e25aa..ef9ca19c7f 100644
--- a/testing/py-ibanlib/APKBUILD
+++ b/testing/py-ibanlib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Library integrate the International Bank Account Number (IBAN)"
url="https://pypi.python.org/pypi/ibanlib"
arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-isbn/APKBUILD b/testing/py-isbn/APKBUILD
index 5167c8d48d..3deb9d23a3 100644
--- a/testing/py-isbn/APKBUILD
+++ b/testing/py-isbn/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A module for working with 10- and 13-digit ISBNs"
url="https://github.com/JNRowe/pyisbn"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-kerberos/APKBUILD b/testing/py-kerberos/APKBUILD
index 774769dabb..4ed76af028 100644
--- a/testing/py-kerberos/APKBUILD
+++ b/testing/py-kerberos/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python Kerberos high-level interface"
url="https://pypi.python.org/pypi/kerberos"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
makedepends="python2-dev py-setuptools python3-dev krb5-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-libacl/APKBUILD b/testing/py-libacl/APKBUILD
index a48222698f..8eccd0ebd5 100644
--- a/testing/py-libacl/APKBUILD
+++ b/testing/py-libacl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A python module for manipulating ACLs"
url="http://pylibacl.k1024.org/"
arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="python2-dev acl-dev py-setuptools"
diff --git a/testing/py-libnacl/APKBUILD b/testing/py-libnacl/APKBUILD
index 2b8e2bbbaf..6f0fef6799 100644
--- a/testing/py-libnacl/APKBUILD
+++ b/testing/py-libnacl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Python bindings for libsodium/tweetnacl"
url="https://libnacl.readthedocs.org/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="$_pkgname-$pkgver.tar.gz::https://github.com/saltstack/libnacl/archive/v$pkgver.tar.gz"
diff --git a/testing/py-logilab-astng/APKBUILD b/testing/py-logilab-astng/APKBUILD
index c106a5aefa..285f3dc3bf 100644
--- a/testing/py-logilab-astng/APKBUILD
+++ b/testing/py-logilab-astng/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Rebuild a new abstract syntax tree from Python's ast"
url="http://pypi.python.org/pypi/logilab-astng"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python2 py-logilab-common"
depends_dev=""
makedepends="python2-dev py-logilab-common"
diff --git a/testing/py-lxc-python2/APKBUILD b/testing/py-lxc-python2/APKBUILD
index 4df7438675..2bcfa25f11 100644
--- a/testing/py-lxc-python2/APKBUILD
+++ b/testing/py-lxc-python2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Python2 bindings for LXC"
url="https://pypi.python.org/pypi/lxc-python2"
arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
depends=""
makedepends="lxc-dev python-dev py-setuptools"
subpackages=""
diff --git a/testing/py-mongo/APKBUILD b/testing/py-mongo/APKBUILD
index 713f15d7e3..00fbc9f3f4 100644
--- a/testing/py-mongo/APKBUILD
+++ b/testing/py-mongo/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python driver for MongoDB"
url="https://github.com/mongodb/mongo-python-driver"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-napalm/APKBUILD b/testing/py-napalm/APKBUILD
index a444a79d63..3cd4067509 100644
--- a/testing/py-napalm/APKBUILD
+++ b/testing/py-napalm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Network Automation and Programmability Abstraction Layer with Multivendor support"
url="https://github.com/napalm-automation/napalm"
arch="noarch"
-license="Apache2"
+license="Apache-2.0"
depends=""
makedepends="python2-dev python3-dev py-setuptools py2-pip"
options="!check" #no testsuite
diff --git a/testing/py-ncclient/APKBUILD b/testing/py-ncclient/APKBUILD
index a399a917d7..2dc93429b0 100644
--- a/testing/py-ncclient/APKBUILD
+++ b/testing/py-ncclient/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Library for NETCONF clients"
url="https://github.com/tomchristie/itypes"
arch="noarch"
-license="Apache2"
+license="Apache-2.0"
depends="py-paramiko py-lxml py-six"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-newt_syrup/APKBUILD b/testing/py-newt_syrup/APKBUILD
index 4ba027870a..5816a6f003 100644
--- a/testing/py-newt_syrup/APKBUILD
+++ b/testing/py-newt_syrup/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Newt Syrup is an app framework built on top of Newt"
url="http://newt-syrup.fedorahosted.org/"
arch="noarch"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
depends="py-newt"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-nmap/APKBUILD b/testing/py-nmap/APKBUILD
index fccbf3f9b8..5136559aef 100644
--- a/testing/py-nmap/APKBUILD
+++ b/testing/py-nmap/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python class to use nmap and access scan results"
url="http://xael.org/norman/python/python-nmap/"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="http://xael.org/pages/python-$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-ntplib/APKBUILD b/testing/py-ntplib/APKBUILD
index 7cfd2da374..234cfcd39b 100644
--- a/testing/py-ntplib/APKBUILD
+++ b/testing/py-ntplib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python NTP library"
url="https://pypi.python.org/pypi/ntplib"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-nwdiag/APKBUILD b/testing/py-nwdiag/APKBUILD
index 67e76140f0..be500ff1f5 100644
--- a/testing/py-nwdiag/APKBUILD
+++ b/testing/py-nwdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="A Python tool to generate network-diagram image"
url="https://pypi.python.org/pypi/nwdiag"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-pillow py-funcparserlib py-blockdiag"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-osourcer/APKBUILD b/testing/py-osourcer/APKBUILD
index b4996c74ad..747a9e2681 100644
--- a/testing/py-osourcer/APKBUILD
+++ b/testing/py-osourcer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Tool to manage licenses in source code"
url="http://github.com/dnarvaez/osourcer"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pika/APKBUILD b/testing/py-pika/APKBUILD
index e707200d6a..6f637fb5ef 100644
--- a/testing/py-pika/APKBUILD
+++ b/testing/py-pika/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python AMQP client library"
url="https://pika.readthedocs.org"
arch="noarch"
-license="MPL 2.0"
+license="MPL-2.0"
depends="python2 py-tornado py-twisted py-ev"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-poppler/APKBUILD b/testing/py-poppler/APKBUILD
index d71840cacf..9e5f1c55dc 100644
--- a/testing/py-poppler/APKBUILD
+++ b/testing/py-poppler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Python bindings for the poppler PDF library"
url="https://launchpad.net/poppler-python"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="python2 poppler-glib py-gtk"
depends_dev=""
makedepends="python2-dev poppler-dev py-gtk-dev py2-cairo-dev"
diff --git a/testing/py-praw/APKBUILD b/testing/py-praw/APKBUILD
index a42371e4a7..f2d62ee3d8 100644
--- a/testing/py-praw/APKBUILD
+++ b/testing/py-praw/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python module to access to reddit's API"
url="https://github.com/praw-dev/praw"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="py-update-checker py-requests py-six"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-progressbar/APKBUILD b/testing/py-progressbar/APKBUILD
index d867db0592..79e603687e 100644
--- a/testing/py-progressbar/APKBUILD
+++ b/testing/py-progressbar/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Text progressbar library for Python"
url="http://code.google.com/p/python-progressbar/"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pybles/APKBUILD b/testing/py-pybles/APKBUILD
index dec6081fd7..be14eb679e 100644
--- a/testing/py-pybles/APKBUILD
+++ b/testing/py-pybles/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python module to represent tables in the terminal"
url="http://pypi.python.org/pypi/Pybles/"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2 py-blessings"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pycountry/APKBUILD b/testing/py-pycountry/APKBUILD
index 7aa1f57e9f..94e3260e90 100644
--- a/testing/py-pycountry/APKBUILD
+++ b/testing/py-pycountry/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
url="http://pypi.python.org/pypi/pycountry"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="python2-dev py-lxml py-setuptools"
diff --git a/testing/py-pycryptodome/APKBUILD b/testing/py-pycryptodome/APKBUILD
index 028394b9fc..107706fcff 100644
--- a/testing/py-pycryptodome/APKBUILD
+++ b/testing/py-pycryptodome/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Self-contained cryptographic library"
url="https://github.com/coveralls-clients/coveralls-python"
arch="all"
-license="Apache2"
+license="Apache-2.0"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-pygfm/APKBUILD b/testing/py-pygfm/APKBUILD
index c88d8de3d5..44a1850375 100644
--- a/testing/py-pygfm/APKBUILD
+++ b/testing/py-pygfm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Basic immutable container types for Python"
url="https://github.com/tomchristie/itypes"
arch="noarch"
-license="BSD3"
+license="BSD-3-Clause"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
checkdepends="py-codecov py-coverage py-coveralls py-markdown"
diff --git a/testing/py-pygtail/APKBUILD b/testing/py-pygtail/APKBUILD
index 3a6c1a7f74..aa153c08d0 100644
--- a/testing/py-pygtail/APKBUILD
+++ b/testing/py-pygtail/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Reads log file lines that have not been read"
url="http://github.com/bgreenlee/pygtail"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pyparted/APKBUILD b/testing/py-pyparted/APKBUILD
index 6b1284ca34..bfe2bd3b37 100644
--- a/testing/py-pyparted/APKBUILD
+++ b/testing/py-pyparted/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Python bindings for GNU parted (libparted)"
url="https://github.com/rhinstaller/pyparted"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="python2-dev python3-dev py-setuptools parted-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="$pkgname-$pkgver.tar.gz::https://github.com/rhinstaller/${pkgname/py-/}/archive/v$pkgver.tar.gz"
diff --git a/testing/py-pyphen/APKBUILD b/testing/py-pyphen/APKBUILD
index da15be2fba..d5a5e79e2a 100644
--- a/testing/py-pyphen/APKBUILD
+++ b/testing/py-pyphen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="python-based dictionary hyphenator library"
url="http://www.pyphen.org/"
arch="noarch"
-license="GPL2+ MPL LGPL2+"
+license="GPL-2.0-or-later MPL LGPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pyzor/APKBUILD b/testing/py-pyzor/APKBUILD
index d38d67834a..1c53b9ac21 100644
--- a/testing/py-pyzor/APKBUILD
+++ b/testing/py-pyzor/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Python implementation of a spam-blocking networked system that use spam signatures to identify them."
url="https://pypi.python.org/pypi/pyzor/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-qt/APKBUILD b/testing/py-qt/APKBUILD
index 82dfbfabad..9d82e3eae0 100644
--- a/testing/py-qt/APKBUILD
+++ b/testing/py-qt/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A set of Python bindings for the Qt toolkit"
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="py-sip"
makedepends="python2-dev py-dbus-dev phonon-dev qt-dev py-sip-dev libx11-dev"
subpackages=""
diff --git a/testing/py-redmine/APKBUILD b/testing/py-redmine/APKBUILD
index 659c12c27e..628a93faa3 100644
--- a/testing/py-redmine/APKBUILD
+++ b/testing/py-redmine/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A simple library for communicating with redmine"
url="https://github.com/maxtepkeev/python-redmine"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2 py-requests"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-relatorio/APKBUILD b/testing/py-relatorio/APKBUILD
index a873d4ecc0..76d0cf9aaf 100644
--- a/testing/py-relatorio/APKBUILD
+++ b/testing/py-relatorio/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A templating library able to output odt and pdf files"
url="http://relatorio.openhex.org"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-rpio/APKBUILD b/testing/py-rpio/APKBUILD
index 908a16dd62..9c2901bfdd 100644
--- a/testing/py-rpio/APKBUILD
+++ b/testing/py-rpio/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="GPIO toolbox for the Raspberry Pi"
url="https://github.com/metachris/RPIO"
arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-runstatus/APKBUILD b/testing/py-runstatus/APKBUILD
index 13b2559187..7ed62d640f 100644
--- a/testing/py-runstatus/APKBUILD
+++ b/testing/py-runstatus/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python library to detect program states"
url="https://github.com/riquito/runstatus/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-s3transfer/APKBUILD b/testing/py-s3transfer/APKBUILD
index 01f3f58418..3bf985ef56 100644
--- a/testing/py-s3transfer/APKBUILD
+++ b/testing/py-s3transfer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Amazon S3 Transfer Manager for Python"
url="https://github.com/boto/s3transfer"
arch="noarch"
-license="apache2"
+license="Apache-2.0"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
source="$_pkgname-$pkgver.tar.gz::https://github.com/boto/$_pkgname/archive/$pkgver.tar.gz"
diff --git a/testing/py-seqdiag/APKBUILD b/testing/py-seqdiag/APKBUILD
index 1e7a469ba6..4529bfe3f5 100644
--- a/testing/py-seqdiag/APKBUILD
+++ b/testing/py-seqdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="seqdiag generate sequence-diagram image file"
url="https://pypi.python.org/pypi/seqdiag"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py-pillow py-funcparserlib py-blockdiag"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-sphinx-theme-epfl/APKBUILD b/testing/py-sphinx-theme-epfl/APKBUILD
index af4b01d54e..1de3ac716b 100644
--- a/testing/py-sphinx-theme-epfl/APKBUILD
+++ b/testing/py-sphinx-theme-epfl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="The EPFL Sphinx theme"
url="http://kis-doc.epfl.ch/sphinx/"
arch="noarch"
-license="GPL3"
+license="GPL-3.0"
depends="python2 py-sphinx"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-gist/APKBUILD b/testing/py-sphinxcontrib-gist/APKBUILD
index 058253ab75..0100d7409d 100644
--- a/testing/py-sphinxcontrib-gist/APKBUILD
+++ b/testing/py-sphinxcontrib-gist/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx gist extension"
url="https://pypi.python.org/pypi/sphinxcontrib-gist"
arch="noarch"
-license="LGPL3"
+license="LGPL-3.0"
depends="python2 py-sphinx"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-git/APKBUILD b/testing/py-sphinxcontrib-git/APKBUILD
index 2c9f665a90..537f5ff805 100644
--- a/testing/py-sphinxcontrib-git/APKBUILD
+++ b/testing/py-sphinxcontrib-git/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx git changelog extension"
url="https://github.com/OddBloke/sphinx-git"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2 py-sphinx py-feedformatter"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-images/APKBUILD b/testing/py-sphinxcontrib-images/APKBUILD
index b6a64697db..d1df008fb8 100644
--- a/testing/py-sphinxcontrib-images/APKBUILD
+++ b/testing/py-sphinxcontrib-images/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx images extension"
url="https://pypi.python.org/pypi/sphinxcontrib-images"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2 py-sphinx py-requests"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-manpage/APKBUILD b/testing/py-sphinxcontrib-manpage/APKBUILD
index 0b78d1e304..cc2b628790 100644
--- a/testing/py-sphinxcontrib-manpage/APKBUILD
+++ b/testing/py-sphinxcontrib-manpage/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx manpage extension"
url="https://pypi.python.org/pypi/sphinxcontrib-manpage"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="python2 py-sphinx py-nwdiag"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-mercurial/APKBUILD b/testing/py-sphinxcontrib-mercurial/APKBUILD
index 8433b63ffc..87f1b723eb 100644
--- a/testing/py-sphinxcontrib-mercurial/APKBUILD
+++ b/testing/py-sphinxcontrib-mercurial/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx mercurial extension"
url="http://bitbucket.org/cointoss1973/sphinxcontrib-mercurial"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2 py-sphinx"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-whoosh/APKBUILD b/testing/py-sphinxcontrib-whoosh/APKBUILD
index 9058f33f55..15be58585c 100644
--- a/testing/py-sphinxcontrib-whoosh/APKBUILD
+++ b/testing/py-sphinxcontrib-whoosh/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sphinx whoosh extension"
url="https://pypi.python.org/pypi/sphinxcontrib-whoosh"
arch="noarch"
-license="Public Domain"
+license="Public-Domain"
depends="python2 py-sphinx"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-stdnum/APKBUILD b/testing/py-stdnum/APKBUILD
index 7f6b30a30b..5481ee676b 100644
--- a/testing/py-stdnum/APKBUILD
+++ b/testing/py-stdnum/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A Python module to handle standardized numbers and codes"
url="http://arthurdejong.org/python-stdnum/"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
source="https://arthurdejong.org/python-stdnum/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-telegram-bot/APKBUILD b/testing/py-telegram-bot/APKBUILD
index 937f053e8b..97d36742be 100644
--- a/testing/py-telegram-bot/APKBUILD
+++ b/testing/py-telegram-bot/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python wrapper around the Telegram Bot API"
url="https://github.com/python-telegram-bot/python-telegram-bot"
arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
depends="py-futures py-certifi"
depends_dev=""
makedepends="python2-dev python3-dev py2-setuptools"
diff --git a/testing/py-tzlocal/APKBUILD b/testing/py-tzlocal/APKBUILD
index f6048bd16f..931aeb6758 100644
--- a/testing/py-tzlocal/APKBUILD
+++ b/testing/py-tzlocal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Python tzinfo object for the local timezone"
url="http://pytz.sourceforge.net/"
arch="noarch"
-license="CC0 1.0"
+license="CC0-1.0"
depends="python2 py-tz"
makedepends="python2-dev py-setuptools"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-unicorn-hat/APKBUILD b/testing/py-unicorn-hat/APKBUILD
index 544412c122..bded9ea2ec 100644
--- a/testing/py-unicorn-hat/APKBUILD
+++ b/testing/py-unicorn-hat/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Python wrapper for driving ws2812 pixels from the Raspberry Pi"
url="http://shop.pimoroni.com/products/unicorn-hat"
arch="armhf aarch64"
-license="GPL2"
+license="GPL-2.0"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-urlobject/APKBUILD b/testing/py-urlobject/APKBUILD
index 84e3d47215..49a57b7b9c 100644
--- a/testing/py-urlobject/APKBUILD
+++ b/testing/py-urlobject/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python utility class for manipulating URLs"
url="https://github.com/dperezrada/html2data"
arch="noarch"
-license="Public Domain"
+license="Public-Domain"
options="!check"
depends=""
makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-vatnumber/APKBUILD b/testing/py-vatnumber/APKBUILD
index 1dd04d7797..7e0f65e3ef 100644
--- a/testing/py-vatnumber/APKBUILD
+++ b/testing/py-vatnumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python module to validate VAT numbers"
url="http://code.google.com/p/vatnumber/"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-wbdata/APKBUILD b/testing/py-wbdata/APKBUILD
index c5641168f7..c9e00bbd3e 100644
--- a/testing/py-wbdata/APKBUILD
+++ b/testing/py-wbdata/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A library to access World Bank data"
url="https://github.com/oliversherouse/wbdata"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-whoispy/APKBUILD b/testing/py-whoispy/APKBUILD
index 5f4844a6c4..1a9c8ed90e 100644
--- a/testing/py-whoispy/APKBUILD
+++ b/testing/py-whoispy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python module/library to get the WHOIS information"
url="https://github.com/nemumu/whoispy"
arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-xlib/APKBUILD b/testing/py-xlib/APKBUILD
index a5cff29773..0a664f3425 100644
--- a/testing/py-xlib/APKBUILD
+++ b/testing/py-xlib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A fully functional X client library for Python programs"
url="https://github.com/python-xlib/python-xlib"
arch="noarch"
-license="LGPL2"
+license="LGPL-2.0"
depends="py-six"
checkdepends="xvfb"
makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-zeroconf/APKBUILD b/testing/py-zeroconf/APKBUILD
index a6c52e8b12..994a2c181d 100644
--- a/testing/py-zeroconf/APKBUILD
+++ b/testing/py-zeroconf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A Python implementation of multicast DNS service discovery"
url="https://github.com/jstasiak/python-zeroconf"
arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="py-six py-netifaces"
makedepends="python2-dev py-setuptools python3-dev"
subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
diff --git a/testing/py-zope-configuration/APKBUILD b/testing/py-zope-configuration/APKBUILD
index 793884a3f4..c1c6f122cb 100644
--- a/testing/py-zope-configuration/APKBUILD
+++ b/testing/py-zope-configuration/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Zope Configuration Markup Language"
url="http://pypi.python.org/pypi/zope.configuration"
arch="noarch"
-license="ZPL2+"
+license="ZPL-2.1"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py-zope-deprecation/APKBUILD b/testing/py-zope-deprecation/APKBUILD
index a0882f7041..88667793d5 100644
--- a/testing/py-zope-deprecation/APKBUILD
+++ b/testing/py-zope-deprecation/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Zope Deprecation Infrastructure"
url="https://pypi.python.org/pypi/zope.deprecation"
arch="noarch"
-license="ZPL2+"
+license="ZPL-2.1"
depends="python2"
depends_dev=""
makedepends="python2-dev py-setuptools"
diff --git a/testing/py3-aiohttp-debugtoolbar/APKBUILD b/testing/py3-aiohttp-debugtoolbar/APKBUILD
index 6b0ecc95ed..9f7d492eb2 100644
--- a/testing/py3-aiohttp-debugtoolbar/APKBUILD
+++ b/testing/py3-aiohttp-debugtoolbar/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A ibrary for debugtoolbar support for aiohttp"
url="https://github.com/aio-libs/aiohttp-debugtoolbar"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py3-aiohttp py3-aiohttp-jinja2"
makedepends="python3-dev"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py3-aiohttp-jinja2/APKBUILD b/testing/py3-aiohttp-jinja2/APKBUILD
index 8c368fa81d..ae2e6b99b9 100644
--- a/testing/py3-aiohttp-jinja2/APKBUILD
+++ b/testing/py3-aiohttp-jinja2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Jinja2 template renderer for aiohttp"
url="https://github.com/aio-libs/aiohttp-jinja2"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py3-aiohttp py3-jinja2"
makedepends="python3-dev"
source="$_pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiohttp-jinja2/archive/v$pkgver.tar.gz"
diff --git a/testing/py3-aiohttp-session/APKBUILD b/testing/py3-aiohttp-session/APKBUILD
index c92dca4f29..e3f3f5da0d 100644
--- a/testing/py3-aiohttp-session/APKBUILD
+++ b/testing/py3-aiohttp-session/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Sessions support for aiohttp"
url="http://aiohttp-session.readthedocs.io/"
arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
depends="py3-aiohttp"
makedepends="python3-dev"
source="${pkgname}-${pkgver}.tar.gz::https://github.com/aio-libs/aiohttp-session/archive/v1.0.1.tar.gz"
diff --git a/testing/py3-pygpgme/APKBUILD b/testing/py3-pygpgme/APKBUILD
index 5c34d834e7..34e51b4a61 100644
--- a/testing/py3-pygpgme/APKBUILD
+++ b/testing/py3-pygpgme/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="PyGPGME is a Python module that lets you sign, verify, encrypt and decrypt messages using the OpenPGP format."
url="https://launchpad.net/pygpgme"
arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
depends="python3 gpgme"
makedepends="python3-dev gpgme-dev"
subpackages=""
diff --git a/testing/py3-unoconv/APKBUILD b/testing/py3-unoconv/APKBUILD
index 60733aefe1..981eee0c1d 100644
--- a/testing/py3-unoconv/APKBUILD
+++ b/testing/py3-unoconv/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Tool to convert between any document format supported by LibreOffice"
url="http://dag.wieers.com/home-made/unoconv/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="libreoffice python3"
makedepends="python3-dev py-setuptools"
subpackages=""
diff --git a/testing/pylint/APKBUILD b/testing/pylint/APKBUILD
index 541bb2011d..89a2ab0d9a 100644
--- a/testing/pylint/APKBUILD
+++ b/testing/pylint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Analyzes Python code looking for bugs and signs of poor quality"
url="http://pypi.python.org/pypi/pylint"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="py-mccabe py-six py-isort py-astroid"
makedepends="python2-dev python3-dev py-setuptools"
subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/qperf/APKBUILD b/testing/qperf/APKBUILD
index b73b22f8be..015def2821 100644
--- a/testing/qperf/APKBUILD
+++ b/testing/qperf/APKBUILD
@@ -7,7 +7,7 @@ url="https://www.openfabrics.org"
arch="all"
makedepends="perl perl-doc"
subpackages="$pkgname-doc"
-license="GPL2"
+license="GPL-2.0"
source="https://www.openfabrics.org/downloads/qperf/$pkgname-$pkgver.tar.gz"
builddir="$srcdir"/"$pkgname"-"$pkgver"
diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD
index f0cceb9301..49747e9065 100644
--- a/testing/qt-creator/APKBUILD
+++ b/testing/qt-creator/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Lightweight and cross-platform IDE for Qt"
url="https://qt-project.org/wiki/Category:Tools::QtCreator"
arch="all !aarch64 !ppc64le"
-license="LGPLv2 with exceptions"
+license="LGPL-2.0 with exceptions"
depends=""
depends_dev=""
makedepends="$depends_dev qt-dev qt-private-dev paxmark"
diff --git a/testing/qt5-qtconnectivity/APKBUILD b/testing/qt5-qtconnectivity/APKBUILD
index 7f750c1e5b..12134e4535 100644
--- a/testing/qt5-qtconnectivity/APKBUILD
+++ b/testing/qt5-qtconnectivity/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="QT5 Connectivity Compontents"
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" #upstream does not provide check
makedepends="qt5-qtbase-dev"
subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtlocation/APKBUILD b/testing/qt5-qtlocation/APKBUILD
index 647c7ef012..a26ebf76e9 100644
--- a/testing/qt5-qtlocation/APKBUILD
+++ b/testing/qt5-qtlocation/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="Qt5 - Location component"
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" # upstream does not provide check
makedepends="qt5-qtbase-dev"
subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtquickcontrols2/APKBUILD b/testing/qt5-qtquickcontrols2/APKBUILD
index d9d45c53e3..be76687057 100644
--- a/testing/qt5-qtquickcontrols2/APKBUILD
+++ b/testing/qt5-qtquickcontrols2/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="Qt5 - module with set of QtQuick controls for embedded"
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" #upstream does not provide check
depends="qt5-qtgraphicaleffects"
makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
diff --git a/testing/qt5-qtremoteobjects/APKBUILD b/testing/qt5-qtremoteobjects/APKBUILD
index 58f0401a26..47f2dc9bb2 100644
--- a/testing/qt5-qtremoteobjects/APKBUILD
+++ b/testing/qt5-qtremoteobjects/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt"
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" #upstream does not provide check
makedepends="qt5-qtbase-dev"
subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtsensors/APKBUILD b/testing/qt5-qtsensors/APKBUILD
index 6fe9603ca7..40f6c7f600 100644
--- a/testing/qt5-qtsensors/APKBUILD
+++ b/testing/qt5-qtsensors/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="+The Qt Sensors API provides access to sensor hardware via QML and C++"
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" #upstream does not provide check
makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtwebchannel/APKBUILD b/testing/qt5-qtwebchannel/APKBUILD
index fd2793200d..de20d7bbf4 100644
--- a/testing/qt5-qtwebchannel/APKBUILD
+++ b/testing/qt5-qtwebchannel/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="library for seamless integration of C++ +and QML applications with HTML/JavaScript clients."
url="http://qt-project.org/"
arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
options="!check" #upstream does not provide check
makedepends="qt5-qtbase-dev qt5-websockets-dev"
subpackages="$pkgname-dev"
diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD
index a63f049f75..8f21ecc3f1 100644
--- a/testing/rabbitmq-server/APKBUILD
+++ b/testing/rabbitmq-server/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="RabbitMQ is an open source multi-protocol messaging broker."
url="http://www.rabbitmq.com/"
arch="noarch"
-license="MPL 1.1"
+license="MPL-1.1"
depends="erlang erlang-tools erlang-runtime-tools erlang-stdlib
logrotate erlang-ssl erlang-crypto erlang-parsetools
erlang-mnesia erlang-sasl erlang-inets erlang-syntax-tools
diff --git a/testing/radare2/APKBUILD b/testing/radare2/APKBUILD
index b64bc17156..0e3bab4839 100644
--- a/testing/radare2/APKBUILD
+++ b/testing/radare2/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
pkgdesc="An opensource, crossplatform reverse engineering framework"
url="http://www.radare.org"
arch="all !aarch64"
-license="GPLv3"
+license="GPL-3.0"
options="!check" # upstream does not provide any working testsuite
depends=""
depends_dev=""
diff --git a/testing/radicale/APKBUILD b/testing/radicale/APKBUILD
index 46b840a649..ff88d6aebf 100644
--- a/testing/radicale/APKBUILD
+++ b/testing/radicale/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A simple CalDAV (calendar) and CardDAV (contact) server"
url="http://radicale.org"
arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
depends="python3 py3-vobject"
pkgusers="radicale"
pkggroups="radicale"
diff --git a/testing/rcs/APKBUILD b/testing/rcs/APKBUILD
index bed4abb80e..115a712b69 100644
--- a/testing/rcs/APKBUILD
+++ b/testing/rcs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Revision Control System"
url="https://www.gnu.org/software/rcs"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends="diffutils"
subpackages="$pkgname-doc"
source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/reaver-wps-fork-t6x/APKBUILD b/testing/reaver-wps-fork-t6x/APKBUILD
index 2724eb3ccf..f94071f88d 100644
--- a/testing/reaver-wps-fork-t6x/APKBUILD
+++ b/testing/reaver-wps-fork-t6x/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Community forked version of reaver, the WPS password cracker"
url="https://github.com/t6x/reaver-wps-fork-t6x"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="pixiewps sqlite aircrack-ng"
makedepends="libpcap-dev sqlite-dev linux-headers"
install=""
diff --git a/testing/recoll/APKBUILD b/testing/recoll/APKBUILD
index c014064879..6599f860fb 100644
--- a/testing/recoll/APKBUILD
+++ b/testing/recoll/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Desktop full-text search tool"
url="http://www.lesbonscomptes.com/recoll/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="file libx11-dev libxslt-dev qt-dev xapian-core-dev zlib-dev"
subpackages="$pkgname-doc"
source="http://www.lesbonscomptes.com/recoll/recoll-$pkgver.tar.gz
diff --git a/testing/refpolicy/APKBUILD b/testing/refpolicy/APKBUILD
index 5d40218191..6cd1732ee0 100644
--- a/testing/refpolicy/APKBUILD
+++ b/testing/refpolicy/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="SELinux policy reference"
url="https://github.com/TresysTechnology/refpolicy/wiki"
arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev checkpolicy python gawk"
diff --git a/testing/rlwrap/APKBUILD b/testing/rlwrap/APKBUILD
index 120ee3d91d..2f38a193ef 100644
--- a/testing/rlwrap/APKBUILD
+++ b/testing/rlwrap/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="A readline wrapper"
url="https://github.com/hanslub42/rlwrap"
arch="all"
-license="GPLv2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev readline-dev ncurses-dev"
diff --git a/testing/sane/APKBUILD b/testing/sane/APKBUILD
index 04d84f6b89..c1375da5a3 100644
--- a/testing/sane/APKBUILD
+++ b/testing/sane/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Scanner Access Now Easy - an universal scanner interface"
url="http://www.sane-project.org/"
arch="x86 x86_64"
-license="GPLv2.0+ GPLv2.0+-with-sane-exception public-domain"
+license="GPL-2.0-or-later GPL-2.0-or-later-with-sane-exception Public-Domain"
depends=""
depends_dev=""
makedepends="diffutils file libtool libusb-dev v4l-utils-dev net-snmp-dev avahi-dev libpng-dev
diff --git a/testing/sbt/APKBUILD b/testing/sbt/APKBUILD
index f35f5add68..8e795ff315 100644
--- a/testing/sbt/APKBUILD
+++ b/testing/sbt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="The interactive build tool, sbt is a build tool for Scala, Java, and more."
url="http://www.scala-sbt.org/"
arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
depends="openjdk8-jre bash"
source="https://dl.bintray.com/$pkgname/native-packages/$pkgname/$pkgver/$pkgname-$pkgver.tgz
global-sbtopts.patch"
diff --git a/testing/sch-cake-hardened/APKBUILD b/testing/sch-cake-hardened/APKBUILD
index f2204633b3..9b56e17608 100644
--- a/testing/sch-cake-hardened/APKBUILD
+++ b/testing/sch-cake-hardened/APKBUILD
@@ -29,7 +29,7 @@ pkgrel=0
pkgdesc="Out of tree build for the new cake qdisc"
url="https://github.com/dtaht/sch_cake"
arch="x86 x86_64 armhf"
-license="Dual BSD/GPL"
+license="BSD or GPL"
depends="linux-${_flavor}=${_kernelver}"
makedepends="linux-${_flavor}-dev=${_kernelver} linux-headers"
install=
diff --git a/testing/setroot/APKBUILD b/testing/setroot/APKBUILD
index beb9b28ac5..a201231402 100644
--- a/testing/setroot/APKBUILD
+++ b/testing/setroot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Simple X background setter inspired by imlibsetroot and feh"
url="https://github.com/ttzhou/setroot"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
depends_dev="imlib2-dev"
makedepends="$depends_dev"
diff --git a/testing/shadowsocks-libev/APKBUILD b/testing/shadowsocks-libev/APKBUILD
index 99121261c4..dd870b621f 100644
--- a/testing/shadowsocks-libev/APKBUILD
+++ b/testing/shadowsocks-libev/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
pkgdesc="lightweight secured SOCKS5 proxy"
url="https://shadowsocks.org/en/download/servers.html"
arch="all"
-license="GPLv3"
+license="GPL-3.0"
depends=""
makedepends="asciidoc autoconf libtool linux-headers
libressl-dev pcre-dev xmlto libev-dev udns-dev libsodium-dev zlib-dev"
diff --git a/testing/shellinabox/APKBUILD b/testing/shellinabox/APKBUILD
index 0f7516f52f..b1c56a55d3 100644
--- a/testing/shellinabox/APKBUILD
+++ b/testing/shellinabox/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Implementation of a web server that can export arbitrary command line tools to a web based terminal emulator"
url="https://github.com/shellinabox/shellinabox"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="autoconf automake m4 libtool libressl-dev zlib-dev"
subpackages="$pkgname-doc"
pkgusers="$_daemonname"
diff --git a/testing/shine/APKBUILD b/testing/shine/APKBUILD
index 5998c6514f..0f23e53fb1 100644
--- a/testing/shine/APKBUILD
+++ b/testing/shine/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Shine: fast fixed-point mp3 encoding"
url="https://github.com/toots/shine"
arch="all"
-license="LGPL2"
+license="LGPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev libtool automake autoconf"
diff --git a/testing/shotcut/APKBUILD b/testing/shotcut/APKBUILD
index aa9bca4ed3..6aedce925b 100644
--- a/testing/shotcut/APKBUILD
+++ b/testing/shotcut/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="a free, open source, cross-platform video editor"
url="https://www.shotcut.org"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
makedepends="qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtmultimedia-dev
qt5-websockets-dev qt5-x11extras-dev ffmpeg-dev mlt-dev"
diff --git a/testing/simple-scan/APKBUILD b/testing/simple-scan/APKBUILD
index 00e840c2af..8ca2f53d96 100644
--- a/testing/simple-scan/APKBUILD
+++ b/testing/simple-scan/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Simple Scan allows you to get images from a scanner"
url="https://launchpad.net/simple-scan"
arch="all"
-license="GPL3"
+license="GPL-3.0"
makedepends="sane-dev dconf-dev gtk+3.0-dev colord-dev libgusb-dev vala itstool
libxml2-utils"
subpackages="$pkgname-doc"
diff --git a/testing/snapraid/APKBUILD b/testing/snapraid/APKBUILD
index 5e855a7f77..548b9529cd 100644
--- a/testing/snapraid/APKBUILD
+++ b/testing/snapraid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A backup program for disk arrays"
url="http://www.snapraid.it"
arch="all"
-license="GPL3"
+license="GPL-3.0"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/amadvance/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/testing/softhsm/APKBUILD b/testing/softhsm/APKBUILD
index 99a7b6ea0b..92c640b382 100644
--- a/testing/softhsm/APKBUILD
+++ b/testing/softhsm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="cryptographic store accessible through a PKCS #11"
url="http://www.softhsm.org/"
arch="all"
-license="BSD2"
+license="BSD-2-Clause"
depends="libressl"
makedepends="libressl-dev automake autoconf libtool file"
install=""
diff --git a/testing/spreed-webrtc/APKBUILD b/testing/spreed-webrtc/APKBUILD
index 8789cda569..d2d5a5f9cb 100644
--- a/testing/spreed-webrtc/APKBUILD
+++ b/testing/spreed-webrtc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="WebRTC audio/video call and conferencing server"
url="http://spreed.me"
arch="all"
-license="AGPL3"
+license="AGPL-3.0"
depends=
depends_dev=
makedepends="$depends_dev autoconf automake go go-context go-acceptlanguageparser
diff --git a/testing/sqm-scripts/APKBUILD b/testing/sqm-scripts/APKBUILD
index e4adb72239..7245c23aa3 100644
--- a/testing/sqm-scripts/APKBUILD
+++ b/testing/sqm-scripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="SQM scripts traffic shaper"
url="https://github.com/tohojo/sqm-scripts"
arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
depends="iproute2 iptables ip6tables"
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/sslh/APKBUILD b/testing/sslh/APKBUILD
index efcd23d8c8..2af08340b7 100644
--- a/testing/sslh/APKBUILD
+++ b/testing/sslh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port) "
url="http://www.rutschle.net/tech/sslh.shtml"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libconfig-dev libcap-dev pcre-dev perl"
subpackages="$pkgname-doc"
options="!check"
diff --git a/testing/stargazer/APKBUILD b/testing/stargazer/APKBUILD
index a707df3c29..1adcde1326 100644
--- a/testing/stargazer/APKBUILD
+++ b/testing/stargazer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A billing system for small home and office networks"
url="http://www.stg.dp.ua"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
makedepends="expat-dev linux-headers"
install=""
diff --git a/testing/stoken/APKBUILD b/testing/stoken/APKBUILD
index 797b1ac909..709344672c 100644
--- a/testing/stoken/APKBUILD
+++ b/testing/stoken/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="RSA SecurID-compatible software token for Linux/UNIX systems"
url="http://stoken.sf.net"
arch="all"
-license="LGPLv2.1+"
+license="LGPL-2.1-or-later"
makedepends="autoconf automake libtool libxml2-dev nettle-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/cernekee/$pkgname/archive/v$pkgver.tar.gz"
diff --git a/testing/subtitleeditor/APKBUILD b/testing/subtitleeditor/APKBUILD
index 305cdc6c7f..ea8e55d3c3 100644
--- a/testing/subtitleeditor/APKBUILD
+++ b/testing/subtitleeditor/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="GTK+3 tool to create and edit subtitles."
url="http://home.gna.org/subtitleeditor/"
arch="x86 x86_64"
-license="GPL3"
+license="GPL-3.0"
makedepends="libxml++-2.6-dev enchant-dev libsigc++-dev xdg-utils gtkmm3-dev gtk+3.0-dev
gst-plugins-base1-dev gstreamer1-dev gstreamermm-dev iso-codes-dev gst-libav1
desktop-file-utils gst-plugins-ugly1"
diff --git a/testing/swaks/APKBUILD b/testing/swaks/APKBUILD
index b6458380f5..a82ad45dd0 100644
--- a/testing/swaks/APKBUILD
+++ b/testing/swaks/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Swiss Army Knife for SMTP"
url="http://www.jetmore.org/john/code/swaks/"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="perl"
install=""
subpackages="$pkgname-doc"
diff --git a/testing/tanidvr/APKBUILD b/testing/tanidvr/APKBUILD
index 10fea3d341..93bea5960c 100644
--- a/testing/tanidvr/APKBUILD
+++ b/testing/tanidvr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="a CLI tool for accessing DVRs and IP cameras based on the proprietary DVR-IP protocol (port 37777/TCP)"
url="http://tanidvr.sourceforge.net"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=
depends_dev=
makedepends=
diff --git a/testing/tcc/APKBUILD b/testing/tcc/APKBUILD
index cffb5d15ee..c8bde7628e 100644
--- a/testing/tcc/APKBUILD
+++ b/testing/tcc/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Tiny C Compiler"
url="http://repo.or.cz/tinycc.git"
arch="all !ppc64le"
-license="LGPL2.1"
+license="LGPL-2.1"
makedepends="texinfo"
options="!check" # test suite currently fails on the server
source="$pkgname-$pkgver.tar.gz::http://repo.or.cz/tinycc.git/snapshot/$_commit.tar.gz"
diff --git a/testing/tcpreplay/APKBUILD b/testing/tcpreplay/APKBUILD
index 472aff0546..f7fc1e1f41 100644
--- a/testing/tcpreplay/APKBUILD
+++ b/testing/tcpreplay/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Replay captured network traffic"
url="http://tcpreplay.synfin.net/trac/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
depends_dev=""
makedepends="libdnet-dev libpcap-dev tcpdump"
diff --git a/testing/tcsh/APKBUILD b/testing/tcsh/APKBUILD
index 3cf154385f..95d031a220 100644
--- a/testing/tcsh/APKBUILD
+++ b/testing/tcsh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="extended C-shell"
url="http://www.tcsh.org"
arch="all"
-license="bsd"
+license="BSD"
depends=""
makedepends="ncurses-dev"
install=""
diff --git a/testing/td-agent-bit/APKBUILD b/testing/td-agent-bit/APKBUILD
index d0914bd5c4..6224486d02 100644
--- a/testing/td-agent-bit/APKBUILD
+++ b/testing/td-agent-bit/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Fast and Lightweight Log/Data Forwarder [fluent-bit]"
url="http://fluentbit.io"
arch="all !aarch64"
-license="Apache2.0"
+license="Apache-2.0"
makedepends="cmake linux-headers zlib-dev mbedtls-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="http://fluentbit.io/releases/0.10/$_pkgname-$pkgver.tar.gz
diff --git a/testing/thermald/APKBUILD b/testing/thermald/APKBUILD
index b2618b1976..f525d2eb51 100644
--- a/testing/thermald/APKBUILD
+++ b/testing/thermald/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Thermal daemon for IA"
url="https://github.com/01org/thermal_daemon"
arch="all !armhf !aarch64"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends="autoconf automake libtool dbus-glib-dev libxml2-dev linux-headers"
subpackages="$pkgname-doc"
diff --git a/testing/tiptop/APKBUILD b/testing/tiptop/APKBUILD
index d57ab3033d..a5889ab519 100644
--- a/testing/tiptop/APKBUILD
+++ b/testing/tiptop/APKBUILD
@@ -12,7 +12,7 @@ url="http://tiptop.gforge.inria.fr"
# elsewhere but without the aforementioned hardware support and kernel
# support, nothing of use will happen when run.
arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
makedepends="byacc flex linux-headers ncurses-dev libxml2-dev"
subpackages="$pkgname-doc"
source="http://$pkgname.gforge.inria.fr/releases/$pkgname-$pkgver.tar.gz"
diff --git a/testing/tlp/APKBUILD b/testing/tlp/APKBUILD
index 838ac3b3b7..4203d3a0ec 100644
--- a/testing/tlp/APKBUILD
+++ b/testing/tlp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Linux Advanced Power Management"
url="http://linrunner.de/en/tlp/tlp.html"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
subpackages="$pkgname-doc $pkgname-rdw:rdw $pkgname-bash-completion:bashcomp"
source="$_pkgname-$pkgver.tar.gz::https://github.com/linrunner/${_pkgname}/archive/${pkgver}.tar.gz
$pkgname.initd"
diff --git a/testing/ts/APKBUILD b/testing/ts/APKBUILD
index c25833b4d9..4bcf8b2740 100644
--- a/testing/ts/APKBUILD
+++ b/testing/ts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Unix batch system where the tasks spooled run one after the other"
url="http://vicerveza.homeunix.net/~viric/soft/ts/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev bash"
diff --git a/testing/tsung/APKBUILD b/testing/tsung/APKBUILD
index 0c2dc0ec7e..8037120c56 100644
--- a/testing/tsung/APKBUILD
+++ b/testing/tsung/APKBUILD
@@ -6,7 +6,7 @@ pkgver=1.7.0
pkgrel=0
pkgdesc="Tsung is a high-performance benchmark framework for various protocols including HTTP,XMPP,LDAP,etc."
url="http://www.process-one.net/en/tsung/"
-license="GPL2"
+license="GPL-2.0"
arch="noarch !armhf"
depends="bash
erlang
diff --git a/testing/ttf-font-awesome/APKBUILD b/testing/ttf-font-awesome/APKBUILD
index 60620198d0..fc70f86e97 100644
--- a/testing/ttf-font-awesome/APKBUILD
+++ b/testing/ttf-font-awesome/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Iconic font designed for Bootstrap TTF file only"
url="http://fortawesome.github.io/Font-Awesome/"
arch="noarch"
-license="CCPL"
+license="CC"
depends="fontconfig mkfontdir mkfontscale"
makedepends="font-util-dev"
install="$pkgname.post-install"
diff --git a/testing/twemproxy/APKBUILD b/testing/twemproxy/APKBUILD
index d1e1208954..9ee7379f52 100644
--- a/testing/twemproxy/APKBUILD
+++ b/testing/twemproxy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A fast, light-weight proxy for memcached and redis"
url="https://github.com/twitter/twemproxy"
arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
depends=""
depends_dev=""
makedepends="automake autoconf libtool yaml-dev"
diff --git a/testing/ucspi-tcp/APKBUILD b/testing/ucspi-tcp/APKBUILD
index ce8a751831..a878d5cb79 100644
--- a/testing/ucspi-tcp/APKBUILD
+++ b/testing/ucspi-tcp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Easy-to-use command-line tools for building TCP client-server applications."
url="http://cr.yp.to/ucspi-tcp.html"
arch="all"
-license="public-domain"
+license="Public-Domain"
depends=""
makedepends=""
source="http://cr.yp.to/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/testing/udpcast/APKBUILD b/testing/udpcast/APKBUILD
index c253e908f6..58b0605df0 100644
--- a/testing/udpcast/APKBUILD
+++ b/testing/udpcast/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Port of UDPcast file transfer tool"
url="https://www.udpcast.linux.lu/index.html"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev linux-headers m4 perl"
diff --git a/testing/upmpdcli/APKBUILD b/testing/upmpdcli/APKBUILD
index 912606efac..e2f61fc6eb 100644
--- a/testing/upmpdcli/APKBUILD
+++ b/testing/upmpdcli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="upmpdcli is a UPnP Media Renderer front-end for MPD, the Music Player Daemon"
url="http://www.lesbonscomptes.com/upmpdcli"
arch="all !armhf"
-license="GPL2"
+license="GPL-2.0"
options="!check"
depends=""
makedepends="libupnpp-dev libmpdclient-dev libmicrohttpd-dev jsoncpp-dev"
diff --git a/testing/ustr/APKBUILD b/testing/ustr/APKBUILD
index 5cde6920c2..e01a91828f 100644
--- a/testing/ustr/APKBUILD
+++ b/testing/ustr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="String library, very low memory overhead, simple to import"
url="http://www.and.org/ustr/"
arch="all"
-license="MIT or LGPLv2+ or BSD"
+license="MIT or LGPL-2.0-or-later or BSD"
depends=""
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/uucp/APKBUILD b/testing/uucp/APKBUILD
index cd456d23d4..dd807eedc4 100644
--- a/testing/uucp/APKBUILD
+++ b/testing/uucp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="Taylor UUCP is a free implementation of UUCP"
url="http://airs.com/ian/uucp.html"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/vdr/APKBUILD b/testing/vdr/APKBUILD
index 68b3f48757..402f805983 100644
--- a/testing/vdr/APKBUILD
+++ b/testing/vdr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Video Disk Recorder"
url="http://www.tvdr.de/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev="libexecinfo-dev fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
libcap-dev alsa-lib-dev libvdpau-dev libva-dev libx11-dev xcb-util-dev xcb-util-wm-dev
diff --git a/testing/viewnior/APKBUILD b/testing/viewnior/APKBUILD
index ef280bac3e..37d0a08d7b 100644
--- a/testing/viewnior/APKBUILD
+++ b/testing/viewnior/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A fast and simple image viewer"
url="http://siyanpanayotov.com/project/viewnior"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
makedepends="autoconf automake gnome-common gtk+2.0-dev exiv2-dev libtool"
subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/vips/APKBUILD b/testing/vips/APKBUILD
index 686c1064ad..15545b7966 100644
--- a/testing/vips/APKBUILD
+++ b/testing/vips/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A fast image processing library with low memory needs"
url="http://www.vips.ecs.soton.ac.uk/"
arch="all"
-license="LGPL 2.1+"
+license="LGPL-2.1-or-later"
depends_dev="libjpeg-turbo-dev libexif-dev lcms2-dev"
makedepends="$depends_dev fftw-dev giflib-dev glib-dev libpng-dev libwebp-dev
expat-dev orc-dev tiff-dev"
diff --git a/testing/virt-what/APKBUILD b/testing/virt-what/APKBUILD
index 906192e972..3e0c247685 100644
--- a/testing/virt-what/APKBUILD
+++ b/testing/virt-what/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Detect if we are running in a virtual machine"
url="https://people.redhat.com/~rjones/virt-what/"
arch="x86 x86_64 ppc64le"
-license="GPL2+"
+license="GPL-2.0-or-later"
checkdepends="checkbashisms"
makedepends="automake autoconf perl-dev"
subpackages="$pkgname-doc"
diff --git a/testing/vpnc/APKBUILD b/testing/vpnc/APKBUILD
index d4ef16a361..b405f36734 100644
--- a/testing/vpnc/APKBUILD
+++ b/testing/vpnc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="IPSec VPN client compatible with Cisco equipment"
url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
makedepends="libgcrypt-dev perl"
subpackages="$pkgname-doc"
source="http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-$pkgver.tar.gz
diff --git a/testing/watchman/APKBUILD b/testing/watchman/APKBUILD
index f29265cb75..8b477d4993 100644
--- a/testing/watchman/APKBUILD
+++ b/testing/watchman/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="A file watching service"
url="https://facebook.github.io/watchman/"
arch="all"
-license="Apache-2"
+license="Apache-2.0"
makedepends="pcre-dev autoconf automake linux-headers"
source="$pkgname-$pkgver.tar.gz::https://github.com/facebook/watchman/archive/v$pkgver.tar.gz"
builddir="$srcdir/"$pkgname-$pkgver
diff --git a/testing/websockify/APKBUILD b/testing/websockify/APKBUILD
index 29dd2a53b6..e65bac5ddc 100644
--- a/testing/websockify/APKBUILD
+++ b/testing/websockify/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="WebSockets support for any application/server"
url="https://github.com/kanaka/websockify"
arch="noarch"
-license="LGPLv3"
+license="LGPL-3.0"
depends="py2-$pkgname=$pkgver-r$pkgrel py-setuptools py2-numpy"
makedepends="python2-dev"
subpackages="py2-$pkgname:py2"
diff --git a/testing/wicd/APKBUILD b/testing/wicd/APKBUILD
index e3bb51392c..3523ff24c2 100644
--- a/testing/wicd/APKBUILD
+++ b/testing/wicd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Wicd is an open source wired and wireless network manager for Linux"
url="http://wicd.sourceforge.net/"
arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
depends="python2 py-gtk dbus py-dbus wireless-tools iproute2 pm-utils py2-babel"
makedepends="py-setuptools"
source="${pkgname}-${pkgver}.tar.gz::https://github.com/dpaleino/wicd/archive/1.7.2.4.tar.gz
diff --git a/testing/windowmaker/APKBUILD b/testing/windowmaker/APKBUILD
index 742ed8e58d..541fe4a0ba 100644
--- a/testing/windowmaker/APKBUILD
+++ b/testing/windowmaker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Window manager for X emulating the NeXTSTEP user interface"
url="http://www.windowmaker.org"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
depends_dev="libx11-dev libxmu-dev libxft-dev"
makedepends="$depends_dev"
diff --git a/testing/wine-staging/APKBUILD b/testing/wine-staging/APKBUILD
index c85ab65ac5..e836fd7b35 100644
--- a/testing/wine-staging/APKBUILD
+++ b/testing/wine-staging/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
pkgdesc="A compatibility layer for running Windows programs :: Staging"
url="http://wine-staging.com"
arch="x86_64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
replaces="wine"
subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
depends_dev="$pkgname perl"
diff --git a/testing/wireguard-hardened/APKBUILD b/testing/wireguard-hardened/APKBUILD
index 484568a3b4..269a90bcef 100644
--- a/testing/wireguard-hardened/APKBUILD
+++ b/testing/wireguard-hardened/APKBUILD
@@ -32,7 +32,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel))
pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
arch='x86 x86_64 armhf'
url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
depends="linux-${_flavor}=${_kpkgver}"
makedepends="linux-${_flavor}-dev=$_kpkgver libmnl-dev"
install_if="wireguard-tools=$_toolsver linux-hardened=$_kpkgver"
diff --git a/testing/wireguard-tools/APKBUILD b/testing/wireguard-tools/APKBUILD
index 743aef3313..620aa83cb0 100644
--- a/testing/wireguard-tools/APKBUILD
+++ b/testing/wireguard-tools/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Next generation secure network tunnel: userspace tools"
arch='all'
url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
makedepends="libmnl-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
options="!check"
diff --git a/testing/wireguard-vanilla/APKBUILD b/testing/wireguard-vanilla/APKBUILD
index d283abe31e..f1fd2054b0 100644
--- a/testing/wireguard-vanilla/APKBUILD
+++ b/testing/wireguard-vanilla/APKBUILD
@@ -32,7 +32,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel))
pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
arch='all'
url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
depends="${_kpkg}=${_kpkgver}"
makedepends="linux-vanilla-dev=$_kpkgver libmnl-dev"
install_if="wireguard-tools=$_toolsver linux-vanilla=$_kpkgver"
diff --git a/testing/wkhtmltopdf/APKBUILD b/testing/wkhtmltopdf/APKBUILD
index c51ccd858c..d4168239da 100644
--- a/testing/wkhtmltopdf/APKBUILD
+++ b/testing/wkhtmltopdf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Simple shell utility to convert html to pdf"
url="http://wkhtmltopdf.org/"
arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtsvg-dev
diff --git a/testing/wmi-client/APKBUILD b/testing/wmi-client/APKBUILD
index 2212e6913b..0ac028a770 100644
--- a/testing/wmi-client/APKBUILD
+++ b/testing/wmi-client/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="DCOM/WMI client implementation"
url="https://www.orvant.com/packages"
arch="all !aarch64"
-license="GPL3"
+license="GPL-3.0"
subpackages="libwmiclient-dev:libdev libwmiclient:lib"
makedepends="autoconf python-dev perl-datetime"
source="https://launchpad.net/~cybersec/+archive/ubuntu/chaos-ppa-v2/+files/${_pkgname}_${pkgver}.orig.tar.bz2
diff --git a/testing/wok/APKBUILD b/testing/wok/APKBUILD
index df06ecbf0d..de4d2e93ae 100644
--- a/testing/wok/APKBUILD
+++ b/testing/wok/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Webserver of Kimchi - a cherrypy framework for multi-purpose plug-ins"
url="http://kimchi-project.github.io/wok/"
arch="noarch"
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
depends="python2 nginx logrotate py-cherrypy py2-jsonschema
py2-pyparted py2-pyldap py2-psutil py2-m2crypto py-cheetah
py2-augeas py2-pam py2-functools32 py2-lxml py2-libvirt py-cherrypy
diff --git a/testing/wpa_actiond/APKBUILD b/testing/wpa_actiond/APKBUILD
index c92874f74e..2fafb399d1 100644
--- a/testing/wpa_actiond/APKBUILD
+++ b/testing/wpa_actiond/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
url="https://git.archlinux.org/wpa_actiond.git/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends=""
makedepends=""
subpackages=""
diff --git a/testing/wput/APKBUILD b/testing/wput/APKBUILD
index b82ab90c4d..93bf886ff6 100644
--- a/testing/wput/APKBUILD
+++ b/testing/wput/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="A command line tool to upload files to FTP site"
url="http://wput.sourceforge.net/"
arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
makedepends="gnutls-dev"
subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz
diff --git a/testing/wqy-zenhei/APKBUILD b/testing/wqy-zenhei/APKBUILD
index c5656fe6ff..ef7ad51be3 100644
--- a/testing/wqy-zenhei/APKBUILD
+++ b/testing/wqy-zenhei/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Hei-Ti style (sans-serif) Chinese outline font"
url="http://wenq.org/wqy2/index.cgi?ZenHei"
arch="noarch"
-license="GPL2"
+license="GPL-2.0"
depends="fontconfig mkfontscale"
makedepends=""
install=""
diff --git a/testing/x11vnc/APKBUILD b/testing/x11vnc/APKBUILD
index 1a2dc12d46..4fb2fbfdab 100644
--- a/testing/x11vnc/APKBUILD
+++ b/testing/x11vnc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="VNC server for real X displays"
url="http://www.karlrunge.com/x11vnc/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libressl-dev libjpeg-turbo-dev avahi-dev libvncserver-dev
automake autoconf"
subpackages="$pkgname-doc"
diff --git a/testing/xf86-input-wacom/APKBUILD b/testing/xf86-input-wacom/APKBUILD
index 110f8594a2..9862f37579 100644
--- a/testing/xf86-input-wacom/APKBUILD
+++ b/testing/xf86-input-wacom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="X.org Wacom tablet input driver"
url="http://linuxwacom.sourceforge.net/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="xorg-server-dev libxext-dev libxi-dev libxrandr-dev
libxinerama-dev eudev-dev"
checkdepends="bash findutils"
diff --git a/testing/xfce-polkit/APKBUILD b/testing/xfce-polkit/APKBUILD
index 846fd68a77..c711da32b3 100644
--- a/testing/xfce-polkit/APKBUILD
+++ b/testing/xfce-polkit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="A simple PolicyKit authentication agent for XFCE"
url="https://github.com/ncopa/xfce-polkit"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="libxfce4ui-dev polkit-dev glib-dev gtk+2.0-dev autoconf automake"
source="https://github.com/ncopa/xfce-polkit/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/xfce4-mailwatch-plugin/APKBUILD b/testing/xfce4-mailwatch-plugin/APKBUILD
index 27df38fa80..34b32be514 100644
--- a/testing/xfce4-mailwatch-plugin/APKBUILD
+++ b/testing/xfce4-mailwatch-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="a multi-protocol, multi-mailbox mail watcher"
url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
arch="all"
-license="GPL-v2"
+license="GPL-2.0"
depends=""
depends_dev=""
makedepends="$depends_dev intltool libx11-dev glib-dev gtk+2.0-dev
diff --git a/testing/xfce4-sensors-plugin/APKBUILD b/testing/xfce4-sensors-plugin/APKBUILD
index 7c6cf955b4..516ce47599 100644
--- a/testing/xfce4-sensors-plugin/APKBUILD
+++ b/testing/xfce4-sensors-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Reads your hardware sensor values and displays them in your panel"
url="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
arch="all"
-license="GPLv2"
+license="GPL-2.0"
depends_dev="xfce4-panel-dev lm_sensors-dev libxfce4ui-dev"
makedepends="$depends_dev bash"
subpackages="$pkgname-dev $pkgname-lang"
diff --git a/testing/xonotic-data/APKBUILD b/testing/xonotic-data/APKBUILD
index c7e21114bd..135f21aeb1 100644
--- a/testing/xonotic-data/APKBUILD
+++ b/testing/xonotic-data/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Data files for Xonotic"
url="http://www.xonotic.org/"
arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends=""
depends_dev=""
makedepends="$depends_dev"
diff --git a/testing/xonotic/APKBUILD b/testing/xonotic/APKBUILD
index c76de09489..3687f701ec 100644
--- a/testing/xonotic/APKBUILD
+++ b/testing/xonotic/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Game engine for Xonotic (quake1/nexuiz derivative)"
url="http://www.xonotic.org/"
arch="x86 x86_64"
-license="GPL2+"
+license="GPL-2.0-or-later"
depends="xonotic-data"
depends_dev=""
makedepends="sdl-dev mesa-dev jpeg-dev libvorbis-dev libxpm-dev libxxf86dga-dev
diff --git a/testing/xournal/APKBUILD b/testing/xournal/APKBUILD
index ef124ece9d..564e6a1cf4 100644
--- a/testing/xournal/APKBUILD
+++ b/testing/xournal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Notetaking, sketching, keeping a journal using a stylus"
url="http://xournal.sourceforge.net/"
arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
makedepends="libgnomecanvas-dev poppler-dev gtk+2.0-dev libart-lgpl-dev"
subpackages="$pkgname-lang"
source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
diff --git a/testing/yodl/APKBUILD b/testing/yodl/APKBUILD
index da3c18096a..f0b845ad73 100644
--- a/testing/yodl/APKBUILD
+++ b/testing/yodl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Pre-document language and tools to process it"
url="https://fbb-git.github.io/yodl/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
makedepends="icmake bash perl flex bison"
subpackages="$pkgname-doc"
source="yodl-$pkgver.tar.gz::https://github.com/fbb-git/yodl/archive/$pkgver.tar.gz"
diff --git a/testing/zbar/APKBUILD b/testing/zbar/APKBUILD
index 534b87ce55..84700d8749 100644
--- a/testing/zbar/APKBUILD
+++ b/testing/zbar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Port of ZBAR BAR CODE READER"
url="http://zbar.sourceforge.net/"
arch="all !aarch64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
depends="py-gobject"
makedepends="imagemagick-dev gtk+-dev py-gtk-dev qt-dev libtool lcms2-dev autoconf python2-dev"
install=""
diff --git a/testing/zerotier-one/APKBUILD b/testing/zerotier-one/APKBUILD
index 608d8a394f..79752e9c76 100644
--- a/testing/zerotier-one/APKBUILD
+++ b/testing/zerotier-one/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="ZeroTier One allows systems to join and participate in ZeroTier virtual networks."
url="https://www.zerotier.com/"
arch="all"
-license="GPL3"
+license="GPL-3.0"
depends=""
makedepends="nodejs linux-headers"
install=""
diff --git a/testing/zim/APKBUILD b/testing/zim/APKBUILD
index 9c1ea7374e..14302ee440 100644
--- a/testing/zim/APKBUILD
+++ b/testing/zim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A Desktop Wiki Editor"
url="http://zim-wiki.org/"
arch="all"
-license="GPL2"
+license="GPL-2.0"
depends="python2 py-gobject py-xdg py-gtk py2-simplejson xdg-utils"
makedepends="desktop-file-utils"
subpackages="$pkgname-doc $pkgname-lang"
diff --git a/testing/zsh-syntax-highlighting/APKBUILD b/testing/zsh-syntax-highlighting/APKBUILD
index 8f27518cd5..476ed0e7e3 100644
--- a/testing/zsh-syntax-highlighting/APKBUILD
+++ b/testing/zsh-syntax-highlighting/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Fish shell like syntax highlighting for Zsh"
url="https://github.com/zsh-users/zsh-syntax-highlighting"
arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
depends="zsh"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"